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

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetNames.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: f18b24ad397dc55445e47535ed36dcc2f5898ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18b24ad397dc55445e47535e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:19:38 2012 +0200 wbemprox: Implement IWbemClassObject::GetNames. --- dlls/wbemprox/class.c | 18 ++++++++++++++++-- dlls/wbemprox/query.c | 22 ++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + include/wbemcli.idl | 19 +++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 423e754..524ba09 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -314,8 +314,22 @@ static HRESULT WINAPI class_object_GetNames( VARIANT *pQualifierVal, SAFEARRAY **pNames ) { - FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszQualifierName), lFlags, pQualifierVal, pNames); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + + TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszQualifierName), lFlags, pQualifierVal, pNames); + + if (wszQualifierName || pQualifierVal) + { + FIXME("qualifier not supported\n"); + return E_NOTIMPL; + } + if (lFlags != WBEM_FLAG_ALWAYS) + { + FIXME("flags %08x not supported\n", lFlags); + return E_NOTIMPL; + } + return get_properties( ec->query->view, pNames ); } static HRESULT WINAPI class_object_BeginEnumeration( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1d17a28..5ed4d07 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -413,3 +413,25 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR if (type) *type = view->table->columns[column].type; return S_OK; } + +HRESULT get_properties( const struct view *view, SAFEARRAY **props ) +{ + SAFEARRAY *sa; + BSTR str; + LONG i; + + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, view->table->num_cols ))) return E_OUTOFMEMORY; + + for (i = 0; i < view->table->num_cols; i++) + { + str = SysAllocString( view->table->columns[i].name ); + if (!str || SafeArrayPutElement( sa, &i, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + } + *props = sa; + return S_OK; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 15a7146..c7edbb0 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -114,6 +114,7 @@ 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 get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index a023491..b2d756b 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -182,6 +182,25 @@ typedef [v1_enum] enum tag_WBEM_TIMEOUT_TYPE WBEM_INFINITE = 0xffffffff } WBEM_TIMEOUT_TYPE; +typedef [v1_enum] enum tag_WBEM_CONDITION_FLAG_TYPE +{ + WBEM_FLAG_ALWAYS = 0, + WBEM_FLAG_ONLY_IF_TRUE = 0x1, + WBEM_FLAG_ONLY_IF_FALSE = 0x2, + WBEM_FLAG_ONLY_IF_IDENTICAL = 0x3, + WBEM_MASK_PRIMARY_CONDITION = 0x3, + WBEM_FLAG_KEYS_ONLY = 0x4, + WBEM_FLAG_REFS_ONLY = 0x8, + WBEM_FLAG_LOCAL_ONLY = 0x10, + WBEM_FLAG_PROPAGATED_ONLY = 0x20, + WBEM_FLAG_SYSTEM_ONLY = 0x30, + WBEM_FLAG_NONSYSTEM_ONLY = 0x40, + WBEM_MASK_CONDITION_ORIGIN = 0x70, + WBEM_FLAG_CLASS_OVERRIDES_ONLY = 0x100, + WBEM_FLAG_CLASS_LOCAL_AND_OVERRIDES = 0x200, + WBEM_MASK_CLASS_CONDITION = 0x300 +} WBEM_CONDITION_FLAG_TYPE; + typedef [v1_enum] enum tag_CIMTYPE_ENUMERATION { CIM_ILLEGAL = 0xfff,

1 0

Hans Leidekker : wmic: Add support for querying class properties.
by Alexandre Julliard 19 Jun '12

19 Jun '12

1 0

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

19 Jun '12

Module: wine Branch: master Commit: 25b79d1886a892489a567a460840a7d0f12cbaf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b79d1886a892489a567a460… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:20:22 2012 +0200 wbemprox: Add a partial Win32_ComputerSystem class implementation. --- dlls/wbemprox/builtin.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2cf55d5..2aa2855 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -33,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_compsysW[] = + {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; @@ -42,6 +44,8 @@ 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_modelW[] = + {'M','o','d','e','l',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[] = @@ -60,6 +64,12 @@ static const struct column col_bios[] = { prop_releasedateW, CIM_DATETIME }, { prop_serialnumberW, CIM_STRING } }; +static const struct column col_compsys[] = +{ + { prop_descriptionW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING }, + { prop_modelW, CIM_STRING } +}; static const struct column col_process[] = { { prop_captionW, CIM_STRING }, @@ -77,6 +87,12 @@ static const WCHAR bios_releasedateW[] = {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = {'0',0}; +static const WCHAR compsys_descriptionW[] = + {'A','T','/','A','T',' ','C','O','M','P','A','T','I','B','L','E',0}; +static const WCHAR compsys_manufacturerW[] = + {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; +static const WCHAR compsys_modelW[] = + {'W','i','n','e',0}; #include "pshpack1.h" struct record_bios @@ -86,6 +102,12 @@ struct record_bios const WCHAR *releasedate; const WCHAR *serialnumber; }; +struct record_computersystem +{ + const WCHAR *description; + const WCHAR *manufacturer; + const WCHAR *model; +}; struct record_process { const WCHAR *caption; @@ -100,6 +122,10 @@ static const struct record_bios data_bios[] = { { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } }; +static const struct record_computersystem data_compsys[] = +{ + { compsys_descriptionW, compsys_manufacturerW, compsys_modelW } +}; static void fill_process( struct table *table ) { @@ -144,6 +170,7 @@ done: static struct table classtable[] = { { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, + { class_compsysW, SIZEOF(col_compsys), col_compsys, SIZEOF(data_compsys), (BYTE *)data_compsys, NULL }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process } };

1 0

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

19 Jun '12

Module: wine Branch: master Commit: bb48585dc8cbc57a84508f2f0f3a907096cd3f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb48585dc8cbc57a84508f2f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:20:42 2012 +0200 wbemprox: Add a partial Win32_Processor class implementation. --- dlls/wbemprox/builtin.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2aa2855..a85802f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -37,6 +37,8 @@ static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; +static const WCHAR class_processorW[] = + {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; @@ -78,6 +80,10 @@ static const struct column col_process[] = { prop_processidW, CIM_UINT32 }, { prop_threadcountW, CIM_UINT32 } }; +static const struct column col_processor[] = +{ + { prop_manufacturerW, CIM_STRING } +}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; @@ -93,6 +99,8 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR processor_manufacturerW[] = + {'G','e','n','u','i','n','e','I','n','t','e','l',0}; #include "pshpack1.h" struct record_bios @@ -116,6 +124,10 @@ struct record_process UINT32 process_id; UINT32 thread_count; }; +struct record_processor +{ + const WCHAR *manufacturer; +}; #include "poppack.h" static const struct record_bios data_bios[] = @@ -126,6 +138,10 @@ static const struct record_computersystem data_compsys[] = { { compsys_descriptionW, compsys_manufacturerW, compsys_modelW } }; +static const struct record_processor data_processor[] = +{ + { processor_manufacturerW } +}; static void fill_process( struct table *table ) { @@ -171,7 +187,8 @@ static struct table classtable[] = { { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, { class_compsysW, SIZEOF(col_compsys), col_compsys, SIZEOF(data_compsys), (BYTE *)data_compsys, NULL }, - { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process } + { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process }, + { class_processorW, SIZEOF(col_processor), col_processor, SIZEOF(data_processor), (BYTE *)data_processor, NULL } }; struct table *get_table( const WCHAR *name )

1 0

Hans Leidekker : wbemprox: Support mixed dynamic and static table data.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 9e748591218e43dfb3de0971bd00f6fbe34ff281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e748591218e43dfb3de0971b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:21:12 2012 +0200 wbemprox: Support mixed dynamic and static table data. --- dlls/wbemprox/builtin.c | 4 ++-- dlls/wbemprox/query.c | 21 +++++++++++---------- dlls/wbemprox/wbemprox_private.h | 5 ++++- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a85802f..8a6a74f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -74,8 +74,8 @@ static const struct column col_compsys[] = }; static const struct column col_process[] = { - { prop_captionW, CIM_STRING }, - { prop_descriptionW, CIM_STRING }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_pprocessidW, CIM_UINT32 }, { prop_processidW, CIM_UINT32 }, { prop_threadcountW, CIM_UINT32 } diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 5ed4d07..9e03544 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -48,7 +48,7 @@ static UINT get_column_size( const struct table *table, UINT column ) { if (table->columns[column].type & CIM_FLAG_ARRAY) return sizeof(void *); - switch (table->columns[column].type) + switch (table->columns[column].type & COL_TYPE_MASK) { case CIM_SINT16: case CIM_UINT16: @@ -60,7 +60,7 @@ static UINT get_column_size( const struct table *table, UINT column ) case CIM_STRING: return sizeof(WCHAR *); default: - ERR("unkown column type %u\n", table->columns[column].type); + ERR("unkown column type %u\n", table->columns[column].type & COL_TYPE_MASK); break; } return sizeof(INT32); @@ -92,7 +92,7 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ *val = (INT_PTR)*(const void **)ptr; return S_OK; } - switch (table->columns[column].type) + switch (table->columns[column].type & COL_TYPE_MASK) { case CIM_DATETIME: case CIM_STRING: @@ -111,7 +111,7 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ *val = *(const UINT32 *)ptr; break; default: - ERR("invalid column type %u\n", table->columns[column].type); + ERR("invalid column type %u\n", table->columns[column].type & COL_TYPE_MASK); *val = 0; break; } @@ -136,7 +136,7 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, static void clear_table( struct table *table ) { - UINT i, j; + UINT i, j, type; if (!table->fill || !table->data) return; @@ -144,9 +144,10 @@ static void clear_table( struct table *table ) { 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)) + if (!(table->columns[j].type & COL_FLAG_DYNAMIC)) continue; + + type = table->columns[j].type & COL_TYPE_MASK; + 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 ); @@ -399,7 +400,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR hr = get_value( view->table, row, column, &val ); if (hr != S_OK) return hr; - switch (view->table->columns[column].type) + switch (view->table->columns[column].type & COL_TYPE_MASK) { case CIM_STRING: case CIM_DATETIME: @@ -410,7 +411,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR ERR("unhandled column type %u\n", view->table->columns[column].type); return WBEM_E_FAILED; } - if (type) *type = view->table->columns[column].type; + if (type) *type = view->table->columns[column].type & COL_TYPE_MASK; return S_OK; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index c7edbb0..30aecca 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -21,10 +21,13 @@ #define SIZEOF(array) (sizeof(array)/sizeof((array)[0])) +#define COL_TYPE_MASK 0x0000ffff +#define COL_FLAG_DYNAMIC 0x00010000 + struct column { const WCHAR *name; - CIMTYPE_ENUMERATION type; + UINT type; }; struct table

1 0

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

19 Jun '12

Module: wine Branch: master Commit: bc66ef043f5436d1dcb6bb76e7be35e803fabb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc66ef043f5436d1dcb6bb76e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:21:47 2012 +0200 wbemprox: Add a partial Win32_OperatingSystem class implementation. --- dlls/wbemprox/builtin.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8a6a74f..a1ef65e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -17,6 +17,8 @@ */ #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "config.h" #include <stdarg.h> @@ -35,6 +37,8 @@ static const WCHAR class_biosW[] = {'W','i','n','3','2','_','B','I','O','S',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_osW[] = + {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_processorW[] = @@ -48,6 +52,8 @@ static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; +static const WCHAR prop_osarchitectureW[] = + {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',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[] = @@ -72,6 +78,11 @@ static const struct column col_compsys[] = { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING } }; +static const struct column col_os[] = +{ + { prop_captionW, CIM_STRING }, + { prop_osarchitectureW, CIM_STRING } +}; static const struct column col_process[] = { { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -99,6 +110,12 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR os_captionW[] = + {'W','i','n','e',0}; +static const WCHAR os_32bitW[] = + {'3','2','-','b','i','t',0}; +static const WCHAR os_64bitW[] = + {'6','4','-','b','i','t',0}; static const WCHAR processor_manufacturerW[] = {'G','e','n','u','i','n','e','I','n','t','e','l',0}; @@ -116,6 +133,11 @@ struct record_computersystem const WCHAR *manufacturer; const WCHAR *model; }; +struct record_operatingsystem +{ + const WCHAR *caption; + const WCHAR *osarchitecture; +}; struct record_process { const WCHAR *caption; @@ -183,10 +205,31 @@ done: CloseHandle( snap ); } +static void fill_os( struct table *table ) +{ + struct record_operatingsystem *rec; + SYSTEM_INFO info; + + if (!(table->data = heap_alloc( sizeof(*rec) ))) return; + + rec = (struct record_operatingsystem *)table->data; + rec->caption = os_captionW; + + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + rec->osarchitecture = os_64bitW; + else + rec->osarchitecture = os_32bitW; + + TRACE("created 1 row\n"); + table->num_rows = 1; +} + static struct table classtable[] = { { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, { class_compsysW, SIZEOF(col_compsys), col_compsys, SIZEOF(data_compsys), (BYTE *)data_compsys, NULL }, + { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, SIZEOF(data_processor), (BYTE *)data_processor, NULL } };

1 0

Dan Kegel : riched20: Accept middle click as paste (like edit control does) .
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: a59e766ea7a57c4241b3bd5c85b25b1085af9461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59e766ea7a57c4241b3bd5c8… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Jun 18 11:31:22 2012 -0700 riched20: Accept middle click as paste (like edit control does). --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6d5749a..44c7ad2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3591,6 +3591,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return FALSE; } case WM_PASTE: + case WM_MBUTTONDOWN: ME_Paste(editor); return 0; case WM_CUT:

1 0

Vincent Povirk : windowscodecs: Check for NULL in IWICComponentInfo:: GetComponentType.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 2846921f91713728d5c4aa0e16427e71beccd763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2846921f91713728d5c4aa0e1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 14:57:40 2012 -0500 windowscodecs: Check for NULL in IWICComponentInfo::GetComponentType. --- dlls/windowscodecs/info.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 92d0542..ed575a8 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -161,6 +161,7 @@ static HRESULT WINAPI BitmapDecoderInfo_GetComponentType(IWICBitmapDecoderInfo * WICComponentType *pType) { TRACE("(%p,%p)\n", iface, pType); + if (!pType) return E_INVALIDARG; *pType = WICDecoder; return S_OK; } @@ -610,6 +611,7 @@ static HRESULT WINAPI BitmapEncoderInfo_GetComponentType(IWICBitmapEncoderInfo * WICComponentType *pType) { TRACE("(%p,%p)\n", iface, pType); + if (!pType) return E_INVALIDARG; *pType = WICEncoder; return S_OK; } @@ -884,6 +886,7 @@ static HRESULT WINAPI FormatConverterInfo_GetComponentType(IWICFormatConverterIn WICComponentType *pType) { TRACE("(%p,%p)\n", iface, pType); + if (!pType) return E_INVALIDARG; *pType = WICPixelFormatConverter; return S_OK; }

1 0

Vincent Povirk : windowscodecs: Implement IWICComponentInfo:: GetFriendlyName.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 0dee027df388b83beb63ce25cc31df28d80e2055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dee027df388b83beb63ce25c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 15:05:58 2012 -0500 windowscodecs: Implement IWICComponentInfo::GetFriendlyName. --- dlls/windowscodecs/info.c | 33 +++++++++++++++++++++++++-------- dlls/windowscodecs/tests/info.c | 4 ++-- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index ed575a8..48106a8 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0}; +static const WCHAR friendlyname_valuename[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; @@ -219,8 +220,12 @@ static HRESULT WINAPI BitmapDecoderInfo_GetSpecVersion(IWICBitmapDecoderInfo *if static HRESULT WINAPI BitmapDecoderInfo_GetFriendlyName(IWICBitmapDecoderInfo *iface, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, friendlyname_valuename, + cchFriendlyName, wzFriendlyName, pcchActual); } static HRESULT WINAPI BitmapDecoderInfo_GetContainerFormat(IWICBitmapDecoderInfo *iface, @@ -669,8 +674,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetSpecVersion(IWICBitmapEncoderInfo *if static HRESULT WINAPI BitmapEncoderInfo_GetFriendlyName(IWICBitmapEncoderInfo *iface, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, friendlyname_valuename, + cchFriendlyName, wzFriendlyName, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_GetContainerFormat(IWICBitmapEncoderInfo *iface, @@ -944,8 +953,12 @@ static HRESULT WINAPI FormatConverterInfo_GetSpecVersion(IWICFormatConverterInfo static HRESULT WINAPI FormatConverterInfo_GetFriendlyName(IWICFormatConverterInfo *iface, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); - return E_NOTIMPL; + FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, friendlyname_valuename, + cchFriendlyName, wzFriendlyName, pcchActual); } static HRESULT WINAPI FormatConverterInfo_GetPixelFormats(IWICFormatConverterInfo *iface, @@ -1147,8 +1160,12 @@ static HRESULT WINAPI PixelFormatInfo_GetSpecVersion(IWICPixelFormatInfo2 *iface static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *iface, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, friendlyname_valuename, + cchFriendlyName, wzFriendlyName, pcchActual); } static HRESULT WINAPI PixelFormatInfo_GetFormatGUID(IWICPixelFormatInfo2 *iface, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 0e09bab..3f59d6b 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -189,13 +189,13 @@ static void test_pixelformat_info(void) ok(hr == S_OK, "GetComponentType failed, hr=%x\n", hr); ok(componenttype == WICPixelFormat, "unexpected component type 0x%x\n", componenttype); - todo_wine - { len = 0xdeadbeef; hr = IWICComponentInfo_GetFriendlyName(info, 0, NULL, &len); ok(hr == S_OK, "GetFriendlyName failed, hr=%x\n", hr); ok(len < 255 && len > 0, "invalid length 0x%x\n", len); + todo_wine + { hr = IWICComponentInfo_GetSigningStatus(info, NULL); ok(hr == E_INVALIDARG, "GetSigningStatus failed, hr=%x\n", hr);

1 0

Vincent Povirk : windowscodecs: Always report pixel formats are signed.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: d99740e8eafa8c57dcd53efe20f28b65d561c3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99740e8eafa8c57dcd53efe2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 15:12:51 2012 -0500 windowscodecs: Always report pixel formats are signed. --- dlls/windowscodecs/info.c | 11 +++++++++-- dlls/windowscodecs/tests/info.c | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 48106a8..699f3f2 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1122,8 +1122,15 @@ static HRESULT WINAPI PixelFormatInfo_GetCLSID(IWICPixelFormatInfo2 *iface, CLSI static HRESULT WINAPI PixelFormatInfo_GetSigningStatus(IWICPixelFormatInfo2 *iface, DWORD *pStatus) { - FIXME("(%p,%p): stub\n", iface, pStatus); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pStatus); + + if (!pStatus) + return E_INVALIDARG; + + /* Pixel formats don't require code, so they are considered signed. */ + *pStatus = WICComponentSigned; + + return S_OK; } static HRESULT WINAPI PixelFormatInfo_GetAuthor(IWICPixelFormatInfo2 *iface, UINT cchAuthor, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 3f59d6b..f8c3402 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -194,8 +194,6 @@ static void test_pixelformat_info(void) ok(hr == S_OK, "GetFriendlyName failed, hr=%x\n", hr); ok(len < 255 && len > 0, "invalid length 0x%x\n", len); - todo_wine - { hr = IWICComponentInfo_GetSigningStatus(info, NULL); ok(hr == E_INVALIDARG, "GetSigningStatus failed, hr=%x\n", hr); @@ -203,6 +201,8 @@ static void test_pixelformat_info(void) ok(hr == S_OK, "GetSigningStatus failed, hr=%x\n", hr); ok(signing == WICComponentSigned, "unexpected signing status 0x%x\n", signing); + todo_wine + { len = 0xdeadbeef; hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len); ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr);

1 0