December 2008 - Wine-commits

Alexandre Julliard : widl: Output vtable information even for interfaces that don' t define new functions.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 61d600f42fc914947a6f37b1cc2dfd3b71b9e907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d600f42fc914947a6f37b1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 1 14:51:17 2008 +0100 widl: Output vtable information even for interfaces that don't define new functions. --- tools/widl/proxy.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3c43aad..860b383 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -508,6 +508,18 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, print_proxy("\n"); } +static int count_methods(type_t *iface) +{ + const func_t *cur; + int count = 0; + + if (iface->ref) count = count_methods(iface->ref); + if (iface->funcs) + LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) + if (!is_callas(cur->def->attrs)) count++; + return count; +} + static int write_proxy_methods(type_t *iface, int skip) { const func_t *cur; @@ -548,17 +560,15 @@ static int write_stub_methods(type_t *iface, int skip) static void write_proxy(type_t *iface, unsigned int *proc_offset) { - int midx = -1, stubs; + int midx = -1, count; const func_t *cur; - if (!iface->funcs) return; - /* FIXME: check for [oleautomation], shouldn't generate proxies/stubs if specified */ fprintf(proxy, "/*****************************************************************************\n"); fprintf(proxy, " * %s interface\n", iface->name); fprintf(proxy, " */\n"); - LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) + if (iface->funcs) LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) { const var_t *def = cur->def; if (!is_local(def->attrs)) { @@ -583,8 +593,11 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) } } + count = count_methods(iface); + if (midx != -1 && midx != count) error("invalid count %u/%u\n", count, midx); + /* proxy vtable */ - print_proxy( "static const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", midx, iface->name); + print_proxy( "static const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", count, iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n", iface->name); @@ -606,7 +619,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "static const PRPC_STUB_FUNCTION %s_table[] =\n", iface->name); print_proxy( "{\n"); indent++; - stubs = write_stub_methods(iface, FALSE); + write_stub_methods(iface, FALSE); fprintf(proxy, "\n"); indent--; fprintf(proxy, "};\n"); @@ -619,7 +632,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) indent++; print_proxy( "&IID_%s,\n", iface->name); print_proxy( "0,\n"); - print_proxy( "%d,\n", stubs+3); + print_proxy( "%d,\n", count); print_proxy( "&%s_table[-3],\n", iface->name); indent--; print_proxy( "},\n", iface->name); @@ -700,7 +713,7 @@ static void write_proxy_iface_name_format(const statement_list_t *stmts, const c else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) { type_t *iface = stmt->u.type; - if (iface->ref && iface->funcs && need_proxy(iface)) + if (iface->ref && need_proxy(iface)) fprintf(proxy, format, iface->name); } } @@ -718,7 +731,7 @@ static void write_proxy_iface_base_iids(const statement_list_t *stmts) else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) { type_t *iface = stmt->u.type; - if (iface->ref && iface->funcs && need_proxy(iface)) + if (iface->ref && need_proxy(iface)) { if (need_delegation(iface)) fprintf( proxy, " &IID_%s, /* %s */\n", iface->ref->name, iface->name ); @@ -739,7 +752,7 @@ static void write_iid_lookup(const statement_list_t *stmts, const char *file_id, else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) { type_t *iface = stmt->u.type; - if(iface->ref && iface->funcs && need_proxy(iface)) + if(iface->ref && need_proxy(iface)) { fprintf(proxy, " if (!_%s_CHECK_IID(%d))\n", file_id, *c); fprintf(proxy, " {\n");

1 0

Austin English : bugzilla/index.html: update git link to point to wiki
by Jeremy Newman 01 Dec '08

01 Dec '08

Module: bugzilla Branch: master Commit: 700d0086c5aecf36c15cb9e857a93ec10269416b URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=700d0086c5aecf36c15cb… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 29 19:07:36 2008 -0600 bugzilla/index.html: update git link to point to wiki -- -Austin --- template/en/default/index.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index cce37cf..e173227 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -144,7 +144,7 @@ function addSidebar() { </li> <li> Make sure you are using the latest stable version or a build from - <a href="http://www.winehq.org/site/git">Git</a>, if + <a href="http://wiki.winehq.org/GitWine">Git</a>, if similar bugs have recently been fixed and committed. </li> <li>

1 0

Austin English : website: remove old git page, change links to wiki
by Jeremy Newman 01 Dec '08

01 Dec '08

Module: website Branch: master Commit: fe6e11fd114529fa06999da54f16b99407332d24 URL: http://source.winehq.org/git/website.git/?a=commit;h=fe6e11fd114529fa06999d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 30 19:06:59 2008 -0600 website: remove old git page, change links to wiki -- -Austin >From 2a516552de968ce3dc51c3ebd19510d1aa59801a Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Sun, 30 Nov 2008 19:05:54 -0600 Subject: [PATCH] website: remove old git page, change links to wiki --- templates/en/download.template | 2 +- templates/en/git.template | 119 --------------------------------- templates/en/menu.xml | 2 +- templates/en/sending_patches.template | 2 +- templates/es/menu.xml | 2 +- templates/es/sending_patches.template | 4 +- 6 files changed, 6 insertions(+), 125 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index a03027a..b837888 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -182,7 +182,7 @@ for post-installation instructions.</b></p> </tr> <tr bgcolor="#ffffff"> - <td> <a href="{$root}/site/git">source.winehq.org/git</a> </td> + <td> <a href="http://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> <td> For the latest development version. </td> </tr> diff --git a/templates/en/git.template b/templates/en/git.template deleted file mode 100644 index f00d788..0000000 --- a/templates/en/git.template +++ /dev/null @@ -1,119 +0,0 @@ - - -<h1>The Wine Git Tree</h1> - -<p>Wine uses an Open Source, open process development model. -Anyone may get the code, post opinions on what should be done, -and contribute patches. You will need to know C and/or perl, and something -about <a href="{$root}/site/resources">Unix and Windows</a>.</p> - -<p><a href="http://git.or.cz/">Git</a> is a fast directory -content manager, originally written for use with large repositories, -such as the Linux Kernel source.</p> - -<p>You will need Git 1.3.1 or above.</p> - -<p>Read the sections below on how to use our Git tree or check the -<a href="http://wiki.winehq.org/GitWine">GitWine</a> guide on the Wine Wiki.</p> - -<ol> - <li><a href="#clone">Getting a local copy of Wine</a></li> - <li><a href="#cleaning">Cleaning up your existing tree</a></li> - <li><a href="#uptodate">Staying Up-To-Date</a></li> - <li><a href="#sourcetree">Source Tree Browsing via the Web</a></li> - <li><a href="#modules">Other modules available from WineHQ</a></li> - <li><a href="#clonecvs">Getting a local copy of Wine with CVS</a></li> -</ol> - -<hr /> - -<h1 id="clone">Getting a local copy of Wine</h1> - -<p>To check out the entire Wine source tree, do:</p> - -<p><code>git clone git://source.winehq.org/git/wine.git wine</code></p> - -<hr /> - -<h1 id="cleaning">Cleaning up your existing tree</h1> - -<p>A quick way to clean up your tree after you've been modifying -it and want to remove changes you haven't checked in is this: </p> - -<p><code>cd wine -git diff-index -p HEAD > total-<i>x.x.x</i>.diff -patch -p1 -R < total-<i>x.x.x</i>.diff -git reset -</code></p> - -<p>Using the current x.x.x tags, you can keep a history of changes -that were in your Wine tree.</p> - -<p>If you have made commits to the tree, and want to remove them all, -you can use the following more dangerous command:</p> - -<p><code>git reset --hard origin</code></p> - - -<p>This will wipe out any local changes you have made, so use it with caution.</p> - -<hr /> - -<h1 id="uptodate">Staying Up-To-Date</h1> - -<p> First, make sure to clean your tree as described above, then -run the following commands from the top level wine directory:</p> - -<p><code>git fetch -git rebase origin -</code></p> - -<hr /> - -<h1 id="sourcetree">Source Tree Browsing via the Web</h1> - -<p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) - cross-referenced and available for browsing, including a search engine. - This cross-references source is based on the snapshot-releases and is made available at: </p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul> - -<p> Direct access from the web to the complete Git tree is also possible, using -<a href="http://www.kernel.org/pub/software/scm/gitweb/">gitweb</a> package:</p> -<ul> - <li><a href="http://source.winehq.org/git/wine.git">source.winehq.org/git/wine.git</a>, - on the primary Git repository</li> -</ul> - -<hr /> - -<h1 id="modules">Other modules available from WineHQ</h1> - -<p>In addition to the main source tree, the WineHQ Git server also -exports the following modules:</p> - -<ul> - <li><a href="http://source.winehq.org/git/website.git">website.git</a> -- source for the WineHQ.org website</li> - <li><a href="http://source.winehq.org/git/bugzilla.git">bugzilla.git</a> -- source for the bugzilla version used on the WineHQ site</li> - <li><a href="http://source.winehq.org/git/appdb.git">appdb.git</a> -- source for the application database web site</li> - <li><a href="http://source.winehq.org/git/docs.git">docs.git</a> -- source for the Wine documentation</li> - <li><a href="http://source.winehq.org/git/tools.git">tools.git</a> -- tools used on the WineHQ site</li> -</ul> - -<hr /> - -<h1 id="clonecvs">Getting a local copy of Wine with CVS</h1> - -<p>If you cannot use Git for some reason, the main source tree is - also available through CVS.</p> - -<p>To login to the CVS server, run in a terminal:</p> - -<p><code>cvs -d :pserver:cvs(a)cvs.winehq.org:/home/wine login</code></p> - -<p>Use "cvs" as the password (without the quotes).</p> - -<p>To check out the Wine source tree run:</p> - -<p><code>cvs -z 3 -d :pserver:cvs(a)cvs.winehq.org:/home/wine checkout wine</code></p> diff --git a/templates/en/menu.xml b/templates/en/menu.xml index 8ac450c..586aef9 100644 --- a/templates/en/menu.xml +++ b/templates/en/menu.xml @@ -35,7 +35,7 @@ <sect name="development" desc="Development" unfold="1" template="top"> <sect name="devel_guide" desc="Developers Guide" link="{$root}/site/docs/winedev-guide/index" /> <sect name="forums" desc="Mailing Lists" link="{$root}/site/forums" /> - <sect name="git" desc="GIT" link="{$root}/site/git" /> + <sect name="git" desc="GIT" link="http://wiki.winehq.org/GitWine" /> <sect name="sending_patches" desc="Sending Patches" link="{$root}/site/sending_patches" /> <sect name="todo" desc="To Do Lists" link="http://wiki.winehq.org/TodoList" /> <sect name="fun_projects" desc="Fun Projects" link="{$root}/site/fun_projects" /> diff --git a/templates/en/sending_patches.template b/templates/en/sending_patches.template index 4289ed3..f185117 100644 --- a/templates/en/sending_patches.template +++ b/templates/en/sending_patches.template @@ -77,7 +77,7 @@ or anywhere else to the Git tree.) <p>It's best to send small patches against the current tree using Git. First, make sure your tree is up to date, as described on the -<a href="{$root}/site/git">Git</a> page. +<a href="http://wiki.winehq.org/GitWine">Git</a> page. <p>Check in your patches to your Git tree using <a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git commit</a>.</p> diff --git a/templates/es/menu.xml b/templates/es/menu.xml index 8ac450c..586aef9 100644 --- a/templates/es/menu.xml +++ b/templates/es/menu.xml @@ -35,7 +35,7 @@ <sect name="development" desc="Development" unfold="1" template="top"> <sect name="devel_guide" desc="Developers Guide" link="{$root}/site/docs/winedev-guide/index" /> <sect name="forums" desc="Mailing Lists" link="{$root}/site/forums" /> - <sect name="git" desc="GIT" link="{$root}/site/git" /> + <sect name="git" desc="GIT" link="http://wiki.winehq.org/GitWine" /> <sect name="sending_patches" desc="Sending Patches" link="{$root}/site/sending_patches" /> <sect name="todo" desc="To Do Lists" link="http://wiki.winehq.org/TodoList" /> <sect name="fun_projects" desc="Fun Projects" link="{$root}/site/fun_projects" /> diff --git a/templates/es/sending_patches.template b/templates/es/sending_patches.template index 501c0d3..3093828 100644 --- a/templates/es/sending_patches.template +++ b/templates/es/sending_patches.template @@ -1,4 +1,4 @@ - +g <h1>Generando y enviando parches</h1> @@ -82,7 +82,7 @@ o en cualquier otro lugar que no sea el árbol Git) <p> Es mejor enviar pequeños parches contra el actual árbol utilizando Git. En primer lugar, asegúrese de que su árbol es hasta la fecha, tal y como -se describe en la página <a href="{$root}/site/git">Git</a>. +se describe en la página <a href="http://wiki.winehq.org/GitWine">Git</a>. <p>Compruebe sus parches en su árbol Git utilizando <a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git commit</a>.</p>

1 0

Seymour : update for lenny repository
by Jeremy Newman 01 Dec '08

01 Dec '08

Module: website Branch: master Commit: 75b2d8646bc1ba01c5b4dd97f188a06dca5c0790 URL: http://source.winehq.org/git/website.git/?a=commit;h=75b2d8646bc1ba01c5b4dd… Author: Seymour <real_seymour(a)yahoo.it> Date: Sat Nov 29 15:18:04 2008 +0100 update for lenny repository >From 8fe4efa55898d4d800ec0cb6e448042e844077f6 Mon Sep 17 00:00:00 2001 From: Maurilio Genovese <maurilio(a)(none).(none)> Date: Sat, 29 Nov 2008 15:14:15 +0100 Subject: Updated download page for new repository link templates/en/download-deblenny.template --- templates/en/download-deblenny.template | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/en/download-deblenny.template b/templates/en/download-deblenny.template index fb51a5d..9751c4e 100644 --- a/templates/en/download-deblenny.template +++ b/templates/en/download-deblenny.template @@ -21,7 +21,8 @@ Wine for Debian Lenny <div style="position:relative;left:20px">Open a terminal</div> <div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> <div style="position:relative;left:20px"><i>gedit /etc/apt/sources.list</i> <font color="gray">#to open repository file with a text editor (you can use gedit or another)</font></div> -<div style="position:relative;left:20px">Add this line: <i>deb http://lamalennyrepo.altervista.org/apt lenny main</i></div> +<div style="position:relative;left:20px">Add this line: <i>deb http://www.lamaresh.net/apt lenny main</i></div> +<div style="position:relative;left:20px">Add this line if you want also sources repository: <i>deb-src http://www.lamaresh.net/apt lenny main</i></div> <div style="position:relative;left:20px">Save and close sources.list</div> <div style="position:relative;left:20px"><i>apt-get update</i> <font color="gray">#to update package list</font></div> <div style="position:relative;left:20px"><i>apt-get install wine</i> <font color="gray">#to install latest wine version</font></div><p></p> @@ -32,6 +33,6 @@ Wine for Debian Lenny <div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> <div style="position:relative;left:20px"><i>dpkg -i wine_1.1.x_i386.deb</i> <font color="gray">#change xxx with your chosen package, this will install wine</font></div> -<br><br><p style="font-size:12px;text-align:left;font-style: italic;">Manteiner: <a href="http://www.lamalennyrepo.altervista.org" target="_new">homepage</a>, <a href="mailto:lamalennyrepo(a)altervista.org">email</a></p> +<br><br><p style="font-size:12px;text-align:left;font-style: italic;">Manteiner: <a href="http://www.lamaresh.net" target="_blank">homepage</a>, <a href="mailto:lamalennyrepo(a)altervista.org">email</a></p>

1 0

Paul Vriens : winetest: Fix detection of crashes in tests with child processes.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: tools Branch: master Commit: d11d6402c2953d7073e992f3b99b1cad4da7a9d2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d11d6402c2953d7073e992f3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 29 13:09:25 2008 +0100 winetest: Fix detection of crashes in tests with child processes. --- winetest/dissect | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 9a00d8e..2ecedef 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -248,7 +248,7 @@ while (<IN>) { $box->{data} .= sprintf "<div class=\"%s\">%s</div>\n", $class, escapeHTML($_); } elsif (/$dll:$unit done $(-?\d+)$\r?$/) { chomp; # current test ended - if ($lines==0) { + if ($lines==0 || $1 < 0) { $result = "failed $1 - -"; my $reason = "test failed: error $1"; if ($1 == 258) { $reason = "test failed: timed out"; }

1 0

Paul Vriens : winetest: Remove unused variable.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: tools Branch: master Commit: f432811428ce81b10bc24bb7fbcdf61a7d0f6f55 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f432811428ce81b10bc24bb7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 29 13:13:06 2008 +0100 winetest: Remove unused variable. --- winetest/build-index | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 165309c..259f0aa 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -30,10 +30,6 @@ my %w2k8 = (name => "2008"); my %unknown = (name => "Other"); my %wine = (name => "Wine"); -# Map dissect's IDs to the above hashes -my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, unknown=>\%unknown, wine=>\%wine); - # Define the order of version groups in the summary my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine);

1 0

Kai Blin : kernel32/tests: logfile can be NULL, avoid dereferencing it ( Coverity).
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: a30724304cda3fa7eff8077057aa5d255b42d5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30724304cda3fa7eff807705… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Dec 1 14:03:55 2008 +0100 kernel32/tests: logfile can be NULL, avoid dereferencing it (Coverity). --- dlls/kernel32/tests/debugger.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 0b943f2..014f390 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -158,7 +158,11 @@ static void doDebugger(int argc, char** argv) else blackbox.debug_rc=TRUE; - get_events(logfile, &start_event, &done_event); + if (logfile) + { + get_events(logfile, &start_event, &done_event); + } + if (strstr(myARGV[2], "order")) { trace("debugger: waiting for the start signal...\n"); @@ -185,7 +189,10 @@ static void doDebugger(int argc, char** argv) else blackbox.detach_rc=TRUE; - save_blackbox(logfile, &blackbox, sizeof(blackbox)); + if (logfile) + { + save_blackbox(logfile, &blackbox, sizeof(blackbox)); + } trace("debugger: done debugging...\n"); SetEvent(done_event);

1 0

Michael Karcher : msxml3: Remove attach_xmldoc(This, NULL) calls.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 8b293040a370ff756beab0692ac316d720becd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b293040a370ff756beab0692… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 10:52:16 2008 +0100 msxml3: Remove attach_xmldoc(This, NULL) calls. This->node should never be zero. Each IXMLDOMNode (and derived interfaces) always represents a present libxml data object. There is no no-data IXMLDOMNode, although there might be documents without a root element. --- dlls/msxml3/domdoc.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 860cd60..c8eec39 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1364,8 +1364,6 @@ static HRESULT WINAPI domdoc_load( assert( This->node ); - attach_xmldoc(This->node, NULL); - switch( V_VT(&xmlSource) ) { case VT_BSTR: @@ -1549,8 +1547,6 @@ static HRESULT WINAPI domdoc_loadXML( assert ( This->node ); - attach_xmldoc( This->node, NULL ); - if ( isSuccessful ) { *isSuccessful = VARIANT_FALSE;

1 0

Michael Karcher : msxml3: attach_xmldoc may fail.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: afb17f29e17b8b2cd6e62b8bf0d2ae02166db573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb17f29e17b8b2cd6e62b8bf… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 10:52:24 2008 +0100 msxml3: attach_xmldoc may fail. The upcoming new implementation of attach_xmldoc needs HeapAlloc. Prepare for the failure case. --- dlls/msxml3/domdoc.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c8eec39..f71b134 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -209,7 +209,7 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) return S_FALSE; } -static void attach_xmldoc( IXMLDOMNode *node, xmlDocPtr xml ) +static HRESULT attach_xmldoc( IXMLDOMNode *node, xmlDocPtr xml ) { xmlnode *This = impl_from_IXMLDOMNode( node ); @@ -220,7 +220,7 @@ static void attach_xmldoc( IXMLDOMNode *node, xmlDocPtr xml ) if(This->node) xmldoc_add_ref(This->node->doc); - return; + return S_OK; } static inline domdoc *impl_from_IXMLDOMDocument2( IXMLDOMDocument2 *iface ) @@ -345,9 +345,8 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( } xmldoc->_private = create_priv(); - attach_xmldoc( This->node, xmldoc ); - return S_OK; + return attach_xmldoc( This->node, xmldoc ); } static HRESULT WINAPI xmldoc_IPersistStream_Save( @@ -1324,7 +1323,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) xmldoc = doparse( ptr, len ); if(xmldoc) { xmldoc->_private = create_priv(); - attach_xmldoc(This->node, xmldoc); + return attach_xmldoc(This->node, xmldoc); } return S_OK; @@ -1377,11 +1376,12 @@ static HRESULT WINAPI domdoc_load( { domdoc *newDoc = impl_from_IXMLDOMDocument2( pNewDoc ); xmldoc = xmlCopyDoc(get_doc(newDoc), 1); - attach_xmldoc(This->node, xmldoc); + hr = attach_xmldoc(This->node, xmldoc); - *isSuccessful = VARIANT_TRUE; + if(SUCCEEDED(hr)) + *isSuccessful = VARIANT_TRUE; - return S_OK; + return hr; } } hr = IUnknown_QueryInterface(V_UNKNOWN(&xmlSource), &IID_IStream, (void**)&pStream); @@ -1438,8 +1438,9 @@ static HRESULT WINAPI domdoc_load( if(!filename || FAILED(hr)) { xmldoc = xmlNewDoc(NULL); xmldoc->_private = create_priv(); - attach_xmldoc(This->node, xmldoc); - hr = S_FALSE; + hr = attach_xmldoc(This->node, xmldoc); + if(SUCCEEDED(hr)) + hr = S_FALSE; } TRACE("ret (%d)\n", hr); @@ -1541,7 +1542,7 @@ static HRESULT WINAPI domdoc_loadXML( xmlDocPtr xmldoc = NULL; char *str; int len; - HRESULT hr = S_FALSE; + HRESULT hr = S_FALSE, hr2; TRACE("%p %s %p\n", This, debugstr_w( bstrXML ), isSuccessful ); @@ -1568,7 +1569,9 @@ static HRESULT WINAPI domdoc_loadXML( xmldoc = xmlNewDoc(NULL); xmldoc->_private = create_priv(); - attach_xmldoc( This->node, xmldoc ); + hr2 = attach_xmldoc( This->node, xmldoc ); + if( FAILED(hr2) ) + hr = hr2; return hr; }

1 0

Andrew Talbot : wined3d: Sign-compare warnings fix.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 89509eb6287ce39c5e9607173b3773efcd847d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89509eb6287ce39c5e9607173… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 1 12:02:08 2008 +0000 wined3d: Sign-compare warnings fix. --- dlls/wined3d/glsl_shader.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6784b96..8f9ec16 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -92,7 +92,7 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) { int infologLength = 0; char *infoLog; - int i; + unsigned int i; BOOL is_spam; const char *spam[] = { @@ -299,13 +299,13 @@ static void shader_glsl_load_constantsI(IWineD3DBaseShaderImpl *This, const Wine GLhandleARB programId, const GLhandleARB locations[MAX_CONST_I], unsigned int max_constants, const int *constants, const BOOL *constants_set) { - int i; + unsigned int i; struct list* ptr; for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { - TRACE_(d3d_constants)("Loading constants %i: %i, %i, %i, %i\n", + TRACE_(d3d_constants)("Loading constants %u: %i, %i, %i, %i\n", i, constants[i*4], constants[i*4+1], constants[i*4+2], constants[i*4+3]); /* We found this uniform name in the program - go ahead and send the data */ @@ -339,7 +339,7 @@ static void shader_glsl_load_constantsB(IWineD3DBaseShaderImpl *This, const Wine GLhandleARB programId, unsigned int max_constants, const BOOL *constants, const BOOL *constants_set) { GLhandleARB tmp_loc; - int i; + unsigned int i; char tmp_name[8]; char is_pshader = shader_is_pshader_version(This->baseShader.hex_version); const char* prefix = is_pshader? "PB":"VB"; @@ -348,11 +348,11 @@ static void shader_glsl_load_constantsB(IWineD3DBaseShaderImpl *This, const Wine for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { - TRACE_(d3d_constants)("Loading constants %i: %i;\n", i, constants[i]); + TRACE_(d3d_constants)("Loading constants %u: %i;\n", i, constants[i]); /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ - snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, i); + snprintf(tmp_name, sizeof(tmp_name), "%s[%u]", prefix, i); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); if (tmp_loc != -1) { /* We found this uniform name in the program - go ahead and send the data */ @@ -401,7 +401,7 @@ static void shader_glsl_load_constants( const struct list *constant_list; GLhandleARB programId; const struct glsl_shader_prog_link *prog = priv->glsl_program; - unsigned int i; + int i; if (!prog) { /* No GLSL program set - nothing to do. */ @@ -503,8 +503,7 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; - int i; - unsigned int extra_constants_needed = 0; + unsigned int i, extra_constants_needed = 0; const local_constant *lconst; /* There are some minor differences between pixel and vertex shaders */

1 0