wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

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_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: 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 : wmic: Add support for querying class properties.
by Alexandre Julliard 19 Jun '12

19 Jun '12

1 0

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 : include: Fix the definition of IWbemClassObject::GetNames.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 612f380ad0b8880b945548419f8db43b21386e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=612f380ad0b8880b945548419… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:19:19 2012 +0200 include: Fix the definition of IWbemClassObject::GetNames. --- dlls/wbemprox/class.c | 2 +- include/wbemcli.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a1fbb70..423e754 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -312,7 +312,7 @@ static HRESULT WINAPI class_object_GetNames( LPCWSTR wszQualifierName, LONG lFlags, VARIANT *pQualifierVal, - SAFEARRAY *pNames ) + SAFEARRAY **pNames ) { FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszQualifierName), lFlags, pQualifierVal, pNames); return E_NOTIMPL; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index a339ab5..a023491 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -476,7 +476,7 @@ interface IWbemClassObject : IUnknown [in,string] LPCWSTR wszQualifierName, [in] long lFlags, [in] VARIANT *pQualifierVal, - [out] SAFEARRAY *pNames); + [out] SAFEARRAY **pNames); HRESULT BeginEnumeration( [in] long lEnumFlags);

1 0

Hans Leidekker : wbemprox: Improve tracing in IWbemLocator::ConnectServer.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: e7a4fb15731e612f466bb2b13a35e9402d0c951d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a4fb15731e612f466bb2b13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:19:03 2012 +0200 wbemprox: Improve tracing in IWbemLocator::ConnectServer. --- dlls/wbemprox/wbemlocator.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 4368db3..b80e080 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -99,7 +99,7 @@ static HRESULT WINAPI wbem_locator_ConnectServer( { HRESULT hr; - FIXME("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), + TRACE("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), pCtx, ppNamespace); if (((NetworkResource[0] == '\\' && NetworkResource[1] == '\\') || @@ -108,6 +108,13 @@ static HRESULT WINAPI wbem_locator_ConnectServer( FIXME("remote computer not supported\n"); return WBEM_E_TRANSPORT_FAILURE; } + if (User || Password || Authority) + FIXME("authentication not supported\n"); + if (Locale) + FIXME("specific locale not supported\n"); + if (SecurityFlags) + FIXME("unsupported flags\n"); + hr = WbemServices_create( NULL, (void **)ppNamespace ); if (SUCCEEDED( hr )) return WBEM_NO_ERROR;

1 0

Józef Kucia : d3dx9/tests: Improve test failure messages for check_dds_pixel_format.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 95b822d6725b4d9a9a4d621ca1b7d1585fca4ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b822d6725b4d9a9a4d621ca… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 19 01:35:48 2012 +0200 d3dx9/tests: Improve test failure messages for check_dds_pixel_format. --- dlls/d3dx9_36/tests/surface.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 325f6b0..84b1c56 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -211,9 +211,12 @@ static void fill_dds_header(struct dds_header *header) header->caps = DDS_CAPS_TEXTURE; } -static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, - DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, - D3DFORMAT expected_format) +#define check_dds_pixel_format(flags, fourcc, bpp, rmask, gmask, bmask, amask, format) \ + check_dds_pixel_format_(__LINE__, flags, fourcc, bpp, rmask, gmask, bmask, amask, format) +static void check_dds_pixel_format_(unsigned int line, + DWORD flags, DWORD fourcc, DWORD bpp, + DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, + D3DFORMAT expected_format) { HRESULT hr; D3DXIMAGE_INFO info; @@ -234,9 +237,13 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, memset(dds.data, 0, sizeof(dds.data)); hr = D3DXGetImageInfoFromFileInMemory(&dds, sizeof(dds), &info); - ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", hr, expected_format, D3D_OK); + ok_(__FILE__, line)(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", + hr, expected_format, D3D_OK); if (SUCCEEDED(hr)) - ok(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n", info.Format, expected_format); + { + ok_(__FILE__, line)(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n", + info.Format, expected_format); + } } static void test_dds_header_handling(void)

1 0

Józef Kucia : d3dx9: Recognize X8B8G8R8 pixel format in DDS files.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 217c8b947e94cc03f5dc2a7d6f472882d0764ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=217c8b947e94cc03f5dc2a7d6… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 19 01:35:47 2012 +0200 d3dx9: Recognize X8B8G8R8 pixel format in DDS files. --- dlls/d3dx9_36/surface.c | 1 + dlls/d3dx9_36/tests/surface.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f71af32..7be3ebe 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -191,6 +191,7 @@ static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_forma { 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10 }, { 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000, D3DFMT_G16R16 }, { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, D3DFMT_A8B8G8R8 }, + { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, }; for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 64bb7a3..325f6b0 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -514,7 +514,9 @@ static void test_D3DXGetImageInfo(void) check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, D3DFMT_A8B8G8R8); check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ff, 0x00ff00, 0xff0000, 0, D3DFMT_X8B8G8R8); check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 16, 0xffff, 0, 0, 0, D3DFMT_L16);

1 0

