Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[greatlrd] 16561: Brandon Turner turnerb7@msu.edu Rewrite to clean up copy and support wildcard. and alot of other small bugfix, like does not crash when a file does not exists.

by greatlrd＠svn.reactos.com

Brandon Turner turnerb7(a)msu.edu Rewrite to clean up copy and support wildcard. and alot of other small bugfix, like does not crash when a file does not exists. Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-14 00:27:53 UTC (rev 16560) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-14 14:51:35 UTC (rev 16561) @@ -22,321 +22,32 @@ * * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) * Remove all hardcode string to En.rc + * + * 13-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) + * Rewrite to clean up copy and support wildcard. */ - + #include <precomp.h> #include "resource.h" - + #ifdef INCLUDE_CMD_COPY - - -#define VERIFY 1 /* VERIFY Switch */ -#define BINARY 2 /* File is to be copied as BINARY */ -#define ASCII 4 /* File is to be copied as ASCII */ -#define PROMPT 8 /* Prompt before overwriting files */ -#define NPROMPT 16 /* Do not prompt before overwriting files */ -#define HELP 32 /* Help was asked for */ -#define SOURCE 128 /* File is a source */ - - -typedef struct tagFILES + +enum { - struct tagFILES *next; - TCHAR szFile[MAX_PATH]; - DWORD dwFlag; /* BINARY -xor- ASCII */ -} FILES, *LPFILES; - - -static BOOL DoSwitches (LPTSTR, LPDWORD); -static BOOL AddFile (LPFILES, TCHAR *, int *, int *, LPDWORD); -static BOOL AddFiles (LPFILES, TCHAR *, int *, int *, int *, LPDWORD); -static BOOL GetDestination (LPFILES, LPFILES); -static INT ParseCommand (LPFILES, int, TCHAR **, LPDWORD); -static VOID DeleteFileList (LPFILES); -static INT Overwrite (LPTSTR); - - -static BOOL -DoSwitches (LPTSTR arg, LPDWORD lpdwFlags) -{ - if (!_tcsicmp (arg, _T("/-Y"))) - { - *lpdwFlags |= PROMPT; - *lpdwFlags &= ~NPROMPT; - return TRUE; - } - else if (_tcslen (arg) > 2) - { - error_too_many_parameters (_T("")); - return FALSE; - } - - switch (_totupper (arg[1])) - { - case _T('V'): - *lpdwFlags |= VERIFY; - break; - - case _T('A'): - *lpdwFlags |= ASCII; - *lpdwFlags &= ~BINARY; - break; - - case _T('B'): - *lpdwFlags |= BINARY; - *lpdwFlags &= ~ASCII; - break; - - case _T('Y'): - *lpdwFlags &= ~PROMPT; - *lpdwFlags |= NPROMPT; - break; - - default: - error_invalid_switch (arg[1]); - return FALSE; - } - return TRUE; -} - - -static BOOL -AddFile (LPFILES f, TCHAR *arg, int *source, int *dest, LPDWORD flags) -{ - if (*dest) - { - error_too_many_parameters (_T("")); - return FALSE; - } - if (*source) - { - *dest = 1; - f->dwFlag = 0; - } - else - { - *source = 1; - f->dwFlag = SOURCE; - } - _tcscpy(f->szFile, arg); - f->dwFlag |= *flags & ASCII ? ASCII : BINARY; - if ((f->next = (LPFILES)malloc (sizeof (FILES))) == NULL) - { - error_out_of_memory (); - return FALSE; - } - f = f->next; - f->dwFlag = 0; - f->next = NULL; - return TRUE; -} - - -static BOOL -AddFiles (LPFILES f, TCHAR *arg, int *source, int *dest, - int *count, LPDWORD flags) -{ - TCHAR t[128]; - int j; - int k; - - if (*dest) - { - error_too_many_parameters (_T("")); - return FALSE; - } - - j = 0; - k = 0; - - while (arg[j] == _T('+')) - j++; - - while (arg[j] != _T('\0')) - { - t[k] = arg[j++]; - if (t[k] == '+' || arg[j] == _T('\0')) - { - if (!k) - continue; - if (arg[j] == _T('\0') && t[k] != _T('+')) - k++; - t[k] = _T('\0'); - *count += 1; - _tcscpy (f->szFile, t); - *source = 1; - if (*flags & ASCII) - f->dwFlag |= *flags | SOURCE | ASCII; - else - f->dwFlag |= *flags | BINARY | SOURCE; - - if ((f->next = (LPFILES)malloc (sizeof (FILES))) == NULL) - { - error_out_of_memory (); - return FALSE; - } - f = f->next; - f->next = NULL; - k = 0; - f->dwFlag = 0; - continue; - } - k++; - } - - if (arg[--j] == _T('+')) - *source = 0; - - return 1; -} - - -static BOOL -GetDestination (LPFILES f, LPFILES dest) -{ - LPFILES p = NULL; - LPFILES start = f; - - while (f->next != NULL) - { - p = f; - f = f->next; - } - - f = p; - - if ((f->dwFlag & SOURCE) == 0) - { - free (p->next); - p->next = NULL; - _tcscpy (dest->szFile, f->szFile); - dest->dwFlag = f->dwFlag; - dest->next = NULL; - f = start; - return TRUE; - } - - return FALSE; -} - - -static INT -ParseCommand (LPFILES f, int argc, TCHAR **arg, LPDWORD lpdwFlags) -{ - INT i; - INT dest; - INT source; - INT count; - TCHAR temp[128]; - dest = 0; - source = 0; - count = 0; - - - - /* hack geting pipe 1>null working */ - for (i = 0; i < argc; i++) - { - if (arg[i][0] != _T('/')) - count++; - } - if (count==3) argc=2; - /* end hack */ - - - - for (i = 0; i < argc; i++) - { - - if (arg[i][0] == _T('/')) - { - if (!DoSwitches (arg[i], lpdwFlags)) - return -1; - } - else - { - if (!_tcscmp(arg[i], _T("+"))) - source = 0; - else if (!_tcschr(arg[i], _T('+')) && source) - { - -// Make sure we have a clean workable path - - GetFullPathName( arg[i], 128, (LPTSTR) &temp, NULL); -// printf("A Input %s, Output %s\n", arg[i], temp); - - if (!AddFile(f, (TCHAR *) &temp, &source, &dest, lpdwFlags)) - return -1; - f = f->next; - count++; - } - else - { - - GetFullPathName( arg[i], 128, (LPTSTR) &temp, NULL); -// printf("B Input %s, Output %s\n", arg[i], temp); - - if (!AddFiles(f, (TCHAR *) &temp, &source, &dest, &count, lpdwFlags)) - return -1; - while (f->next != NULL) - f = f->next; - } - } - } - -#ifdef _DEBUG - DebugPrintf (_T("ParseCommand: flags has %s\n"), - *lpdwFlags & ASCII ? _T("ASCII") : _T("BINARY")); -#endif - return count; -} - - -static VOID -DeleteFileList (LPFILES f) -{ - LPFILES temp; - - while (f != NULL) - { - temp = f; - f = f->next; - free (temp); - } -} - - -static INT -Overwrite (LPTSTR fn) -{ - TCHAR inp[10]; - LPTSTR p; - TCHAR szOptions[4]; - - LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szOptions, sizeof(szOptions) / sizeof(szOptions[0]) ); - - ConOutResPuts(STRING_COPY_HELP1); - - ConInString(inp, 10); - ConOutPuts(_T("")); - - _tcsupr (inp); - for (p = inp; _istspace (*p); p++) - ; - - if (*p != szOptions[0] && *p != szOptions[2]) - return 0; - if (*p == szOptions[2]) - return 2; - - return 1; -} - - + COPY_ASCII = 0x001, /* /A */ + COPY_DECRYPT = 0x004, /* /D : Not Impleneted */ + COPY_VERIFY = 0x008, /* /V : Dummy, Never will be Impleneted */ + COPY_SHORTNAME = 0x010, /* /N : Not Impleneted */ + COPY_NO_PROMPT = 0x020, /* /Y */ + COPY_PROMPT = 0x040, /* /-Y */ + COPY_RESTART = 0x080, /* /Z : Not Impleneted */ + COPY_BINARY = 0x100, /* /B */ +}; + #define BUFF_SIZE 16384 /* 16k = max buffer size */ - - -int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags) + + +int copy (LPTSTR source, LPTSTR dest, int append, DWORD lpdwFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; FILETIME srctime; @@ -348,33 +59,33 @@ DWORD dwWritten; DWORD i; BOOL bEof = FALSE; - + #ifdef _DEBUG DebugPrintf (_T("checking mode\n")); #endif - + dwAttrib = GetFileAttributes (source); - + hFileSrc = CreateFile (source, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); + NULL, OPEN_EXISTING, 0, NULL); if (hFileSrc == INVALID_HANDLE_VALUE) { LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, source); + ConOutPrintf(szMsg, source); return 0; } - + #ifdef _DEBUG DebugPrintf (_T("getting time\n")); #endif - + GetFileTime (hFileSrc, &srctime, NULL, NULL); - + #ifdef _DEBUG DebugPrintf (_T("copy: flags has %s\n"), - *lpdwFlags & ASCII ? "ASCII" : "BINARY"); + *lpdwFlags & ASCII ? "ASCII" : "BINARY"); #endif - + if (!IsExistingFile (dest)) { #ifdef _DEBUG @@ -388,50 +99,53 @@ if (!_tcscmp (dest, source)) { LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, source); - + ConOutPrintf(szMsg, source); + CloseHandle (hFileSrc); return 0; } - + #ifdef _DEBUG DebugPrintf (_T("SetFileAttributes (%s, FILE_ATTRIBUTE_NORMAL);\n"), dest); #endif SetFileAttributes (dest, FILE_ATTRIBUTE_NORMAL); - + #ifdef _DEBUG DebugPrintf (_T("DeleteFile (%s);\n"), dest); #endif DeleteFile (dest); - - hFileDest = - CreateFile (dest, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + + hFileDest = CreateFile (dest, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); } else { LONG lFilePosHigh = 0; - + if (!_tcscmp (dest, source)) { CloseHandle (hFileSrc); return 0; } - + #ifdef _DEBUG DebugPrintf (_T("opening/appending\n")); #endif + SetFileAttributes (dest, FILE_ATTRIBUTE_NORMAL); + hFileDest = CreateFile (dest, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + + /* Move to end of file to start writing */ SetFilePointer (hFileDest, 0, &lFilePosHigh,FILE_END); } - - if (hFileDest == INVALID_HANDLE_VALUE) + + + if (hFileDest == INVALID_HANDLE_VALUE) { CloseHandle (hFileSrc); error_path_not_found (); return 0; } - buffer = (LPBYTE)malloc (BUFF_SIZE); if (buffer == NULL) { @@ -440,11 +154,11 @@ error_out_of_memory (); return 0; } - + do { ReadFile (hFileSrc, buffer, BUFF_SIZE, &dwRead, NULL); - if (*lpdwFlags & ASCII) + if (lpdwFlags & COPY_ASCII) { for (i = 0; i < dwRead; i++) { @@ -456,15 +170,15 @@ } dwRead = i; } - + if (dwRead == 0) break; - + WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL); if (dwWritten != dwRead) { - ConErrResPuts(STRING_COPY_ERROR3); - + ConOutResPuts(STRING_COPY_ERROR3); + free (buffer); CloseHandle (hFileDest); CloseHandle (hFileSrc); @@ -472,13 +186,13 @@ } } while (dwRead && !bEof); - + #ifdef _DEBUG DebugPrintf (_T("setting time\n")); #endif SetFileTime (hFileDest, &srctime, NULL, NULL); - - if (*lpdwFlags & ASCII) + + if (lpdwFlags & COPY_ASCII) { ((LPTSTR)buffer)[0] = 0x1A; ((LPTSTR)buffer)[1] = _T('\0'); @@ -487,298 +201,448 @@ #endif WriteFile (hFileDest, buffer, sizeof(TCHAR), &dwWritten, NULL); } - + free (buffer); CloseHandle (hFileDest); CloseHandle (hFileSrc); - + #ifdef _DEBUG DebugPrintf (_T("setting mode\n")); #endif SetFileAttributes (dest, dwAttrib); - + return 1; } - - -static INT -SetupCopy (LPFILES sources, TCHAR **p, BOOL bMultiple, - TCHAR *drive_d, TCHAR *dir_d, TCHAR *file_d, - TCHAR *ext_d, int *append, LPDWORD lpdwFlags) + + +static INT Overwrite (LPTSTR fn) { - WIN32_FIND_DATA find; - TCHAR drive_s[_MAX_DRIVE]; - TCHAR dir_s[_MAX_DIR]; - TCHAR file_s[_MAX_FNAME]; - TCHAR ext_s[_MAX_EXT]; - TCHAR from_merge[_MAX_PATH]; - - LPTSTR real_source; - LPTSTR real_dest; - - INT nCopied = 0; - BOOL bAll = FALSE; - BOOL bDone; - HANDLE hFind; - TCHAR temp[128]; - -#ifdef _DEBUG - DebugPrintf (_T("SetupCopy\n")); -#endif - - real_source = (LPTSTR)malloc (MAX_PATH * sizeof(TCHAR)); - real_dest = (LPTSTR)malloc (MAX_PATH * sizeof(TCHAR)); - - if (!real_source || !real_dest) + /*ask the user if they want to override*/ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + INT res; + LoadString(CMD_ModuleHandle, STRING_COPY_HELP1, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg,fn); + res = FilePromptYNA (""); + return res; +} + + +INT cmd_copy (LPTSTR cmd, LPTSTR param) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LPTSTR *arg; + INT argc, i, nFiles, nOverwrite = 0, nSrc = -1, nDes = -1; + /* this is the path up to the folder of the src and dest ie C:\windows\ */ + TCHAR szDestPath[MAX_PATH]; + TCHAR szSrcPath[MAX_PATH]; + DWORD dwFlags = 0; + /* If this is the type of copy where we are adding files */ + BOOL bAppend = FALSE; + WIN32_FIND_DATA findBuffer; + HANDLE hFile; + /* Used when something like "copy c*.exe d*.exe" during the process of + figuring out the new name */ + TCHAR tmpName[MAX_PATH] = _T(""); + /* Pointer to keep track of how far through the append input(file1+file2+file3) we are */ + TCHAR * appendPointer = _T("\0"); + /* The full path to src and dest. This has drive letter, folders, and filename */ + TCHAR tmpDestPath[MAX_PATH]; + TCHAR tmpSrcPath[MAX_PATH]; + /* A bool on weather or not the destination name will be taking from the input */ + BOOL bSrcName = FALSE; + /* Seems like a waste but it is a pointer used to copy from input to PreserveName */ + TCHAR * UseThisName; + /* Stores the name( i.e. blah.txt or blah*.txt) which later we might need */ + TCHAR PreserveName[MAX_PATH]; + + /*Show help/usage info*/ + if (!_tcsncmp (param, _T("/?"), 2)) { - error_out_of_memory (); - DeleteFileList (sources); - free (real_source); - free (real_dest); - freep (p); + ConOutResPaging(TRUE, STRING_COPY_HELP2); return 0; } - - while (sources->next != NULL) + + /*Split the user input into array*/ + arg = split (param, &argc, FALSE); + nFiles = argc; + + /*Read switches and count files*/ + for (i = 0; i < argc; i++) { - -/* Force a clean full path -*/ - GetFullPathName( sources->szFile, 128, (LPTSTR) &temp, NULL); - if (IsExistingDirectory(temp)) + if (*arg[i] == _T('/')) { - _tcscat(temp, _T("\\*")); - } - - _tsplitpath (temp, drive_s, dir_s, file_s, ext_s); - - hFind = FindFirstFile ((TCHAR*)&temp, &find); - if (hFind == INVALID_HANDLE_VALUE) - { - error_file_not_found(); - freep(p); - free(real_source); - free(real_dest); - return 0; - } - - do - { - if (find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - goto next; - - _tmakepath(from_merge, drive_d, dir_d, file_d, ext_d); - - if (from_merge[_tcslen(from_merge) - 1] == _T('\\')) - from_merge[_tcslen(from_merge) - 1] = 0; - -// printf("Merge %s, filename %s\n", from_merge, find.cFileName); - - if (IsExistingDirectory (from_merge)) + if (_tcslen(arg[i]) >= 2) { - -// printf("Merge DIR\n"); - - bMultiple = FALSE; - _tcscat (from_merge, _T("\\")); - _tcscat (from_merge, find.cFileName); - } - else - bMultiple = TRUE; - - _tcscpy (real_dest, from_merge); - _tmakepath (real_source, drive_s, dir_s, find.cFileName, NULL); - -#ifdef _DEBUG - DebugPrintf(_T("copying %S -> %S (%Sappending%S)\n"), - real_source, real_dest, - *append ? _T("") : _T("not "), - sources->dwFlag & ASCII ? _T(", ASCII") : _T(", BINARY")); -#endif - - if (IsExistingFile (real_dest) && !bAll) - { - /* Don't prompt in a batch file */ - if (bc != NULL) + switch (_totupper(arg[i][1])) { - bAll = TRUE; + + case _T('A'): + dwFlags |= COPY_ASCII; + break; + + case _T('B'): + dwFlags |= COPY_DECRYPT; + break; + + case _T('D'): + dwFlags |= COPY_DECRYPT; + break; + + case _T('V'): + dwFlags |= COPY_VERIFY; + break; + + case _T('N'): + dwFlags |= COPY_SHORTNAME; + break; + + case _T('Y'): + dwFlags |= COPY_NO_PROMPT; + dwFlags &= ~COPY_PROMPT; + break; + + case _T('-'): + if(_tcslen(arg[i]) >= 3) + if(_totupper(arg[i][2]) == _T('Y')) + { + dwFlags &= ~COPY_NO_PROMPT; + dwFlags |= COPY_PROMPT; + } + + break; + + case _T('Z'): + dwFlags |= COPY_RESTART; + break; + + default: + /* invaild switch */ + error_invalid_switch(_totupper(arg[i][1])); + return 1; + break; } - else - { - int over; - - over = Overwrite (real_dest); - if (over == 2) - bAll = TRUE; - else if (over == 0) - goto next; - else if (bMultiple) - bAll = TRUE; - } } - if (copy (real_source, real_dest, *append, lpdwFlags)) - nCopied++; - next: - bDone = FindNextFile (hFind, &find); - - if (bMultiple) - *append = 1; + /*If it was a switch, subtract from total arguments*/ + nFiles--; } - while (bDone); - - FindClose (hFind); - sources = sources->next; - + else + { + /*if it isnt a switch then it is the source or destination*/ + if(nSrc == -1) + nSrc = i; + else if(nDes == -1) + nDes = i; + + } } - free (real_source); - free (real_dest); - - return nCopied; -} - - -INT cmd_copy (LPTSTR first, LPTSTR rest) -{ - TCHAR **p; - TCHAR drive_d[_MAX_DRIVE]; - TCHAR dir_d[_MAX_DIR]; - TCHAR file_d[_MAX_FNAME]; - TCHAR ext_d[_MAX_EXT]; - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - int argc; - int append; - int files; - int copied; - - LPFILES sources = NULL; - LPFILES start = NULL; - FILES dest; - BOOL bMultiple; - BOOL bWildcards; - BOOL bDestFound; - DWORD dwFlags = 0; - - if (!_tcsncmp (rest, _T("/?"), 2)) + + if(nFiles < 1) { - ConOutResPaging(TRUE,STRING_COPY_HELP2); + /* There is not enough files, there has to be at least 1 */ + error_req_param_missing(); return 1; } - - p = split (rest, &argc, FALSE); - - if (argc == 0) + + if(nFiles > 2) { - error_req_param_missing (); - return 0; + /* there is too many file names in command */ + error_too_many_parameters(""); + return 1; } - - sources = (LPFILES)malloc (sizeof (FILES)); - if (!sources) + + if((nDes != -1) && + ((_tcschr (arg[nSrc], _T('+')) != NULL) || + (_tcschr (arg[nSrc], _T('*')) != NULL && _tcschr (arg[nDes], _T('*')) == NULL) || + (IsExistingDirectory (arg[nSrc]) && (_tcschr (arg[nDes], _T('*')) == NULL && !IsExistingDirectory (arg[nDes]))) + )) { - error_out_of_memory (); - return 0; + /* There is a + in the source filename, this means + that there is more then one file being put into + one file. */ + bAppend = TRUE; + if(_tcschr (arg[nSrc], _T('+')) != NULL) + appendPointer = arg[nSrc]; } - sources->next = NULL; - sources->dwFlag = 0; - - if ((files = ParseCommand (sources, argc, p, &dwFlags)) == -1) + + /* Reusing the number of files variable */ + nFiles = 0; + + do { - DeleteFileList (sources); - freep (p); - return 0; + + /* Set up the string that is the path to the destination */ + if(nDes != -1) + { + /* Check to make sure if they entered c:, if they do then GFPN + return current directory even though msdn says it will return c:\ */ + if(_tcslen(arg[nDes]) == 2) + { + if(arg[nDes][1] == _T(':')) + { + _tcscpy (szDestPath, arg[nDes]); + _tcscat (szDestPath, _T("\\")); + } + } + else + /* If the user entered two file names then form the full string path*/ + GetFullPathName (arg[nDes], MAX_PATH, szDestPath, NULL); + } - else if (files == 0) + else { - error_req_param_missing(); - DeleteFileList (sources); - freep (p); - return 0; + /* If no destination was entered then just use + the current directory as the destination */ + GetCurrentDirectory (MAX_PATH, szDestPath); } - start = sources; - - bDestFound = GetDestination (sources, &dest); - if (bDestFound) + + + /* Get the full string of the path to the source file*/ + if(_tcschr (arg[nSrc], _T('+')) != NULL) { - _tsplitpath (dest.szFile, drive_d, dir_d, file_d, ext_d); - if (IsExistingDirectory (dest.szFile)) + + _tcscpy(tmpName,_T("\0")); + /* Loop through the source file name and copy all + the chars one at a time until it gets too + */ + while(TRUE) { -// printf("A szFile= %s, Dir = %s, File = %s, Ext = %s\n", dest.szFile, dir_d, file_d, ext_d); - _tcscat (dir_d, file_d); - _tcscat (dir_d, ext_d); - file_d[0] = _T('\0'); - ext_d[0] = _T('\0'); + + if(!_tcsncmp (appendPointer,_T("+"),1) || !_tcsncmp (appendPointer,_T("\0"),1)) + { + /* Now that the pointer is on the + we + need to go to the start of the next filename */ + if(!_tcsncmp (appendPointer,_T("+"),1)) + appendPointer++; + break; + } + _tcsncat(tmpName,appendPointer,1); + appendPointer++; } + /* Finish the string off with a null char */ + _tcsncat(tmpName,_T("\0"),1); + /* Check to make sure if they entered c:, if they do then GFPN + return current directory even though msdn says it will return c:\ */ + if(_tcslen(tmpName) == 2) + { + if(tmpName[1] == _T(':')) + { + _tcscpy (szSrcPath, tmpName); + _tcscat (szSrcPath, _T("\\")); + } + } + else + /* Get the full path to first file in the string of file names */ + GetFullPathName (tmpName, MAX_PATH, szSrcPath, NULL); } - - if (_tcschr (dest.szFile, _T('*')) || _tcschr (dest.szFile, _T('?'))) - bWildcards = TRUE; else - bWildcards = FALSE; - - if (_tcschr(rest, _T('+'))) - bMultiple = TRUE; - else - bMultiple = FALSE; - - append = 0; - copied = 0; - - if (bDestFound && !bWildcards) { - -// _tcscpy(sources->szFile, dest.szFile); - - copied = SetupCopy (sources, p, bMultiple, drive_d, dir_d, file_d, ext_d, &append, &dwFlags); + /* Check to make sure if they entered c:, if they do then GFPN + return current directory even though msdn says it will return c:\ */ + if(_tcslen(arg[nSrc]) == 2) + { + if(arg[nSrc][1] == _T(':')) + { + _tcscpy (szSrcPath, arg[nSrc]); + _tcscat (szSrcPath, _T("\\")); + } + } + else + /* Get the full path of the source file */ + GetFullPathName (arg[nSrc], MAX_PATH, szSrcPath, NULL); + } - else if (bDestFound && bWildcards) + + /* From this point on, we can assume that the shortest path is 3 letters long + and that would be [DriveLetter]:\ */ + + /* If there is no * in the path name and it is a folder + then we will need to add a wildcard to the pathname + so FindFirstFile comes up with all the files in that + folder */ + if(_tcschr (szSrcPath, _T('*')) == NULL && + IsExistingDirectory (szSrcPath)) { - ConErrResPuts(STRING_COPY_ERROR4); - - DeleteFileList (sources); - freep (p); - return 0; + /* If it doesnt have a \ at the end already then on needs to be added */ + if(szSrcPath[_tcslen(szSrcPath) - 1] != _T('\\')) + _tcscat (szSrcPath, _T("\\")); + /* Add a wildcard after the \ */ + _tcscat (szSrcPath, _T("*")); } - else if (!bDestFound && !bMultiple) + /* Make sure there is an ending slash to the path if the dest is a folder */ + if(_tcschr (szDestPath, _T('*')) == NULL && + IsExistingDirectory(szDestPath)) { - _tsplitpath (sources->szFile, drive_d, dir_d, file_d, ext_d); - if (IsExistingDirectory (sources->szFile)) - { -// printf("B File = %s, Ext = %s\n", file_d, ext_d); - - _tcscat (dir_d, file_d); - _tcscat (dir_d, ext_d); [truncated at 1000 lines; 203 more skipped]

