July 2006 - Wine-Commits - list.winehq.org

appdb/. votestats.php
by WineHQ July 11, 2006

July 11, 2006

ChangeSet ID: 26460 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/11 14:26:14 Modified files: . : votestats.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Stop copying variables, update comments Patch: http://cvs.winehq.org/patch.py?id=26460 Old revision New revision Changes Path 1.25 1.26 +34 -45 appdb/votestats.php Index: appdb/votestats.php diff -u -p appdb/votestats.php:1.25 appdb/votestats.php:1.26 --- appdb/votestats.php:1.25 11 Jul 2006 19:26:14 -0000 +++ appdb/votestats.php 11 Jul 2006 19:26:14 -0000 @@ -1,31 +1,25 @@ <?php -/*********************/ -/* voting statistics */ -/*********************/ - -/* - * application environment - */ +/** + * Voting statistics. + * + * Optional parameters: + * - iTopNumber, the number of applications to be displayed + * - iCategoryId, the category identifier of the category whose stats we want to see + */ + +// application environment include("path.php"); require(BASE."include/incl.php"); require(BASE."include/filter.php"); require_once(BASE."include/category.php"); -/* default to 25 apps, main categories */ -$topNumber = 25; -$categoryId = "any"; /* default to all categories */ - -/* process the post variables to override the default settings */ -if( !empty($aClean['iTopNumber']) AND is_numeric($aClean['iTopNumber'])) - $topNumber = $aClean['iTopNumber']; -if( !empty($aClean['iCategoryId']) AND is_numeric($aClean['iCategoryId'])) - $categoryId = $aClean['iCategoryId']; - -/* Check if the value makes sense */ -if($topNumber > 200 || $topNumber < 1) - $topNumber = 25; +// set default values and check if the value makes sense +if(empty($aClean['iTopNumber']) || $aClean['iTopNumber'] > 200 || $aClean['iTopNumber'] < 0) + $aClean['iTopNumber'] = 25; +if(empty($aClean['iCategoryId'])) + $aClean['iCategoryId'] = 0; -apidb_header("Vote Stats - Top $topNumber Applications"); +apidb_header("Vote Stats - Top ".$aClean['iTopNumber']." Applications"); /* display the selection for the top number of apps to view */ echo "<form method=\"post\" name=\"sMessage\" action=\"".$_SERVER['PHP_SELF']."\">"; @@ -35,28 +29,23 @@ $topNumberArray = array(25, 50, 100, 200 foreach ($topNumberArray as $i => $value) { - if($topNumberArray[$i] == $topNumber) + if($topNumberArray[$i] == $aClean['iTopNumber']) echo "<option value='$topNumberArray[$i]' SELECTED>$topNumberArray[$i]"; else echo "<option value='$topNumberArray[$i]'>$topNumberArray[$i]"; } echo "</select>"; -/* list sub categories */ -if($categoryId == "any") - $catId = 0; -else - $catId = $categoryId; - -/******************************************************************/ -/* build an array of categories from the current category back up */ -/* the tree to the main category */ +/** + * build an array of categories from the current category back up + * the tree to the main category + */ $cat_array = Array(); $cat_name_array = Array(); -if($catId != 0) +if(!empty($aClean['iCategoryId'])) { - $currentCatId = $catId; + $currentCatId = $aClean['iCategoryId']; do { @@ -82,10 +71,10 @@ if($catId != 0) echo "<b>Section:</b>"; echo '<select name="iCategoryId">'; -if($catId == 0) - echo '<option value="any" SELECTED>Any</option>'; +if(empty($aClean['iCategoryId'])) + echo '<option value="0" SELECTED>Any</option>'; else - echo '<option value="any">Any</option>'; + echo '<option value="0">Any</option>'; $indent = 1; @@ -95,7 +84,7 @@ $cat_name_array_reversed = array_reverse foreach ($cat_array_reversed as $i => $value) { /* if this is the current category, select this option */ - if($categoryId == $cat_array_reversed[$i]) + if($aClean['iCategoryId'] == $cat_array_reversed[$i]) echo "<option value='$cat_array_reversed[$i]' SELECTED>"; else echo "<option value='$cat_array_reversed[$i]'>"; @@ -106,9 +95,9 @@ foreach ($cat_array_reversed as $i => $v $indent++; } -/******************************************************************/ -/* add to the list all of the sub sections of the current section */ -$cat = new Category($catId); + +// add to the list all of the sub sections of the current section +$cat = new Category($aClean['iCategoryId']); $subs = $cat->aSubcatsIds; if($subs) @@ -117,7 +106,7 @@ if($subs) { $oSubcat = new Category($id); /* if this is the current category, select this option */ - if($id == $catId) + if($id == $aClean['iCategoryId']) echo "<option value=$id SELECTED>"; else echo "<option value=$id>"; @@ -134,13 +123,13 @@ echo '<br />'; /***************************************************/ /* build a list of the apps in the chosen category */ -if(strcasecmp($categoryId, "any") == 0) +if(empty($aClean['iCategoryId'])) { - /* leave out the appFamily.catId = '$categoryId' */ + /* leave out the appFamily.catId = '$aClean['iCategoryId']' */ $hResult = query_parameters("SELECT appVotes.appId, appName, count(userId) as count ". "FROM appVotes, appFamily ". "WHERE appVotes.appId = appFamily.appId ". - "GROUP BY appId ORDER BY count DESC LIMIT ?", $topNumber); + "GROUP BY appId ORDER BY count DESC LIMIT ?", $aClean['iTopNumber']); } else { /* Display all application for a given category (including sub categories) @@ -160,7 +149,7 @@ if(strcasecmp($categoryId, "any") == 0) OR c.catParent = '?' ) GROUP BY appId - ORDER BY count DESC LIMIT ?", $categoryId, $categoryId, $topNumber); + ORDER BY count DESC LIMIT ?", $aClean['iCategoryId'], $aClean['iCategoryId'], $aClean['iTopNumber']); } if($hResult)

