Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 16498: Set right %ERRORLEVEL% value, fixing end of line for /? for most commands after implement of page break.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

Set right %ERRORLEVEL% value, fixing end of line for /? for most commands after implement of page break. Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-07-07 19:54:25 UTC (rev 16497) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-07-07 20:41:13 UTC (rev 16498) @@ -20,7 +20,7 @@ /S Processes matching files in the current directory\n\ and all subdirectories\n\ /D Processes directories as well\n\n\ -Type ATTRIB without a parameter to display the attributes of all files." +Type ATTRIB without a parameter to display the attributes of all files.\n" STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ ALIAS [alias=[command]]\n\n\ @@ -33,7 +33,7 @@ To remove an alias from the alias list:\n\ ALIAS da=" -STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP" +STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP\n" STRING_CALL_HELP, "Calls one batch program from another.\n\n\ CALL [drive:][path]filename [batch-parameter]\n\n\ @@ -48,12 +48,12 @@ .. parent directory\n\ . previous directory\n\n\ Type CD drive: to display the current directory on the specified drive.\n\ -Type CD without a parameter to display the current drive and directory." +Type CD without a parameter to display the current drive and directory.\n" STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n\ CHCP [nnn]\n\n\ nnn Specifies the active code page number.\n\n\ -Type CHCP without a parameter to display the active code page number." +Type CHCP without a parameter to display the active code page number.\n" STRING_CHOICE_HELP, "Waits for the user to choose one of a set of choices.\n\n\ CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ @@ -62,9 +62,9 @@ /S Treat choice keys as case sensitive.\n\ /T[:]c,nn Default choice to c after nn seconds.\n\ text Prompt string to display.\n\n\ -ERRORLEVEL is set to offset of key user presses in choices." +ERRORLEVEL is set to offset of key user presses in choices.\n" -STRING_CLS_HELP, "Clears the screen.\n\nCLS" +STRING_CLS_HELP, "Clears the screen.\n\nCLS\n" STRING_CMD_HELP1, "\nInternal commands available:\n" @@ -86,7 +86,7 @@ /K command Runs the specified command and remains.\n\ /P CMD becomes permanent and runs autoexec.bat\n\ (cannot be terminated).\n\ - /T:bf Sets the background/foreground color (see COLOR command)." + /T:bf Sets the background/foreground color (see COLOR command).\n" STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n\ COLOR [attr [/-F]] \n\n\ @@ -105,7 +105,7 @@ 4 4 Red 12 C Bright Red\n\ 5 5 Magenta 13 D Bright Magenta\n\ 6 6 Yellow 14 E Bright Yellow\n\ -7 7 White 15 F Bright White" +7 7 White 15 F Bright White\n" STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? " @@ -122,7 +122,7 @@ /-Y Causes prompting to confirm you want to overwrite an\n\ existing destination file.\n\n\ The switch /Y may be present in the COPYCMD environment variable.\n\ -..." +...\n" STRING_DATE_HELP1, "\nEnter new date (mm%cdd%cyyyy): " @@ -134,7 +134,7 @@ DATE [/T][date]\n\n\ /T display only\n\n\ Type DATE without parameters to display the current date setting and\n\ -a prompt for a new one. Press ENTER to keep the same date." +a prompt for a new one. Press ENTER to keep the same date.\n" STRING_DEL_HELP1, "Deletes one or more files.\n\n\ DEL [/N /P /T /Q /W /Y /Z /A[[:]attributes]] file ...\n\ @@ -163,7 +163,7 @@ STRING_DELAY_HELP, "pause for n seconds or milliseconds\n\ DELAY [/m]n\n\n\ /m specifiy than n are milliseconds\n\ - otherwise n are seconds" + otherwise n are seconds\n" STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ @@ -210,7 +210,7 @@ STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ changes to the specified directory.\n\n\ PUSHD [path | ..]\n\n\ - path Specifies the directory to make the current directory" + path Specifies the directory to make the current directory\n" STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" @@ -236,7 +236,7 @@ STRING_ECHO_HELP5, "ECHO is %s\n" -STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" +STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT\n" STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n\ FOR %variable IN (set) DO command [parameters]\n\n\ @@ -245,7 +245,7 @@ command Specifies the command to carry out for each file.\n\ parameters Specifies parameters or switches for the specified command.\n\n\ To use the FOR command in a batch program, specify %%variable instead of\n\ -%variable." +%variable.\n" STRING_FREE_HELP1, "\nVolume in drive %s is %-11s\n\ Serial number is %s\n\ @@ -253,7 +253,7 @@ %16s bytes used\n\ %16s bytes free\n" -STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]" +STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]\n" STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ @@ -269,7 +269,7 @@ match.\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ - defined." + defined.\n" STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ GOTO label\n\n\ @@ -349,7 +349,7 @@ $T Current time\n\ $V OS version number\n\ $_ Carriage return and linefeed\n\ - $$ $ (dollar sign)" + $$ $ (dollar sign)\n" STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n\ 'Press any key to continue...' or a user defined message.\n\n\ @@ -375,7 +375,7 @@ /S Rename subdirectories.\n\ /T Display total number of renamed files.\n\n\ Note that you cannot specify a new drive or path for your destination. Use\n\ -the MOVE command for that purpose." +the MOVE command for that purpose.\n" STRING_REN_HELP2, " %lu file renamed\n" @@ -402,13 +402,13 @@ STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\ TITLE [string]\n\n\ -string Specifies the title for the command prompt window." +string Specifies the title for the command prompt window.\n" STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ TIME [/T][time]\n\n\ /T display only\n\n\ Type TIME with no parameters to display the current time setting and a prompt\n\ -for a new one. Press ENTER to keep the same time." +for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2, "Enter new time: " @@ -438,7 +438,7 @@ Sets whether to verify that your files are written correctly to a\n\ disk.\n\n\ VERIFY [ON | OFF]\n\n\ -Type VERIFY without a parameter to display the current VERIFY setting." +Type VERIFY without a parameter to display the current VERIFY setting.\n" STRING_VERIFY_HELP2, "VERIFY is %s.\n" @@ -463,7 +463,7 @@ STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n\ it under the terms of the GNU General Public License as published by\n\ the Free Software Foundation; either version 2 of the License, or\n\ - (at your option) any later version." + (at your option) any later version.\n" STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.com>.\n\ Updates are available at: http://www.reactos.com" @@ -493,7 +493,7 @@ MIN minimize the window\n\ MAX maximize the window\n\ RESTORE restore the window\n\ -title new title" +title new title\n" STRING_HELP1, "List of all available commands (+ description)\n\n\ _____ Modified: trunk/reactos/subsys/system/cmd/time.c --- trunk/reactos/subsys/system/cmd/time.c 2005-07-07 19:54:25 UTC (rev 16497) +++ trunk/reactos/subsys/system/cmd/time.c 2005-07-07 20:41:13 UTC (rev 16498) @@ -144,6 +144,8 @@ return 0; } + nErrorLevel = 0; + /* build parameter array */ arg = split (param, &argc, FALSE); @@ -202,6 +204,7 @@ } ConErrResPuts(STRING_TIME_ERROR1); + nErrorLevel = 1; } freep (arg); _____ Modified: trunk/reactos/subsys/system/cmd/ver.c --- trunk/reactos/subsys/system/cmd/ver.c 2005-07-07 19:54:25 UTC (rev 16497) +++ trunk/reactos/subsys/system/cmd/ver.c 2005-07-07 20:41:13 UTC (rev 16498) @@ -65,6 +65,8 @@ { INT i; + nErrorLevel = 0; + if (_tcsstr (param, _T("/?")) != NULL) { ConOutResPaging(TRUE,STRING_VERSION_HELP1); _____ Modified: trunk/reactos/subsys/system/cmd/verify.c --- trunk/reactos/subsys/system/cmd/verify.c 2005-07-07 19:54:25 UTC (rev 16497) +++ trunk/reactos/subsys/system/cmd/verify.c 2005-07-07 20:41:13 UTC (rev 16498) @@ -38,6 +38,8 @@ return 0; } + nErrorLevel = 0; + if (!*param) { LoadString(CMD_ModuleHandle, STRING_VERIFY_HELP2, szMsg, RC_STRING_MAX_SIZE);

