January 2007 - Wine-commits

appdb/ ./distributionView.php include/distribu ...
by WineHQ 26 Jan '07

26 Jan '07

ChangeSet ID: 30910 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/26 18:30:00 Modified files: . : distributionView.php include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add distribution functions and use them. Based on a patch by Chris Morgan Patch: http://cvs.winehq.org/patch.py?id=30910 Old revision New revision Changes Path 1.23 1.24 +8 -29 appdb/distributionView.php 1.5 1.6 +71 -1 appdb/include/distribution.php Index: appdb/distributionView.php diff -u -p appdb/distributionView.php:1.23 appdb/distributionView.php:1.24 --- appdb/distributionView.php:1.23 27 Jan 2007 0:30: 0 -0000 +++ appdb/distributionView.php 27 Jan 2007 0:30: 0 -0000 @@ -25,46 +25,25 @@ if ($aClean['sSub']) } $oDistribution = new distribution($aClean['iDistributionId']); -//exit with error if no distribution +/* Display distribution list if no id given */ if(!$oDistribution->iDistributionId) { apidb_header("View Distributions"); //get available Distributions - $hResult = query_parameters("SELECT distributionId FROM distributions ORDER BY name, distributionId;"); + $hResult = distribution::ObjectGetEntries(false); // show Distribution list echo html_frame_start("","90%","",0); echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n"; - echo "<tr class=color4>\n"; - echo " <td>Distribution name</td>\n"; - echo " <td>Distribution url</td>\n"; - echo " <td align=\"right\">Linked Tests</td>\n"; - if ($_SESSION['current']->hasPriv("admin")) - echo " <td align=\"center\">Action</td>\n"; - echo "</tr>\n\n"; - - $c = 1; - while($oRow = mysql_fetch_object($hResult)) + distribution::ObjectOutputHeader("color4"); + + for($c = 1; $oRow = mysql_fetch_object($hResult); $c++) { - if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - $oDistribution = new distribution($oRow->distributionId); - echo "<tr class=\"$bgcolor\">\n"; - echo " <td><a href=\"".BASE."distributionView.php?iDistributionId=".$oDistribution->iDistributionId."\">","\n"; - echo $oDistribution->sName."</a></td>\n"; - echo " <td><a href=\"".$oDistribution->sUrl."\">".$oDistribution->sUrl."</a></td>\n"; - echo " <td align=\"right\">".sizeof($oDistribution->aTestingIds)."</td>\n"; - if ($_SESSION['current']->hasPriv("admin")) - { - echo " <td align=\"center\">"; - echo "[<a href='".BASE."admin/editDistribution.php?iDistributionId=".$oDistribution->iDistributionId."'>edit</a>]"; - if(!sizeof($oDistribution->aTestingIds)) - echo "   [<a href='".$_SERVER['PHP_SELF']."?sSub=delete&iDistributionId=".$oDistribution->iDistributionId."'>delete</a>]"; - echo " </td>\n"; - } - echo "</tr>\n"; - $c++; + $oDistribution = distribution::ObjectGetInstanceFromRow($oRow); + + $oDistribution->display(($c % 2) ? "color0" : "color1"); } echo "</table>\n\n"; echo html_frame_end(" "); Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.5 appdb/include/distribution.php:1.6 --- appdb/include/distribution.php:1.5 27 Jan 2007 0:30: 0 -0000 +++ appdb/include/distribution.php 27 Jan 2007 0:30: 0 -0000 @@ -7,7 +7,7 @@ require_once(BASE."include/util.php"); // Test class for handling Distributions. -class distribution{ +class distribution { var $iDistributionId; var $sName; var $sDescription; @@ -422,6 +422,76 @@ class distribution{ } echo "</select>\n"; } + + function ObjectOutputHeader($sClass = "") + { + $aCells = array( + "Distribution name", + "Distribution url", + array("Linked Tests", "align=\"right\"")); + + if(distribution::canEdit()) + $aCells[3] = array("Action", "align=\"center\""); + + echo html_tr($aCells, $sClass); + } + + function ObjectGetEntries($bQueued) + { + if($bQueued) + { + if(distribution::canEdit()) + { + /* Only users with edit privileges are allowed to view queued + items, so return NULL in that case */ + $sQuery = "SELECT distributionId FROM distributions + WHERE queued = '?' ORDER BY name"; + return query_parameters($sQuery, $bQueued ? "true" : "false"); + } else + return NULL; + } else + { + $sQuery = "SELECT distributionId FROM distributions + WHERE queued = '?' ORDER BY name"; + return query_parameters($sQuery, "false"); + } + } + + function ObjectGetInstanceFromRow($oRow) + { + return new distribution($oRow->distributionId); + } + + function display($sClass = "") + { + $aCells = array( + "<a href=\"".BASE."distributionView.php?iDistributionId=". + $this->iDistributionId."\">$this->sName.</a>", + "<a href=\"$this->sUrl\">$this->sUrl</a>", + array(sizeof($this->aTestingIds), "align=\"right\"")); + + if($this->canEdit()) + { + $aCells[3] = array( + "[<a href='".BASE."admin/editDistribution.php?iDistributionId=". + $this->iDistributionId."'>edit</a>]". + (!sizeof($this->aTestingIds)) ? + "   [<a href='".$_SERVER['PHP_SELF']."?sSub=delete&". + "iDistributionId=$this->iDistributionId'>delete</a>]" : "", + "align=\"center\""); + } + + echo html_tr($aCells, $sClass); + } + + // Whether the user has permission to edit distributions + function canEdit() + { + if($_SESSION['current']->hasPriv("admin")) + return TRUE; + + return FALSE; + } } ?>