1 0

appdb/include db.php
by WineHQ July 11, 2006

July 11, 2006

ChangeSet ID: 26459 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/11 14:25:16 Modified files: include : db.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up variable naming in query_parameters() Patch: http://cvs.winehq.org/patch.py?id=26459 Old revision New revision Changes Path 1.18 1.19 +16 -16 appdb/include/db.php Index: appdb/include/db.php diff -u -p appdb/include/db.php:1.18 appdb/include/db.php:1.19 --- appdb/include/db.php:1.18 11 Jul 2006 19:25:16 -0000 +++ appdb/include/db.php 11 Jul 2006 19:25:16 -0000 @@ -56,41 +56,41 @@ function query_parameters() mysql_select_db(APPS_DB, $hAppdbLink); } - $data = func_get_args(); - $query = $data[0]; - $tokens = split("[&?~]", $query); /* NOTE: no need to escape characters inside of [] in regex */ - $preparedquery = $tokens[0]; - $count = strlen($tokens[0]); + $aData = func_get_args(); + $sQuery = $aData[0]; + $aTokens = split("[&?~]", $sQuery); /* NOTE: no need to escape characters inside of [] in regex */ + $sPreparedquery = $aTokens[0]; + $iCount = strlen($aTokens[0]); /* do we have the correct number of tokens to the number of parameters provided? */ - if(count($tokens) != count($data)) + if(count($aTokens) != count($aData)) return NULL; /* count mismatch, return NULL */ - for ($i=1; $i < count($tokens); $i++) + for ($i=1; $i < count($aTokens); $i++) { - $char = substr($query, $count, 1); - $count += (strlen($tokens[$i])+1); + $char = substr($sQuery, $iCount, 1); + $iCount += (strlen($aTokens[$i])+1); if ($char == "&") { - $fp = @fopen($data[$i], 'r'); + $fp = @fopen($aData[$i], 'r'); $pdata = ""; if ($fp) { - while (($buf = fread($fp, 4096)) != false) + while (($sBuf = fread($fp, 4096)) != false) { - $pdata .= $buf; + $pdata .= $sBuf; } fclose($fp); } } else { - $pdata = &$data[$i]; + $pdata = &$aData[$i]; } - $preparedquery .= ($char != "~" ? mysql_real_escape_string($pdata) : $pdata); - $preparedquery .= $tokens[$i]; + $sPreparedquery .= ($char != "~" ? mysql_real_escape_string($pdata) : $pdata); + $sPreparedquery .= $aTokens[$i]; } - return query_appdb($preparedquery); + return query_appdb($sPreparedquery); } function query_bugzilladb($sQuery,$sComment="")

