wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Hans Leidekker : wbemprox: Add tests for IWbemServices.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: bde60cb95193a8309e0d839b9e99517f957ee073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde60cb95193a8309e0d839b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 14:00:58 2012 +0200 wbemprox: Add tests for IWbemServices. --- dlls/wbemprox/tests/Makefile.in | 3 +- dlls/wbemprox/tests/services.c | 92 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/tests/Makefile.in b/dlls/wbemprox/tests/Makefile.in index f88fa58..fdff192 100644 --- a/dlls/wbemprox/tests/Makefile.in +++ b/dlls/wbemprox/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = wbemprox.dll IMPORTS = uuid oleaut32 ole32 C_SRCS = \ - query.c + query.c \ + services.c @MAKE_TEST_RULES@ diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c new file mode 100644 index 0000000..64be978 --- /dev/null +++ b/dlls/wbemprox/tests/services.c @@ -0,0 +1,92 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> +#include "windows.h" +#include "objidl.h" +#include "wbemcli.h" +#include "wine/test.h" + +static void test_IClientSecurity(void) +{ + static const WCHAR rootW[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + HRESULT hr; + IWbemLocator *locator; + IWbemServices *services; + IClientSecurity *security; + BSTR path = SysAllocString( rootW ); + ULONG refs; + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); + if (hr != S_OK) + { + win_skip("can't create instance of WbemLocator\n"); + return; + } + ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + + refs = IWbemLocator_Release( locator ); + ok( refs == 0, "unexpected refcount %u\n", refs ); + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); + ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + refs = IWbemServices_Release( services ); + ok( refs == 0, "unexpected refcount %u\n", refs ); + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = IWbemServices_QueryInterface( services, &IID_IClientSecurity, (void **)&security ); + ok( hr == S_OK, "failed to query IClientSecurity interface %08x\n", hr ); + ok( (void *)services != (void *)security, "expected pointers to be different\n" ); + + refs = IClientSecurity_Release( security ); + ok( refs == 1, "unexpected refcount %u\n", refs ); + + refs = IWbemServices_Release( services ); + ok( refs == 0, "unexpected refcount %u\n", refs ); + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = IWbemServices_QueryInterface( services, &IID_IClientSecurity, (void **)&security ); + ok( hr == S_OK, "failed to query IClientSecurity interface %08x\n", hr ); + ok( (void *)services != (void *)security, "expected pointers to be different\n" ); + + refs = IWbemServices_Release( services ); + todo_wine ok( refs == 1, "unexpected refcount %u\n", refs ); + + refs = IWbemServices_Release( security ); + todo_wine ok( refs == 0, "unexpected refcount %u\n", refs ); + + IWbemLocator_Release( locator ); + SysFreeString( path ); +} + +START_TEST(services) +{ + CoInitialize( NULL ); + test_IClientSecurity(); + CoUninitialize(); +}

1 0

