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

James Hawkins : msiexec: Use CommandLineToArgvW instead of process_args to reduce code duplication.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 7c35db000b26852fc2bf4a7a7e349953f60d183f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c35db000b26852fc2bf4a7… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 26 14:53:32 2006 -0700 msiexec: Use CommandLineToArgvW instead of process_args to reduce code duplication. --- programs/msiexec/Makefile.in | 2 - programs/msiexec/msiexec.c | 104 +----------------------------------------- 2 files changed, 4 insertions(+), 102 deletions(-) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 22815a0..2ddd272 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msiexec.exe APPMODE = -mconsole -IMPORTS = msi ole32 advapi32 user32 kernel32 +IMPORTS = msi shell32 ole32 advapi32 user32 kernel32 EXTRALIBS = $(LIBUNICODE) C_SRCS = \ diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 809b38f..d637216 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -25,6 +25,7 @@ #include <windows.h> #include <msi.h> #include <objbase.h> #include <stdio.h> +#include <shellapi.h> #include "wine/debug.h" #include "wine/unicode.h" @@ -210,14 +211,6 @@ static DWORD msi_atou(LPCWSTR str) return 0; } -static LPWSTR msi_strdup(LPCWSTR str) -{ - DWORD len = lstrlenW(str)+1; - LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); - lstrcpyW(ret, str); - return ret; -} - /* str1 is the same as str2, ignoring case */ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) { @@ -316,97 +309,6 @@ static DWORD DoDllUnregisterServer(LPCWS return 0; } -/* - * state machine to break up the command line properly - */ - -enum chomp_state -{ - cs_whitespace, - cs_token, - cs_quote -}; - -static int chomp( WCHAR *str ) -{ - enum chomp_state state = cs_whitespace; - WCHAR *p, *out; - int count = 0, ignore; - - for( p = str, out = str; *p; p++ ) - { - ignore = 1; - switch( state ) - { - case cs_whitespace: - switch( *p ) - { - case ' ': - break; - case '"': - state = cs_quote; - count++; - break; - default: - count++; - ignore = 0; - state = cs_token; - } - break; - - case cs_token: - switch( *p ) - { - case '"': - state = cs_quote; - break; - case ' ': - state = cs_whitespace; - *out++ = 0; - break; - default: - ignore = 0; - } - break; - - case cs_quote: - switch( *p ) - { - case '"': - state = cs_token; - break; - default: - ignore = 0; - } - break; - } - if( !ignore ) - *out++ = *p; - } - - *out = 0; - - return count; -} - -static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) -{ - WCHAR **argv, *p = msi_strdup(cmdline); - int i, n; - - n = chomp( p ); - argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); - for( i=0; i<n; i++ ) - { - argv[i] = p; - p += lstrlenW(p) + 1; - } - argv[i] = NULL; - - *pargc = n; - *pargv = argv; -} - static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) { LONG r; @@ -425,7 +327,7 @@ static BOOL process_args_from_reg( LPWST r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); if( r == ERROR_SUCCESS ) { - process_args(buf, pargc, pargv); + *pargv = CommandLineToArgvW(buf, pargc); ret = TRUE; } } @@ -471,7 +373,7 @@ int main(int argc, char **argv) LPWSTR *argvW = NULL; /* overwrite the command line */ - process_args( GetCommandLineW(), &argc, &argvW ); + argvW = CommandLineToArgvW( GetCommandLineW(), &argc ); /* * If the args begin with /@ IDENT then we need to load the real

1 0

Alexandre Julliard : wineconsole: Portability fixes in the curses mouse support.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: f5f37a8566c5cfcb265824d8adfdd7debdb67c43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5f37a8566c5cfcb265824d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 16:41:43 2006 +0200 wineconsole: Portability fixes in the curses mouse support. --- configure | 130 +++++++++++++++++++++++++++++++++++++++-- configure.ac | 4 + include/config.h.in | 3 + programs/wineconsole/curses.c | 77 ++++++++++++++++++------ 4 files changed, 189 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f5f37a8566c5cfcb265…

