August 2007 - Wine-commits - list.winehq.org

appdb/ ./addcomment.php ./appview.php ./browse ...
by WineHQ 03 Aug '07

03 Aug '07

ChangeSet ID: 31305 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/03 18:27:25 Modified files: . : addcomment.php appview.php browse_downloadable.php index.php preferences.php screenshots.php viewScreenshots.php viewbugs.php votestats.php admin : addAppNote.php addCategory.php adminBugs.php adminCommentView.php adminMaintainers.php adminScreenshots.php adminUsers.php editBundle.php maintainerNotification.php moveAppVersion.php cron : cleanup.php include : appData.php appdb.php application.php application_queue.php bugs.php category.php comment.php distribution.php downloadurl.php error_log.php incl.php maintainer.php monitor.php note.php objectManager.php query.php screenshot.php session.php tableve.php testData.php url.php user.php util.php vendor.php version.php version_queue.php vote.php unit_test : run_tests.php test_application.php test_maintainer.php test_maintainer_notify.php test_om_objects.php test_query.php test_user_password_migration.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Replace direct mysql_xxx() calls with query_xxx() calls. Replace calls to mysql_insert_id() with calls specific to the appdb or bugzilla database. Fixes a bug where a call to mysql_insert_id() can potentially retrieve an id from either the bugzilla or appdb database, depending on whichever database was last opened by mysql_connect(). Patch: http://cvs.winehq.org/patch.py?id=31305 Old revision New revision Changes Path 1.37 1.38 +1 -1 appdb/addcomment.php 1.102 1.103 +2 -2 appdb/appview.php 1.8 1.9 +4 -4 appdb/browse_downloadable.php 1.52 1.53 +1 -1 appdb/index.php 1.38 1.39 +1 -1 appdb/preferences.php 1.47 1.48 +2 -2 appdb/screenshots.php 1.14 1.15 +1 -1 appdb/viewScreenshots.php 1.13 1.14 +2 -2 appdb/viewbugs.php 1.33 1.34 +2 -2 appdb/votestats.php 1.33 1.34 +1 -1 appdb/admin/addAppNote.php 1.17 1.18 +1 -1 appdb/admin/addCategory.php 1.17 1.18 +2 -2 appdb/admin/adminBugs.php 1.18 1.19 +2 -2 appdb/admin/adminCommentView.php 1.31 1.32 +2 -2 appdb/admin/adminMaintainers.php 1.21 1.22 +2 -2 appdb/admin/adminScreenshots.php 1.15 1.16 +1 -1 appdb/admin/adminUsers.php 1.16 1.17 +4 -4 appdb/admin/editBundle.php 1.1 1.2 +2 -2 appdb/admin/maintainerNotification.php 1.13 1.14 +1 -1 appdb/admin/moveAppVersion.php 1.45 1.46 +7 -7 appdb/cron/cleanup.php 1.32 1.33 +5 -5 appdb/include/appData.php 1.7 1.8 +4 -4 appdb/include/appdb.php 1.123 1.124 +14 -14 appdb/include/application.php 1.10 1.11 +3 -3 appdb/include/application_queue.php 1.28 1.29 +7 -7 appdb/include/bugs.php 1.24 1.25 +6 -6 appdb/include/category.php 1.37 1.38 +11 -11 appdb/include/comment.php 1.41 1.42 +7 -7 appdb/include/distribution.php 1.23 1.24 +9 -9 appdb/include/downloadurl.php 1.5 1.6 +3 -3 appdb/include/error_log.php 1.46 1.47 +8 -17 appdb/include/incl.php 1.52 1.53 +17 -17 appdb/include/maintainer.php 1.18 1.19 +6 -6 appdb/include/monitor.php 1.27 1.28 +2 -2 appdb/include/note.php 1.42 1.43 +3 -3 appdb/include/objectManager.php 1.9 1.10 +60 -3 appdb/include/query.php 1.76 1.77 +5 -5 appdb/include/screenshot.php 1.14 1.15 +2 -2 appdb/include/session.php 1.15 1.16 +18 -18 appdb/include/tableve.php 1.76 1.77 +12 -12 appdb/include/testData.php 1.21 1.22 +6 -6 appdb/include/url.php 1.95 1.96 +22 -22 appdb/include/user.php 1.101 1.102 +20 -20 appdb/include/util.php 1.36 1.37 +6 -6 appdb/include/vendor.php 1.144 1.145 +21 -21 appdb/include/version.php 1.17 1.18 +1 -1 appdb/include/version_queue.php 1.29 1.30 +5 -5 appdb/include/vote.php 1.17 1.18 +1 -1 appdb/unit_test/run_tests.php 1.7 1.8 +1 -1 appdb/unit_test/test_application.php 1.12 1.13 +4 -4 appdb/unit_test/test_maintainer.php 1.2 1.3 +2 -2 appdb/unit_test/test_maintainer_notify.php 1.22 1.23 +5 -5 appdb/unit_test/test_om_objects.php 1.3 1.4 +3 -3 appdb/unit_test/test_query.php 1.1 1.2 +3 -3 appdb/unit_test/test_user_password_migration.php