1 0

[hbirr] 16497: Fixed a bug which was introduced by r16441.
by hbirr＠svn.reactos.com 07 Jul '05

07 Jul '05

Fixed a bug which was introduced by r16441. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-07 19:51:09 UTC (rev 16496) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-07 19:54:25 UTC (rev 16497) @@ -2102,14 +2102,14 @@ } else { - for (i = Page %1024; i >= 0; i--, Pte--) + for (i = Page %1024; (LONG)i >= 0; i--, Pte--) { if (0LL == ExfInterlockedCompareExchange64UL(Pte, &Entry, &ZeroEntry)) { break; } } - if (i < 0) + if ((LONG)i < 0) { Pte = PAE_ADDR_TO_PTE(HYPERSPACE) + 1023; for (i = 1023; i > Page % 1024; i--, Pte--) @@ -2159,14 +2159,14 @@ } else { - for (i = Page % 1024; i >= 0; i--, Pte--) + for (i = Page % 1024; (LONG)i >= 0; i--, Pte--) { if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) { break; } } - if (i < 0) + if ((LONG)i < 0) { Pte = ADDR_TO_PTE(HYPERSPACE) + 1023; for (i = 1023; i > Page % 1024; i--, Pte--)

1 0

[greatlrd] 16496: set right value of %ERRORLEVEL% for vol
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

set right value of %ERRORLEVEL% for vol Modified: trunk/reactos/subsys/system/cmd/vol.c _____ Modified: trunk/reactos/subsys/system/cmd/vol.c --- trunk/reactos/subsys/system/cmd/vol.c 2005-07-07 19:26:46 UTC (rev 16495) +++ trunk/reactos/subsys/system/cmd/vol.c 2005-07-07 19:51:09 UTC (rev 16496) @@ -43,7 +43,7 @@ NULL, 0)) { - ErrorMessage (GetLastError (), _T("")); + ErrorMessage (GetLastError (), _T("")); return 1; } @@ -77,6 +77,8 @@ return 0; } + nErrorLevel = 0; + if (param[0] == _T('\0')) { GetCurrentDirectory (MAX_PATH, szPath); @@ -89,20 +91,24 @@ szRootPath[0] = param[0]; else { - error_invalid_drive (); + error_invalid_drive (); + nErrorLevel = 1; return 1; } } if (!IsValidPathName (szRootPath)) { - error_invalid_drive (); + error_invalid_drive (); + nErrorLevel = 1; return 1; } /* print the header */ if (!PrintVolumeHeader (szRootPath)) + { return 1; + } return 0; }