1 0

Alexandre Julliard : libwine: Attempt to increase some user limits that are set too low on some platforms .
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 96d6724eaf12c8178c96ded765f99a23ed1dff72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96d6724eaf12c8178c96ded… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 17:35:46 2006 +0200 libwine: Attempt to increase some user limits that are set too low on some platforms. --- libs/wine/loader.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 5f82c00..adbadd5 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -31,6 +31,9 @@ #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -599,6 +602,23 @@ int wine_dll_get_owner( const char *name /*********************************************************************** + * set_max_limit + * + * Set a user limit to the maximum allowed value. + */ +static void set_max_limit( int limit ) +{ + struct rlimit rlimit; + + if (!getrlimit( limit, &rlimit )) + { + rlimit.rlim_cur = rlimit.rlim_max; + setrlimit( limit, &rlimit ); + } +} + + +/*********************************************************************** * wine_init * * Main Wine initialisation. @@ -610,6 +630,10 @@ void wine_init( int argc, char *argv[], void *ntdll = NULL; void (*init_func)(void); + /* force a few limits that are set too low on some platforms */ + set_max_limit( RLIMIT_NOFILE ); + set_max_limit( RLIMIT_AS ); + wine_init_argv0_path( argv[0] ); build_dll_path(); __wine_main_argc = argc;

1 0

appdb/ ./addcomment.php ./appimage.php ./appsu ...
by WineHQ June 27, 2006

June 27, 2006

ChangeSet ID: 26083 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/27 14:16:28 Modified files: . : addcomment.php appimage.php appsubmit.php appview.php distributionView.php index.php preferences.php vendorview.php viewScreenshots.php viewbugs.php votestats.php admin : addAppNote.php addCategory.php adminAppDataQueue.php adminAppQueue.php adminBugs.php adminCommentView.php adminMaintainerQueue.php adminMaintainers.php adminScreenshots.php adminUsers.php editAppFamily.php editAppVersion.php editBundle.php moveAppVersion.php include : appdb.php application.php bugs.php category.php comment.php db.php distributions.php incl.php maintainer.php monitor.php note.php screenshot.php session.php tableve.php testResults.php url.php user.php util.php vendor.php version.php vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Use query_parameters() in SQL select, update and delete statements to protect against sql injection attacks Patch: http://cvs.winehq.org/patch.py?id=26083 Old revision New revision Changes Path 1.23 1.24 +2 -1 appdb/addcomment.php 1.17 1.18 +3 -4 appdb/appimage.php 1.42 1.43 +8 -8 appdb/appsubmit.php 1.81 1.82 +4 -3 appdb/appview.php 1.9 1.10 +1 -2 appdb/distributionView.php 1.33 1.34 +1 -1 appdb/index.php 1.24 1.25 +1 -1 appdb/preferences.php 1.14 1.15 +1 -2 appdb/vendorview.php 1.2 1.3 +4 -3 appdb/viewScreenshots.php 1.2 1.3 +9 -9 appdb/viewbugs.php 1.20 1.21 +11 -11 appdb/votestats.php 1.22 1.23 +2 -2 appdb/admin/addAppNote.php 1.9 1.10 +9 -9 appdb/admin/addCategory.php 1.20 1.21 +1 -1 appdb/admin/adminAppDataQueue.php 1.56 1.57 +10 -10 appdb/admin/adminAppQueue.php 1.4 1.5 +2 -12 appdb/admin/adminBugs.php 1.11 1.12 +4 -4 appdb/admin/adminCommentView.php 1.23 1.24 +6 -5 appdb/admin/adminMaintainerQueue.php 1.18 1.19 +3 -3 appdb/admin/adminMaintainers.php 1.7 1.8 +3 -3 appdb/admin/adminScreenshots.php 1.7 1.8 +5 -4 appdb/admin/adminUsers.php 1.36 1.37 +2 -1 appdb/admin/editAppFamily.php 1.34 1.35 +2 -1 appdb/admin/editAppVersion.php 1.9 1.10 +6 -4 appdb/admin/editBundle.php 1.3 1.4 +1 -1 appdb/admin/moveAppVersion.php 1.5 1.6 +8 -4 appdb/include/appdb.php 1.48 1.49 +35 -23 appdb/include/application.php 1.8 1.9 +11 -10 appdb/include/bugs.php 1.17 1.18 +16 -12 appdb/include/category.php 1.19 1.20 +18 -9 appdb/include/comment.php 1.15 1.16 +11 -2 appdb/include/db.php 1.6 1.7 +53 -32 appdb/include/distributions.php 1.28 1.29 +12 -6 appdb/include/incl.php 1.9 1.10 +7 -7 appdb/include/maintainer.php 1.3 1.4 +1 -1 appdb/include/monitor.php 1.8 1.9 +9 -9 appdb/include/note.php 1.37 1.38 +37 -38 appdb/include/screenshot.php 1.9 1.10 +7 -6 appdb/include/session.php 1.11 1.12 +4 -2 appdb/include/tableve.php 1.22 1.23 +36 -23 appdb/include/testResults.php 1.4 1.5 +14 -14 appdb/include/url.php 1.69 1.70 +128 -98 appdb/include/user.php 1.59 1.60 +35 -29 appdb/include/util.php 1.7 1.8 +11 -9 appdb/include/vendor.php 1.56 1.57 +40 -38 appdb/include/version.php 1.16 1.17 +9 -8 appdb/include/vote.php