1 0

docs/en winedev-testing.sgml
by Dimi Paun 26 Jan '07

26 Jan '07

ChangeSet ID: 1169841747310509969321178 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/01/26 12:02:27 Modified files: en : winedev-testing.sgml Log message: Fix formatting. Old revision New revision Changes Path 1.6 1.7 +5 -7 docs/en/winedev-testing.sgml Index: docs/en/winedev-testing.sgml diff -u -p docs/en/winedev-testing.sgml:1.6 docs/en/winedev-testing.sgml:1.7 --- docs/en/winedev-testing.sgml 26 Jan 2007 20: 2:27 -0000 +++ /dev/null 26 Jan 2007 20: 2:27 -0000 @@ -276,13 +276,11 @@ thread.c: 86 tests executed, 5 marked as do not need the processor pack. In either case it is recommended to the most recent compatible Visual Studio <ulink url="http://msdn.microsoft.com/vstudio/downloads/updates/sp/">service pack</>. - If are using Visual Studio Express and you need specific libraries - like <filename>ntdll.lib</> that don't ship with Visual Studio - Express, you will need the - <ulink url="http://www.microsoft.com/whdc/devtools/ddk/default.mspx">Windows - Driver Development Kit (DDK)</> which is part of the - <ulink url="http://www.microsoft.com/whdc/resources/downloads.mspx">Windows - Developer Kit</>. + If are using Visual Studio Express and you need specific libraries like + <filename>ntdll.lib</> that don't ship with Visual Studio Express, you will need the + <ulink url="http://www.microsoft.com/whdc/devtools/ddk/default.mspx">Windows Driver Development Kit (DDK)</> + which is part of the + <ulink url="http://www.microsoft.com/whdc/resources/downloads.mspx">Windows Developer Kit</>. </para></listitem> <listitem><para> get the Wine sources

1 0

docs/en winedev-testing.sgml
by Dimi Paun 26 Jan '07

26 Jan '07

ChangeSet ID: 1169841610203059096894325 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/01/26 12:00:10 Modified files: en : winedev-testing.sgml Log message: "Jeff Latimer" <lats(a)yless4u.com.au> Fixed a typo. Old revision New revision Changes Path 1.5 1.6 +1 -1 docs/en/winedev-testing.sgml Index: docs/en/winedev-testing.sgml diff -u -p docs/en/winedev-testing.sgml:1.5 docs/en/winedev-testing.sgml:1.6 --- docs/en/winedev-testing.sgml 26 Jan 2007 20: 0:10 -0000 +++ /dev/null 26 Jan 2007 20: 0:10 -0000 @@ -280,7 +280,7 @@ thread.c: 86 tests executed, 5 marked as like <filename>ntdll.lib</> that don't ship with Visual Studio Express, you will need the <ulink url="http://www.microsoft.com/whdc/devtools/ddk/default.mspx">Windows - Device Development Kit (DDK)</> which is part of the + Driver Development Kit (DDK)</> which is part of the <ulink url="http://www.microsoft.com/whdc/resources/downloads.mspx">Windows Developer Kit</>. </para></listitem>

1 0

docs/en winedev-documentation.sgml
by Dimi Paun 26 Jan '07

26 Jan '07