1 0

[greatlrd] 16495: add %CMDEXTVERSION% example to use it echo %CMDEXTVERSION% the value are hardcode to 2. for it is that value ms win2k / winxp report back. thx arty to test it in win xp.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

add %CMDEXTVERSION% example to use it echo %CMDEXTVERSION% the value are hardcode to 2. for it is that value ms win2k / winxp report back. thx arty to test it in win xp. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 19:16:46 UTC (rev 16494) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 19:26:46 UTC (rev 16495) @@ -1037,7 +1037,15 @@ cp = _stpcpy (cp, pargv); } - + /* %CMDEXTVERSION% */ + else if (_tcsicmp(ip,_T("cmdextversion")) ==0) + { + TCHAR szVER[40]; + /* Set version number to 2 */ + _itot(2,szVER,10); + cp = _stpcpy (cp, szVER); + } + /* %ERRORLEVEL% */ else if (_tcsicmp(ip,_T("errorlevel")) ==0) {

1 0

[greatlrd] 16494: adding %cmdcmdline%, example how to use it echo %CMDCMDLINE%
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

adding %cmdcmdline%, example how to use it echo %CMDCMDLINE% Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 18:44:08 UTC (rev 16493) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 19:16:46 UTC (rev 16494) @@ -1028,6 +1028,15 @@ cp = _stpcpy (cp, szRand); } + /* %CMDCMDLINE% */ + else if (_tcsicmp(ip,_T("cmdcmdline")) ==0) + { + TCHAR *pargv; + /* Get random number */ + pargv = GetCommandLine(); + cp = _stpcpy (cp, pargv); + } + /* %ERRORLEVEL% */ else if (_tcsicmp(ip,_T("errorlevel")) ==0) @@ -1493,6 +1502,7 @@ argv = CommandLineToArgvW(GetCommandLineW(), &argc); #endif #endif + SetFileApisToOEM(); InputCodePage= 0; @@ -1512,16 +1522,18 @@ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); CMD_ModuleHandle = GetModuleHandle(NULL); - + /* check switches on command-line */ Initialize(argc, argv); /* call prompt routine */ nExitCode = ProcessInput(FALSE); + /* do the cleanup */ Cleanup(argc, argv); + return(nExitCode); }

1 0

[mf] 16493: Sync to Wine:
by mf＠svn.reactos.com 07 Jul '05

