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

Jacek Caban : vbscript: Added support for exit for statement in 'for in' loops.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 00dfcb08b83976dfd824c776eedd267bf0037b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00dfcb08b83976dfd824c776e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 19:18:00 2012 +0200 vbscript: Added support for exit for statement in 'for in' loops. --- dlls/vbscript/compile.c | 11 ++++++----- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index de29777..7c4b0e6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -650,7 +650,8 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t *stat) { - unsigned loop_start, loop_end; + statement_ctx_t loop_ctx = {1}; + unsigned loop_start; HRESULT hres; hres = compile_expression(ctx, stat->group_expr); @@ -661,14 +662,14 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t return E_OUTOFMEMORY; loop_start = ctx->instr_cnt; - if(!(loop_end = alloc_label(ctx))) + if(!(loop_ctx.for_end_label = alloc_label(ctx))) return E_OUTOFMEMORY; - hres = push_instr_uint_bstr(ctx, OP_enumnext, loop_end, stat->identifier); + hres = push_instr_uint_bstr(ctx, OP_enumnext, loop_ctx.for_end_label, stat->identifier); if(FAILED(hres)) return hres; - hres = compile_statement(ctx, NULL, stat->body); + hres = compile_statement(ctx, &loop_ctx, stat->body); if(FAILED(hres)) return hres; @@ -676,7 +677,7 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t if(FAILED(hres)) return hres; - label_set_addr(ctx, loop_end); + label_set_addr(ctx, loop_ctx.for_end_label); return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c03fa8f..9389462 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -431,6 +431,15 @@ next Call ok(y = 3, "y = " & y) Call ok(getVT(x) = "VT_EMPTY*", "getVT(x) = " & getVT(x)) +Call collectionObj.reset() +y = false +for each x in collectionObj + if x = 2 then exit for + y = 1 +next +Call ok(y = 1, "y = " & y) +Call ok(x = 2, "x = " & x) + if false then Sub testsub x = true

1 0

Dmitry Timoshkov : winex11.drv: Avoid conflicting definitions of WINGDIAPI.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 6173e6bfb68108a84e190c1ce76dce26e97bc009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6173e6bfb68108a84e190c1ce… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 4 01:21:11 2012 +0900 winex11.drv: Avoid conflicting definitions of WINGDIAPI. --- dlls/winex11.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f43127c..44882cb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -44,6 +44,7 @@ #endif #undef APIENTRY #undef GLAPI +#undef WINGDIAPI #include "x11drv.h" #include "winternl.h"

1 0

Gerald Pfeifer : ntdll: Omit unused typedef in test_query_process_basic.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 80d078d0715e7013686c4e829256eff8c1f886a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d078d0715e7013686c4e829… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jul 4 00:10:43 2012 +0200 ntdll: Omit unused typedef in test_query_process_basic. --- dlls/ntdll/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 18b8fce..4c23552 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -588,7 +588,7 @@ static void test_query_process_basic(void) DWORD_PTR BasePriority; ULONG_PTR UniqueProcessId; ULONG_PTR InheritedFromUniqueProcessId; - } PROCESS_BASIC_INFORMATION_PRIVATE, *PPROCESS_BASIC_INFORMATION_PRIVATE; + } PROCESS_BASIC_INFORMATION_PRIVATE; PROCESS_BASIC_INFORMATION_PRIVATE pbi;

1 0

