November 2013 - Wine-commits

Alexandre Julliard : makedep: Add per-file flag to store the information about files to generate.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 1f3e3fa4248ec59a6cca612dda248cb37854119f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3e3fa4248ec59a6cca612dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 17:39:30 2013 +0100 makedep: Add per-file flag to store the information about files to generate. --- tools/makedep.c | 164 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 91 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f3e3fa4248ec59a6cca6…

1 0

Alexandre Julliard : widl: Add support for #pragma directives.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: cc02e15220cdf082b3fc19e585f7bab11e523198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc02e15220cdf082b3fc19e58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 14:13:06 2013 +0100 widl: Add support for #pragma directives. --- tools/widl/header.c | 3 +++ tools/widl/parser.l | 4 ++++ tools/widl/parser.y | 11 ++++++++++- tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 1 + 5 files changed, 19 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 2f275c7..bd9f21c 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1342,6 +1342,7 @@ static void write_imports(FILE *header, const statement_list_t *stmts) case STMT_TYPEDEF: case STMT_MODULE: case STMT_CPPQUOTE: + case STMT_PRAGMA: case STMT_DECLARATION: /* not processed here */ break; @@ -1376,6 +1377,7 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts) case STMT_TYPEDEF: case STMT_MODULE: case STMT_CPPQUOTE: + case STMT_PRAGMA: case STMT_DECLARATION: /* not processed here */ break; @@ -1428,6 +1430,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons break; case STMT_IMPORTLIB: case STMT_MODULE: + case STMT_PRAGMA: /* not included in header */ break; case STMT_IMPORT: diff --git a/tools/widl/parser.l b/tools/widl/parser.l index fb61e21..b911186 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -37,6 +37,7 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* %x WSTRQUOTE %x ATTR %x PP_LINE +%x PP_PRAGMA %x SQUOTE %{ @@ -125,6 +126,7 @@ UUID *parse_uuid(const char *u) ************************************************************************** */ %% +<INITIAL>^{ws}*\#{ws}*pragma{ws}+ yy_push_state(PP_PRAGMA); <INITIAL,ATTR>^{ws}*\#{ws}* yy_push_state(PP_LINE); <PP_LINE>[^\n]* { int lineno; @@ -144,6 +146,8 @@ UUID *parse_uuid(const char *u) line_number = lineno - 1; /* We didn't read the newline */ input_name = xstrdup(fname); } +<PP_PRAGMA>midl_echo[^\n]* yyless(9); yy_pop_state(); return tCPPQUOTE; +<PP_PRAGMA>[^\n]* parser_lval.str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" { yy_pop_state(); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 97c3896..946d165 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -114,6 +114,7 @@ static statement_t *make_statement_type_decl(type_t *type); static statement_t *make_statement_reference(type_t *type); static statement_t *make_statement_declaration(var_t *var); static statement_t *make_statement_library(typelib_t *typelib); +static statement_t *make_statement_pragma(const char *str); static statement_t *make_statement_cppquote(const char *str); static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); @@ -152,7 +153,7 @@ static attr_list_t *append_attribs(attr_list_t *, attr_list_t *); enum storage_class stgclass; } -%token <str> aIDENTIFIER +%token <str> aIDENTIFIER aPRAGMA %token <str> aKNOWNTYPE %token <num> aNUM aHEXNUM %token <dbl> aDOUBLE @@ -363,6 +364,7 @@ statement: | declaration ';' { $$ = make_statement_declaration($1); } | import { $$ = make_statement_import($1); } | typedef ';' { $$ = $1; } + | aPRAGMA { $$ = make_statement_pragma($1); } ; typedecl: @@ -2744,6 +2746,13 @@ static statement_t *make_statement_library(typelib_t *typelib) return stmt; } +static statement_t *make_statement_pragma(const char *str) +{ + statement_t *stmt = make_statement(STMT_PRAGMA); + stmt->u.str = str; + return stmt; +} + static statement_t *make_statement_cppquote(const char *str) { statement_t *stmt = make_statement(STMT_CPPQUOTE); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index efde0b0..30b6560 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -243,6 +243,7 @@ enum statement_type STMT_TYPEDEF, STMT_IMPORT, STMT_IMPORTLIB, + STMT_PRAGMA, STMT_CPPQUOTE }; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index dd98486..6eb229a 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2266,6 +2266,7 @@ static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) switch(stmt->type) { case STMT_LIBRARY: case STMT_IMPORT: + case STMT_PRAGMA: case STMT_CPPQUOTE: case STMT_DECLARATION: /* not included in typelib */