1 0

CVSROOT/. log_accum
by Alexandre Julliard 03 Aug '07

03 Aug '07

ChangeSet ID: 31304 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2007/08/03 10:53:53 Modified files: . : log_accum Log message: log_accum: Fixes for new CVS syntax and for temp file cleanup. Patch: http://cvs.winehq.org/patch.py?id=31304 Old revision New revision Changes Path 1.33 1.34 +10 -10 CVSROOT/log_accum Index: CVSROOT/log_accum diff -u -p CVSROOT/log_accum:1.33 CVSROOT/log_accum:1.34 --- CVSROOT/log_accum:1.33 3 Aug 2007 15:53:53 -0000 +++ CVSROOT/log_accum 3 Aug 2007 15:53:53 -0000 @@ -246,9 +246,8 @@ sub change_summary { chop; $delta = $_; # newly added files don't have the lines: indication - if (index($delta, 'lines:') != -1) { - $delta =~ s/^.*;//; - $delta =~ s/^[\s]+lines:\s*//; + if ($delta =~ /lines:\s*([^;]*)/) { + $delta = $1; } else { $delta = '+0 -0'; } @@ -286,12 +285,12 @@ sub create_diff { @text = (); $tmp_old = $tmp_new = $dif_old = $dif_new = '/dev/null'; - if ($old_rev != 'Added') { + if ($old_rev ne 'Added') { $tmp_old = "$tmp_file.old"; $dif_old = "$filename:$old_rev"; system("cd /; cvs -qf -d '$cvsroot' co -p -r '$old_rev' '$filename' > '$tmp_old'"); } - if ($new_rev != 'Removed') { + if ($new_rev ne 'Removed') { $tmp_new = "$tmp_file.new"; $dif_new = "$filename:$new_rev"; system("cd /; cvs -qf -d '$cvsroot' co -p -r '$new_rev' '$filename' > '$tmp_new'"); @@ -304,7 +303,7 @@ sub create_diff { } system($cvs_cmd); - if ($new_rev == 'Removed') { + if ($new_rev eq 'Removed') { $dis_old = $filename; $dis_new = '/dev/null'; } else { @@ -326,8 +325,8 @@ sub create_diff { push(@text, $_); } close(DIFF); - unlink $tmp_old unless $tmp_old = '/dev/null'; - unlink $tmp_new unless $tmp_new = '/dev/null'; + unlink $tmp_old unless $tmp_old eq '/dev/null'; + unlink $tmp_new unless $tmp_new eq '/dev/null'; return $#text > 4 ? @text : (); } @@ -654,7 +653,7 @@ if ($debug) { # files[2] - "New" # files[3] - "directory" # -if ($files[2] =~ /New/ && $files[3] =~ /directory/) { +if ($files[1] =~ /- New directory/ || ($files[2] =~ /New/ && $files[3] =~ /directory/)) { local(@text); @text = (); @@ -741,7 +740,7 @@ for ($i = $#log_lines; $i > 0; $i--) { # files[2] - "Imported" # files[3] - "sources" # -if ($files[2] =~ /Imported/ && $files[3] =~ /sources/) { +if ($files[1] =~ /- Imported sources/ || ($files[2] =~ /Imported/ && $files[3] =~ /sources/)) { local(@text); @text = (); @@ -762,6 +761,7 @@ if ($files[2] =~ /Imported/ && $files[3] &write_commitlog($commitlog, @text); } + &cleanup_tmpfiles() unless $debug; exit 0; }

1 0

lostwages/templates/en contributing.template
by Jeremy Newman 03 Aug '07

03 Aug '07

ChangeSet ID: 31303 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/08/03 10:34:29 Modified files: templates/en : contributing.template Log message: Tom Wickline <twickline(a)gmail.com> update WPF information and mailing address Patch: http://cvs.winehq.org/patch.py?id=31303 Old revision New revision Changes Path 1.33 1.34 +16 -9 lostwages/templates/en/contributing.template Index: lostwages/templates/en/contributing.template diff -u -p lostwages/templates/en/contributing.template:1.33 lostwages/templates/en/contributing.template:1.34 --- lostwages/templates/en/contributing.template:1.33 3 Aug 2007 15:34:29 -0000 +++ lostwages/templates/en/contributing.template 3 Aug 2007 15:34:29 -0000 @@ -363,8 +363,17 @@ <h3 id="wpf">Wine Party Fund</h3> <p>The purpose of the Wine Party Fund is to show appreciation to Wine - developers by collecting funds for developer meetings, such as future Wine - Conferences, or in some cases to purchase documentation.</p> +developers by collecting funds for developer meetings, such as future +Wine Conferences, or in some cases to purchase documentation.</p> + +<p>The organization that currently manages our donations is the +<a href="http://conservancy.softwarefreedom.org/">Software Freedom +Conservancy</a>. If you have any questions or are otherwise in need +of further assistance please visit the SFC site.</p> + +<p>The Software Freedom Conservancy is a 501(c)(3) organization, and +donations made through it are fully tax-deductible to the extent +permitted by law.</p> <p><strong>Ways to contribute:</strong></p> <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> <div> @@ -379,13 +388,11 @@ <p>We also have a SourceForge PayPal account <a href="http://sourceforge.net/donate/index.php?group_id=6241">sourceforge.net</a></p> -<p>You can also send cash, checks or international money order in US funds to:</p> -<address>The Wine Party Fund -c/o Jeremy White -CodeWeavers -2356 University Ave. West -Suite 420 -St. Paul, MN 55114</address> +<p>You can also send cash, cheque or international money order in US funds to:</p> +<address>Wine Project +Software Freedom Conservancy +1995 Broadway FL 17 +New York, NY 10023-5882</address> <p>Purchase books or music from <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq"> Amazon.com</a> or <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> (Use these specific links only, so that the Wine Party Fund gets the credit.)</p> \ No newline at end of file

1 0

tools/winetest gather
by Jeremy Newman 03 Aug '07

03 Aug '07

ChangeSet ID: 31302 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/03 10:10:38 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Skip tests for which the dll is missing Patch: http://cvs.winehq.org/patch.py?id=31302 Old revision New revision Changes Path 1.20 1.21 +4 -0 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.20 tools/winetest/gather:1.21 --- tools/winetest/gather:1.20 3 Aug 2007 15:10:38 -0000 +++ tools/winetest/gather 3 Aug 2007 15:10:38 -0000 @@ -96,6 +96,10 @@ foreach my $file (glob "$datadir/$build/ my ($digest, $unit, $test, $count, $todo, $error, $skipped, $source, $rev) = split; my $testname = "$unit:$test"; + if ($test =~ /_dll_missing/) { + # Skip these tests for now + next; + } $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname};

1 0