19 years, 6 months

[jimtabor] 16560: Typo fix. I was thinking oct not dec.

by jimtabor＠svn.reactos.com

Typo fix. I was thinking oct not dec. Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-13 23:22:20 UTC (rev 16559) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-14 00:27:53 UTC (rev 16560) @@ -1153,7 +1153,7 @@ 0x01 Shift key 0x02 Ctrl key 0x04 Alt key - Should have only 7 valid possibilities. + Should have only 8 valid possibilities. Including zero. */ for(CapsState = 0; CapsState < vtwTbl->nModifications; CapsState++) {

19 years, 6 months

[jimtabor] 16559: Implemented VkKeyScan, GetKeyboardTypeand, GetKeyboardLayout and some Wine ports.

by jimtabor＠svn.reactos.com

Implemented VkKeyScan, GetKeyboardTypeand, GetKeyboardLayout and some Wine ports. Modified: trunk/reactos/lib/user32/windows/input.c _____ Modified: trunk/reactos/lib/user32/windows/input.c --- trunk/reactos/lib/user32/windows/input.c 2005-07-13 23:19:59 UTC (rev 16558) +++ trunk/reactos/lib/user32/windows/input.c 2005-07-13 23:22:20 UTC (rev 16559) @@ -162,24 +162,22 @@ /* - * @unimplemented + * @implemented */ HKL STDCALL GetKeyboardLayout(DWORD idThread) { - UNIMPLEMENTED; - return (HKL)0; + return (HKL)NtUserCallOneParam((DWORD) idThread, ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT); } /* - * @unimplemented + * @implemented */ UINT STDCALL GetKBCodePage(VOID) { - UNIMPLEMENTED; - return 0; + return GetOEMCP(); } @@ -246,12 +244,15 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GetKeyboardLayoutNameA(LPSTR pwszKLID) { - UNIMPLEMENTED; + WCHAR buf[KL_NAMELENGTH]; + + if (GetKeyboardLayoutNameW(buf)) + return WideCharToMultiByte( CP_ACP, 0, buf, -1, pwszKLID, KL_NAMELENGTH, NULL, NULL ) != 0; return FALSE; } @@ -268,7 +269,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GetKeyboardState(PBYTE lpKeyState) @@ -279,13 +280,12 @@ /* - * @unimplemented + * @implemented */ int STDCALL GetKeyboardType(int nTypeFlag) { - UNIMPLEMENTED; - return 0; +return (int)NtUserCallOneParam((DWORD) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE); } @@ -301,14 +301,22 @@ /* - * @unimplemented + * @implemented */ HKL STDCALL LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags) { - UNIMPLEMENTED; - return (HKL)0; + HKL ret; + UNICODE_STRING pwszKLIDW; + + if (pwszKLID) RtlCreateUnicodeStringFromAsciiz(&pwszKLIDW, pwszKLID); + else pwszKLIDW.Buffer = NULL; + + ret = LoadKeyboardLayoutW(pwszKLIDW.Buffer, Flags); + RtlFreeUnicodeString(&pwszKLIDW); + return ret; + } @@ -371,13 +379,24 @@ /* - * @unimplemented - */ + * @implemented + */ DWORD STDCALL OemKeyScan(WORD wOemChar) { - UNIMPLEMENTED; - return 0; + WCHAR p; + SHORT Vk; + UINT Scan; + + MultiByteToWideChar(CP_OEMCP, 0, (PCSTR)&wOemChar, 1, &p, 1); + Vk = VkKeyScanW(p); + Scan = MapVirtualKeyW((Vk & 0x00ff), 0); + if(!Scan) return -1; + /* + Page 450-1, MS W2k SuperBible by SAMS. Return, low word has the + scan code and high word has the shift state. + */ + return ((Vk & 0xff00) << 8) | Scan; } @@ -411,7 +430,7 @@ /* - * @unimplemented + * @implemented */ HWND STDCALL SetFocus(HWND hWnd) @@ -421,7 +440,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL SetKeyboardState(LPBYTE lpKeyState) @@ -495,7 +514,7 @@ /* - * @unimplemented + * @implemented */ int STDCALL ToUnicodeEx(UINT wVirtKey, @@ -565,14 +584,13 @@ /* - * @unimplemented + * @implemented */ SHORT STDCALL VkKeyScanExW(WCHAR ch, HKL dwhkl) { - UNIMPLEMENTED; - return -1; + return (SHORT) NtUserVkKeyScanEx((DWORD) ch,(DWORD) dwhkl,(DWORD)NULL); } @@ -850,7 +868,8 @@ pos.y = 0; SetRectEmpty(&client); - DPRINT("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); + DbgPrint("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); + UNIMPLEMENTED; if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { DPRINT("wrong TRACKMOUSEEVENT size from app\n");

19 years, 6 months

[jimtabor] 16558: Implemented VkKeyScan, GetKeyboardTypeand GetKeyboardLayout.

by jimtabor＠svn.reactos.com

Implemented VkKeyScan, GetKeyboardTypeand GetKeyboardLayout. Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-13 17:59:37 UTC (rev 16557) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-13 23:19:59 UTC (rev 16558) @@ -1050,4 +1050,126 @@ IntUnLockQueueState; } + +DWORD +STDCALL +NtUserGetKeyboardLayoutList( + DWORD Items, + DWORD pHklBuff) +{ + UNIMPLEMENTED + + return 0; +} + +DWORD +STDCALL +NtUserGetKeyboardLayoutName( + DWORD lpszName) +{ + UNIMPLEMENTED + + return 0; +} + +HKL +STDCALL +NtUserGetKeyboardLayout( + DWORD dwThreadId) +{ + NTSTATUS Status; + PETHREAD Thread; + PW32THREAD W32Thread; + PKBDTABLES layout; + + if (!dwThreadId) + W32Thread = PsGetWin32Thread(); + else + { + Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); + if(!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + W32Thread = Thread->Tcb.Win32Thread; + } + layout = W32Thread->KeyboardLayout; + if(!layout) return 0; + return (HKL)layout; +} + + +DWORD +STDCALL +NtUserGetKeyboardType( + DWORD TypeFlag) +{ + switch(TypeFlag) + { + case 0: /* Keyboard type */ + return 4; /* AT-101 */ + case 1: /* Keyboard Subtype */ + return 0; /* There are no defined subtypes */ + case 2: /* Number of F-keys */ + return 12; /* We're doing an 101 for now, so return 12 F-keys */ + default: + DPRINT1("Unknown type!\n"); + return 0; /* The book says 0 here, so 0 */ + } +} + + +/* + Based on TryToTranslateChar, instead of processing VirtualKey match, + look for wChar match. + */ +DWORD +STDCALL +NtUserVkKeyScanEx( + DWORD wChar, + DWORD KeyboardLayout, + DWORD Unknown2) +{ + PKBDTABLES KeyLayout; + PVK_TO_WCHAR_TABLE vtwTbl; + PVK_TO_WCHARS10 vkPtr; + size_t size_this_entry; + int nMod; + DWORD CapsMod = 0, CapsState = 0; + + if(!KeyboardLayout) return -1; + KeyLayout = (PKBDTABLES) KeyboardLayout; + + for (nMod = 0; KeyLayout->pVkToWcharTable[nMod].nModifications; nMod++) + { + vtwTbl = &KeyLayout->pVkToWcharTable[nMod]; + size_this_entry = vtwTbl->cbSize; + vkPtr = (PVK_TO_WCHARS10)((BYTE *)vtwTbl->pVkToWchars); + + while(vkPtr->VirtualKey) + { + /* + 0x01 Shift key + 0x02 Ctrl key + 0x04 Alt key + Should have only 7 valid possibilities. + */ + for(CapsState = 0; CapsState < vtwTbl->nModifications; CapsState++) + { + if(vkPtr->wch[CapsState] == wChar) + { + CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState]; + DPRINT("nMod %d Vk %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n", + nMod, wVirtKey, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits); + return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff)); + } + } + vkPtr = (PVK_TO_WCHARS10)(((BYTE *)vkPtr) + size_this_entry); + } + } + return -1; +} + + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-13 17:59:37 UTC (rev 16557) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-13 23:19:59 UTC (rev 16558) @@ -341,6 +341,12 @@ case ONEPARAM_ROUTINE_MSQSETWAKEMASK: return (DWORD)IntMsqSetWakeMask(Param); + + case ONEPARAM_ROUTINE_GETKEYBOARDTYPE: + return NtUserGetKeyboardType(Param); + + case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT: + return (DWORD)NtUserGetKeyboardLayout(Param); } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param); _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-07-13 17:59:37 UTC (rev 16557) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-07-13 23:19:59 UTC (rev 16558) @@ -344,29 +344,9 @@ return 0; } -DWORD -STDCALL -NtUserGetKeyboardLayoutList( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - return 0; -} - DWORD STDCALL -NtUserGetKeyboardLayoutName( - DWORD Unknown0) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserGetListBoxInfo( DWORD Unknown0) { @@ -703,18 +683,6 @@ DWORD STDCALL -NtUserVkKeyScanEx( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserWaitForInputIdle( DWORD Unknown0, DWORD Unknown1,

19 years, 6 months

[hbirr] 16557: Fixed the allocation of the buffer for the environment variable in ProcessInput.

by hbirr＠svn.reactos.com

Fixed the allocation of the buffer for the environment variable in ProcessInput. 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-13 17:32:39 UTC (rev 16556) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-13 17:59:37 UTC (rev 16557) @@ -1061,18 +1061,19 @@ } else { - evar = malloc ( size * sizeof(TCHAR)); + evar = malloc ( 512 * sizeof(TCHAR)); if (evar==NULL) return 1; - size = GetEnvironmentVariable (ip, evar, size); - if (size!=0) + size = GetEnvironmentVariable (ip, evar, 512); + if (size > 512) { evar = realloc(evar,size * sizeof(TCHAR) ); - if (evar!=NULL) + if (evar==NULL) { - size = GetEnvironmentVariable (ip, evar, size); + return 1; } + size = GetEnvironmentVariable (ip, evar, size); } if (size)

19 years, 6 months

[hbirr] 16556: Fixed a bug in IsConsoleHandle which was introduced by r16540.

by hbirr＠svn.reactos.com

Fixed a bug in IsConsoleHandle which was introduced by r16540. Modified: trunk/reactos/lib/kernel32/include/kernel32.h _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-13 16:36:24 UTC (rev 16555) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-13 17:32:39 UTC (rev 16556) @@ -24,7 +24,7 @@ #endif #define IsConsoleHandle(h) \ - ((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE + (((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE) #define HANDLE_DETACHED_PROCESS (HANDLE)-1 #define HANDLE_CREATE_NEW_CONSOLE (HANDLE)-2

19 years, 6 months

[weiden] 16555: only NULL-terminate the string in GetEnvironmentVariableW if the buffer size is greater than 0. Thanks to Joseph Galbraith for the hint

by weiden＠svn.reactos.com

only NULL-terminate the string in GetEnvironmentVariableW if the buffer size is greater than 0. Thanks to Joseph Galbraith for the hint Modified: trunk/reactos/lib/kernel32/misc/env.c _____ Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-07-13 15:46:59 UTC (rev 16554) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-07-13 16:36:24 UTC (rev 16555) @@ -158,9 +158,12 @@ } } - /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U - only terminates it if MaximumLength < Length */ - VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; + if (nSize != 0) + { + /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length */ + VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; + } return (VarValue.Length / sizeof(WCHAR)); }

19 years, 6 months

[weiden] 16553: handle memory allocation errors in GetEnvironmentVariable() and ensure the string is always null-terminated

by weiden＠svn.reactos.com

handle memory allocation errors in GetEnvironmentVariable() and ensure the string is always null-terminated Modified: trunk/reactos/lib/kernel32/misc/env.c _____ Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-07-13 08:48:49 UTC (rev 16552) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-07-13 15:09:52 UTC (rev 16553) @@ -48,17 +48,33 @@ /* initialize unicode variable value string and allocate buffer */ VarValueU.Length = 0; - VarValueU.MaximumLength = nSize * sizeof(WCHAR); - VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - VarValueU.MaximumLength); + if (nSize != 0) + { + VarValueU.MaximumLength = (nSize - 1) * sizeof(WCHAR); + VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), + 0, + nSize * sizeof(WCHAR)); + if (VarValueU.Buffer != NULL) + { + /* NULL-terminate the buffer in any case! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length! */ + VarValueU.Buffer[nSize - 1] = L'\0'; + } + } + else + { + VarValueU.MaximumLength = 0; + VarValueU.Buffer = NULL; + } - /* get unicode environment variable */ - Status = RtlQueryEnvironmentVariable_U (NULL, - &VarNameU, - &VarValueU); - if (!NT_SUCCESS(Status)) - { + if (VarValueU.Buffer != NULL || nSize == 0) + { + /* get unicode environment variable */ + Status = RtlQueryEnvironmentVariable_U (NULL, + &VarNameU, + &VarValueU); + if (!NT_SUCCESS(Status)) + { /* free unicode buffer */ RtlFreeHeap (RtlGetProcessHeap (), 0, @@ -70,28 +86,37 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return VarValueU.Length / sizeof(WCHAR) + 1; + return (VarValueU.Length / sizeof(WCHAR)) + 1; } else { return 0; } - } + } - /* convert unicode value string to ansi */ - RtlUnicodeStringToAnsiString (&VarValue, - &VarValueU, - FALSE); + /* convert unicode value string to ansi */ + RtlUnicodeStringToAnsiString (&VarValue, + &VarValueU, + FALSE); - /* free unicode buffer */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - VarValueU.Buffer); + if (VarValueU.Buffer != NULL) + { + /* free unicode buffer */ + RtlFreeHeap (RtlGetProcessHeap (), + 0, + VarValueU.Buffer); + } - /* free unicode variable name string */ - RtlFreeUnicodeString (&VarNameU); + /* free unicode variable name string */ + RtlFreeUnicodeString (&VarNameU); - return (VarValueU.Length / sizeof(WCHAR)); + return (VarValueU.Length / sizeof(WCHAR)); + } + else + { + SetLastError (ERROR_NOT_ENOUGH_MEMORY); + return 0; + } } @@ -114,7 +139,7 @@ lpName); VarValue.Length = 0; - VarValue.MaximumLength = nSize * sizeof(WCHAR); + VarValue.MaximumLength = (nSize != 0 ? (nSize - 1) * sizeof(WCHAR) : 0); VarValue.Buffer = lpBuffer; Status = RtlQueryEnvironmentVariable_U (NULL, @@ -125,13 +150,17 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return (VarValue.Length / sizeof(WCHAR)) + 1; + return (VarValue.Length / sizeof(WCHAR)) + 1; } else { return 0; } } + + /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length */ + VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; return (VarValue.Length / sizeof(WCHAR)); }

19 years, 6 months

[ion] 16554: Fix macro to be optimized out, thanks to Filip

by ion＠svn.reactos.com

Fix macro to be optimized out, thanks to Filip Modified: trunk/reactos/include/wine/debug.h _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-07-13 15:09:52 UTC (rev 16553) +++ trunk/reactos/include/wine/debug.h 2005-07-13 15:46:59 UTC (rev 16554) @@ -20,7 +20,7 @@ #endif #if !defined(DBG) || !defined(YDEBUG) -#define DPRINT(...) do { DbgPrint(__VA_ARGS__); } while(0) +#define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #else #define DPRINT DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint #endif

19 years, 6 months

[arty] 16552: stop exporting MmCopyFromCaller and kin and make a local version in the

by arty＠svn.reactos.com

stop exporting MmCopyFromCaller and kin and make a local version in the last place we use it, now based on SEH. we'll remove the copy from caller hack from ntoskrnl soon. Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Added: trunk/reactos/subsys/win32k/include/mmcopy.h Modified: trunk/reactos/subsys/win32k/include/win32k.h Added: trunk/reactos/subsys/win32k/misc/copy.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/subsys/win32k/win32k.xml _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-07-13 08:48:49 UTC (rev 16552) @@ -690,8 +690,8 @@ MmAllocatePagesForMdl@28 MmBuildMdlForNonPagedPool@4 MmCanFileBeTruncated@8 -MmCopyFromCaller@12 -MmCopyToCaller@12 +;MmCopyFromCaller@12 +;MmCopyToCaller@12 MmCreateMdl@12 MmCreateSection@32 MmDbgTranslatePhysicalAddress@8 _____ Added: trunk/reactos/subsys/win32k/include/mmcopy.h --- trunk/reactos/subsys/win32k/include/mmcopy.h 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/include/mmcopy.h 2005-07-13 08:48:49 UTC (rev 16552) @@ -0,0 +1,11 @@ +#ifndef NDK_MMCOPY_H +#define NDK_MMCOPY_H + +#include <pseh/pseh.h> + +NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ); + +#define MmCopyFromCaller(x,y,z) _MmCopyFromCaller((PCHAR)(x),(PCHAR)(y),(UINT)(z)) +#define MmCopyToCaller(x,y,z) MmCopyFromCaller(x,y,z) + +#endif/*NDK_MMCOPY_H*/ _____ Modified: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-07-13 08:48:49 UTC (rev 16552) @@ -54,8 +54,8 @@ #include <include/window.h> #include <include/winpos.h> #include <include/winsta.h> +#include <include/mmcopy.h> #include <eng/objects.h> #include <eng/misc.h> #include <dib/dib.h> - /* EOF */ _____ Added: trunk/reactos/subsys/win32k/misc/copy.c --- trunk/reactos/subsys/win32k/misc/copy.c 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/misc/copy.c 2005-07-13 08:48:49 UTC (rev 16552) @@ -0,0 +1,13 @@ +#include "w32k.h" + +NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ) { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY { + RtlCopyMemory(Target,Source,Bytes); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + return Status; +} _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/w32k.h 2005-07-13 08:48:49 UTC (rev 16552) @@ -19,14 +19,6 @@ #include <windows.h> #include <ndk/ntndk.h> -/* FIXME: ReactOS will be R-Rated if I really write what I'm about to */ -NTSTATUS -STDCALL -MmCopyFromCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes); -NTSTATUS -STDCALL -MmCopyToCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes); - /* SEH Support with PSEH */ #include <pseh/pseh.h> _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/win32k.xml 2005-07-13 08:48:49 UTC (rev 16552) @@ -58,6 +58,7 @@ <file>math.c</file> <file>object.c</file> <file>ssec.c</file> + <file>copy.c</file> </directory> <directory name="ntddraw"> <file>ddraw.c</file>

19 years, 6 months

← Newer
1
...
34
35
36
37
38
39
40
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005