Hans Leidekker : wbemprox: Add query tests.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 9614ddb5496a1ac94d97914c249e33b2da35053c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9614ddb5496a1ac94d97914c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:32:22 2012 +0200 wbemprox: Add query tests. --- configure | 1 + configure.ac | 1 + dlls/wbemprox/tests/Makefile.in | 7 ++ dlls/wbemprox/tests/query.c | 158 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4e0982f..0849b84 100755 --- a/configure +++ b/configure @@ -15524,6 +15524,7 @@ wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemprox enable_wbemprox +wine_fn_config_test dlls/wbemprox/tests wbemprox_test wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi diff --git a/configure.ac b/configure.ac index c9623ff..a9b52f9 100644 --- a/configure.ac +++ b/configure.ac @@ -2940,6 +2940,7 @@ WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) +WINE_CONFIG_TEST(dlls/wbemprox/tests) WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) diff --git a/dlls/wbemprox/tests/Makefile.in b/dlls/wbemprox/tests/Makefile.in new file mode 100644 index 0000000..f88fa58 --- /dev/null +++ b/dlls/wbemprox/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = wbemprox.dll +IMPORTS = uuid oleaut32 ole32 + +C_SRCS = \ + query.c + +@MAKE_TEST_RULES@ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c new file mode 100644 index 0000000..6916443 --- /dev/null +++ b/dlls/wbemprox/tests/query.c @@ -0,0 +1,158 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> +#include "windows.h" +#include "ocidl.h" +#include "initguid.h" +#include "objidl.h" +#include "wbemcli.h" +#include "wine/test.h" + +static const WCHAR wqlW[] = {'w','q','l',0}; + +static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result ) +{ + static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; + static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; + HRESULT hr; + IWbemClassObject *obj; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( str ); + LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; + ULONG count; + + hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, result ); + if (hr == S_OK) + { + trace("%s\n", wine_dbgstr_w(str)); + for (;;) + { + VARIANT var; + + IEnumWbemClassObject_Next( *result, WBEM_INFINITE, 1, &obj, &count ); + if (!count) break; + + if (IWbemClassObject_Get( obj, captionW, 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) + { + trace("caption: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear( &var ); + } + if (IWbemClassObject_Get( obj, descriptionW, 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) + { + trace("description: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear( &var ); + } + IWbemClassObject_Release( obj ); + } + } + SysFreeString( wql ); + SysFreeString( query ); + return hr; +} + +static void test_select(void) +{ + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + static const WCHAR sqlW[] = {'S','Q','L',0}; + static const WCHAR query1[] = + {'S','E','L','E','C','T',' ','H','O','T','F','I','X','I','D',' ','F','R','O','M',' ', + 'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; + static const WCHAR query2[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S',0}; + static const WCHAR query3[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k',' ','W','H','E','R','E',' ', + '\"','N','T','F','S','\"',' ','=',' ','F','i','l','e','S','y','s','t','e','m',0}; + static const WCHAR query4[] = + {'S','E','L','E','C','T',' ','a',' ','F','R','O','M',' ','b',0}; + static const WCHAR query5[] = + {'S','E','L','E','C','T',' ','a',' ','F','R','O','M',' ','W','i','n','3','2','_','B','i','o','s',0}; + static const WCHAR query6[] = + {'S','E','L','E','C','T',' ','D','e','s','c','r','i','p','t','i','o','n',' ','F','R','O','M',' ', + 'W','i','n','3','2','_','B','i','o','s',0}; + static const WCHAR query7[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', + 'L','I','K','E',' ','\'','%','%','R','E','G','E','D','I','T','%','\'',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; + HRESULT hr; + IWbemLocator *locator; + IWbemServices *services; + IEnumWbemClassObject *result; + BSTR path = SysAllocString( cimv2W ); + BSTR wql = SysAllocString( wqlW ); + BSTR sql = SysAllocString( sqlW ); + BSTR query = SysAllocString( query1 ); + UINT i; + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator ); + if (hr != S_OK) + { + win_skip("can't create instance of WbemLocator\n"); + return; + } + ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, NULL, NULL, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, NULL, query, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, wql, NULL, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, sql, query, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_QUERY_TYPE, "query failed %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, sql, NULL, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + hr = exec_query( services, test[i], &result ); + ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + if (result) IEnumWbemClassObject_Release( result ); + } + + IWbemServices_Release( services ); + IWbemLocator_Release( locator ); + SysFreeString( path ); + SysFreeString( wql ); + SysFreeString( sql ); + SysFreeString( query ); +} + +START_TEST(query) +{ + CoInitialize( NULL ); + CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, + RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); + test_select(); + CoUninitialize(); +}

1 0