Józef Kucia : d3dx9/tests: Add tests for ID3DXFont:: GetGlyphData.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 720dfb9b95b39918d93ae421202b7699966fbc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720dfb9b95b39918d93ae4212… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 19 01:15:38 2012 +0200 d3dx9/tests: Add tests for ID3DXFont::GetGlyphData. --- dlls/d3dx9_36/tests/core.c | 117 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index aa848b5..cb5c7ec 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -309,6 +309,18 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ID3DXFont *font; HRESULT hr; int ref; + int i; + static const struct { + INT font_height; + UINT expected_size; + DWORD expected_levels; + } texture_tests[] = { + { 6, 128, 4 }, + { 8, 128, 4 }, + { 10, 256, 5 }, + { 12, 256, 5 }, + { 72, 256, 8 } + }; /* D3DXCreateFont */ @@ -475,6 +487,111 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n"); + + + /* ID3DXFont_GetGlyphData, ID3DXFont_PreloadGlyphs, ID3DXFont_PreloadCharacters */ + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + if(SUCCEEDED(hr)) { + char c; + HDC hdc; + DWORD ret; + HRESULT hr; + RECT blackbox; + POINT cellinc; + IDirect3DTexture9 *texture; + + hdc = ID3DXFont_GetDC(font); + + todo_wine { + hr = ID3DXFont_GetGlyphData(font, 0, NULL, &blackbox, &cellinc); + ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXFont_GetGlyphData(font, 0, &texture, NULL, &cellinc); + if(SUCCEEDED(hr)) check_release((IUnknown*)texture, 1); + ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXFont_GetGlyphData(font, 0, &texture, &blackbox, NULL); + if(SUCCEEDED(hr)) check_release((IUnknown*)texture, 1); + ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + + hr = ID3DXFont_PreloadCharacters(font, 'b', 'a'); + ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXFont_PreloadGlyphs(font, 1, 0); + ok(hr == D3D_OK, "ID3DXFont_PreloadGlyphs returned %#x, expected %#x\n", hr, D3D_OK); + + hr = ID3DXFont_PreloadCharacters(font, 'a', 'a'); + ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); + } + + for(c = 'b'; c <= 'z'; c++) { + WORD glyph; + + ret = GetGlyphIndicesA(hdc, &c, 1, &glyph, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesA failed\n"); + + hr = ID3DXFont_GetGlyphData(font, glyph, &texture, &blackbox, &cellinc); + todo_wine ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + if(SUCCEEDED(hr)) { + DWORD levels; + D3DSURFACE_DESC desc; + + levels = IDirect3DTexture9_GetLevelCount(texture); + ok(levels == 5, "Got levels %u, expected %u\n", levels, 5); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc failed\n"); + ok(desc.Format == D3DFMT_A8R8G8B8, "Got format %#x, expected %#x\n", desc.Format, D3DFMT_A8R8G8B8); + ok(desc.Usage == 0, "Got usage %#x, expected %#x\n", desc.Usage, 0); + ok(desc.Width == 256, "Got width %u, expected %u\n", desc.Width, 256); + ok(desc.Height == 256, "Got height %u, expected %u\n", desc.Height, 256); + ok(desc.Pool == D3DPOOL_MANAGED, "Got pool %u, expected %u\n", desc.Pool, D3DPOOL_MANAGED); + + check_release((IUnknown*)texture, 1); + } + } + + hr = ID3DXFont_PreloadCharacters(font, 'a', 'z'); + todo_wine ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); + + check_release((IUnknown*)font, 0); + } else skip("Failed to create a ID3DXFont object\n"); + + for(i = 0; i < sizeof(texture_tests) / sizeof(texture_tests[0]); i++) { + HDC hdc; + DWORD ret; + HRESULT hr; + WORD glyph; + char c = 'a'; + IDirect3DTexture9 *texture; + + hr = D3DXCreateFontA(device, texture_tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + if(FAILED(hr)) { + skip("Failed to create a ID3DXFont object\n"); + continue; + } + + hdc = ID3DXFont_GetDC(font); + + ret = GetGlyphIndicesA(hdc, &c, 1, &glyph, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesA failed\n"); + + hr = ID3DXFont_GetGlyphData(font, glyph, &texture, NULL, NULL); + todo_wine ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + if(SUCCEEDED(hr)) { + DWORD levels; + D3DSURFACE_DESC desc; + + levels = IDirect3DTexture9_GetLevelCount(texture); + ok(levels == texture_tests[i].expected_levels, "Got levels %u, expected %u\n", levels, texture_tests[i].expected_levels); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc failed\n"); + ok(desc.Format == D3DFMT_A8R8G8B8, "Got format %#x, expected %#x\n", desc.Format, D3DFMT_A8R8G8B8); + ok(desc.Usage == 0, "Got usage %#x, expected %#x\n", desc.Usage, 0); + ok(desc.Width == texture_tests[i].expected_size, "Got width %u, expected %u\n", desc.Width, texture_tests[i].expected_size); + ok(desc.Height == texture_tests[i].expected_size, "Got height %u, expected %u\n", desc.Height, texture_tests[i].expected_size); + ok(desc.Pool == D3DPOOL_MANAGED, "Got pool %u, expected %u\n", desc.Pool, D3DPOOL_MANAGED); + + IDirect3DTexture9_Release(texture); + } + ID3DXFont_Release(font); + } } static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
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