1 0

appdb/unit_test test_user.php
by WineHQ June 27, 2006

June 27, 2006

ChangeSet ID: 26082 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/27 14:07:52 Modified files: unit_test : test_user.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Unit tests for user::update_password() and user::getMaintainerCount() Patch: http://cvs.winehq.org/patch.py?id=26082 Old revision New revision Changes Path 1.2 1.3 +129 -0 appdb/unit_test/test_user.php Index: appdb/unit_test/test_user.php diff -u -p appdb/unit_test/test_user.php:1.2 appdb/unit_test/test_user.php:1.3 --- appdb/unit_test/test_user.php:1.2 27 Jun 2006 19: 7:52 -0000 +++ appdb/unit_test/test_user.php 27 Jun 2006 19: 7:52 -0000 @@ -6,6 +6,7 @@ require_once("path.php"); require_once("test_common.php"); require_once(BASE."include/incl.php"); require_once(BASE."include/user.php"); +require_once(BASE."include/application.php"); /* TODO: check permissions functions */ @@ -234,6 +235,124 @@ function test_user_getpref_setpref() return true; } +function test_user_update_password() +{ + test_start(__FUNCTION__); + + global $test_email, $test_password; + + /* login the user */ + $oUser = new User(); + $retval = $oUser->login($test_email, $test_password); + if($retval != SUCCESS) + { + echo "Got '".$retval."' instead of SUCCESS(".SUCCESS.")\n"; + return false; + } + + /* change the users password to something new */ + $sNewPassword = $test_password.$test_password; + if(!$oUser->update_password($sNewPassword)) + { + echo "user::update_password() failed to update password to '".$sNewPassword."'\n"; + return false; + } + + /* log the user in again, using the new password this time */ + $oUser = new User(); + $retval = $oUser->login($test_email, $sNewPassword); + if($retval != SUCCESS) + { + echo "Failed to login with new password, got '".$retval."' instead of SUCCESS(".SUCCESS.")\n"; + return false; + } + + /* change the password back to the original one */ + if(!$oUser->update_password($test_password)) + { + echo "user::update_password() failed, unable to restore password to .".$test_password."'\n"; + return false; + } + + return true; +} + +function test_user_getMaintainerCount() +{ + test_start(__FUNCTION__); + + global $test_email, $test_password; + + /* login the user */ + $oUser = new User(); + $retval = $oUser->login($test_email, $test_password); + if($retval != SUCCESS) + { + echo "Got '".$retval."' instead of SUCCESS(".SUCCESS.")\n"; + return false; + } + + /** + * make the user a super maintatiner + */ + $iAppId = 655000; + $iVersionId = 655200; + $iQueueId = 655300; + $statusMessage = $oUser->addAsMaintainer($iAppId, $iVersionId, TRUE, $iQueueId); + + /* see that the user is a super maintainer of the one application we added them to be */ + $iExpected = 1; /* we expect 1 super maintainer for this user */ + $iSuperMaintainerCount = $oUser->getMaintainerCount(TRUE); + if($iSuperMaintainerCount != $iExpected) + { + echo "Got super maintainer count of '".$iSuperMaintainerCount."' instead of '".$iExpected."'\n"; + return false; + } + + /* maintainer count should be zero */ + $iExpected = 0; + $iMaintainerCount = $oUser->getMaintainerCount(FALSE); + if($iMaintainerCount != $iExpected) + { + echo "Got maintainer count of '".$iMaintainerCount."' instead of '".$iExpected."'\n"; + return false; + } + + /* remove maintainership for this user */ + $oUser->deleteMaintainer($iAppId); + + + + + /** + * make the user a maintainer + */ + $statusMessage = $oUser->addAsMaintainer($iAppId, $iVersionId, FALSE, $iQueueId); + + /* see that the user is a super maintainer of no applications */ + $iExpected = 0; /* we expect 1 super maintainer for this user */ + $iSuperMaintainerCount = $oUser->getMaintainerCount(TRUE); + if($iSuperMaintainerCount != $iExpected) + { + echo "Got super maintainer count of '".$iSuperMaintainerCount."' instead of '".$iExpected."'\n"; + return false; + } + + /* maintainer count should be one */ + $iExpected = 1; + $iMaintainerCount = $oUser->getMaintainerCount(FALSE); + if($iMaintainerCount != $iExpected) + { + echo "Got maintainer count of '".$iMaintainerCount."' instead of '".$iExpected."'\n"; + return false; + } + + /* remove maintainership for this user */ + $oUser->deleteMaintainer($iAppId, $iVersionId); + + return true; +} + /*************************/ /* Main testing routines */ @@ -263,6 +382,16 @@ if(!test_user_getpref_setpref()) else echo "test_user_getpref_setpref() passed\n"; +if(!test_user_update_password()) + echo "test_user_update_password() failed!\n"; +else + echo "test_user_update_password() passed\n"; + +if(!test_user_getMaintainerCount()) + echo "test_user_getMaintainerCount() failed!\n"; +else + echo "test_user_getMaintainerCount() passed\n"; + /* TODO: the rest of the user member functions we don't currently test */