Hans Leidekker : wbemprox: Add a partial Win32_BaseBoard class implementation.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 993d8c245a5c0cc87aafd93c99ee108aaab3962c URL: http://source.winehq.org/git/wine.git/?a=commit;h=993d8c245a5c0cc87aafd93c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 4 10:32:00 2012 +0200 wbemprox: Add a partial Win32_BaseBoard 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 75f37dc..740e096 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +static const WCHAR class_baseboardW[] = + {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; static const WCHAR class_biosW[] = {'W','i','n','3','2','_','B','I','O','S',0}; static const WCHAR class_compsysW[] = @@ -118,12 +120,20 @@ static const WCHAR prop_speedW[] = {'S','p','e','e','d',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; +static const WCHAR prop_tagW[] = + {'T','a','g',0}; static const WCHAR prop_threadcountW[] = {'T','h','r','e','a','d','C','o','u','n','t',0}; static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; /* column definitions must be kept in sync with record structures below */ +static const struct column col_baseboard[] = +{ + { prop_manufacturerW, CIM_STRING }, + { prop_serialnumberW, CIM_STRING }, + { prop_tagW, CIM_STRING|COL_FLAG_KEY } +}; static const struct column col_bios[] = { { prop_descriptionW, CIM_STRING }, @@ -190,6 +200,12 @@ static const struct column col_videocontroller[] = { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const WCHAR baseboard_manufacturerW[] = + {'I','n','t','e','l',' ','C','o','r','p','o','r','a','t','i','o','n',0}; +static const WCHAR baseboard_serialnumberW[] = + {'N','o','n','e',0}; +static const WCHAR baseboard_tagW[] = + {'B','a','s','e',' ','B','o','a','r','d',0}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; static const WCHAR bios_manufacturerW[] = @@ -219,6 +235,12 @@ static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; #include "pshpack1.h" +struct record_baseboard +{ + const WCHAR *manufacturer; + const WCHAR *serialnumber; + const WCHAR *tag; +}; struct record_bios { const WCHAR *description; @@ -286,6 +308,10 @@ struct record_videocontroller }; #include "poppack.h" +static const struct record_baseboard data_baseboard[] = +{ + { baseboard_manufacturerW, baseboard_serialnumberW, baseboard_tagW } +}; static const struct record_bios data_bios[] = { { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } @@ -632,6 +658,7 @@ done: static struct table classtable[] = { + { class_baseboardW, SIZEOF(col_baseboard), col_baseboard, SIZEOF(data_baseboard), (BYTE *)data_baseboard }, { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk },

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor. Manufacturer and Win32_Processor.Name.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 716870ef87e70937f822b8a2192b1068e42bd46a URL: http://source.winehq.org/git/wine.git/?a=commit;h=716870ef87e70937f822b8a21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 4 10:32:55 2012 +0200 wbemprox: Implement Win32_Processor.Manufacturer and Win32_Processor.Name. --- dlls/wbemprox/builtin.c | 68 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 58 insertions(+), 10 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 740e096..53f9c6d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -187,7 +187,8 @@ static const struct column col_processor[] = { { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_manufacturerW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_videocontroller[] = @@ -229,8 +230,6 @@ 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}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; @@ -295,6 +294,7 @@ struct record_processor UINT16 cpu_status; const WCHAR *device_id; const WCHAR *manufacturer; + const WCHAR *name; const WCHAR *processor_id; }; struct record_videocontroller @@ -543,27 +543,75 @@ static inline void do_cpuid( unsigned int ax, unsigned int *p ) #endif } +static void get_processor_id( WCHAR *processor_id ) +{ + static const WCHAR fmtW[] = {'%','0','8','X','%','0','8','X',0}; + unsigned int regs[4] = {0, 0, 0, 0}; + + do_cpuid( 1, regs ); + sprintfW( processor_id, fmtW, regs[3], regs[0] ); +} +static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +{ + unsigned int i; + unsigned char *p = (unsigned char *)regs; + + for (i = 0; i < len; i++) + { + buffer[i] = *p++; + } + buffer[i] = 0; + return; +} +static void get_processor_manufacturer( WCHAR *manufacturer ) +{ + unsigned int tmp, regs[4] = {0, 0, 0, 0}; + + do_cpuid( 0, regs ); + tmp = regs[2]; /* swap edx and ecx */ + regs[2] = regs[3]; + regs[3] = tmp; + + regs_to_str( regs + 1, 12, manufacturer ); +} +static void get_processor_name( WCHAR *name ) +{ + unsigned int regs[4] = {0, 0, 0, 0}; + + do_cpuid( 0x80000000, regs ); + if (regs[0] >= 0x80000004) + { + do_cpuid( 0x80000002, regs ); + regs_to_str( regs, 16, name ); + do_cpuid( 0x80000003, regs ); + regs_to_str( regs, 16, name + 16 ); + do_cpuid( 0x80000004, regs ); + regs_to_str( regs, 16, name + 32 ); + } +} + static void fill_processor( struct table *table ) { static const WCHAR fmtW[] = {'C','P','U','%','u',0}; - static const WCHAR fmt_cpuidW[] = {'%','0','8','X','%','0','8','X',0}; - WCHAR device_id[14], cpu_id[17]; + WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; UINT i, offset = 0, count = get_processor_count(); - unsigned int regs[4] = {0, 0, 0, 0}; if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return; - do_cpuid( 1, regs ); - sprintfW( cpu_id, fmt_cpuidW, regs[3], regs[0] ); + get_processor_id( processor_id ); + get_processor_manufacturer( manufacturer ); + get_processor_name( name ); + for (i = 0; i < count; i++) { rec = (struct record_processor *)(table->data + offset); rec->cpu_status = 1; /* CPU Enabled */ - rec->manufacturer = processor_manufacturerW; sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); - rec->processor_id = heap_strdupW( cpu_id ); + rec->manufacturer = heap_strdupW( manufacturer ); + rec->name = heap_strdupW( name ); + rec->processor_id = heap_strdupW( processor_id ); offset += sizeof(*rec); }