07 Jul '05

Sync to Wine: - switch to UNICODE compilaton in Wine - remove separate unixcalls.c file - don't crash in set_curdir() for NULL in the 'entry' pointer Deleted: trunk/reactos/subsys/system/winefile/unixcalls.c Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Deleted: trunk/reactos/subsys/system/winefile/unixcalls.c --- trunk/reactos/subsys/system/winefile/unixcalls.c 2005-07-07 18:21:44 UTC (rev 16492) +++ trunk/reactos/subsys/system/winefile/unixcalls.c 2005-07-07 18:44:08 UTC (rev 16493) @@ -1,90 +0,0 @@ -/* - * Winefile - * - * Copyright 2004 Martin Fuchs - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifdef __WINE__ - -#include <unistd.h> -#include <string.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <dirent.h> - - -void call_getcwd(char* buffer, size_t len) -{ - getcwd(buffer, len); -} - - -#ifndef _NO_EXTENSIONS - -/* proxy functions to call UNIX readdir() */ - -void* call_opendir(const char* path) -{ - DIR* pdir = opendir(path); - - return pdir; -} - -int call_readdir(void* pdir, char* name, unsigned* inode) -{ - struct dirent* ent = readdir((DIR*)pdir); - - if (!ent) - return 0; - - strcpy(name, ent->d_name); - *inode = ent->d_ino; - - return 1; -} - -void call_closedir(void* pdir) -{ - closedir((DIR*)pdir); -} - - -/* proxy function to call UNIX stat() */ -int call_stat( - const char* path, int* pis_dir, - unsigned long* psize_low, unsigned long* psize_high, - time_t* patime, time_t* pmtime, - unsigned long* plinks -) -{ - struct stat st; - - if (stat(path, &st)) - return 1; - - *pis_dir = S_ISDIR(st.st_mode); - *psize_low = st.st_size & 0xFFFFFFFF; - *psize_high = 0; /*st.st_size >> 32;*/ - *patime = st.st_atime; - *pmtime = st.st_mtime; - - return 0; -} - -#endif /* _NO_EXTENSIONS */ - -#endif /* __WINE__ */ _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-07-07 18:21:44 UTC (rev 16492) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-07-07 18:44:08 UTC (rev 16493) @@ -21,6 +21,11 @@ #ifdef __WINE__ #include "config.h" #include "wine/port.h" + +/* for unix filesystem function calls */ +#include <sys/stat.h> +#include <sys/types.h> +#include <dirent.h> #endif #include "winefile.h" @@ -501,8 +506,9 @@ Entry* first_entry = NULL; Entry* last = NULL; Entry* entry; - void* pdir; + DIR* pdir; + int level = dir->level + 1; #ifdef UNICODE char cpath[MAX_PATH]; @@ -511,17 +517,13 @@ const char* cpath = path; #endif - pdir = call_opendir(cpath); + pdir = opendir(cpath); - int level = dir->level + 1; - if (pdir) { - char buffer[MAX_PATH]; - time_t atime, mtime; - unsigned inode; - int is_dir; + struct stat st; + struct dirent* ent; + char buffer[MAX_PATH], *p; const char* s; - char* p; for(p=buffer,s=cpath; *s; ) *p++ = *s++; @@ -529,7 +531,7 @@ if (p==buffer || p[-1]!='/') *p++ = '/'; - while(call_readdir(pdir, p, &inode)) { + while((ent=readdir(pdir))) { entry = alloc_entry(); if (!first_entry) @@ -540,28 +542,31 @@ entry->etype = ET_UNIX; + strcpy(p, ent->d_name); #ifdef UNICODE MultiByteToWideChar(CP_UNIXCP, 0, p, -1, entry->data.cFileName, MAX_PATH); #else lstrcpy(entry->data.cFileName, p); #endif - entry->data.dwFileAttributes = p[0]=='.'? FILE_ATTRIBUTE_HIDDEN: 0; + if (!stat(buffer, &st)) { + entry->data.dwFileAttributes = p[0]=='.'? FILE_ATTRIBUTE_HIDDEN: 0; - if (!call_stat(buffer, &is_dir, - &entry->data.nFileSizeLow, &entry->data.nFileSizeHigh, - &atime, &mtime, &entry->bhfi.nNumberOfLinks)) - { - if (is_dir) + if (S_ISDIR(st.st_mode)) entry->data.dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY; + entry->data.nFileSizeLow = st.st_size & 0xFFFFFFFF; + entry->data.nFileSizeHigh = st.st_size >> 32; + memset(&entry->data.ftCreationTime, 0, sizeof(FILETIME)); - time_to_filetime(&atime, &entry->data.ftLastAccessTime); - time_to_filetime(&mtime, &entry->data.ftLastWriteTime); + time_to_filetime(&st.st_atime, &entry->data.ftLastAccessTime); + time_to_filetime(&st.st_mtime, &entry->data.ftLastWriteTime); - entry->bhfi.nFileIndexLow = inode; + entry->bhfi.nFileIndexLow = ent->d_ino; entry->bhfi.nFileIndexHigh = 0; + entry->bhfi.nNumberOfLinks = st.st_nlink; + entry->bhfi_valid = TRUE; } else { entry->data.nFileSizeLow = 0; @@ -581,7 +586,7 @@ if (last) last->next = NULL; - call_closedir(pdir); + closedir(pdir); } dir->down = first_entry; @@ -2348,10 +2353,10 @@ #ifdef UNICODE - call_getcwd(cpath, MAX_PATH); + getcwd(cpath, MAX_PATH); MultiByteToWideChar(CP_UNIXCP, 0, cpath, -1, path, MAX_PATH); #else - call_getcwd(path, MAX_PATH); + getcwd(path, MAX_PATH); #endif child = alloc_child_window(path, NULL, hwnd); @@ -2717,7 +2722,7 @@ return TRUE; } -static BOOL pattern_match_ncase(LPCTSTR str, LPCTSTR pattern) +static BOOL pattern_imatch(LPCTSTR str, LPCTSTR pattern) { TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; @@ -2773,7 +2778,7 @@ /* filter using the file name pattern */ if (pattern) - if (!pattern_match_ncase(entry->data.cFileName, pattern)) + if (!pattern_imatch(entry->data.cFileName, pattern)) continue; /* filter system and hidden files */ @@ -3691,6 +3696,9 @@ { TCHAR path[MAX_PATH]; + if (!entry) + return; + path[0] = '\0'; child->left.cur = entry; _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-07-07 18:21:44 UTC (rev 16492) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-07-07 18:44:08 UTC (rev 16493) @@ -163,21 +163,6 @@ #define _stprintf sprintf #endif - -/* functions in unixcalls.c */ - -extern void call_getcwd(char* buffer, size_t len); -extern void* call_opendir(const char* path); -extern int call_readdir(void* pdir, char* name, unsigned* pinode); -extern void call_closedir(void* pdir); - -extern int call_stat( - const char* path, int* pis_dir, - unsigned long* psize_low, unsigned long* psize_high, - time_t* patime, time_t* pmtime, - unsigned long* plinks -); - #else #include <tchar.h> /* for _tsplitpath() */