1 0

appdb/ ./addcomment.php ./deletecomment.php ad ...
by WineHQ June 27, 2006

June 27, 2006

ChangeSet ID: 26081 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/27 11:54:22 Modified files: . : addcomment.php deletecomment.php admin : adminUsers.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Html attributes and values are lowercase to be forward compatible with xhtml Patch: http://cvs.winehq.org/patch.py?id=26081 Old revision New revision Changes Path 1.22 1.23 +7 -7 appdb/addcomment.php 1.22 1.23 +3 -3 appdb/deletecomment.php 1.6 1.7 +3 -3 appdb/admin/adminUsers.php Index: appdb/addcomment.php diff -u -p appdb/addcomment.php:1.22 appdb/addcomment.php:1.23 --- appdb/addcomment.php:1.22 27 Jun 2006 16:54:22 -0000 +++ appdb/addcomment.php 27 Jun 2006 16:54:22 -0000 @@ -70,7 +70,7 @@ else } } - echo "<form method=\"POST\" action=\"addcomment.php\">\n"; + echo "<form method=\"post\" action=\"addcomment.php\">\n"; echo html_frame_start($mesTitle,500,"",0); @@ -81,19 +81,19 @@ else echo " <td> <input type=\"text\" size=\"35\" name=\"subject\" value=\"".$aClean['subject']."\" /> </td></tr>\n"; echo "<tr class=\"color1\"><td colspan=2><textarea name=\"body\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$aClean['body']."</textarea></td></tr>\n"; echo "<tr class=\"color1\"><td colspan=2 align=center>\n"; - echo " <input type=\"SUBMIT\" value=\"Post Comment\" class=\"button\" />\n"; - echo " <input type=\"RESET\" value=\"Reset\" class=\"button\" />\n"; + echo " <input type=\"submit\" value=\"Post Comment\" class=\"button\" />\n"; + echo " <input type=\"reset\" value=\"Reset\" class=\"button\" />\n"; echo "</td></tr>\n"; echo "</table>\n"; echo html_frame_end(); - echo "<input type=\"HIDDEN\" name=\"thread\" value=\"".$aClean['thread']."\" />\n"; - echo "<input type=\"HIDDEN\" name=\"appId\" value=\"".$aClean['appId']."\" />\n"; - echo "<input type=\"HIDDEN\" name=\"versionId\" value=\"".$aClean['versionId']."\" />\n"; + echo "<input type=\"hidden\" name=\"thread\" value=\"".$aClean['thread']."\" />\n"; + echo "<input type=\"hidden\" name=\"appId\" value=\"".$aClean['appId']."\" />\n"; + echo "<input type=\"hidden\" name=\"versionId\" value=\"".$aClean['versionId']."\" />\n"; if (!empty($aClean['thread'])) { - echo "<input type=\"HIDDEN\" name=\"originator\" value=\"$originator\" />\n"; + echo "<input type=\"hidden\" name=\"originator\" value=\"$originator\" />\n"; } echo "</form>"; } Index: appdb/deletecomment.php diff -u -p appdb/deletecomment.php:1.22 appdb/deletecomment.php:1.23 --- appdb/deletecomment.php:1.22 27 Jun 2006 16:54:22 -0000 +++ appdb/deletecomment.php 27 Jun 2006 16:54:22 -0000 @@ -33,7 +33,7 @@ if($_SESSION['current']->getPref("confir { apidb_header("Delete Comment"); $mesTitle = "<b>Please state why you are deleting the following comment</b>"; - echo "<form method=\"POST\" action=\"".$_SERVER['PHP_SELF']."\">\n"; + echo "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">\n"; echo html_frame_start($mesTitle,500,"",0); echo "<br />"; echo html_frame_start($oComment->sSubject,500); @@ -42,11 +42,11 @@ if($_SESSION['current']->getPref("confir echo '<table width="100%" border=0 cellpadding=0 cellspacing=1>',"\n"; echo "<tr class=color1><td colspan=2><textarea name=\"str_why\" cols=\"70\" rows=\"15\" wrap=\"virtual\"></textarea></td></tr>\n"; echo "<tr class=color1><td colspan=2 align=center>\n"; - echo " <input type=\"SUBMIT\" value=\"Delete Comment\" class=\"button\" />\n"; + echo " <input type=\"submit\" value=\"Delete Comment\" class=\"button\" />\n"; echo "</td></tr>\n"; echo "</table>\n"; echo html_frame_end(); - echo "<input type=\"HIDDEN\" name=\"int_delete_it\" value=\"1\" />\n"; + echo "<input type=\"hidden\" name=\"int_delete_it\" value=\"1\" />\n"; echo "<input type=\"hidden\" name=\"commentId\" value=\"".$oComment->iCommentId."\" />"; echo "</form>"; Index: appdb/admin/adminUsers.php diff -u -p appdb/admin/adminUsers.php:1.6 appdb/admin/adminUsers.php:1.7 --- appdb/admin/adminUsers.php:1.6 27 Jun 2006 16:54:22 -0000 +++ appdb/admin/adminUsers.php 27 Jun 2006 16:54:22 -0000 @@ -33,7 +33,7 @@ if($aClean['action'] == "delete" && is_n // search form echo html_frame_start("Users Management","400","",0) ?> - <form action="<?php echo $_SERVER['PHP_SELF'];?>" METHOD="POST"> + <form action="<?php echo $_SERVER['PHP_SELF'];?>" method="post"> <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> <td class="color1">Pattern</td> @@ -52,7 +52,7 @@ echo html_frame_start("Users Management" <tr> <td class="color1">Order by</td> <td> - <select NAME="sOrderBy"> + <select name="sOrderBy"> <option value="email"<?php if($aClean['sOrderBy']=="email")echo" SELECTED";?>>e-mail</option> <option value="realname"<?php if($aClean['sOrderBy']=="realname")echo" SELECTED";?>>real name</option> <option value="created"<?php if($aClean['sOrderBy']=="created")echo" SELECTED";?>>creation date</option> @@ -60,7 +60,7 @@ echo html_frame_start("Users Management" </td> </tr> <tr> - <td colspan=2 class=color3 align=center><input type="SUBMIT" name="sSubmit" value="List Users" class="button"></td> + <td colspan=2 class=color3 align=center><input type="submit" name="sSubmit" value="List Users" class="button"></td> </tr> </table> </form>