1 0

appdb/ ./appbrowse.php ./appview.php include/a ...
by WineHQ July 11, 2006

July 11, 2006

ChangeSet ID: 26458 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/11 13:53:06 Modified files: . : appbrowse.php appview.php include : application.php category.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up category class. Move category related functions into the class and remove now extranious $catId parameter from category::display() Patch: http://cvs.winehq.org/patch.py?id=26458 Old revision New revision Changes Path 1.21 1.22 +6 -6 appdb/appbrowse.php 1.94 1.95 +1 -15 appdb/appview.php 1.66 1.67 +2 -1 appdb/include/application.php 1.21 1.22 +43 -34 appdb/include/category.php 1.74 1.75 +2 -1 appdb/include/version.php

1 0

appdb/include distributions.php sidebar.php te ...
by WineHQ July 11, 2006

July 11, 2006

ChangeSet ID: 26457 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/11 12:02:35 Modified files: include : distributions.php sidebar.php testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Move distribution related functions into distribution class and combine getNumberOfDistributions() and getNumberOfQueuedDistributions() by passing in a $bQueued flag Patch: http://cvs.winehq.org/patch.py?id=26457 Old revision New revision Changes Path 1.12 1.13 +29 -35 appdb/include/distributions.php 1.20 1.21 +1 -1 appdb/include/sidebar.php 1.33 1.34 +1 -1 appdb/include/testResults.php Index: appdb/include/distributions.php diff -u -p appdb/include/distributions.php:1.12 appdb/include/distributions.php:1.13 --- appdb/include/distributions.php:1.12 11 Jul 2006 17: 2:35 -0000 +++ appdb/include/distributions.php 11 Jul 2006 17: 2:35 -0000 @@ -387,48 +387,42 @@ class distribution{ $this->sName = $aValues['sName']; $this->sUrl = $aValues['sUrl']; } -} - -/* Make a dropdown list of distributions */ -function make_distribution_list($varname, $cvalue) -{ - $sQuery = "SELECT name, distributionId FROM distributions ORDER BY name"; - $hResult = query_parameters($sQuery); - if(!$hResult) return; - echo "<select name='$varname'>\n"; - echo "<option value=\"\">Choose ...</option>\n"; - while(list($name, $value) = mysql_fetch_row($hResult)) + /* Get the total number of Distributions in the database */ + function getNumberOfDistributions($bQueued) { - if($value == $cvalue) - echo "<option value=$value selected>$name\n"; + if($bQueued) + $hResult = query_parameters("SELECT count(*) as num_dists FROM + distributions WHERE queued='true';"); else - echo "<option value=$value>$name\n"; + $hResult = query_parameters("SELECT count(*) as num_dists FROM + distributions"); + if($hResult) + { + $oRow = mysql_fetch_object($hResult); + return $oRow->num_dists; + } + return 0; } - echo "</select>\n"; -} -/* Get the total number of Distributions in the database */ -function getNumberOfDistributions() -{ - $hResult = query_parameters("SELECT count(*) as num_dists FROM distributions"); - if($hResult) - { - $oRow = mysql_fetch_object($hResult); - return $oRow->num_dists; - } - return 0; -} -/* Get the number of Queued Distributions in the database */ -function getNumberOfQueuedDistributions() -{ - $hResult = query_parameters("SELECT count(*) as num_dists FROM distributions WHERE queued='true';"); - if($hResult) + /* Make a dropdown list of distributions */ + function make_distribution_list($varname, $cvalue) { - $oRow = mysql_fetch_object($hResult); - return $oRow->num_dists; + $sQuery = "SELECT name, distributionId FROM distributions ORDER BY name"; + $hResult = query_parameters($sQuery); + if(!$hResult) return; + + echo "<select name='$varname'>\n"; + echo "<option value=\"\">Choose ...</option>\n"; + while(list($name, $value) = mysql_fetch_row($hResult)) + { + if($value == $cvalue) + echo "<option value=$value selected>$name\n"; + else + echo "<option value=$value>$name\n"; + } + echo "</select>\n"; } - return 0; } ?> Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.20 appdb/include/sidebar.php:1.21 --- appdb/include/sidebar.php:1.20 11 Jul 2006 17: 2:35 -0000 +++ appdb/include/sidebar.php 11 Jul 2006 17: 2:35 -0000 @@ -27,7 +27,7 @@ function global_sidebar_menu() { $g->add("Submit Application", BASE."appsubmit.php?sSub=view&sAppType=application"); $g->add("Help & Documentation", BASE."help/"); $g->add("AppDB Stats", BASE."appdbStats.php"); - $g->add("View Distributions (".getNumberOfDistributions().")", BASE."distributionView.php"); + $g->add("View Distributions (".distribution::getNumberOfDistributions(false).")", BASE."distributionView.php"); $g->add("View Vendors (".getNumberOfvendors().")", BASE."vendorview.php"); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.33 appdb/include/testResults.php:1.34 --- appdb/include/testResults.php:1.33 11 Jul 2006 17: 2:35 -0000 +++ appdb/include/testResults.php 11 Jul 2006 17: 2:35 -0000 @@ -514,7 +514,7 @@ class testData{ echo '<tr><td class=color0><b></b></td>',"\n"; } echo '<td class=color0>',"\n"; - make_distribution_list("iDistributionId", $this->iDistributionId); + distribution::make_distribution_list("iDistributionId", $this->iDistributionId); echo '</td></tr>',"\n"; // Version List echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n";