1 0

[greatlrd] 16492: Did forget instate in for loop the patternX, the right way. thx GvG to spot it and tell me how to fix.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

Did forget instate in for loop the patternX, the right way. thx GvG to spot it and tell me how to fix. Modified: trunk/reactos/tools/gendib/gendib.c _____ Modified: trunk/reactos/tools/gendib/gendib.c --- trunk/reactos/tools/gendib/gendib.c 2005-07-07 18:07:40 UTC (rev 16491) +++ trunk/reactos/tools/gendib/gendib.c 2005-07-07 18:21:44 UTC (rev 16492) @@ -483,7 +483,7 @@ } if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) { - Output(Out, "PatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) %%\n"); + Output(Out, "BasePatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) %%\n"); Output(Out, " BltInfo->PatternSurface->sizlBitmap.cx;\n"); } @@ -503,6 +503,11 @@ } Output(Out, "DestPtr = (PULONG) DestBase;\n"); } + + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "PatternX = BasePatternX;\n"); + } if (ROPCODE_SRCCOPY == RopInfo->RopCode && 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) @@ -744,7 +749,7 @@ #endif if (RopInfo->UsesPattern) { - Output(Out, "ULONG PatternX, PatternY = 0;\n"); + Output(Out, "ULONG PatternX =0, PatternY = 0, BasePatternX = 0;\n"); } First = 1; if (RopInfo->UsesSource)

1 0

[mf] 16491: Jonathan Ernst <Jonathan@ErnstFamily.ch>
by mf＠svn.reactos.com 07 Jul '05

07 Jul '05