1 0

appdb/ include/db.php unit_test/run_tests.php ...
by WineHQ June 27, 2006

June 27, 2006

ChangeSet ID: 26080 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/27 11:39:41 Modified files: include : db.php unit_test : run_tests.php test_user.php Added files: unit_test : test_common.php test_db.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Unit test for query_parameters(), fix bugs in query_parameters() found by the unit test Patch: http://cvs.winehq.org/patch.py?id=26080 Old revision New revision Changes Path 1.14 1.15 +5 -1 appdb/include/db.php 1.1 1.2 +2 -0 appdb/unit_test/run_tests.php 1.1 1.2 +1 -5 appdb/unit_test/test_user.php Added 1.1 +0 -0 appdb/unit_test/test_common.php Added 1.1 +0 -0 appdb/unit_test/test_db.php

1 0

Alexandre Julliard : widl: Fixed syntax of DECL_LINK macro to look more like C code.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: fdb4c7e98696e8922876881324f5be55a6eae988 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fdb4c7e98696e8922876881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 11:51:07 2006 +0200 widl: Fixed syntax of DECL_LINK macro to look more like C code. --- tools/widl/widltypes.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d26b364..c86e8c0 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -48,7 +48,7 @@ typedef struct _typelib_t typelib_t; #define DECL_LINK(type) \ type *l_next; \ - type *l_prev; + type *l_prev #define LINK(x,y) do { x->l_next = y; if (y) y->l_prev = x; } while (0) @@ -178,7 +178,7 @@ struct _attr_t { void *pval; } u; /* parser-internal */ - DECL_LINK(attr_t) + DECL_LINK(attr_t); }; struct _expr_t { @@ -194,7 +194,7 @@ struct _expr_t { int is_const; long cval; /* parser-internal */ - DECL_LINK(expr_t) + DECL_LINK(expr_t); }; struct _type_t { @@ -208,7 +208,7 @@ struct _type_t { int defined, written, user_types_registered; int typelib_idx; /* parser-internal */ - DECL_LINK(type_t) + DECL_LINK(type_t); }; struct _typeref_t { @@ -228,7 +228,7 @@ struct _var_t { expr_t *eval; /* parser-internal */ - DECL_LINK(var_t) + DECL_LINK(var_t); }; struct _func_t { @@ -237,7 +237,7 @@ struct _func_t { int ignore, idx; /* parser-internal */ - DECL_LINK(func_t) + DECL_LINK(func_t); }; struct _ifref_t { @@ -245,7 +245,7 @@ struct _ifref_t { attr_t *attrs; /* parser-internal */ - DECL_LINK(ifref_t) + DECL_LINK(ifref_t); }; struct _class_t { @@ -254,7 +254,7 @@ struct _class_t { ifref_t *ifaces; /* parser-internal */ - DECL_LINK(class_t) + DECL_LINK(class_t); }; struct _typelib_entry_t { @@ -267,7 +267,7 @@ struct _typelib_entry_t { type_t *enumeration; var_t *tdef; } u; - DECL_LINK(typelib_entry_t) + DECL_LINK(typelib_entry_t); }; struct _importinfo_t {