ChangeSet ID: 1169841450351699027073668 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/01/26 11:57:30 Modified files: en : winedev-documentation.sgml Log message: "Jeff Latimer" <lats(a)yless4u.com.au> Add a reference as where to obtain instructions for getting documentation from Sourceforge. Old revision New revision Changes Path 1.3 1.4 +5 -0 docs/en/winedev-documentation.sgml Index: docs/en/winedev-documentation.sgml diff -u -p docs/en/winedev-documentation.sgml:1.3 docs/en/winedev-documentation.sgml:1.4 --- docs/en/winedev-documentation.sgml 26 Jan 2007 19:57:30 -0000 +++ /dev/null 26 Jan 2007 19:57:30 -0000 @@ -74,6 +74,11 @@ </para> <para> + To obtain a copy of the Wine documentation from Sourceforge refer to + <ulink url="http://www.winehq.com/site/cvs#docs">the Wine CVS page</> for instructions. + </para> + + <para> Another source of documentation is the <emphasis>Wine API Guide</emphasis>. This is generated information taken from special comments placed in the Wine source code. When you update or add new API calls to Wine you should consider documenting them so

1 0

Mike McCormack : msi: Add a (mostly empty) typelib for the MsiServer interface.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 702adb37a204b5f4210af5daf859cc67ae480a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702adb37a204b5f4210af5daf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 26 21:14:58 2007 +0900 msi: Add a (mostly empty) typelib for the MsiServer interface. --- .gitignore | 1 + dlls/msi/Makefile.in | 2 + dlls/msi/msiserver.idl | 123 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 24b6912..f9502bd 100644 --- a/.gitignore +++ b/.gitignore @@ -316,6 +316,7 @@ dlls/msi/instadvert.bmp dlls/msi/instlocal.bmp dlls/msi/libmsi.def dlls/msi/msi.res +dlls/msi/msiserver.tlb dlls/msi/sql.tab.c dlls/msi/sql.tab.h dlls/msi/tests/*.ok diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index a26892d..5fb0941 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -47,6 +47,8 @@ C_SRCS = \ upgrade.c \ where.c +IDL_TLB_SRCS = msiserver.idl + BISON_SRCS = \ cond.y \ sql.y diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl new file mode 100644 index 0000000..9966d90 --- /dev/null +++ b/dlls/msi/msiserver.idl @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2007 Mike McCormack + * + * 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 "unknwn.idl"; +import "wtypes.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +[ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] +library WindowsInstaller +{ + dispinterface Installer; + dispinterface Record; + dispinterface Session; + dispinterface Database; + dispinterface SummaryInfo; + dispinterface View; + dispinterface UIPreview; + dispinterface FeatureInfo; + dispinterface RecordList; + dispinterface StringList; + dispinterface Product; + dispinterface Patch; + + [ uuid(000C1090-0000-0000-C000-000000000046) ] + dispinterface Installer + { + properties: + methods: + } + + [ uuid(000C1093-0000-0000-C000-000000000046) ] + dispinterface Record + { + properties: + methods: + } + + [ uuid(000C1095-0000-0000-C000-000000000046) ] + dispinterface StringList + { + properties: + methods: + } + + [ uuid(000C1096-0000-0000-C000-000000000046) ] + dispinterface RecordList + { + properties: + methods: + } + + [ uuid(000C109A-0000-0000-C000-000000000046) ] + dispinterface UIPreview + { + properties: + methods: + } + + [ uuid(000C109B-0000-0000-C000-000000000046) ] + dispinterface SummaryInfo + { + properties: + methods: + } + + [ uuid(000C109C-0000-0000-C000-000000000046) ] + dispinterface View + { + properties: + methods: + } + + [ uuid(000C109D-0000-0000-C000-000000000046) ] + dispinterface Database + { + properties: + methods: + } + + [ uuid(000C109E-0000-0000-C000-000000000046) ] + dispinterface Session + { + properties: + methods: + } + + [ uuid(000C109F-0000-0000-C000-000000000046) ] + dispinterface FeatureInfo + { + properties: + methods: + } + + [ uuid(000C10A0-0000-0000-C000-000000000046) ] + dispinterface Product + { + properties: + methods: + } + + [ uuid(000C10A1-0000-0000-C000-000000000046) ] + dispinterface Patch + { + properties: + methods: + } +}

1 0

Mike McCormack : widl: Handle TKIND_DISPATCH when generating MSFT typelibs.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 7d1e21e2c12406be87b1fc5cb46f9222b13eef94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1e21e2c12406be87b1fc5cb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 26 21:13:52 2007 +0900 widl: Handle TKIND_DISPATCH when generating MSFT typelibs. --- tools/widl/write_msft.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index b2dfa15..0017bd9 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -733,6 +733,7 @@ static void add_structure_typeinfo(msft_ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface); static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration); static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls); +static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface); /**************************************************************************** @@ -974,6 +975,8 @@ static int encode_type( case 0: if (type->kind == TKIND_COCLASS) add_coclass_typeinfo(typelib, type); + else if (type->kind == TKIND_DISPATCH) + add_dispinterface_typeinfo(typelib, type); else error("encode_type: VT_USERDEFINED - can't yet add typedef's on the fly\n"); break; @@ -1887,7 +1890,7 @@ static void add_dispatch(msft_typelib_t } static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface) -{ +{ int idx = 0; const func_t *func; var_t *var;

1 0

Alexandre Julliard : makefile: Use git-ls-files if possible to build tags files.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 7f9f78aecd11e8d8ead20596087c8ea507406fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9f78aecd11e8d8ead205960… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:53:35 2007 +0100 makefile: Use git-ls-files if possible to build tags files. --- Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 79cf7e6..9c24f16 100644 --- a/Makefile.in +++ b/Makefile.in @@ -132,10 +132,10 @@ $(TESTSUBDIRS:%=%/__crosstest__): tools # Misc rules TAGS etags: - find -L $(TOPSRCDIR) -name '*.[ch]' -print | etags - + (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | etags - tags ctags: - find -L $(TOPSRCDIR) -name '*.[ch]' -print | ctags --c-types=+px -L - + (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | ctags - manpages htmlpages sgmlpages: dummy @cd documentation && $(MAKE) $@

1 0

Francois Gouget : winapi_check: Print the line number when an error or warning is found in the API files.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 9b28bd0a3df971f7a36480fa673c1cd5545788e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b28bd0a3df971f7a36480fa6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 26 13:21:54 2007 +0100 winapi_check: Print the line number when an error or warning is found in the API files. --- tools/winapi/winapi.pm | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 53b7465..8fcaa41 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -139,7 +139,9 @@ sub parse_api_file($$) { open(IN, "< $winapi_dir/$file") || die "$winapi_dir/$file: $!\n"; $/ = "\n"; + my $linenum=0; while(<IN>) { + $linenum++; s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begin and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines @@ -193,12 +195,12 @@ sub parse_api_file($$) { if(!$forbidden) { if(defined($module)) { if($$allowed_modules_unlimited{$type}) { - $output->write("$file: type ($type) already specified as an unlimited type\n"); + $output->write("$file:$linenum: type ($type) already specified as an unlimited type\n"); } elsif(!$$allowed_modules{$type}{$module}) { $$allowed_modules{$type}{$module} = 1; $$allowed_modules_limited{$type} = 1; } else { - $output->write("$file: type ($type) already specified\n"); + $output->write("$file:$linenum: type ($type) already specified\n"); } } else { $$allowed_modules_unlimited{$type} = 1; @@ -207,14 +209,14 @@ sub parse_api_file($$) { $$allowed_modules_limited{$type} = 1; } if(defined($$translate_argument{$type}) && $$translate_argument{$type} ne $kind) { - $output->write("$file: type ($type) respecified as different kind ($kind != $$translate_argument{$type})\n"); + $output->write("$file:$linenum: type ($type) respecified as different kind ($kind != $$translate_argument{$type})\n"); } else { $$translate_argument{$type} = $kind; } $$type_format{$module}{$type} = $format; } else { - $output->write("$file: file must begin with %<type> statement\n"); + $output->write("$file:$linenum: file must begin with %<type> statement\n"); exit 1; } }

1 0

Francois Gouget : wintrust: Add missing prototypes and a missing include directive to mscat.h.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 31a006a23b23ab2aace3e27855032dda9f636618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a006a23b23ab2aace3e2785… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 26 13:18:56 2007 +0100 wintrust: Add missing prototypes and a missing include directive to mscat.h. --- include/mscat.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/mscat.h b/include/mscat.h index 7e95155..6f9ad61 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -19,6 +19,8 @@ #ifndef __WINE_MSCAT_H #define __WINE_MSCAT_H +#include <mssip.h> + typedef HANDLE HCATADMIN; typedef HANDLE HCATINFO; @@ -44,6 +46,9 @@ BOOL WINAPI CryptCATAdminAcquireCon BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); +BOOL WINAPI CryptCATClose(HANDLE); +CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*); +HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); #ifdef __cplusplus }

1 0

Francois Gouget : wintrust: Add missing packing directives to mscat.h.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 6a45cd1bfcddd7fe0dc0b4be2461201da8de34fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a45cd1bfcddd7fe0dc0b4be2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 26 13:19:12 2007 +0100 wintrust: Add missing packing directives to mscat.h. --- include/mscat.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/mscat.h b/include/mscat.h index 6f9ad61..f7a739a 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -28,6 +28,9 @@ typedef HANDLE HCATINFO; extern "C" { #endif + +#include <pshpack8.h> + typedef struct CRYPTCATMEMBER_ { DWORD cbStruct; LPWSTR pwszReferenceTag; @@ -42,6 +45,9 @@ typedef struct CRYPTCATMEMBER_ { CRYPT_ATTR_BLOB sEncodedMemberInfo; } CRYPTCATMEMBER; +#include <poppack.h> + + BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*);

1 0