Jonathan Ernst <Jonathan(a)ErnstFamily.ch> Updated winefile French resources. Modified: trunk/reactos/subsys/system/winefile/fr.rc _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-07-07 17:54:50 UTC (rev 16490) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-07-07 18:07:40 UTC (rev 16491) @@ -6,6 +6,7 @@ * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * Copyright 2003 Sylvain Petreolle + * Copyright 2005 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -176,8 +177,90 @@ PUSHBUTTON "Pa&rcourir...", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Par type de fichier" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Name:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Type de fichier",-1,7,23,87,56 + CONTROL "&RÚpertoires",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programmes",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Autres fichiers",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Montrer les fichiers cachÚs/&systÞme",IDC_VIEW_TYPE_HIDDEN, + "Bouton",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Annuler",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "PropriÚtÚs de %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Annuler",IDCANCEL,191,29,50,14 + LTEXT "Nom du &fichier:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Chemin com&plet:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Modification:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Taille:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributs",-1,7,79,158,46 + CONTROL "Lectu&re seule",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "Cac&hÚ",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&SystÞme",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&CompressÚ",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Version Information",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Appliquer les rÚglages des fontes" IDS_FONT_SEL_ERROR "Erreur dans la sÚlection de la nouvelle fonte." } + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Erreur" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Desktop" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Pas encore implÚmentÚ" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nom" + IDS_COL_SIZE "Taille" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Liens" + IDS_COL_ATTR "Attributs" + IDS_COL_SEC "SÚcuritÚ" + + IDS_FREE_SPACE_FMT "%s sur %s libre" +}

1 0

[greatlrd] 16490: move PatternX initiate calculation out from for loop, it should have been outside of the for loop.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

move PatternX initiate calculation out from for loop, it should have been outside of the for loop. Modified: trunk/reactos/tools/gendib/gendib.c _____ Modified: trunk/reactos/tools/gendib/gendib.c --- trunk/reactos/tools/gendib/gendib.c 2005-07-07 17:09:56 UTC (rev 16489) +++ trunk/reactos/tools/gendib/gendib.c 2005-07-07 17:54:50 UTC (rev 16490) @@ -481,6 +481,12 @@ Output(Out, "CenterCount = 2 * (BltInfo->DestRect.right -\n"); Output(Out, " BltInfo->DestRect.left);\n"); } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "PatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) %%\n"); + Output(Out, " BltInfo->PatternSurface->sizlBitmap.cx;\n"); + } + Output(Out, "for (LineIndex = 0; LineIndex < LineCount; LineIndex++)\n"); Output(Out, "{\n"); if (ROPCODE_SRCCOPY != RopInfo->RopCode || @@ -497,11 +503,7 @@ } Output(Out, "DestPtr = (PULONG) DestBase;\n"); } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - Output(Out, "PatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) %%\n"); - Output(Out, " BltInfo->PatternSurface->sizlBitmap.cx;\n"); - } + if (ROPCODE_SRCCOPY == RopInfo->RopCode && 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) {

1 0

[greatlrd] 16489: adding %RANDOM% example how to use it echo %random%
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

adding %RANDOM% example how to use it echo %random% Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/precomp.h _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 16:45:42 UTC (rev 16488) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 17:09:56 UTC (rev 16489) @@ -1006,7 +1006,8 @@ GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, szTime, sizeof(szTime)); cp = _stpcpy (cp, szTime); } - + + /* %DATE% */ else if (_tcsicmp(ip,_T("date")) ==0) { TCHAR szDate[40]; @@ -1015,9 +1016,16 @@ cp = _stpcpy (cp, szDate); cp = _stpcpy (cp, _T(" ")); GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDate, sizeof (szDate)); - cp = _stpcpy (cp, szDate); + } + /* %RANDOM% */ + else if (_tcsicmp(ip,_T("random")) ==0) + { + TCHAR szRand[40]; + /* Get random number */ + _itot(rand(),szRand,10); + cp = _stpcpy (cp, szRand); } _____ Modified: trunk/reactos/subsys/system/cmd/precomp.h --- trunk/reactos/subsys/system/cmd/precomp.h 2005-07-07 16:45:42 UTC (rev 16488) +++ trunk/reactos/subsys/system/cmd/precomp.h 2005-07-07 17:09:56 UTC (rev 16489) @@ -10,6 +10,7 @@ #include <stdlib.h> #include <stdarg.h> #include <math.h> +#include <time.h> #include "cmd.h" #include "config.h"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs