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

appdb/include sidebar_admin.php testResults.php
by WineHQ July 10, 2006

July 10, 2006

ChangeSet ID: 26391 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/10 10:39:21 Modified files: include : sidebar_admin.php testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> testData class cleanup. Move some test related functions into the class as static functions. Clean up some variable names. Patch: http://cvs.winehq.org/patch.py?id=26391 Old revision New revision Changes Path 1.21 1.22 +1 -1 appdb/include/sidebar_admin.php 1.31 1.32 +43 -47 appdb/include/testResults.php Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.21 appdb/include/sidebar_admin.php:1.22 --- appdb/include/sidebar_admin.php:1.21 10 Jul 2006 15:39:21 -0000 +++ appdb/include/sidebar_admin.php 10 Jul 2006 15:39:21 -0000 @@ -18,7 +18,7 @@ function global_admin_menu() { $g->add("View Maintainer Queue (".getQueuedMaintainerCount().")", BASE."admin/adminMaintainerQueue.php"); $g->add("View Maintainer Entries (".getMaintainerCount().")", BASE."admin/adminMaintainers.php"); $g->add("View Bug Links (".getNumberOfQueuedBugLinks()."/".getNumberOfBugLinks().")", BASE."admin/adminBugs.php"); - $g->add("View Test Results Queue (".getNumberOfQueuedTests().")", BASE."admin/adminTestResults.php"); + $g->add("View Test Results Queue (".testData::getNumberOfQueuedTests().")", BASE."admin/adminTestResults.php"); $g->addmisc(" "); $g->add("Users Management", BASE."admin/adminUsers.php"); Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.31 appdb/include/testResults.php:1.32 --- appdb/include/testResults.php:1.31 10 Jul 2006 15:39:21 -0000 +++ appdb/include/testResults.php 10 Jul 2006 15:39:21 -0000 @@ -525,11 +525,11 @@ class testData{ echo '</td></tr>',"\n"; // Installs echo '<tr><td class=color0><b>Installs?</b></td><td class=color0>',"\n"; - make_Installs_list("sInstalls", $this->sInstalls); + testData::make_Installs_list("sInstalls", $this->sInstalls); echo '</td></tr>',"\n"; // Runs echo '<tr><td class=color1><b>Runs?</b></td><td class=color0>',"\n"; - make_Runs_list("sRuns", $this->sRuns); + testData::make_Runs_list("sRuns", $this->sRuns); echo '</td></tr>',"\n"; // Rating echo '<tr><td class="color0"><b>Rating</b></td><td class="color0">',"\n"; @@ -668,63 +668,59 @@ class testData{ echo "</table>","\n"; echo html_frame_end(); - } -} -/* Get the number of TestResults in the database */ -function getNumberOfQueuedTests() -{ - $sQuery = "SELECT count(*) as num_tests + /* Get the number of TestResults in the database */ + function getNumberOfQueuedTests() + { + $sQuery = "SELECT count(*) as num_tests FROM testResults, appVersion WHERE appVersion.versionId=testResults.versionId and appVersion.queued='false' and testResults.queued='true';"; - $hResult = query_parameters($sQuery); - if($hResult) - { - $oRow = mysql_fetch_object($hResult); - return $oRow->num_tests; + $hResult = query_parameters($sQuery); + if($hResult) + { + $oRow = mysql_fetch_object($hResult); + return $oRow->num_tests; + } + return 0; } - return 0; -} -function make_Installs_list($varname, $cvalue) -{ - - echo "<select name='$varname'>\n"; - echo "<option value=\"\">Choose ...</option>\n"; - $aRating = array("Yes", "No", "N/A"); - $iMax = count($aRating); - - for($i=0; $i < $iMax; $i++) - { - if($aRating[$i] == $cvalue) - echo "<option value='".$aRating[$i]."' selected>".$aRating[$i]."\n"; - else - echo "<option value='".$aRating[$i]."'>".$aRating[$i]."\n"; + function make_Installs_list($sVarname, $sSelectedValue) + { + echo "<select name='$sVarname'>\n"; + echo "<option value=\"\">Choose ...</option>\n"; + $aRating = array("Yes", "No", "N/A"); + $iMax = count($aRating); + + for($i=0; $i < $iMax; $i++) + { + if($aRating[$i] == $sSelectedValue) + echo "<option value='".$aRating[$i]."' selected>".$aRating[$i]."\n"; + else + echo "<option value='".$aRating[$i]."'>".$aRating[$i]."\n"; + } + echo "</select>\n"; } - echo "</select>\n"; -} -function make_Runs_list($varname, $cvalue) -{ - - echo "<select name='$varname'>\n"; - echo "<option value=\"\">Choose ...</option>\n"; - $aRating = array("Yes", "No", "Not Installable"); - $iMax = count($aRating); - - for($i=0; $i < $iMax; $i++) - { - if($aRating[$i] == $cvalue) - echo "<option value='".$aRating[$i]."' selected>".$aRating[$i]."\n"; - else - echo "<option value='".$aRating[$i]."'>".$aRating[$i]."\n"; + function make_Runs_list($sVarname, $sSelectedValue) + { + echo "<select name='$sVarname'>\n"; + echo "<option value=\"\">Choose ...</option>\n"; + $aRating = array("Yes", "No", "Not Installable"); + $iMax = count($aRating); + + for($i=0; $i < $iMax; $i++) + { + if($aRating[$i] == $sSelectedValue) + echo "<option value='".$aRating[$i]."' selected>".$aRating[$i]."\n"; + else + echo "<option value='".$aRating[$i]."'>".$aRating[$i]."\n"; + } + echo "</select>\n"; } - echo "</select>\n"; } - ?>

1 0

appdb/ ./appimage.php admin/adminAppDataQueue. ...
by WineHQ July 10, 2006

July 10, 2006

ChangeSet ID: 26390 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/10 10:18:08 Modified files: . : appimage.php admin : adminAppDataQueue.php include : screenshot.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Screenshot class optimization. Defer creation of thumbnail and screenshot images until values are necessary. This greatly speeds up the loading of the main page as we create screenshot objects to check their other internal parameters and not output their images. Patch: http://cvs.winehq.org/patch.py?id=26390 Old revision New revision Changes Path 1.26 1.27 +2 -2 appdb/appimage.php 1.29 1.30 +2 -2 appdb/admin/adminAppDataQueue.php 1.44 1.45 +72 -7 appdb/include/screenshot.php Index: appdb/appimage.php diff -u -p appdb/appimage.php:1.26 appdb/appimage.php:1.27 --- appdb/appimage.php:1.26 10 Jul 2006 15:18: 8 -0000 +++ appdb/appimage.php 10 Jul 2006 15:18: 8 -0000 @@ -98,7 +98,7 @@ if (isset($_SERVER['HTTP_IF_MODIFIED_SIN header("Last-Modified: ".fHttpDate($iModTime)); if(!$aClean['bThumbnail']) - $oScreenshot->oScreenshotImage->output_to_browser(1); + $oScreenshot->output_screenshot(false); else - $oScreenshot->oThumbnailImage->output_to_browser(1); + $oScreenshot->output_screenshot(true); ?> Index: appdb/admin/adminAppDataQueue.php diff -u -p appdb/admin/adminAppDataQueue.php:1.29 appdb/admin/adminAppDataQueue.php:1.30 --- appdb/admin/adminAppDataQueue.php:1.29 10 Jul 2006 15:18: 8 -0000 +++ appdb/admin/adminAppDataQueue.php 10 Jul 2006 15:18: 8 -0000 @@ -120,11 +120,11 @@ if (!$aClean['iId']) $oScreenshot = new Screenshot($obj_row->id); echo '<tr valign=top><td class=color0><b>Submited image</b></td>',"\n"; echo '<td>'; - $imgSRC = '<img width="'.$oScreenshot->oThumbnailImage->width.'" height="'.$oScreenshot->oThumbnailImage->height.'" src="../appimage.php?bQueued=true&iId='.$obj_row->id.'" />'; + $imgSRC = '<img width="'.$oScreenshot->get_thumbnail_width().'" height="'.$oScreenshot->get_thumbnail_height().'" src="../appimage.php?bQueued=true&iId='.$obj_row->id.'" />'; // generate random tag for popup window $randName = User::generate_passwd(5); // set image link based on user pref - $img = '<a href="javascript:openWin(\'../appimage.php?bQueued=true&iId='.$obj_row->id.'\',\''.$randName.'\','.$oScreenshot->oScreenshotImage->width.','.($oScreenshot->oScreenshotImage->height+4).');">'.$imgSRC.'</a>'; + $img = '<a href="javascript:openWin(\'../appimage.php?bQueued=true&iId='.$obj_row->id.'\',\''.$randName.'\','.$oScreenshot->get_screenshot_width().','.($oScreenshot->get_screenshot_height()+4).');">'.$imgSRC.'</a>'; if ($_SESSION['current']->isLoggedIn()) { if ($_SESSION['current']->getpref("window:screenshot") == "no") Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.44 appdb/include/screenshot.php:1.45 --- appdb/include/screenshot.php:1.44 10 Jul 2006 15:18: 8 -0000 +++ appdb/include/screenshot.php 10 Jul 2006 15:18: 8 -0000 @@ -42,8 +42,6 @@ class Screenshot { $oRow = mysql_fetch_object($hResult); $this->iScreenshotId = $iScreenshotId; $this->sDescription = $oRow->description; - $this->oScreenshotImage = new Image("/data/screenshots/".$oRow->url); - $this->oThumbnailImage = new Image("/data/screenshots/thumbnails/".$oRow->url); $this->iAppId = $oRow->appId; $this->iVersionId = $oRow->versionId; $this->sUrl = $oRow->url; @@ -108,7 +106,6 @@ class Screenshot { query_parameters($sQuery, $this->iScreenshotId); return false; } - } $this->screenshot($this->iScreenshotId,$this->bQueued); @@ -133,6 +130,11 @@ class Screenshot { /* we can perform better permissions checking there */ if($_SESSION['current']->deleteAppData($this->iScreenshotId)) { + /* make sure the screenshot and thumbnail is loaded */ + /* up before we try to delete them */ + $this->load_image(true); + $this->load_image(false); + $this->oScreenshotImage->delete(); $this->oThumbnailImage->delete(); unlink(appdb_fullpath("/data/screenshots/originals/".$this->iScreenshotId)); @@ -231,6 +233,69 @@ class Screenshot { return true; } + /* ensure that either the thumbnail or screenshot */ + /* has been loaded into memory */ + function load_image($bThumbnail) + { + if($bThumbnail) + { + /* if we haven't loaded the thumbnail up yet, do so */ + if(!$this->oThumbnailImage) + $this->oThumbnailImage = new Image("/data/screenshots/thumbnails/".$this->sUrl); + } else + { + /* if we haven't loaded the screenshot up yet, do so */ + if(!$this->oScreenshotImage) + $this->oScreenshotImage = new Image("/data/screenshots/".$this->sUrl); + } + } + + /* output the thumbnail if $bThumbnail or the full screenshot if !$bThumbnail */ + /* NOTE: use this instead of calling through to this classes oScreenshot or */ + /* oThumbnail objects directly to their output_*() functions */ + function output_screenshot($bThumbnail) + { + $this->load_image($bThumbnail); + + if($bThumbnail) + { + if($this->oThumbnailImage) + $this->oThumbnailImage->output_to_browser(1); + } else + { + if($this->oScreenshotImage) + $this->oScreenshotImage->output_to_browser(1); + } + } + + /* Accessor functions for the screenshot and thumbnail images that this */ + /* screenshot object encapsulates */ + /* NOTE: DO NOT call like $oScreenshot->oScreenshotImage->get_width(), there is NO */ + /* guarantee that oScreenshotImage will be valid */ + function get_screenshot_width() + { + $this->load_image(false); + return $this->oScreenshotImage->get_width(); + } + + function get_screenshot_height() + { + $this->load_image(false); + return $this->oScreenshotImage->get_height(); + } + + function get_thumbnail_width() + { + $this->load_image(true); + return $this->oThumbnailImage->get_width(); + } + + function get_thumbnail_height() + { + $this->load_image(true); + return $this->oThumbnailImage->get_height(); + } + function mailSubmitter($bRejected=false) { @@ -411,14 +476,14 @@ function get_thumbnail($id) // set img tag $imgSRC = '<img src="'.apidb_fullurl("appimage.php"). '?bThumbnail=true&iId='.$id.'" alt="'.$oScreenshot->sDescription. - '" width="'.$oScreenshot->oThumbnailImage->get_width(). - '" height="'.$oScreenshot->oThumbnailImage->get_height().'">'; + '" width="'.$oScreenshot->get_thumbnail_width(). + '" height="'.$oScreenshot->get_thumbnail_height().'">'; $img = '<a href="'.apidb_fullurl("appimage.php"). '?iId='.$id. '" onclick="javascript:openWin(\''.apidb_fullurl("appimage.php"). '?iId='.$id.'\',\''.$randName.'\','. - ($oScreenshot->oScreenshotImage->get_width() + 20).','. - ($oScreenshot->oScreenshotImage->get_height() + 6). + ($oScreenshot->get_screenshot_width() + 20).','. + ($oScreenshot->get_screenshot_height() + 6). ');return false;">'.$imgSRC.'</a>'; // set image link based on user pref

1 0

James Hawkins : advpack: Add tests for different configurations of INF filenames and
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: ac9e421999a98598ba05e72a397f776d0c7bf698 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac9e421999a98598ba05e72… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 7 18:30:46 2006 -0700 advpack: Add tests for different configurations of INF filenames and working directories for install functions. --- dlls/advpack/install.c | 25 +++++-- dlls/advpack/tests/install.c | 144 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ac9e421999a98598ba0…

1 0

Mike McCormack : query: Add a skeleton for query.dll.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: defbc49b7e50e285b71e969c32d237f561306a61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=defbc49b7e50e285b71e969… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 7 18:21:36 2006 +0900 query: Add a skeleton for query.dll. --- configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/query/.gitignore | 1 + dlls/query/Makefile.in | 15 +++++++++ dlls/query/query.spec | 46 ++++++++++++++++++++++++++++ dlls/query/query_main.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 143 insertions(+), 1 deletions(-) create mode 100644 dlls/query/.gitignore create mode 100644 dlls/query/Makefile.in create mode 100644 dlls/query/query.spec create mode 100644 dlls/query/query_main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=defbc49b7e50e285b71…

1 0

Alexandre Julliard : configure: Define _WIN64 when building on a 64-bit platform.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 58c64190f46cd897597c48c9e2c742a887b27124 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58c64190f46cd897597c48c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 13:05:20 2006 +0200 configure: Define _WIN64 when building on a 64-bit platform. --- configure | 31 +++++++++++++++++++++++++++++++ configure.ac | 3 ++- include/basetsd.h | 2 +- include/windef.h | 2 +- tools/winegcc/winegcc.c | 7 +++++++ 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ece71b4..6c25767 100755 --- a/configure +++ b/configure @@ -24167,6 +24167,37 @@ if test $ac_cv_cpp_def___x86_64__ = yes; CFLAGS="$CFLAGS -D__x86_64__" LINTFLAGS="$LINTFLAGS -D__x86_64__" fi + + { echo "$as_me:$LINENO: checking whether we need to define _WIN64" >&5 +echo $ECHO_N "checking whether we need to define _WIN64... $ECHO_C" >&6; } +if test "${ac_cv_cpp_def__WIN64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef _WIN64 +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + ac_cv_cpp_def__WIN64=yes +else + ac_cv_cpp_def__WIN64=no +fi +rm -f conftest* + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def__WIN64" >&5 +echo "${ECHO_T}$ac_cv_cpp_def__WIN64" >&6; } +if test $ac_cv_cpp_def__WIN64 = yes; then + CFLAGS="$CFLAGS -D_WIN64" + LINTFLAGS="$LINTFLAGS -D_WIN64" +fi ;; *alpha*) { echo "$as_me:$LINENO: checking whether we need to define __ALPHA__" >&5 echo $ECHO_N "checking whether we need to define __ALPHA__... $ECHO_C" >&6; } diff --git a/configure.ac b/configure.ac index 3c55d8c..85e3c20 100644 --- a/configure.ac +++ b/configure.ac @@ -1502,7 +1502,8 @@ dnl *** check for the need to define pla case $host_cpu in *i[[3456789]]86*) WINE_CHECK_DEFINE([__i386__]) ;; - *x86_64*) WINE_CHECK_DEFINE([__x86_64__]) ;; + *x86_64*) WINE_CHECK_DEFINE([__x86_64__]) + WINE_CHECK_DEFINE([_WIN64]) ;; *alpha*) WINE_CHECK_DEFINE([__ALPHA__]) ;; *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;; *powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;; diff --git a/include/basetsd.h b/include/basetsd.h index 292483a..444e876 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -38,7 +38,7 @@ #endif /* defined(__cplusplus) */ * type model where int and long are 32 bit and pointer is 64-bit. */ -#ifdef __x86_64__ +#if defined(__x86_64__) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/windef.h b/include/windef.h index 2908cfc..d9c0331 100644 --- a/include/windef.h +++ b/include/windef.h @@ -45,7 +45,7 @@ #if defined(_X86_) && !defined(__i386__) # define __i386__ #endif -#ifdef __x86_64__ +#if defined(__x86_64__) && !defined(_WIN64) #define _WIN64 #endif diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2cc73ca..07d0ac1 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -269,10 +269,17 @@ #endif strarray_addall(comp_args, strarray_fromstring(DLLFLAGS, " ")); } +#ifdef _WIN64 + strarray_add(comp_args, "-DWIN64"); + strarray_add(comp_args, "-D_WIN64"); + strarray_add(comp_args, "-D__WIN64"); + strarray_add(comp_args, "-D__WIN64__"); +#else strarray_add(comp_args, "-DWIN32"); strarray_add(comp_args, "-D_WIN32"); strarray_add(comp_args, "-D__WIN32"); strarray_add(comp_args, "-D__WIN32__"); +#endif strarray_add(comp_args, "-D__WINNT"); strarray_add(comp_args, "-D__WINNT__");

1 0

Alexandre Julliard : include/msvcrt: Fix all definitions of size_t for Win64.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 945292737b15f6196c7485617cea95ebc35d959c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=945292737b15f6196c74856… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 12:28:25 2006 +0200 include/msvcrt: Fix all definitions of size_t for Win64. --- include/msvcrt/direct.h | 8 ++++++++ include/msvcrt/malloc.h | 7 +++++++ include/msvcrt/mbstring.h | 8 ++++++++ include/msvcrt/search.h | 8 ++++++++ include/msvcrt/stdio.h | 13 ++++++++----- include/msvcrt/stdlib.h | 10 ++++++---- include/msvcrt/sys/types.h | 8 ++++++++ include/msvcrt/time.h | 8 ++++++++ include/msvcrt/wchar.h | 14 ++++++++------ 9 files changed, 69 insertions(+), 15 deletions(-) diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index 76ad31b..bd05db9 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -22,8 +22,16 @@ typedef unsigned short wchar_t; #endif #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index deb6199..eff45e8 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -34,9 +34,16 @@ #define _HEAPBADPTR -6 #define _FREEENTRY 0 #define _USEDENTRY 1 +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index de4032b..f47a4c0 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -23,8 +23,16 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h index 8337856..c3a2e50 100644 --- a/include/msvcrt/search.h +++ b/include/msvcrt/search.h @@ -23,8 +23,16 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index b1c8043..bc58de3 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -11,15 +11,14 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif -#if !defined(_MSC_VER) && !defined(__int64) -/* FIXME: not compatible, but needed for __int64 definition */ -#include <basetsd.h> -#endif - #ifndef RC_INVOKED #include <stdarg.h> #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + /* file._flag flags */ #define _IOREAD 0x0001 #define _IOWRT 0x0002 @@ -81,7 +80,11 @@ #define _FPOS_T_DEFINED #endif #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index d903500..a8b6ab5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -26,10 +26,8 @@ typedef unsigned short wchar_t; #endif #endif -#ifndef _MSC_VER -# ifndef __int64 -# define __int64 long long -# endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long #endif #define EXIT_SUCCESS 0 @@ -56,7 +54,11 @@ typedef struct _ldiv_t { } ldiv_t; #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h index 1cc1e66..fc6f269 100644 --- a/include/msvcrt/sys/types.h +++ b/include/msvcrt/sys/types.h @@ -23,6 +23,10 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _DEV_T_DEFINED typedef unsigned int _dev_t; #define _DEV_T_DEFINED @@ -67,7 +71,11 @@ #define _PID_T_DEFINED #endif #ifndef _SSIZE_T_DEFINED +#ifdef _WIN64 +typedef __int64 ssize_t; +#else typedef int ssize_t; +#endif #define _SSIZE_T_DEFINED #endif diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 8b9e2ab..b2caa03 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -30,8 +30,16 @@ typedef unsigned short wchar_t; #endif #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 73db7f8..81982e2 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -35,10 +35,18 @@ #endif #define WCHAR_MIN 0 #define WCHAR_MAX ((wchar_t)-1) +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + typedef int mbstate_t; #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif @@ -48,12 +56,6 @@ typedef unsigned short wctype_t; #define _WCTYPE_T_DEFINED #endif -#ifndef _MSC_VER -# ifndef __int64 -# define __int64 long long -# endif -#endif - #ifndef WEOF #define WEOF (wint_t)(0xFFFF) #endif

1 0

Alexandre Julliard : msvcrt: Avoid including system headers in msvcrt.h.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 429cd9e8173451c92faaf36661145e7ff3f5506d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=429cd9e8173451c92faaf36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 11:54:10 2006 +0200 msvcrt: Avoid including system headers in msvcrt.h. --- dlls/msvcrt/ctype.c | 2 ++ dlls/msvcrt/locale.c | 1 + dlls/msvcrt/msvcrt.h | 4 ---- dlls/msvcrt/time.c | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 71e4ec6..9c23810 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -17,7 +17,9 @@ * 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 "msvcrt.h" +#include "winnls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 367b1b2..de4cb58 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -28,6 +28,7 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winnls.h" #include "msvcrt.h" #include "mtdll.h" diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fc330ce..0066e3d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -37,13 +37,9 @@ #ifndef __WINE_MSVCRT_H #define __WINE_MSVCRT_H #include <stdarg.h> -#include <ctype.h> -#include <string.h> #include "windef.h" #include "winbase.h" -#include "winerror.h" -#include "winnls.h" typedef unsigned short MSVCRT_wchar_t; typedef unsigned short MSVCRT_wint_t; diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 868a0dc..5da2f9c 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -33,6 +33,7 @@ #include <limits.h> #include "msvcrt.h" #include "winbase.h" +#include "winnls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);

1 0

Mike McCormack : query: Add ntquery.h.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: c53cdac4f9e58d3e8acedfcf500153ebb55b7724 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c53cdac4f9e58d3e8acedfc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 7 17:20:59 2006 +0900 query: Add ntquery.h. --- include/Makefile.in | 1 + include/ntquery.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) create mode 100644 include/ntquery.h diff --git a/include/Makefile.in b/include/Makefile.in index 14c9b2f..d485620 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -209,6 +209,7 @@ WINDOWS_INCLUDES = \ ntddscsi.h \ ntddstor.h \ ntdsapi.h \ + ntquery.h \ ntsecapi.h \ ntstatus.h \ objbase.h \ diff --git a/include/ntquery.h b/include/ntquery.h new file mode 100644 index 0000000..ec7e1c2 --- /dev/null +++ b/include/ntquery.h @@ -0,0 +1,47 @@ +/* + * Copyright 2006 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 + */ + +#ifndef __WINE_NTQUERY_H__ +#define __WINE_NTQUERY_H__ + +#include <pshpack4.h> + +typedef struct _CI_STATE +{ + DWORD cbStruct; + DWORD cWordList; + DWORD cPersistentIndex; + DWORD cQueries; + DWORD cDocuments; + DWORD cFreshTest; + DWORD dwMergeProgress; + DWORD eState; + DWORD cFilteredDocuments; + DWORD cTotalDocuments; + DWORD cPendingScans; + DWORD dwIndexSize; + DWORD cUniqueKeys; + DWORD cSeqQDocuments; + DWORD dwPropCacheSize; +} CI_STATE; + +#include <poppack.h> + +STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *); + +#endif

1 0

Paul Vriens : ntdll/tests: Added some NULL testing.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: b872d83115aeb0a31edd7f0700a755018fc2e7cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b872d83115aeb0a31edd7f0… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Jul 7 10:36:46 2006 +0200 ntdll/tests: Added some NULL testing. --- dlls/ntdll/tests/reg.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 654ae64..c9fab3a 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -88,6 +88,7 @@ static NTSTATUS (WINAPI * pRtlOpenCurren static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); +static NTSTATUS (WINAPI * pNtFlushKey)(HKEY); static NTSTATUS (WINAPI * pNtDeleteKey)(HKEY); static NTSTATUS (WINAPI * pNtCreateKey)( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, @@ -134,6 +135,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtClose) NTDLL_GET_PROC(NtDeleteValueKey) NTDLL_GET_PROC(NtCreateKey) + NTDLL_GET_PROC(NtFlushKey) NTDLL_GET_PROC(NtDeleteKey) NTDLL_GET_PROC(NtSetValueKey) NTDLL_GET_PROC(NtOpenKey) @@ -290,6 +292,38 @@ static void test_RtlQueryRegistryValues( pRtlFreeHeap(GetProcessHeap(), 0, QueryTable); } +static void test_NtOpenKey(void) +{ + HANDLE key; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + ACCESS_MASK am = KEY_READ; + +#if 0 /* Crashes Wine */ + /* All NULL */ + status = pNtOpenKey(NULL, 0, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08lx\n", status); + + /* NULL attributes */ + status = pNtOpenKey(&key, 0, NULL); + ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08lx\n", status); +#endif + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + + /* NULL key */ + status = pNtOpenKey(NULL, 0, &attr); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08lx\n", status); + + /* Length > sizeof(OBJECT_ATTRIBUTES) */ + attr.Length *= 2; + status = pNtOpenKey(&key, am, &attr); + todo_wine + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08lx\n", status); +} + static void test_NtCreateKey(void) { /*Create WineTest*/ @@ -375,6 +409,25 @@ static void test_RtlCheckRegistryKey(voi ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and RTL_REGISTRY_OPTIONAL: 0x%08lx\n", status); } +static void test_NtFlushKey(void) +{ + NTSTATUS status; + HANDLE hkey; + OBJECT_ATTRIBUTES attr; + ACCESS_MASK am = KEY_ALL_ACCESS; + + status = pNtFlushKey(NULL); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08lx\n", status); + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + pNtOpenKey(&hkey, am, &attr); + + status = pNtFlushKey(hkey); + ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08lx\n", status); + + pNtClose(hkey); +} + static void test_NtDeleteKey(void) { NTSTATUS status; @@ -382,6 +435,9 @@ static void test_NtDeleteKey(void) OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_ALL_ACCESS; + status = pNtDeleteKey(NULL); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08lx\n", status); + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&hkey, am, &attr); @@ -401,11 +457,13 @@ START_TEST(reg) pRtlAppendUnicodeToString(&winetestpath, winetest); + test_NtOpenKey(); test_NtCreateKey(); test_NtSetValueKey(); test_RtlCheckRegistryKey(); test_RtlOpenCurrentUser(); test_RtlQueryRegistryValues(); + test_NtFlushKey(); test_NtDeleteKey(); pRtlFreeUnicodeString(&winetestpath);

1 0

Alexandre Julliard : server: Only accept 0 as registry handle in functions that take a parent key.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: dd77d1a99759529aa22aec444868a99a4cac32bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd77d1a99759529aa22aec4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 11:53:23 2006 +0200 server: Only accept 0 as registry handle in functions that take a parent key. --- server/registry.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/server/registry.c b/server/registry.c index 34c962b..ae32aa7 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1003,12 +1003,18 @@ static void delete_value( struct key *ke } /* get the registry key corresponding to an hkey handle */ -static struct key *get_hkey_obj( obj_handle_t hkey, unsigned int access ) +static inline struct key *get_hkey_obj( obj_handle_t hkey, unsigned int access ) { - if (!hkey) return (struct key *)grab_object( root_key ); return (struct key *)get_handle_obj( current->process, hkey, access, &key_ops ); } +/* get the registry key corresponding to a parent key handle */ +static inline struct key *get_parent_hkey_obj( obj_handle_t hkey ) +{ + if (!hkey) return (struct key *)grab_object( root_key ); + return (struct key *)get_handle_obj( current->process, hkey, 0, &key_ops ); +} + /* read a line from the input file */ static int read_next_line( struct file_load_info *info ) { @@ -1727,7 +1733,7 @@ DECL_HANDLER(create_key) name.len = (class.str - name.str) * sizeof(WCHAR); /* NOTE: no access rights are required from the parent handle to create a key */ - if ((parent = get_hkey_obj( req->parent, 0 ))) + if ((parent = get_parent_hkey_obj( req->parent ))) { int flags = (req->options & REG_OPTION_VOLATILE) ? KEY_VOLATILE : KEY_DIRTY; @@ -1750,7 +1756,7 @@ DECL_HANDLER(open_key) if (access & MAXIMUM_ALLOWED) access = KEY_ALL_ACCESS; /* FIXME: needs general solution */ reply->hkey = 0; /* NOTE: no access rights are required to open the parent key, only the child key */ - if ((parent = get_hkey_obj( req->parent, 0 ))) + if ((parent = get_parent_hkey_obj( req->parent ))) { get_req_path( &name, !req->parent ); if ((key = open_key( parent, &name ))) @@ -1883,7 +1889,7 @@ DECL_HANDLER(load_registry) return; } - if ((parent = get_hkey_obj( req->hkey, 0 ))) + if ((parent = get_parent_hkey_obj( req->hkey ))) { int dummy; get_req_path( &name, !req->hkey );

1 0