Hans Leidekker : wbemprox: Add a partial Win32_Process class implementation .
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: c2a27a38725f06146573cad2df4696925feda2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a27a38725f06146573cad2d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:32:02 2012 +0200 wbemprox: Add a partial Win32_Process class implementation. --- dlls/wbemprox/builtin.c | 69 +++++++++++++++++++++++++++++++++++++- dlls/wbemprox/query.c | 68 +++++++++++++++++++++++++------------ dlls/wbemprox/wbemprox_private.h | 9 +++++ 3 files changed, 123 insertions(+), 23 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c6879e7..2cf55d5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "wbemcli.h" +#include "tlhelp32.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -32,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static const WCHAR class_biosW[] = {'W','i','n','3','2','_','B','I','O','S',0}; +static const WCHAR class_processW[] = + {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; @@ -39,10 +42,16 @@ static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; +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_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_threadcountW[] = + {'T','h','r','e','a','d','C','o','u','n','t',0}; static const struct column col_bios[] = { @@ -51,6 +60,14 @@ static const struct column col_bios[] = { prop_releasedateW, CIM_DATETIME }, { prop_serialnumberW, CIM_STRING } }; +static const struct column col_process[] = +{ + { prop_captionW, CIM_STRING }, + { prop_descriptionW, CIM_STRING }, + { prop_pprocessidW, CIM_UINT32 }, + { prop_processidW, CIM_UINT32 }, + { prop_threadcountW, CIM_UINT32 } +}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; @@ -69,6 +86,14 @@ struct record_bios const WCHAR *releasedate; const WCHAR *serialnumber; }; +struct record_process +{ + const WCHAR *caption; + const WCHAR *description; + UINT32 pprocess_id; + UINT32 process_id; + UINT32 thread_count; +}; #include "poppack.h" static const struct record_bios data_bios[] = @@ -76,9 +101,50 @@ static const struct record_bios data_bios[] = { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } }; +static void fill_process( struct table *table ) +{ + struct record_process *rec; + PROCESSENTRY32W entry; + HANDLE snap; + UINT num_rows = 0, offset = 0, count = 8; + + snap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); + if (snap == INVALID_HANDLE_VALUE) return; + + entry.dwSize = sizeof(entry); + if (!Process32FirstW( snap, &entry )) goto done; + if (!(table->data = heap_alloc( count * sizeof(*rec) ))) goto done; + + do + { + if (num_rows > count) + { + BYTE *data; + count *= 2; + if (!(data = heap_realloc( table->data, count * sizeof(*rec) ))) goto done; + table->data = data; + } + rec = (struct record_process *)(table->data + offset); + rec->caption = heap_strdupW( entry.szExeFile ); + rec->description = heap_strdupW( entry.szExeFile ); + rec->process_id = entry.th32ProcessID; + rec->pprocess_id = entry.th32ParentProcessID; + rec->thread_count = entry.cntThreads; + offset += sizeof(*rec); + num_rows++; + } while (Process32NextW( snap, &entry )); + + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; + +done: + CloseHandle( snap ); +} + static struct table classtable[] = { - { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios } + { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, + { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process } }; struct table *get_table( const WCHAR *name ) @@ -91,6 +157,7 @@ struct table *get_table( const WCHAR *name ) if (!strcmpiW( classtable[i].name, name )) { table = &classtable[i]; + if (table->fill && !table->data) table->fill( table ); break; } } diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7b228ae..1d17a28 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -30,28 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_view( const struct property *proplist, const WCHAR *class, - const struct expr *cond, struct view **ret ) -{ - struct view *view = heap_alloc( sizeof(struct view) ); - - if (!view) return E_OUTOFMEMORY; - view->proplist = proplist; - view->table = get_table( class ); - view->cond = cond; - view->result = NULL; - view->count = 0; - view->index = 0; - *ret = view; - return S_OK; -} - -void destroy_view( struct view *view ) -{ - heap_free( view->result ); - heap_free( view ); -} - static HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *column ) { UINT i; @@ -140,6 +118,52 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ return S_OK; } +HRESULT create_view( const struct property *proplist, const WCHAR *class, + const struct expr *cond, struct view **ret ) +{ + struct view *view = heap_alloc( sizeof(struct view) ); + + if (!view) return E_OUTOFMEMORY; + view->proplist = proplist; + view->table = get_table( class ); + view->cond = cond; + view->result = NULL; + view->count = 0; + view->index = 0; + *ret = view; + return S_OK; +} + +static void clear_table( struct table *table ) +{ + UINT i, j; + + if (!table->fill || !table->data) return; + + for (i = 0; i < table->num_rows; i++) + { + for (j = 0; j < table->num_cols; j++) + { + if (table->columns[j].type == CIM_STRING || + table->columns[j].type == CIM_DATETIME || + (table->columns[j].type & CIM_FLAG_ARRAY)) + { + void *ptr; + if (get_value( table, i, j, (INT_PTR *)&ptr ) == S_OK) heap_free( ptr ); + } + } + } + heap_free( table->data ); + table->data = NULL; +} + +void destroy_view( struct view *view ) +{ + if (view->table) clear_table( view->table ); + heap_free( view->result ); + heap_free( view ); +} + static BOOL eval_like( INT_PTR lval, INT_PTR rval ) { const WCHAR *p = (const WCHAR *)lval, *q = (const WCHAR *)rval; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 1e3ca0c..15a7146 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -34,6 +34,7 @@ struct table const struct column *columns; UINT num_rows; BYTE *data; + void (*fill)(struct table *); }; struct property @@ -135,3 +136,11 @@ static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); } + +static inline WCHAR *heap_strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + return dst; +}

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::Get.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 92e99866282925e07cda24de3e28a7aa4f17cf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e99866282925e07cda24de3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:31:29 2012 +0200 wbemprox: Implement IWbemClassObject::Get. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/class.c | 14 ++++++++++- dlls/wbemprox/query.c | 42 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 + 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 3a4d9f3..f973c2f 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = ole32 advapi32 +IMPORTS = oleaut32 ole32 advapi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index b31dcbb..a1fbb70 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -274,8 +274,18 @@ static HRESULT WINAPI class_object_Get( CIMTYPE *pType, LONG *plFlavor ) { - FIXME("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + + 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 ); } static HRESULT WINAPI class_object_Put( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 701d656..7b228ae 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -347,3 +347,45 @@ done: if (hr != S_OK) free_query( query ); return hr; } + +static BOOL is_selected_prop( const struct view *view, const WCHAR *name ) +{ + const struct property *prop = view->proplist; + + if (!prop) return TRUE; + while (prop) + { + if (!strcmpiW( prop->name, name )) return TRUE; + prop = prop->next; + } + return FALSE; +} + +HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type ) +{ + HRESULT hr; + UINT column, row = view->result[index]; + INT_PTR val; + + if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; + + hr = get_column_index( view->table, name, &column ); + if (hr != S_OK) return WBEM_E_NOT_FOUND; + + hr = get_value( view->table, row, column, &val ); + if (hr != S_OK) return hr; + + switch (view->table->columns[column].type) + { + case CIM_STRING: + case CIM_DATETIME: + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = SysAllocString( (const WCHAR *)val ); + break; + default: + ERR("unhandled column type %u\n", view->table->columns[column].type); + return WBEM_E_FAILED; + } + if (type) *type = view->table->columns[column].type; + return S_OK; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 3b4af0d..1e3ca0c 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -111,6 +111,8 @@ HRESULT create_view( const struct property *, const WCHAR *, const struct expr * struct view ** ) DECLSPEC_HIDDEN; 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; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Implement IEnumWbemClassObject::Skip.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: bb80d7db9a6ded62441baf069b316e939a3cb4af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb80d7db9a6ded62441baf069… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:31:00 2012 +0200 wbemprox: Implement IEnumWbemClassObject::Skip. --- dlls/wbemprox/class.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 9119132..b31dcbb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -152,8 +152,20 @@ static HRESULT WINAPI enum_class_object_Skip( LONG lTimeout, ULONG nCount ) { - FIXME("%p, %d, %u\n", iface, lTimeout, nCount); - return E_NOTIMPL; + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); + struct view *view = ec->query->view; + + TRACE("%p, %d, %u\n", iface, lTimeout, nCount); + + if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); + + if (view->index + nCount >= view->count) + { + view->index = view->count - 1; + return WBEM_S_FALSE; + } + view->index += nCount; + return WBEM_S_NO_ERROR; } static const IEnumWbemClassObjectVtbl enum_class_object_vtbl =

1 0

Hans Leidekker : wbemprox: Implement IEnumWbemClassObject::Reset.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 0f936f49ca199b9ba6b834e69bfdf6e470f4e05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f936f49ca199b9ba6b834e69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:30:43 2012 +0200 wbemprox: Implement IEnumWbemClassObject::Reset. --- dlls/wbemprox/class.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a950e41..9119132 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -91,8 +91,13 @@ static HRESULT WINAPI enum_class_object_QueryInterface( static HRESULT WINAPI enum_class_object_Reset( IEnumWbemClassObject *iface ) { - FIXME("%p\n", iface); - return E_NOTIMPL; + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); + struct view *view = ec->query->view; + + TRACE("%p\n", iface); + + view->index = 0; + return WBEM_S_NO_ERROR; } static HRESULT WINAPI enum_class_object_Next(

1 0

Dmitry Timoshkov : windowscodecs: Remove not reachable code in the TIFF decoder.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: a16f7044a44b35246185cb4153f202efd2ac3256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16f7044a44b35246185cb415… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 18 14:32:04 2012 +0900 windowscodecs: Remove not reachable code in the TIFF decoder. --- dlls/windowscodecs/tiffformat.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 66f65d1..669351d 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -440,12 +440,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { decode_info->tiled = 1; - if (!ret) - { - WARN("missing tile width\n"); - return E_FAIL; - } - ret = pTIFFGetField(tiff, TIFFTAG_TILELENGTH, &decode_info->tile_height); if (!ret) {

1 0

Nikolay Sivov : msxml3: Reader shouldn' t depend on input being properly allocated BSTR string.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 7cbd9dcdc31e7d2febcb562f96ae2aa6d8960bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbd9dcdc31e7d2febcb562f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 17 23:51:09 2012 +0400 msxml3: Reader shouldn't depend on input being properly allocated BSTR string. --- dlls/msxml3/saxreader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index cf87d98..485644a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2151,6 +2151,8 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz saxlocator *locator; HRESULT hr; + TRACE("(%p)->(%p %d)\n", This, buffer, size); + hr = SAXLocator_create(This, &locator, vbInterface); if (FAILED(hr)) return hr; @@ -2441,7 +2443,7 @@ static HRESULT internal_parse( { case VT_BSTR: hr = internal_parseBuffer(This, (const char*)V_BSTR(&varInput), - SysStringByteLen(V_BSTR(&varInput)), vbInterface); + strlenW(V_BSTR(&varInput))*sizeof(WCHAR), vbInterface); break; case VT_ARRAY|VT_UI1: { void *pSAData;

1 0

Nikolay Sivov : msxml3: Revert: msxml3: Reuse MXAttributes implementation for SAX reader attributes reporting.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 16ef649b5fd9f7c42de482f8528b5681fe45b430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ef649b5fd9f7c42de482f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 17 16:37:45 2012 +0400 msxml3: Revert: msxml3: Reuse MXAttributes implementation for SAX reader attributes reporting. This reverts commit c2c8b9e771a1eb80cab4b142a3bc3ed5434a4a47 and adds a comment for uri reporting feature that some application use, for example Office 2010. The problem is that namespace uri pointer should stay the same and we keep it in element stack for that, MXAttributes allocates new string for each attribute and won't work as needed unfortunately. --- dlls/msxml3/saxreader.c | 533 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 391 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16ef649b5fd9f7c42de48…

1 0

Thomas Faber : include: Make IMAGE_COR20_HEADER declaration compatible with PSDK headers.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: bb95b706cb5b7022fb56f48222b1034dd133b4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb95b706cb5b7022fb56f4822… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 15:51:56 2012 +0200 include: Make IMAGE_COR20_HEADER declaration compatible with PSDK headers. --- dlls/fusion/tests/asmcache.c | 2 +- include/winnt.h | 5 ++++- tools/winedump/pe.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 890bd9c..e97cfbe 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -412,7 +412,7 @@ static struct _tagASSEMBLY 5, /* MinorRuntimeVersion */ { 0x2188, 0x1B4 }, /* MetaData */ COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_STRONGNAMESIGNED, /* Flags */ - 0, /* EntryPointToken */ + { 0 }, /* EntryPointToken */ { 0x20D0, 0xB8 }, /* Resources */ { 0x2050, 0x80 }, /* StrongNameSignature */ { 0 }, /* CodeManagerTable */ diff --git a/include/winnt.h b/include/winnt.h index 6903d34..16cc4e9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3429,7 +3429,10 @@ typedef struct IMAGE_COR20_HEADER IMAGE_DATA_DIRECTORY MetaData; DWORD Flags; - DWORD EntryPointToken; + union { + DWORD EntryPointToken; + DWORD EntryPointRVA; + } DUMMYUNIONNAME; IMAGE_DATA_DIRECTORY Resources; IMAGE_DATA_DIRECTORY StrongNameSignature; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f005b49..c655451 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -966,7 +966,7 @@ static void dump_dir_clr_header(void) print_dword( "Header Size", dir->cb ); print_ver( "Required runtime version", dir->MajorRuntimeVersion, dir->MinorRuntimeVersion ); print_clrflags( "Flags", dir->Flags ); - print_dword( "EntryPointToken", dir->EntryPointToken ); + print_dword( "EntryPointToken", dir->u.EntryPointToken ); printf("\n"); printf( "CLR Data Directory\n" ); print_clrdirectory( "MetaData", &dir->MetaData );

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
83
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 June 2012