1 0

Andrey Turkin : shlwapi: Test for UrlGetPart in case of file name.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: a7d008f51bae8a70d9a2121aaaf29ca6513c9b86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7d008f51bae8a70d9a2121… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Wed Jun 21 14:47:15 2006 +0400 shlwapi: Test for UrlGetPart in case of file name. --- dlls/shlwapi/tests/path.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index e931d81..f8c74ab 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -365,6 +365,25 @@ static void test_url_part(const char* sz static void test_UrlGetPart(void) { + CHAR szPart[INTERNET_MAX_URL_LENGTH]; + DWORD dwSize; + HRESULT res; + + dwSize = sizeof szPart; + szPart[0]='x'; szPart[1]=0; + res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); + todo_wine { + ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08lX\n", res); + ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); + } + dwSize = sizeof szPart; + szPart[0]='x'; szPart[1]=0; + res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); + todo_wine { + ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08lX\n", res); + ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); + } + test_url_part(TEST_URL_3, URL_PART_HOSTNAME, 0, "localhost"); test_url_part(TEST_URL_3, URL_PART_PORT, 0, "21"); test_url_part(TEST_URL_3, URL_PART_USERNAME, 0, "foo"); @@ -435,10 +454,20 @@ static void test_UrlEscape(void) static void test_UrlCanonicalize(void) { unsigned int i; + CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; + DWORD dwSize; + for(i=0; i<sizeof(TEST_CANONICALIZE)/sizeof(TEST_CANONICALIZE[0]); i++) { test_url_canonicalize(TEST_CANONICALIZE[i].url, TEST_CANONICALIZE[i].flags, TEST_CANONICALIZE[i].expectret, TEST_CANONICALIZE[i].expecturl); } + + /* move to TEST_CANONICALIZE when fixed */ + dwSize = sizeof szReturnUrl; + ok(UrlCanonicalizeA("c:\\tests\\foo bar", szReturnUrl, &dwSize, 0) == S_OK, "UrlCanonicalizeA didn't return 0x%08lx\n", S_OK); + todo_wine { + ok(strcmp(szReturnUrl,"file:///c:/tests/foo%20bar")==0, "UrlCanonicalizeA got %s\n", szReturnUrl); + } } static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFlags, HRESULT dwExpectReturn, const char *szExpectUrl)