1 0

Alexander Dorofeyev : wined3d: Fix resultarg state handling in nvrc/ nvts code.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: a14793f50ba3acb0b99bb166b8534b255ff09ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14793f50ba3acb0b99bb166b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Nov 2 08:14:46 2013 +0200 wined3d: Fix resultarg state handling in nvrc/nvts code. Resultarg affects both rgb and alpha register combiner output. Ensure that changing resultarg updates both. --- dlls/wined3d/nvidia_texture_shader.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a14793f50ba3acb0b99bb…

1 0

Nikolay Sivov : msxml3/tests: Consolidate check for available class versions.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 61c8a4e6eac55c5e8f2d4578d9d884f55812fac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c8a4e6eac55c5e8f2d4578d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 14:16:55 2013 +0400 msxml3/tests: Consolidate check for available class versions. --- dlls/msxml3/tests/domdoc.c | 245 +++++++++++++++++++++++--------------------- 1 files changed, 129 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61c8a4e6eac55c5e8f2d4…

1 0

Nikolay Sivov : msxml3: Implement url() property of IXMLDOMDocument.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: e0344e1a28db14ff7f194055f88558e1d846cde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0344e1a28db14ff7f194055f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 14:17:12 2013 +0400 msxml3: Implement url() property of IXMLDOMDocument. --- dlls/msxml3/bsc.c | 2 +- dlls/msxml3/domdoc.c | 31 ++++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index c8683d5..d9519f3 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -259,7 +259,7 @@ HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) return E_FAIL; } - if(FAILED(UrlCreateFromPathW(url, fileUrl, &needed, 0))) + if(FAILED(UrlCreateFromPathW(fullpath, fileUrl, &needed, 0))) { ERR("can't create url from path\n"); return E_FAIL; diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 26a2dad..e3dd792 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -131,7 +131,9 @@ struct domdoc domdoc_properties* properties; HRESULT error; - /* IObjectWithSite*/ + WCHAR *url; + + /* IObjectWithSite */ IUnknown *site; /* IObjectSafety */ @@ -946,6 +948,7 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) for (eid = 0; eid < EVENTID_LAST; eid++) if (This->events[eid]) IDispatch_Release(This->events[eid]); + CoTaskMemFree(This->url); release_namespaces(This); heap_free(This); } @@ -2199,10 +2202,15 @@ static HRESULT WINAPI domdoc_load( { IMoniker *mon; + CoTaskMemFree(This->url); + This->url = NULL; + hr = create_moniker_from_url( filename, &mon); if ( SUCCEEDED(hr) ) { hr = domdoc_load_moniker( This, mon ); + if (hr == S_OK) + IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); IMoniker_Release(mon); } @@ -2265,11 +2273,25 @@ static HRESULT WINAPI domdoc_get_parseError( static HRESULT WINAPI domdoc_get_url( IXMLDOMDocument3 *iface, - BSTR* urlString ) + BSTR* url ) { domdoc *This = impl_from_IXMLDOMDocument3(iface); - FIXME("(%p)->(%p)\n", This, urlString); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, url); + + if (!url) + return E_INVALIDARG; + + if (This->url) + { + *url = SysAllocString(This->url); + if (!*url) + return E_OUTOFMEMORY; + + return S_OK; + } + else + return return_null_bstr(url); } @@ -3546,6 +3568,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->safeopt = 0; doc->cp_list = NULL; doc->namespaces = NULL; + doc->url = NULL; memset(doc->events, 0, sizeof(doc->events)); /* events connection points */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3a18f9f..8e17885 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1258,6 +1258,11 @@ if (0) ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); + str = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); + /* try load an empty document */ b = VARIANT_TRUE; str = SysAllocString( szEmpty ); @@ -9583,6 +9588,11 @@ static void test_load(void) EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + /* load from a path: VT_BSTR|VT_BYREF */ V_VT(&src) = VT_BSTR | VT_BYREF; V_BSTRREF(&src) = &path; @@ -9590,6 +9600,11 @@ static void test_load(void) EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + /* load from a path: VT_BSTR|VT_BYREF, null ptr */ V_VT(&src) = VT_BSTR | VT_BYREF; V_BSTRREF(&src) = NULL; @@ -9597,6 +9612,11 @@ static void test_load(void) EXPECT_HR(hr, E_INVALIDARG); ok(b == VARIANT_FALSE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + DeleteFileA("test.xml"); /* load from existing path, no xml content */ @@ -9609,6 +9629,11 @@ static void test_load(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(b == VARIANT_FALSE, "got %d\n", b); + bstr1 = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(bstr1 == NULL, "got %p\n", bstr1); + DeleteFileA("test.xml"); IXMLDOMDocument_Release(doc); @@ -11737,6 +11762,25 @@ static void test_create_attribute(void) free_bstrs(); } +static void test_url(void) +{ + IXMLDOMDocument *doc; + HRESULT hr; + BSTR s; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_get_url(doc, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + s = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &s); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(s == NULL, "got %s\n", wine_dbgstr_w(s)); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -11815,6 +11859,7 @@ START_TEST(domdoc) test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); + test_url(); test_xsltemplate(); test_xsltext();

1 0

Hans Leidekker : wbemprox: Implement Win32_BaseBoard. Model and Win32_BaseBoard.Name.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 796d4d0ccf780842a0f4b2e098add56df0288fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=796d4d0ccf780842a0f4b2e09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:53:46 2013 +0100 wbemprox: Implement Win32_BaseBoard.Model and Win32_BaseBoard.Name. --- dlls/wbemprox/builtin.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8dca46e..912a6b1 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -253,6 +253,8 @@ static const WCHAR prop_versionW[] = static const struct column col_baseboard[] = { { prop_manufacturerW, CIM_STRING }, + { prop_modelW, CIM_STRING }, + { prop_nameW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_tagW, CIM_STRING|COL_FLAG_KEY } }; @@ -506,6 +508,8 @@ static const WCHAR videocontroller_deviceidW[] = struct record_baseboard { const WCHAR *manufacturer; + const WCHAR *model; + const WCHAR *name; const WCHAR *serialnumber; const WCHAR *tag; }; @@ -697,7 +701,7 @@ struct record_videocontroller static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } }; static const struct record_bios data_bios[] = {

1 0

Hans Leidekker : wbemprox: Implement Win32_BIOS. IdentificationCode and Win32_BIOS.SMBIOSBIOSVersion.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 1eefe9dd8eb04234f86369974c629e0a78c6b311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eefe9dd8eb04234f86369974… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:54:10 2013 +0100 wbemprox: Implement Win32_BIOS.IdentificationCode and Win32_BIOS.SMBIOSBIOSVersion. --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 912a6b1..9a50f29 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -152,6 +152,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_idW[] = {'I','D',0}; +static const WCHAR prop_identificationcodeW[] = + {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; static const WCHAR prop_interfaceindexW[] = @@ -216,6 +218,8 @@ static const WCHAR prop_servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR prop_smbiosbiosversionW[] = + {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; static const WCHAR prop_sizeW[] = @@ -260,11 +264,13 @@ static const struct column col_baseboard[] = }; static const struct column col_bios[] = { - { prop_descriptionW, CIM_STRING }, - { prop_manufacturerW, CIM_STRING }, - { prop_releasedateW, CIM_DATETIME }, - { prop_serialnumberW, CIM_STRING }, - { prop_versionW, CIM_STRING|COL_FLAG_KEY } + { prop_descriptionW, CIM_STRING }, + { prop_identificationcodeW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING }, + { prop_releasedateW, CIM_DATETIME }, + { prop_serialnumberW, CIM_STRING }, + { prop_smbiosbiosversionW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = { @@ -457,6 +463,8 @@ 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 bios_smbiosbiosversionW[] = + {'W','i','n','e',0}; static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR cdromdrive_nameW[] = @@ -516,9 +524,11 @@ struct record_baseboard struct record_bios { const WCHAR *description; + const WCHAR *identificationcode; const WCHAR *manufacturer; const WCHAR *releasedate; const WCHAR *serialnumber; + const WCHAR *smbiosbiosversion; const WCHAR *version; }; struct record_cdromdrive @@ -705,7 +715,8 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } + { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, + bios_smbiosbiosversionW, bios_versionW } }; static const struct record_diskdrive data_diskdrive[] = {

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_NetworkAdapterConfiguration.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: ec1a57f25b25dba1ed47e8456cc64c2cc1ee0aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1a57f25b25dba1ed47e8456… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:54:51 2013 +0100 wbemprox: Add a partial implementation of Win32_NetworkAdapterConfiguration. --- dlls/wbemprox/builtin.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9a50f29..4efb17b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -66,6 +66,9 @@ static const WCHAR class_logicaldisk2W[] = {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; +static const WCHAR class_networkadapterconfigW[] = + {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',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_paramsW[] = @@ -160,6 +163,8 @@ static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; +static const WCHAR prop_ipenabledW[] = + {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; static const WCHAR prop_localdatetimeW[] = @@ -342,6 +347,12 @@ static const struct column col_networkadapter[] = { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; +static const struct column col_networkadapterconfig[] = +{ + { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } +}; static const struct column col_os[] = { { prop_captionW, CIM_STRING }, @@ -601,6 +612,12 @@ struct record_networkadapter const WCHAR *pnpdevice_id; UINT64 speed; }; +struct record_networkadapterconfig +{ + UINT32 index; + int ipenabled; + const WCHAR *mac_address; +}; struct record_operatingsystem { const WCHAR *caption; @@ -1602,6 +1619,50 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e return status; } +static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) +{ + struct record_networkadapterconfig *rec; + IP_ADAPTER_ADDRESSES *aa, *buffer; + UINT row = 0, offset = 0, count = 0; + DWORD size = 0, ret; + enum fill_status status = FILL_STATUS_UNFILTERED; + + ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; + + if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) count++; + if (!resize_table( table, count, sizeof(*rec) )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) + { + rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->index = aa->u.s.IfIndex; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + TRACE("created %u rows\n", row); + table->num_rows = row; + + heap_free( buffer ); + return status; +} + static WCHAR *get_cmdline( DWORD process_id ) { if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); @@ -2130,6 +2191,8 @@ static struct table builtin_classes[] = { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, + { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, + fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process },

1 0

Stefan Dösinger : wined3d: Check for support before calling glDrawElementsInstancedBaseVertex.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 84a1e60e48d99efdaa6d7f4648d51bf938a98f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a1e60e48d99efdaa6d7f464… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 4 12:38:33 2013 +0100 wined3d: Check for support before calling glDrawElementsInstancedBaseVertex. --- dlls/wined3d/drawprim.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3c9a780..2475644 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -52,9 +52,18 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit { if (start_instance) FIXME("Start instance (%u) not supported.\n", start_instance); - GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); - checkGLcall("glDrawElementsInstancedBaseVertex"); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + { + GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); + checkGLcall("glDrawElementsInstancedBaseVertex"); + } + else + { + GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count)); + checkGLcall("glDrawElementsInstancedARB"); + } } } else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])

1 0

Stefan Dösinger : wined3d: GL_ARB_instanced_arrays provides glDrawElementsInstanced.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 292612cf4b4a906d273d096ffc2a8c25a0e735ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=292612cf4b4a906d273d096ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 4 12:38:34 2013 +0100 wined3d: GL_ARB_instanced_arrays provides glDrawElementsInstanced. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2475644..14149b5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -44,7 +44,7 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (instance_count) { - if (!gl_info->supported[ARB_DRAW_INSTANCED]) + if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS]) { FIXME("Instanced drawing not supported.\n"); }

1 0