1 0

Michael Stefaniuc : quartz: Remove an object to IFilterGraph2 cast.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 4e57e3bf5291fd687e2627432114c9654ead94df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e57e3bf5291fd687e2627432… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 4 17:26:49 2012 +0200 quartz: Remove an object to IFilterGraph2 cast. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7b6654b..6b0085d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1991,7 +1991,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) This->EcCompleteCount = 0; if (This->defaultclock && !This->refClock) - IFilterGraph2_SetDefaultSyncSource((IFilterGraph2*)This); + IFilterGraph2_SetDefaultSyncSource(&This->IFilterGraph2_iface); if (This->refClock) {

1 0

André Hentschel : Wine 1.5.8 freigegeben
by Jeremy Newman 05 Jul '12

05 Jul '12

Module: website Branch: master Commit: cf3f2e34e431223b3fef26edcae5454a77b262a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=cf3f2e34e431223b3fef26… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 3 22:08:17 2012 +0200 Wine 1.5.8 freigegeben --- news/de/2012070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012070301.xml b/news/de/2012070301.xml new file mode 100644 index 0000000..5be36a1 --- /dev/null +++ b/news/de/2012070301.xml @@ -0,0 +1,17 @@ +<news> +<date>3. Juli 2012</date> +<title>Wine 1.5.8 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.8 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.8">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehr Stream Funktionalität in der C++ Runtime.</li> + <li>Zahlreiche Windows Codecs Verbesserungen.</li> + <li>Mehr WBEM Klassen und Eigenschaften.</li> + <li>Einige Fehlerbehebungen für die HTML Hilfe.</li> + <li>Unterstützung für das Drucken von gefakten Kursivschriften.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.8.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.8
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: website Branch: master Commit: 9fa58bd6b4a208b7142582f081b0ae0a4b2f5a86 URL: http://source.winehq.org/git/website.git/?a=commit;h=9fa58bd6b4a208b7142582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 3 21:13:59 2012 +0200 Wine release 1.5.8 --- news/en/2012070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012070301.xml b/news/en/2012070301.xml new file mode 100644 index 0000000..2b1e8a0 --- /dev/null +++ b/news/en/2012070301.xml @@ -0,0 +1,17 @@ +<news> +<date>July 3, 2012</date> +<title>Wine 1.5.8 Released</title> +<body> + The Wine development release 1.5.8 is now available. + <a href="{$root}/announce/1.5.8">What's new</a> in this release: +<ul> + <li>More stream functionality in the C++ runtime.</li> + <li>A number of Windows Codecs improvements.</li> + <li>More WBEM classes and properties.</li> + <li>Some HTML Help fixes.</li> + <li>Support for printing fake italic fonts.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.8.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.8.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 80c276066848a56acb534bd8362195e3a8ef3a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c276066848a56acb534bd83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 3 21:02:41 2012 +0200 Release 1.5.8. --- ANNOUNCE | 1017 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 509 insertions(+), 528 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80c276066848a56acb534…

1 0

Tag wine-1.5.8 : Alexandre Julliard : Release 1.5.8
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: refs/tags/wine-1.5.8 Tag: f752bf2f37dea6d065e66b293982709d91fb5c40 URL: http://source.winehq.org/git/wine.git/?a=tag;h=f752bf2f37dea6d065e66b293982… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 3 21:02:47 2012 +0200 Release 1.5.8

1 0