Nigel Liang : winecfg: Remove bad default setting for logpixels registery.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 35f4e95c36094372ca03e548ef24abe149c7b7d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f4e95c36094372ca03e548e… Author: Nigel Liang <ncliang(a)gmail.com> Date: Thu Aug 2 16:33:23 2007 -0700 winecfg: Remove bad default setting for logpixels registery. --- programs/winecfg/x11drvdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index e7612be..5f6e2d6 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -245,7 +245,7 @@ static INT read_logpixels_reg(void) { DWORD dwLogPixels; char *buf = get_reg_key(HKEY_LOCAL_MACHINE, logpixels_reg, - "LogPixels", (const char *)MAXDPI); + "LogPixels", NULL); dwLogPixels = *buf; HeapFree(GetProcessHeap(), 0, buf); return dwLogPixels;

1 0

John Klehm : inkobj: Add stub implementation of inkobj dll.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: e9252251032b41556c6c5811369f355c834449a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9252251032b41556c6c58113… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Jul 31 11:58:02 2007 -0500 inkobj: Add stub implementation of inkobj dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/inkobj/Makefile.in | 13 +++++++ dlls/inkobj/inkobj.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/inkobj/inkobj.spec | 4 ++ 7 files changed, 107 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 002f425..d504ac6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -253,6 +253,7 @@ ALL_MAKEFILES = \ dlls/imm32/Makefile \ dlls/infosoft/Makefile \ dlls/infosoft/tests/Makefile \ + dlls/inkobj/Makefile \ dlls/inseng/Makefile \ dlls/iphlpapi/Makefile \ dlls/iphlpapi/tests/Makefile \ @@ -617,6 +618,7 @@ dlls/imagehlp/Makefile: dlls/imagehlp/Makefile.in dlls/Makedll.rules dlls/imm32/Makefile: dlls/imm32/Makefile.in dlls/Makedll.rules dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules +dlls/inkobj/Makefile: dlls/inkobj/Makefile.in dlls/Makedll.rules dlls/inseng/Makefile: dlls/inseng/Makefile.in dlls/Makedll.rules dlls/iphlpapi/Makefile: dlls/iphlpapi/Makefile.in dlls/Makedll.rules dlls/iphlpapi/tests/Makefile: dlls/iphlpapi/tests/Makefile.in dlls/Maketest.rules diff --git a/configure b/configure index fdcdbd5..b9ea64f 100755 --- a/configure +++ b/configure @@ -20456,6 +20456,8 @@ ac_config_files="$ac_config_files dlls/infosoft/Makefile" ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile" +ac_config_files="$ac_config_files dlls/inkobj/Makefile" + ac_config_files="$ac_config_files dlls/inseng/Makefile" ac_config_files="$ac_config_files dlls/iphlpapi/Makefile" @@ -21625,6 +21627,7 @@ do "dlls/imm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/Makefile" ;; "dlls/infosoft/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/Makefile" ;; "dlls/infosoft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/tests/Makefile" ;; + "dlls/inkobj/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inkobj/Makefile" ;; "dlls/inseng/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inseng/Makefile" ;; "dlls/iphlpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iphlpapi/Makefile" ;; "dlls/iphlpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iphlpapi/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index e6088ec..ba5b4da 100644 --- a/configure.ac +++ b/configure.ac @@ -1654,6 +1654,7 @@ AC_CONFIG_FILES([dlls/imagehlp/Makefile]) AC_CONFIG_FILES([dlls/imm32/Makefile]) AC_CONFIG_FILES([dlls/infosoft/Makefile]) AC_CONFIG_FILES([dlls/infosoft/tests/Makefile]) +AC_CONFIG_FILES([dlls/inkobj/Makefile]) AC_CONFIG_FILES([dlls/inseng/Makefile]) AC_CONFIG_FILES([dlls/iphlpapi/Makefile]) AC_CONFIG_FILES([dlls/iphlpapi/tests/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index a1bbfdc..2fdc360 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -88,6 +88,7 @@ BASEDIRS = \ imagehlp \ imm32 \ infosoft \ + inkobj \ inseng \ iphlpapi \ itss \ diff --git a/dlls/inkobj/Makefile.in b/dlls/inkobj/Makefile.in new file mode 100644 index 0000000..932da81 --- /dev/null +++ b/dlls/inkobj/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = inkobj.dll +IMPORTS = kernel32 + +C_SRCS = \ + inkobj.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c new file mode 100644 index 0000000..517b6a7 --- /dev/null +++ b/dlls/inkobj/inkobj.c @@ -0,0 +1,83 @@ +/* Copyright (C) 2007 C John Klehm + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inkobj); + +static LONG INKOBJ_refCount; +static HINSTANCE INKOBJ_hInstance; + +/***************************************************** + * DllMain (INKOBJ.init) + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + break; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + INKOBJ_hInstance = hinst; + break; + } + return TRUE; +} + +/***************************************************** + * DllCanUnloadNow (INKOBJ.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return (INKOBJ_refCount != 0)? S_FALSE : S_OK; +} + +/***************************************************** + * DllGetClassObject [INKOBJ.@] + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +{ + FIXME("Not implemented. Requested class was:%s\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/***************************************************** + * DllRegisterServer (INKOBJ.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; /* unable to register */ +} + +/***************************************************** + * DllUnregisterServer (INKOBJ.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; /* unable to register */ +} diff --git a/dlls/inkobj/inkobj.spec b/dlls/inkobj/inkobj.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/inkobj/inkobj.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Nigel Liang : winecfg: Read/write registry in unicode.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 2d5a89bab087d09f3e3876e29ae32a2e863273fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5a89bab087d09f3e3876e29… Author: Nigel Liang <ncliang(a)gmail.com> Date: Thu Aug 2 16:33:24 2007 -0700 winecfg: Read/write registry in unicode. --- programs/winecfg/winecfg.c | 252 +++++++++++++++++++++++++++++++------------- programs/winecfg/winecfg.h | 5 + 2 files changed, 183 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d5a89bab087d09f3e387…

1 0

Alexandre Julliard : make_makefiles: Added support for updating include/ Makefile.in.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: ac91ffd7f87fbecd5ac831e54b8e1f6891f7fc37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac91ffd7f87fbecd5ac831e54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 3 14:12:04 2007 +0200 make_makefiles: Added support for updating include/Makefile.in. --- tools/make_makefiles | 133 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 103 insertions(+), 30 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 05b90da..0fc183c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -102,6 +102,44 @@ my @ignore_srcs = ( [ 'IDL_S_SRCS', '\.idl', '_s.c' ], ); +my %private_headers = ( + "thread.h" => 1, + "win.h" => 1, + "wine/list.h" => 1, + "wine/mmsystem16.h" => 1, + "wine/mscvpdb.h" => 1, + "wine/port.h" => 1, + "wine/pthread.h" => 1, + "wine/rpcfc.h" => 1, + "wine/rpcss_shared.h" => 1, + "wine/server.h" => 1, + "wine/server_protocol.h" => 1, + "wine/test.h" => 1, + "wine/wgl.h" => 1, + "wine/winaspi.h" => 1, + "wine/winbase16.h" => 1, + "wine/windef16.h" => 1, + "wine/wined3d_caps.h" => 1, + "wine/wined3d_gl.h" => 1, + "wine/wined3d_interface.h" => 1, + "wine/wined3d_types.h" => 1, + "wine/wingdi16.h" => 1, + "wine/winnet16.h" => 1, + "wine/winsock16.h" => 1, + "wine/winuser16.h" => 1, + "wine/wpp.h" => 1 +); + +my %private_idl_headers = ( + "axcore.idl" => 1, + "axextend.idl" => 1, + "dbinit.idl" => 1, + "dbprop.idl" => 1, + "dbs.idl" => 1, + "devenum.idl" => 1, + "dyngraph.idl" => 1 +); + my (@makefiles, %makefiles); # update a file if changed @@ -203,41 +241,14 @@ sub parse_makefile($) return %make; } -if (-d ".git") -{ - @makefiles = map { s/\.in$//; $_; } split /\s/, `git ls-files -c Makefile.in \\*/Makefile.in`; -} -else -{ - @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`); -} - -foreach my $file (sort values %makerules, @makefiles) -{ - my %make = parse_makefile( $file ); - $makefiles{$file} = \%make; -} ################################################################ # update the makefile list in configure.ac -my @lines = (); - -foreach my $var (sort { $makerules{$a} cmp $makerules{$b}; } keys %makerules) -{ - push @lines, "$var=$makerules{$var}\n"; - push @lines, "AC_SUBST_FILE($var)\n\n"; -} - -foreach my $var ((sort values %makerules), (sort @makefiles)) +sub update_makerules(@) { - push @lines, "AC_CONFIG_FILES([$var])\n"; } -push @lines, "\nAC_OUTPUT\n"; - -replace_in_file( "configure.ac", '^MAKE_RULES', '^AC_OUTPUT$', @lines); - ################################################################ # update the tests list in programs/winetest/Makefile.in and programs/winetest/winetest.rc @@ -272,11 +283,25 @@ sub update_winetest(@) ################################################################ -# update the makefile list in Makefile.in +# update the makefile list in configure.ac and Makefile.in sub update_makefiles(@) { - my (@targets, @depends); + my (@targets, @depends, @lines); + + foreach my $var (sort { $makerules{$a} cmp $makerules{$b}; } keys %makerules) + { + push @lines, "$var=$makerules{$var}\n"; + push @lines, "AC_SUBST_FILE($var)\n\n"; + } + + foreach my $var ((sort values %makerules), (sort @_)) + { + push @lines, "AC_CONFIG_FILES([$var])\n"; + } + + push @lines, "\nAC_OUTPUT\n"; + replace_in_file( "configure.ac", '^MAKE_RULES', '^AC_OUTPUT$', @lines); foreach my $file (sort values %makerules) { @@ -603,6 +628,37 @@ sub update_progs(@) ################################################################ +# update include/Makefile.in + +sub update_includes() +{ + return unless -d ".git"; + my (@h_srcs, @idl_srcs, @tlb_srcs, %subdirs); + my @includes = map { s/^include\///; $_; } split /\0/, `git ls-files -c -z include`; + foreach my $incl (@includes) + { + if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; } + next if ($private_headers{$incl}); + if ($incl =~ /stdole2\.idl$/) { push @tlb_srcs, $incl; } + elsif ($private_idl_headers{$incl}) { push @h_srcs, $incl; } + elsif ($incl =~ /\.h$/) { push @h_srcs, $incl; } + elsif ($incl =~ /\.inl$/) { push @h_srcs, $incl; } + elsif ($incl =~ /\.idl$/) { push @idl_srcs, $incl; } + } + replace_in_file( "include/Makefile.in", '^IDL_H_SRCS\s*=', '^INSTALLDIRS', + "IDL_H_SRCS = \\\n\t", + join( " \\\n\t", sort @idl_srcs ), + "\n\nIDL_TLB_SRCS = \\\n\t", + join( " \\\n\t", sort @tlb_srcs ), + "\n\nSRCDIR_INCLUDES = \\\n\t\$(IDL_TLB_SRCS) \\\n\t\$(IDL_H_SRCS) \\\n\t", + join( " \\\n\t", sort @h_srcs ), + "\n\nEXTRASUBDIRS = ", + join( " ", sort keys %subdirs ), + "\n\nINSTALLDIRS = \\\n" ); +} + + +################################################################ # update the main .gitignore sub update_gitignore(@) @@ -636,6 +692,23 @@ sub update_gitignore(@) } +if (-d ".git") +{ + @makefiles = map { s/\.in$//; $_; } split /\0/, `git ls-files -c -z Makefile.in \\*/Makefile.in`; +} +else +{ + @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`); +} + +update_includes(); + +foreach my $file (sort values %makerules, @makefiles) +{ + my %make = parse_makefile( $file ); + $makefiles{$file} = \%make; +} + update_makefiles( @makefiles ); push @ignores, update_ignores( @makefiles ); push @ignores, update_winetest( @makefiles );

1 0

John Klehm : inkobj: Add stub header for inkobj dll.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: fe7ae95852181ee95654ee84b1acbd31db66cbe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7ae95852181ee95654ee84b… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Jul 31 00:53:43 2007 -0500 inkobj: Add stub header for inkobj dll. --- .gitignore | 1 + include/Makefile.in | 1 + include/msinkaut.idl | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 0ddaa04..2fdb222 100644 --- a/.gitignore +++ b/.gitignore @@ -727,6 +727,7 @@ include/mlang.h include/mmstream.h include/mshtmhst.h include/mshtml.h +include/msinkaut.h include/msxml.h include/msxml2.h include/netfw.h diff --git a/include/Makefile.in b/include/Makefile.in index 9fb456a..0810f81 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -30,6 +30,7 @@ IDL_H_SRCS = \ mmstream.idl \ mshtmhst.idl \ mshtml.idl \ + msinkaut.idl \ msxml.idl \ msxml2.idl \ netfw.idl \ diff --git a/include/msinkaut.idl b/include/msinkaut.idl new file mode 100644 index 0000000..f0eac27 --- /dev/null +++ b/include/msinkaut.idl @@ -0,0 +1,29 @@ +/* Copyright (C) 2007 C John Klehm + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "ocidl.idl"; + +[ + uuid(7D868ACD-1A5D-4A47-A247-F39741353012), + version(1.0) +] +library MSINKAUTLib +{ + importlib("stdole2.tlb"); + + typedef float single; +};

1 0

Misha Koshelev : Revert "urlmon: Use BSCF_ values passed to report_data to keep track of download state."
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 99989f8241be0374a81a71842638951301de156f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99989f8241be0374a81a71842… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Aug 3 13:35:35 2007 +0200 Revert "urlmon: Use BSCF_ values passed to report_data to keep track of download state." This reverts commit 978f6b98c9a67055f5a0f878a44b3b66c16a6019. --- dlls/urlmon/binding.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index bf0d027..e1fac1c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -67,6 +67,12 @@ typedef struct { HRESULT hres; } ProtocolStream; +typedef enum { + BEFORE_DOWNLOAD, + DOWNLOADING, + END_DOWNLOAD +} download_state_t; + struct Binding { const IBindingVtbl *lpBindingVtbl; const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; @@ -88,6 +94,7 @@ struct Binding { BOOL report_mime; DWORD continue_call; BOOL request_locked; + download_state_t download_state; DWORD apartment_thread; HWND notif_hwnd; @@ -905,10 +912,12 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progress_max) { FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; - BOOL end_download = FALSE; TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); + if(This->download_state == END_DOWNLOAD) + return; + if(GetCurrentThreadId() != This->apartment_thread) FIXME("called from worked hread\n"); @@ -926,17 +935,15 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres BINDSTATUS_MIMETYPEAVAILABLE, mime); } - if(bscf & BSCF_FIRSTDATANOTIFICATION) { + if(This->download_state == BEFORE_DOWNLOAD) { fill_stream_buffer(This->stream); + This->download_state = DOWNLOADING; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_BEGINDOWNLOADDATA, This->url); } - if((bscf & BSCF_LASTDATANOTIFICATION) || - (bscf & BSCF_DATAFULLYAVAILABLE) || - progress == progress_max) { - end_download = TRUE; + if(This->stream->hres == S_FALSE || (bscf & BSCF_LASTDATANOTIFICATION)) { IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); } @@ -949,7 +956,8 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &This->stgmed); - if(end_download) { + if(This->stream->hres == S_FALSE) { + This->download_state = END_DOWNLOAD; IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); } } @@ -1302,6 +1310,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->report_mime = TRUE; ret->continue_call = 0; ret->request_locked = FALSE; + ret->download_state = BEFORE_DOWNLOAD; ret->task_queue_head = ret->task_queue_tail = NULL; memset(&ret->bindinfo, 0, sizeof(BINDINFO));

1 0