1 0

Vitaliy Margolen : ntdll: Fix 2 failing test on native. Change Wine accordingly.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 27e3b82d493bc64b15be80e642f08705063b637d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27e3b82d493bc64b15be80e… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Jun 21 07:35:13 2006 -0600 ntdll: Fix 2 failing test on native. Change Wine accordingly. --- dlls/ntdll/path.c | 7 ++----- dlls/ntdll/tests/path.c | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index e9286a0..78ee9fd 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -356,11 +356,8 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWST end = p - 1; if (end >= dos_name && *end == ':') end--; /* remove trailing ':' before extension */ } - else - { - /* no extension, remove trailing spaces */ - while (end >= dos_name && *end == ' ') end--; - } + /* remove trailing spaces */ + while (end >= dos_name && *end == ' ') end--; /* now we have a potential device name between start and end, check it */ switch(end - start + 1) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 3c35624..14af1cf 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -105,13 +105,13 @@ static void test_RtlIsDosDeviceName(void { "c:prn ", 4, 6 }, { "c:prn.......", 4, 6 }, { "c:prn... ...", 4, 6 }, - { "c:NUL .... ", 0, 0 }, + { "c:NUL .... ", 4, 6 }, { "c: . . .", 0, 0 }, { "c:", 0, 0 }, { " . . . :", 0, 0 }, { ":", 0, 0 }, { "c:nul. . . :", 4, 6 }, - { "c:nul . . :", 0, 0 }, + { "c:nul . . :", 4, 6 }, { "c:nul0", 0, 0 }, { "c:prn:aaa", 0, 0 }, { "c:PRN:.txt", 4, 6 },

1 0