1 0

Juan Lang : crypt32: Check a pointer before dereferencing it (Coverity).
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: c0752da99f5adaf2d7d146e253c5502086272a4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0752da99f5adaf2d7d146e… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jul 10 20:30:54 2006 -0700 crypt32: Check a pointer before dereferencing it (Coverity). --- dlls/crypt32/decode.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index c3b2a7a..fe40ccc 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -561,7 +561,8 @@ static BOOL CRYPT_AsnDecodeArray(const s itemSizes = CryptMemAlloc( cItems * sizeof(struct AsnArrayItemSize)); - memcpy(itemSizes, &itemSize, sizeof(itemSize)); + if (itemSizes) + memcpy(itemSizes, &itemSize, sizeof(itemSize)); } if (itemSizes) {

1 0

Juan Lang : shell32: Always NULL-terminate path in SHGetPathFromIDList.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 961193bc5ddcfe7b6419d32e62f55d9d47f62f2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=961193bc5ddcfe7b6419d32… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jul 10 20:11:09 2006 -0700 shell32: Always NULL-terminate path in SHGetPathFromIDList. --- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/tests/shlfolder.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e4fe443..c849643 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1240,8 +1240,7 @@ BOOL WINAPI SHGetPathFromIDListA(LPCITEM BOOL bSuccess; bSuccess = SHGetPathFromIDListW(pidl, wszPath); - if (bSuccess) - WideCharToMultiByte(CP_ACP, 0, wszPath, -1, pszPath, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, wszPath, -1, pszPath, MAX_PATH, NULL, NULL); return bSuccess; } @@ -1262,6 +1261,7 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEM TRACE_(shell)("(pidl=%p,%p)\n", pidl, pszPath); pdump(pidl); + *pszPath = '\0'; if (!pidl) return FALSE; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7a79ab6..7751514 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -771,6 +771,13 @@ static void test_SHGetPathFromIDList(voi if(!pSHGetSpecialFolderPathW) return; + /* Calling SHGetPathFromIDList with no pidl should return the empty string */ + wszPath[0] = 'a'; + wszPath[1] = '\0'; + result = SHGetPathFromIDListW(NULL, wszPath); + ok(!result, "Expected failure\n"); + ok(!wszPath[0], "Expected empty string\n"); + /* Calling SHGetPathFromIDList with an empty pidl should return the desktop folder's path. */ result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %08lx\n", GetLastError()); @@ -794,9 +801,12 @@ static void test_SHGetPathFromIDList(voi } SetLastError(0xdeadbeef); + wszPath[0] = 'a'; + wszPath[1] = '\0'; result = SHGetPathFromIDListW(pidlMyComputer, wszPath); ok (!result, "SHGetPathFromIDList succeeded where it shouldn't!\n"); ok (GetLastError()==0xdeadbeef, "SHGetPathFromIDList shouldn't set last error! Last error: %08lx\n", GetLastError()); + ok (!wszPath[0], "Expected empty path\n"); if (result) { IShellFolder_Release(psfDesktop); return;

1 0

Mike McCormack : infosoft: Add a word breaker for English.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 4d3877b649e8665a398d51e61a93003ddfe1f2b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d3877b649e8665a398d51e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 11 11:13:18 2006 +0900 infosoft: Add a word breaker for English. --- configure | 5 + configure.ac | 3 - dlls/Makefile.in | 1 dlls/infosoft/Makefile.in | 16 ++++ dlls/infosoft/infosoft.spec | 4 + dlls/infosoft/infosoft_main.c | 155 ++++++++++++++++++++++++++++++++++++++ dlls/infosoft/wordbreaker.c | 167 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 348 insertions(+), 3 deletions(-) create mode 100644 dlls/infosoft/Makefile.in create mode 100644 dlls/infosoft/infosoft.spec create mode 100644 dlls/infosoft/infosoft_main.c create mode 100644 dlls/infosoft/wordbreaker.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4d3877b649e8665a398…

1 0

Ge van Geldorp : winebuild: Save registers which might contain parameters for the function to be called .
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 7a15278504eec7b924c43993e120dc2733c4eeb4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a15278504eec7b924c4399… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jul 10 08:58:59 2006 +0200 winebuild: Save registers which might contain parameters for the function to be called. --- tools/winebuild/import.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 3dcab2d..c06512a 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -932,10 +932,20 @@ static void output_delayed_import_thunks break; case CPU_x86_64: fprintf( outfile, "\tpushq %%rdi\n" ); + fprintf( outfile, "\tpushq %%rsi\n" ); + fprintf( outfile, "\tpushq %%rdx\n" ); + fprintf( outfile, "\tpushq %%rcx\n" ); + fprintf( outfile, "\tpushq %%r8\n" ); + fprintf( outfile, "\tpushq %%r9\n" ); fprintf( outfile, "\tsubq $8,%%rsp\n" ); fprintf( outfile, "\tmovq %%r11,%%rdi\n" ); fprintf( outfile, "\tcall %s\n", asm_name("__wine_spec_delay_load") ); fprintf( outfile, "\taddq $8,%%rsp\n" ); + fprintf( outfile, "\tpopq %%r9\n" ); + fprintf( outfile, "\tpopq %%r8\n" ); + fprintf( outfile, "\tpopq %%rcx\n" ); + fprintf( outfile, "\tpopq %%rdx\n" ); + fprintf( outfile, "\tpopq %%rsi\n" ); fprintf( outfile, "\tpopq %%rdi\n" ); fprintf( outfile, "\tjmp *%%rax\n" ); break;

1 0

Ge van Geldorp : ntdll: Widen fields in LDR_RESOURCE_INFO to accomodate 64 bit pointers.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 6096e5861ae8ab99dcbb86a78cb612f9fea2e093 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6096e5861ae8ab99dcbb86a… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jul 10 08:58:12 2006 +0200 ntdll: Widen fields in LDR_RESOURCE_INFO to accomodate 64 bit pointers. --- dlls/kernel/resource.c | 16 ++++++++-------- include/winternl.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/resource.c b/dlls/kernel/resource.c index 3d95696..aed006a 100644 --- a/dlls/kernel/resource.c +++ b/dlls/kernel/resource.c @@ -137,8 +137,8 @@ static HRSRC find_resourceA( HMODULE hMo { if ((status = get_res_nameA( name, &nameW )) != STATUS_SUCCESS) goto done; if ((status = get_res_nameA( type, &typeW )) != STATUS_SUCCESS) goto done; - info.Type = (ULONG)typeW.Buffer; - info.Name = (ULONG)nameW.Buffer; + info.Type = (ULONG_PTR)typeW.Buffer; + info.Name = (ULONG_PTR)nameW.Buffer; info.Language = lang; status = LdrFindResource_U( hModule, &info, 3, &entry ); done: @@ -170,8 +170,8 @@ static HRSRC find_resourceW( HMODULE hMo { if ((status = get_res_nameW( name, &nameW )) != STATUS_SUCCESS) goto done; if ((status = get_res_nameW( type, &typeW )) != STATUS_SUCCESS) goto done; - info.Type = (ULONG)typeW.Buffer; - info.Name = (ULONG)nameW.Buffer; + info.Type = (ULONG_PTR)typeW.Buffer; + info.Name = (ULONG_PTR)nameW.Buffer; info.Language = lang; status = LdrFindResource_U( hModule, &info, 3, &entry ); done: @@ -495,8 +495,8 @@ BOOL WINAPI EnumResourceLanguagesA( HMOD goto done; if ((status = get_res_nameA( name, &nameW )) != STATUS_SUCCESS) goto done; - info.Type = (ULONG)typeW.Buffer; - info.Name = (ULONG)nameW.Buffer; + info.Type = (ULONG_PTR)typeW.Buffer; + info.Name = (ULONG_PTR)nameW.Buffer; if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS) goto done; @@ -538,8 +538,8 @@ BOOL WINAPI EnumResourceLanguagesW( HMOD goto done; if ((status = get_res_nameW( name, &nameW )) != STATUS_SUCCESS) goto done; - info.Type = (ULONG)typeW.Buffer; - info.Name = (ULONG)nameW.Buffer; + info.Type = (ULONG_PTR)typeW.Buffer; + info.Name = (ULONG_PTR)nameW.Buffer; if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS) goto done; diff --git a/include/winternl.h b/include/winternl.h index 2f85171..5177348 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1245,8 +1245,8 @@ typedef BOOLEAN (WINAPI * PWINSTATIONQUE typedef struct _LDR_RESOURCE_INFO { - ULONG Type; - ULONG Name; + ULONG_PTR Type; + ULONG_PTR Name; ULONG Language; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;

1 0

James Hawkins : msi: Test how SetTargetPath affects the target paths of install files.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 15ad5de13c7046d65a1e7c9b6153dfc8e6dd7c62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15ad5de13c7046d65a1e7c9… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 10 11:30:20 2006 -0700 msi: Test how SetTargetPath affects the target paths of install files. --- dlls/msi/tests/package.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f020408..338b3fb 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -331,6 +331,25 @@ static void test_gettargetpath_bad(void) DeleteFile(msifile); } +static void query_file_path(MSIHANDLE hpkg, LPCSTR file, LPSTR buff) +{ + UINT r; + DWORD size; + MSIHANDLE rec; + + rec = MsiCreateRecord( 1 ); + ok(rec, "MsiCreate record failed\n"); + + r = MsiRecordSetString( rec, 0, file ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); + + size = MAX_PATH; + r = MsiFormatRecord( hpkg, rec, buff, &size ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); + + MsiCloseHandle( rec ); +} + static void test_settargetpath(void) { char tempdir[MAX_PATH+8], buffer[MAX_PATH]; @@ -363,6 +382,12 @@ static void test_settargetpath(void) ok( r == S_OK, "cannot add dummy component: %d\n", r ); r = run_query( hdb, + "INSERT INTO `Component` " + "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) " + "VALUES( 'TestComp', '{A3FB59C8-C293-4F7E-B8C5-F0E1D8EEE4E5}', 'TestDir', 0, '', 'TestFile')" ); + ok( r == S_OK, "cannot add test component: %d\n", r ); + + r = run_query( hdb, "CREATE TABLE `Feature` ( " "`Feature` CHAR(38) NOT NULL, " "`Feature_Parent` CHAR(38), " @@ -375,12 +400,56 @@ static void test_settargetpath(void) "PRIMARY KEY `Feature`)" ); ok( r == S_OK, "cannot create Feature table: %d\n", r ); + r = run_query( hdb, + "INSERT INTO `Feature` " + "(`Feature`, `Feature_Parent`, `Display`, `Level`, `Attributes`) " + "VALUES( 'TestFeature', '', 0, 1, 0 )" ); + ok( r == ERROR_SUCCESS, "cannot add TestFeature to Feature table: %d\n", r ); + + r = run_query( hdb, + "CREATE TABLE `FeatureComponents` ( " + "`Feature_` CHAR(38) NOT NULL, " + "`Component_` CHAR(72) NOT NULL " + "PRIMARY KEY `Feature_` )" ); + ok( r == S_OK, "cannot create FeatureComponents table: %d\n", r ); + + r = run_query( hdb, + "INSERT INTO `FeatureComponents` " + "(`Feature_`, `Component_`) " + "VALUES( 'TestFeature', 'TestComp' )" ); + ok( r == S_OK, "cannot insert component into FeatureComponents table: %d\n", r ); + + add_directory_entry( hdb, "'TestParent', 'TARGETDIR', 'TestParent'" ); + add_directory_entry( hdb, "'TestDir', 'TestParent', 'TestDir'" ); + + r = run_query( hdb, + "CREATE TABLE `File` (" + "`File` CHAR(72) NOT NULL, " + "`Component_` CHAR(72) NOT NULL, " + "`FileName` CHAR(255) NOT NULL, " + "`FileSize` LONG NOT NULL, " + "`Version` CHAR(72), " + "`Language` CHAR(20), " + "`Attributes` SHORT, " + "`Sequence` SHORT NOT NULL " + "PRIMARY KEY `File`)" ); + ok( r == S_OK, "cannot create File table: %d\n", r ); + + r = run_query( hdb, + "INSERT INTO `File` " + "(`File`, `Component_`, `FileName`, `FileSize`, `Version`, `Language`, `Attributes`, `Sequence`) " + "VALUES( 'TestFile', 'TestComp', 'testfile.txt', 0, '', '1033', 8192, 1 )" ); + ok( r == S_OK, "cannot add file to the File table: %d\n", r ); + hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); r = MsiDoAction( hpkg, "CostInitialize"); ok( r == ERROR_SUCCESS, "cost init failed\n"); + r = MsiDoAction( hpkg, "FileCost"); + ok( r == ERROR_SUCCESS, "file cost failed\n"); + r = MsiDoAction( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed\n"); @@ -425,6 +494,16 @@ static void test_settargetpath(void) } else { trace( "MsiGetTargetPath failed: %d\n", r ); } + + r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two" ); + ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + + query_file_path( hpkg, "[#TestFile]", buffer ); + todo_wine + { + ok( !lstrcmp(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), + "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer ); + } MsiCloseHandle( hpkg ); }

1 0