Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 30699: - Fix scut.cmd again. My previous attempt passed all parameters as one parameter to scut.exe, this one should work correct now. - Check if fgets was really successful, if not terminate the program. This prevents bad outputs if the user pressed Control-C at a prompt.
by cfinck＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: cfinck Date: Fri Nov 23 20:01:34 2007 New Revision: 30699 URL: http://svn.reactos.org/svn/reactos?rev=30699&view=rev Log: - Fix scut.cmd again. My previous attempt passed all parameters as one parameter to scut.exe, this one should work correct now. - Check if fgets was really successful, if not terminate the program. This prevents bad outputs if the user pressed Control-C at a prompt. Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Fri Nov 23 20:01:34 2007 @@ -31,7 +31,7 @@ goto :EOC :paramcall -call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%*" +call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%1" %2 %3 :EOC title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Fri Nov 23 20:01:34 2007 @@ -117,8 +117,11 @@ { printf("Please enter a name for the shortcut: "); fflush(stdin); - fgets(name, 260, stdin); - } while(strlen(name) == 1); + + if(!fgets(name, 260, stdin)) + return 1; + } while(strlen(name) <= 1); + strcpy(name, strtok(name, "\n")); } if (!checkname(shortcuts, name)) @@ -137,8 +140,11 @@ { printf("Please enter the path for the shortcut: "); fflush(stdin); - fgets(path, 260, stdin); - } while(strlen(path) == 1); + + if(!fgets(path, 260, stdin)) + return 1; + } while(strlen(path) <= 1); + strcpy(path, strtok(path, "\n")); } if (!checkpath(path)) @@ -168,8 +174,11 @@ { printf("Please enter the name of the shortcut to remove: "); fflush(stdin); - fgets(name, 260, stdin); - } while(strlen(name) == 1); + + if(!fgets(name, 260, stdin)) + return 1; + } while(strlen(name) <= 1); + strcpy(name, strtok(name, "\n")); } if (!_stricmp(name, "Default")) @@ -215,8 +224,11 @@ { printf("Please enter the name of the shortcut to edit: "); fflush(stdin); - fgets(name, 260, stdin); - } while(strlen(name) == 1); + + if(!fgets(name, 260, stdin)) + return 1; + } while(strlen(name) <= 1); + strcpy(name, strtok(name, "\n")); } if (!_stricmp(name, "Default") || checkname(shortcuts, name)) @@ -239,8 +251,11 @@ { printf("Please enter a new path for the shortcut: "); fflush(stdin); - fgets(path, 260, stdin); - } while(strlen(path) == 1); + + if(!fgets(path, 260, stdin)) + return 1; + } while(strlen(path) <= 1); + strcpy(path, strtok(path, "\n")); } if (!checkpath(path)) @@ -276,8 +291,11 @@ { printf("Please enter the the name of the shortcut to set as default: "); fflush(stdin); - fgets(name, 260, stdin); - } while(strlen(name) == 1); + + if(!fgets(name, 260, stdin)) + return 1; + } while(strlen(name) <= 1); + strcpy(name, strtok(name, "\n")); } if (!_stricmp(name, "Default") || checkname(shortcuts, name))

1 0

[cfinck] 30698: [FORMATTING] - Fix the indentation mess - Fix some typos in comments No code changes
by cfinck＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: cfinck Date: Fri Nov 23 19:21:10 2007 New Revision: 30698 URL: http://svn.reactos.org/svn/reactos?rev=30698&view=rev Log: [FORMATTING] - Fix the indentation mess - Fix some typos in comments No code changes Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Fri Nov 23 19:21:10 2007 @@ -37,838 +37,817 @@ enum { - COPY_ASCII = 0x001, /* /A */ - COPY_DECRYPT = 0x004, /* /D */ - COPY_VERIFY = 0x008, /* /V : Dummy, Never will be Impleneted */ - COPY_SHORTNAME = 0x010, /* /N : Dummy, Never will be Impleneted */ - COPY_NO_PROMPT = 0x020, /* /Y */ - COPY_PROMPT = 0x040, /* /-Y */ - COPY_RESTART = 0x080, /* /Z */ - COPY_BINARY = 0x100, /* /B */ + COPY_ASCII = 0x001, /* /A */ + COPY_DECRYPT = 0x004, /* /D */ + COPY_VERIFY = 0x008, /* /V : Dummy, Never will be Impleneted */ + COPY_SHORTNAME = 0x010, /* /N : Dummy, Never will be Impleneted */ + COPY_NO_PROMPT = 0x020, /* /Y */ + COPY_PROMPT = 0x040, /* /-Y */ + COPY_RESTART = 0x080, /* /Z */ + COPY_BINARY = 0x100, /* /B */ }; INT copy (TCHAR source[MAX_PATH], - TCHAR dest[MAX_PATH], - INT append, - DWORD lpdwFlags, - BOOL bTouch) + TCHAR dest[MAX_PATH], + INT append, + DWORD lpdwFlags, + BOOL bTouch) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - FILETIME srctime,NewFileTime; - HANDLE hFileSrc; - HANDLE hFileDest; - LPBYTE buffer; - DWORD dwAttrib; - DWORD dwRead; - DWORD dwWritten; - BOOL bEof = FALSE; - TCHAR TrueDest[MAX_PATH]; - TCHAR TempSrc[MAX_PATH]; - TCHAR * FileName; - SYSTEMTIME CurrentTime; - - /* Check Breaker */ - if(CheckCtrlBreak(BREAK_INPUT)) - return 0; - -#ifdef _DEBUG - DebugPrintf (_T("checking mode\n")); -#endif - - if(bTouch) - { - hFileSrc = CreateFile (source, GENERIC_WRITE, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - if (hFileSrc == INVALID_HANDLE_VALUE) - { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, source); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + FILETIME srctime,NewFileTime; + HANDLE hFileSrc; + HANDLE hFileDest; + LPBYTE buffer; + DWORD dwAttrib; + DWORD dwRead; + DWORD dwWritten; + BOOL bEof = FALSE; + TCHAR TrueDest[MAX_PATH]; + TCHAR TempSrc[MAX_PATH]; + TCHAR * FileName; + SYSTEMTIME CurrentTime; + + /* Check Breaker */ + if(CheckCtrlBreak(BREAK_INPUT)) + return 0; + +#ifdef _DEBUG + DebugPrintf (_T("checking mode\n")); +#endif + + if(bTouch) + { + hFileSrc = CreateFile (source, GENERIC_WRITE, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (hFileSrc == INVALID_HANDLE_VALUE) + { + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, source); + nErrorLevel = 1; + return 0; + } + + GetSystemTime(&CurrentTime); + SystemTimeToFileTime(&CurrentTime, &NewFileTime); + if(SetFileTime(hFileSrc,(LPFILETIME) NULL, (LPFILETIME) NULL, &NewFileTime)) + { + CloseHandle(hFileSrc); + nErrorLevel = 1; + return 1; + + } + else + { + CloseHandle(hFileSrc); + return 0; + } + } + + dwAttrib = GetFileAttributes (source); + + hFileSrc = CreateFile (source, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (hFileSrc == INVALID_HANDLE_VALUE) + { + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, source); nErrorLevel = 1; - return 0; - } - - GetSystemTime(&CurrentTime); - SystemTimeToFileTime(&CurrentTime, &NewFileTime); - if(SetFileTime(hFileSrc,(LPFILETIME) NULL, (LPFILETIME) NULL, &NewFileTime)) - { - CloseHandle(hFileSrc); - nErrorLevel = 1; - return 1; - - } - else - { - CloseHandle(hFileSrc); - return 0; - } - } - - dwAttrib = GetFileAttributes (source); - - hFileSrc = CreateFile (source, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - if (hFileSrc == INVALID_HANDLE_VALUE) - { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); - 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 & COPY_ASCII ? "ASCII" : "BINARY"); +#endif + + /* Check to see if /D or /Z are true, if so we need a middle + man to copy the file too to allow us to use CopyFileEx later */ + if(lpdwFlags & COPY_DECRYPT) + { + GetEnvironmentVariable(_T("TEMP"),TempSrc,MAX_PATH); + _tcscat(TempSrc,_T("\\")); + FileName = _tcsrchr(source,_T('\\')); + FileName++; + _tcscat(TempSrc,FileName); + /* This is needed to be on the end to prevent an error + if the user did "copy /D /Z foo bar then it would be copied + too %TEMP%\foo here and when %TEMP%\foo when it sets it up + for COPY_RESTART, this would mean it is copying to itself + which would error when it tried to open the handles for ReadFile + and WriteFile */ + _tcscat(TempSrc,_T(".decrypt")); + if(!CopyFileEx(source, TempSrc, NULL, NULL, FALSE, COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) + { + nErrorLevel = 1; + return 0; + } + _tcscpy(source, TempSrc); + } + + + if(lpdwFlags & COPY_RESTART) + { + _tcscpy(TrueDest, dest); + GetEnvironmentVariable(_T("TEMP"),dest,MAX_PATH); + _tcscat(dest,_T("\\")); + FileName = _tcsrchr(TrueDest,_T('\\')); + FileName++; + _tcscat(dest,FileName); + } + + + if (!IsExistingFile (dest)) + { +#ifdef _DEBUG + DebugPrintf (_T("opening/creating\n")); +#endif + hFileDest = + CreateFile (dest, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + } + else if (!append) + { +#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); + } + 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) + { + CloseHandle (hFileSrc); + ConOutResPuts(STRING_ERROR_PATH_NOT_FOUND); nErrorLevel = 1; - 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 & COPY_ASCII ? "ASCII" : "BINARY"); -#endif - - /* Check to see if /D or /Z are true, if so we need a middle - man to copy the file too to allow us to use CopyFileEx later */ - if(lpdwFlags & COPY_DECRYPT) - { - GetEnvironmentVariable(_T("TEMP"),TempSrc,MAX_PATH); - _tcscat(TempSrc,_T("\\")); - FileName = _tcsrchr(source,_T('\\')); - FileName++; - _tcscat(TempSrc,FileName); - /* This is needed to be on the end to prevent an error - if the user did "copy /D /Z foo bar then it would be copied - too %TEMP%\foo here and when %TEMP%\foo when it sets it up - for COPY_RESTART, this would mean it is copying to itself - which would error when it tried to open the handles for ReadFile - and WriteFile */ - _tcscat(TempSrc,_T(".decrypt")); - if(!CopyFileEx(source, TempSrc, NULL, NULL, FALSE, COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) - { - nErrorLevel = 1; - return 0; - } - _tcscpy(source, TempSrc); - } - - - if(lpdwFlags & COPY_RESTART) - { - _tcscpy(TrueDest, dest); - GetEnvironmentVariable(_T("TEMP"),dest,MAX_PATH); - _tcscat(dest,_T("\\")); - FileName = _tcsrchr(TrueDest,_T('\\')); - FileName++; - _tcscat(dest,FileName); - } - - - if (!IsExistingFile (dest)) - { -#ifdef _DEBUG - DebugPrintf (_T("opening/creating\n")); -#endif - hFileDest = - CreateFile (dest, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - } - else if (!append) - { -#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); - } - 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) - { - CloseHandle (hFileSrc); - ConOutResPuts(STRING_ERROR_PATH_NOT_FOUND); + return 0; + } + + /* A page-aligned buffer usually give more speed */ + buffer = (LPBYTE)VirtualAlloc(NULL, BUFF_SIZE, MEM_COMMIT, PAGE_READWRITE); + if (buffer == NULL) + { + CloseHandle (hFileDest); + CloseHandle (hFileSrc); + ConOutResPuts(STRING_ERROR_OUT_OF_MEMORY); nErrorLevel = 1; - return 0; - } - - /* A page-aligned buffer usually give more speed */ - buffer = (LPBYTE)VirtualAlloc(NULL, BUFF_SIZE, MEM_COMMIT, PAGE_READWRITE); - if (buffer == NULL) - { - CloseHandle (hFileDest); - CloseHandle (hFileSrc); - ConOutResPuts(STRING_ERROR_OUT_OF_MEMORY); - nErrorLevel = 1; - return 0; - } - - do - { - - ReadFile (hFileSrc, buffer, BUFF_SIZE, &dwRead, NULL); - if (lpdwFlags & COPY_ASCII) - { - LPBYTE pEof = memchr(buffer, 0x1A, dwRead); - if (pEof != NULL) - { - bEof = TRUE; - dwRead = pEof-buffer+1; - break; - } - } - - if (dwRead == 0) - break; - - WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL); - if (dwWritten != dwRead || CheckCtrlBreak(BREAK_INPUT)) - { - ConOutResPuts(STRING_COPY_ERROR3); - - cmd_free (buffer); - CloseHandle (hFileDest); - CloseHandle (hFileSrc); - nErrorLevel = 1; - return 0; - } - } - while (!bEof); - -#ifdef _DEBUG - DebugPrintf (_T("setting time\n")); -#endif - SetFileTime (hFileDest, &srctime, NULL, NULL); - - if ((lpdwFlags & COPY_ASCII) && !bEof) - { - /* we're dealing with ASCII files! */ - buffer[0] = 0x1A; -#ifdef _DEBUG - DebugPrintf (_T("appending ^Z\n")); -#endif - WriteFile (hFileDest, buffer, sizeof(CHAR), &dwWritten, NULL); - } - - VirtualFree (buffer, 0, MEM_RELEASE); - CloseHandle (hFileDest); - CloseHandle (hFileSrc); - -#ifdef _DEBUG - DebugPrintf (_T("setting mode\n")); -#endif - SetFileAttributes (dest, dwAttrib); - - /* Now finish off the copy if needed with CopyFileEx */ - if(lpdwFlags & COPY_RESTART) - { - if(!CopyFileEx(dest, TrueDest, NULL, NULL, FALSE, COPY_FILE_RESTARTABLE)) - { - nErrorLevel = 1; - DeleteFile(dest); - return 0; - } - /* Take care of file in the temp folder */ - DeleteFile(dest); - - } - - if(lpdwFlags & COPY_DECRYPT) - DeleteFile(TempSrc); - - return 1; + return 0; + } + + do + { + ReadFile (hFileSrc, buffer, BUFF_SIZE, &dwRead, NULL); + if (lpdwFlags & COPY_ASCII) + { + LPBYTE pEof = memchr(buffer, 0x1A, dwRead); + if (pEof != NULL) + { + bEof = TRUE; + dwRead = pEof-buffer+1; + break; + } + } + + if (dwRead == 0) + break; + + WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL); + if (dwWritten != dwRead || CheckCtrlBreak(BREAK_INPUT)) + { + ConOutResPuts(STRING_COPY_ERROR3); + + cmd_free (buffer); + CloseHandle (hFileDest); + CloseHandle (hFileSrc); + nErrorLevel = 1; + return 0; + } + } + while (!bEof); + +#ifdef _DEBUG + DebugPrintf (_T("setting time\n")); +#endif + SetFileTime (hFileDest, &srctime, NULL, NULL); + + if ((lpdwFlags & COPY_ASCII) && !bEof) + { + /* we're dealing with ASCII files! */ + buffer[0] = 0x1A; +#ifdef _DEBUG + DebugPrintf (_T("appending ^Z\n")); +#endif + WriteFile (hFileDest, buffer, sizeof(CHAR), &dwWritten, NULL); + } + + VirtualFree (buffer, 0, MEM_RELEASE); + CloseHandle (hFileDest); + CloseHandle (hFileSrc); + +#ifdef _DEBUG + DebugPrintf (_T("setting mode\n")); +#endif + SetFileAttributes (dest, dwAttrib); + + /* Now finish off the copy if needed with CopyFileEx */ + if(lpdwFlags & COPY_RESTART) + { + if(!CopyFileEx(dest, TrueDest, NULL, NULL, FALSE, COPY_FILE_RESTARTABLE)) + { + nErrorLevel = 1; + DeleteFile(dest); + return 0; + } + /* Take care of file in the temp folder */ + DeleteFile(dest); + + } + + if(lpdwFlags & COPY_DECRYPT) + DeleteFile(TempSrc); + + return 1; } static INT CopyOverwrite (LPTSTR fn) { - /*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 (_T("")); - return res; + /*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 (_T("")); + 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; - BOOL bTouch = FALSE; - /* 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]; - /* for CMDCOPY env */ - TCHAR *evar; - int size; - TCHAR * szTouch; - BOOL bDone = FALSE; - - - /*Show help/usage info*/ - if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutResPaging(TRUE, STRING_COPY_HELP2); - return 0; - } - - nErrorLevel = 0; - - /* Get the envor value if it exists */ - evar = cmd_alloc(512 * sizeof(TCHAR)); - if (evar==NULL) size = 0; - else - { - size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); - } - if (size > 512) - { - evar = cmd_realloc(evar,size * sizeof(TCHAR) ); - if (evar!=NULL) - { - size = GetEnvironmentVariable (_T("COPYCMD"), evar, size); - } + 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; + BOOL bTouch = FALSE; + /* 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]; + /* for CMDCOPY env */ + TCHAR *evar; + int size; + TCHAR * szTouch; + BOOL bDone = FALSE; + + + /* Show help/usage info */ + if (!_tcsncmp (param, _T("/?"), 2)) + { + ConOutResPaging(TRUE, STRING_COPY_HELP2); + return 0; + } + + nErrorLevel = 0; + + /* Get the envor value if it exists */ + evar = cmd_alloc(512 * sizeof(TCHAR)); + if (evar == NULL) + size = 0; else - { - size=0; - } - } - - /* check see if we did get any env variable */ - if (size !=0) - { - int t=0; - /* scan and set the flags */ - for (t=0;t<size;t++) - { - if (_tcsncicmp(_T("/A"),&evar[t],2)==0) - { - dwFlags |=COPY_ASCII; - t++; - } - - else if (_tcsncicmp(_T("/B"),&evar[t],2)==0) - { - dwFlags |= COPY_BINARY; - t++; - } - else if (_tcsncicmp(_T("/D"),&evar[t],2)==0) - { - dwFlags |= COPY_DECRYPT; - t++; - } - - else if (_tcsncicmp(_T("/V"),&evar[t],2)==0) - { - dwFlags |= COPY_VERIFY; - t++; - } - - else if (_tcsncicmp(_T("/N"),&evar[t],2)==0) - { - dwFlags |= COPY_SHORTNAME; - t++; - } - - else if (_tcsncicmp(_T("/Y"),&evar[t],2)==0) - { + size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); + + if (size > 512) + { + evar = cmd_realloc(evar,size * sizeof(TCHAR) ); + if (evar!=NULL) + size = GetEnvironmentVariable (_T("COPYCMD"), evar, size); + else + size=0; + } + + /* check see if we did get any env variable */ + if (size !=0) + { + int t=0; + /* scan and set the flags */ + for (t=0;t<size;t++) + { + if (_tcsncicmp(_T("/A"),&evar[t],2) == 0) + { + dwFlags |=COPY_ASCII; + t++; + } + else if (_tcsncicmp(_T("/B"),&evar[t],2) == 0) + { + dwFlags |= COPY_BINARY; + t++; + } + else if (_tcsncicmp(_T("/D"),&evar[t],2) == 0) + { + dwFlags |= COPY_DECRYPT; + t++; + } + else if (_tcsncicmp(_T("/V"),&evar[t],2) == 0) + { + dwFlags |= COPY_VERIFY; + t++; + } + else if (_tcsncicmp(_T("/N"),&evar[t],2) == 0) + { + dwFlags |= COPY_SHORTNAME; + t++; + } + else if (_tcsncicmp(_T("/Y"),&evar[t],2) == 0) + { + dwFlags |= COPY_NO_PROMPT; + t++; + } + else if (_tcsncicmp(_T("/-Y"),&evar[t],3) == 0) + { + dwFlags |= COPY_PROMPT; + t+=2; + } + else if (_tcsncicmp(_T("/Z"),&evar[t],2) == 0) + { + dwFlags |= COPY_PROMPT; + t++; + } + } + } + cmd_free(evar); + + + /* Split the user input into array */ + arg = split (param, &argc, FALSE); + nFiles = argc; + + + /* Read switches and count files */ + for (i = 0; i < argc; i++) + { + if (*arg[i] == _T('/')) + { + if (_tcslen(arg[i]) >= 2) + { + switch (_totupper(arg[i][1])) + { + case _T('A'): + dwFlags |= COPY_ASCII; + break; + + case _T('B'): + dwFlags |= COPY_BINARY; + 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: + /* Invalid switch */ + LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, _totupper(arg[i][1])); + nErrorLevel = 1; + return 1; + break; + } + } + /* If it was a switch, subtract from total arguments */ + nFiles--; + } + else + { + /* If it isn't a switch then it is the source or destination */ + if(nSrc == -1) + { + nSrc = i; + } + else if(*arg[i] == _T('+') || *arg[i] == _T(',')) + { + /* Add these onto the source string + this way we can do all checks + directly on source string later on */ + _tcscat(arg[nSrc],arg[i]); + nFiles--; + } + else if(nDes == -1) + { + nDes = i; + } + } + } + + /* keep quiet within batch files */ + if (bc != NULL) + { dwFlags |= COPY_NO_PROMPT; - t++; - } - - else if (_tcsncicmp(_T("/-Y"),&evar[t],3)==0) - { - dwFlags |= COPY_PROMPT; - t+=2; - } - - else if (_tcsncicmp(_T("/Z"),&evar[t],2)==0) - { - dwFlags |= COPY_PROMPT; - t++; - } - } - } - cmd_free(evar); - - - /*Split the user input into array*/ - arg = split (param, &argc, FALSE); - nFiles = argc; - - - /*Read switches and count files*/ - for (i = 0; i < argc; i++) - { - if (*arg[i] == _T('/')) - { - if (_tcslen(arg[i]) >= 2) - { - switch (_totupper(arg[i][1])) - { - - case _T('A'): - dwFlags |= COPY_ASCII; - break; - - case _T('B'): - dwFlags |= COPY_BINARY; - 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 */ - LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, _totupper(arg[i][1])); - nErrorLevel = 1; - return 1; - break; - } - } - /*If it was a switch, subtract from total arguments*/ - nFiles--; - } - else - { - /*if it isnt a switch then it is the source or destination*/ - if(nSrc == -1) - { - nSrc = i; - } - else if(*arg[i] == _T('+') || *arg[i] == _T(',')) - { - /* Add these onto the source string - this way we can do all checks - directly on source string later on */ - _tcscat(arg[nSrc],arg[i]); - nFiles--; - } - else if(nDes == -1) - { - nDes = i; - } - - } - } - - /* keep quiet within batch files */ - if (bc != NULL) - { - dwFlags |= COPY_NO_PROMPT; - dwFlags &= ~COPY_PROMPT; - } - - if(nFiles < 1) - { - /* There is not enough files, there has to be at least 1 */ - ConOutResPuts(STRING_ERROR_REQ_PARAM_MISSING); - freep (arg); - return 1; - } - - if(nFiles > 2) - { - /* there is too many file names in command */ + dwFlags &= ~COPY_PROMPT; + } + + if(nFiles < 1) + { + /* There are not enough files, there has to be at least 1 */ + ConOutResPuts(STRING_ERROR_REQ_PARAM_MISSING); + freep (arg); + return 1; + } + + if(nFiles > 2) + { + /* There are too many file names in command */ LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg,_T("")); + ConErrPrintf(szMsg,_T("")); nErrorLevel = 1; - freep (arg); - return 1; - } - - if(((_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]))) - )) - { - /* 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]; - } - - /* Reusing the number of files variable */ - nFiles = 0; - - do - { - /* Set up the string that is the path to the destination */ - if(nDes != -1) - { - if(_tcslen(arg[nDes]) == 2 && arg[nDes][1] == _T(':')) - { - GetRootPath(arg[nDes],szDestPath,MAX_PATH); - } - else - /* If the user entered two file names then form the full string path*/ - GetFullPathName (arg[nDes], MAX_PATH, szDestPath, NULL); - - } - else - { - /* If no destination was entered then just use - the current directory as the destination */ - GetCurrentDirectory (MAX_PATH, szDestPath); - } - - - /* Get the full string of the path to the source file*/ - if(_tcschr (arg[nSrc], _T('+')) != NULL) - { - _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) - { - 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++; - else - bDone = TRUE; - break; - - } - - _tcsncat(tmpName,appendPointer,1); - appendPointer++; - - } - /* Finish the string off with a null char */ - _tcsncat(tmpName,_T("\0"),1); - - if(_tcschr (arg[nSrc], _T(',')) != NULL) - { - /* Only time there is a , in the source is when they are using touch - Cant have a destination and can only have on ,, at the end of the string - Cant have more then one file name */ - szTouch = _tcsstr (arg[nSrc], _T("+")); - if(_tcsncmp (szTouch,_T("+,,\0"),4) || nDes != -1) - { - LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg,arg[nSrc]); - nErrorLevel = 1; - freep (arg); - return 1; - } - bTouch = TRUE; - bDone = TRUE; - } - - if(_tcslen(tmpName) == 2) - { - if(tmpName[1] == _T(':')) - { - - GetRootPath(tmpName,szSrcPath,MAX_PATH); - } - } - else - /* Get the full path to first file in the string of file names */ - GetFullPathName (tmpName, MAX_PATH, szSrcPath, NULL); - } - else - { - bDone = TRUE; - if(_tcslen(arg[nSrc]) == 2 && arg[nSrc][1] == _T(':')) - { - GetRootPath(arg[nSrc],szSrcPath,MAX_PATH); - } - else - /* Get the full path of the source file */ - GetFullPathName (arg[nSrc], MAX_PATH, szSrcPath, NULL); - - } - - /* 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)) - { - /* 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("*")); - } - /* Make sure there is an ending slash to the path if the dest is a folder */ - if(_tcschr (szDestPath, _T('*')) == NULL && - IsExistingDirectory(szDestPath)) - { - if(szDestPath[_tcslen(szDestPath) - 1] != _T('\\')) - _tcscat (szDestPath, _T("\\")); - } - - - /* Get a list of all the files */ - hFile = FindFirstFile (szSrcPath, &findBuffer); - - - /* We need to figure out what the name of the file in the is going to be */ - if((szDestPath[_tcslen(szDestPath) - 1] == _T('*') && szDestPath[_tcslen(szDestPath) - 2] == _T('\\')) || - szDestPath[_tcslen(szDestPath) - 1] == _T('\\')) - { - /* In this case we will be using the same name as the source file - for the destination file because destination is a folder */ - bSrcName = TRUE; - } - else - { - /* Save the name the user entered */ - UseThisName = _tcsrchr(szDestPath,_T('\\')); - UseThisName++; - _tcscpy(PreserveName,UseThisName); - } - - /* Strip the paths back to the folder they are in */ - for(i = (_tcslen(szSrcPath) - 1); i > -1; i--) - if(szSrcPath[i] != _T('\\')) - szSrcPath[i] = _T('\0'); - else - break; - - for(i = (_tcslen(szDestPath) - 1); i > -1; i--) - if(szDestPath[i] != _T('\\')) - szDestPath[i] = _T('\0'); - else - break; - - do - { - /* Check Breaker */ - if(CheckCtrlBreak(BREAK_INPUT)) - { - freep(arg); - return 1; - } - /* Set the override to yes each new file */ - nOverwrite = 1; - - /* If it couldnt open the file handle, print out the error */ - if(hFile == INVALID_HANDLE_VALUE) - { - ConOutFormatMessage (GetLastError(), szSrcPath); - freep (arg); - nErrorLevel = 1; - return 1; - } - - /* Ignore the . and .. files */ - if(!_tcscmp (findBuffer.cFileName, _T(".")) || - !_tcscmp (findBuffer.cFileName, _T(".."))|| - findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - - /* Copy the base folder over to a tmp string */ - _tcscpy(tmpDestPath,szDestPath); - - /* Can't put a file into a folder that isnt there */ - if(!IsExistingDirectory(szDestPath)) - { - ConOutFormatMessage (GetLastError (), szSrcPath); - freep (arg); - nErrorLevel = 1; - return 1; - } - /* Copy over the destination path name */ - if(bSrcName) - _tcscat (tmpDestPath, findBuffer.cFileName); - else - { - /* If there is no wildcard you can use the name the user entered */ - if(_tcschr (PreserveName, _T('*')) == NULL) - { - _tcscat (tmpDestPath, PreserveName); - } - else - { - /* The following lines of copy were written by someone else - (most likely Eric Khoul) and it was taken from ren.c */ - LPTSTR p,q,r; - TCHAR DoneFile[MAX_PATH]; - /* build destination file name */ - p = findBuffer.cFileName; - q = PreserveName; - r = DoneFile; - while(*q != 0) - { - if (*q == '*') - { - q++; - while (*p != 0 && *p != *q) - { - *r = *p; - p++; - r++; - } - } - else if (*q == '?') - { - q++; - if (*p != 0) - { - *r = *p; - p++; - r++; - } - } - else - { - *r = *q; - if (*p != 0) - p++; - q++; - r++; - } - } - *r = 0; - /* Add the filename to the tmp string path */ - _tcscat (tmpDestPath, DoneFile); - - } - } - - - /* Build the string path to the source file */ - _tcscpy(tmpSrcPath,szSrcPath); - _tcscat (tmpSrcPath, findBuffer.cFileName); - - /* Check to see if the file is the same file */ - if(!bTouch && !_tcscmp (tmpSrcPath, tmpDestPath)) - { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); + freep (arg); + return 1; + } + + if(((_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]))) + )) + { + /* 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]; + } + + /* Reusing the number of files variable */ + nFiles = 0; + + do + { + /* Set up the string that is the path to the destination */ + if(nDes != -1) + { + if(_tcslen(arg[nDes]) == 2 && arg[nDes][1] == _T(':')) + { + GetRootPath(arg[nDes],szDestPath,MAX_PATH); + } + else + /* If the user entered two file names then form the full string path */ + GetFullPathName (arg[nDes], MAX_PATH, szDestPath, NULL); + } + else + { + /* If no destination was entered then just use + the current directory as the destination */ + GetCurrentDirectory (MAX_PATH, szDestPath); + } + + /* Get the full string of the path to the source file */ + if(_tcschr (arg[nSrc], _T('+')) != NULL) + { + _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) + { + 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++; + else + bDone = TRUE; + break; + } + + _tcsncat(tmpName,appendPointer,1); + appendPointer++; + } + + /* Finish the string off with a null char */ + _tcsncat(tmpName,_T("\0"),1); + + if(_tcschr (arg[nSrc], _T(',')) != NULL) + { + /* Only time there is a , in the source is when they are using touch + Cant have a destination and can only have on ,, at the end of the string + Cant have more then one file name */ + szTouch = _tcsstr (arg[nSrc], _T("+")); + if(_tcsncmp (szTouch,_T("+,,\0"),4) || nDes != -1) + { + LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg,arg[nSrc]); + nErrorLevel = 1; + freep (arg); + return 1; + } + bTouch = TRUE; + bDone = TRUE; + } + + if(_tcslen(tmpName) == 2) + { + if(tmpName[1] == _T(':')) + { + GetRootPath(tmpName,szSrcPath,MAX_PATH); + } + } + else + /* Get the full path to first file in the string of file names */ + GetFullPathName (tmpName, MAX_PATH, szSrcPath, NULL); + } + else + { + bDone = TRUE; + if(_tcslen(arg[nSrc]) == 2 && arg[nSrc][1] == _T(':')) + { + GetRootPath(arg[nSrc],szSrcPath,MAX_PATH); + } + else + /* Get the full path of the source file */ + GetFullPathName (arg[nSrc], MAX_PATH, szSrcPath, NULL); + } + + /* 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)) + { + /* 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("*")); + } + /* Make sure there is an ending slash to the path if the dest is a folder */ + if(_tcschr (szDestPath, _T('*')) == NULL && + IsExistingDirectory(szDestPath)) + { + if(szDestPath[_tcslen(szDestPath) - 1] != _T('\\')) + _tcscat (szDestPath, _T("\\")); + } + + /* Get a list of all the files */ + hFile = FindFirstFile (szSrcPath, &findBuffer); + + /* We need to figure out what the name of the file in the is going to be */ + if((szDestPath[_tcslen(szDestPath) - 1] == _T('*') && szDestPath[_tcslen(szDestPath) - 2] == _T('\\')) || + szDestPath[_tcslen(szDestPath) - 1] == _T('\\')) + { + /* In this case we will be using the same name as the source file + for the destination file because destination is a folder */ + bSrcName = TRUE; + } + else + { + /* Save the name the user entered */ + UseThisName = _tcsrchr(szDestPath,_T('\\')); + UseThisName++; + _tcscpy(PreserveName,UseThisName); + } + + /* Strip the paths back to the folder they are in */ + for(i = (_tcslen(szSrcPath) - 1); i > -1; i--) + if(szSrcPath[i] != _T('\\')) + szSrcPath[i] = _T('\0'); + else + break; + + for(i = (_tcslen(szDestPath) - 1); i > -1; i--) + if(szDestPath[i] != _T('\\')) + szDestPath[i] = _T('\0'); + else + break; + + do + { + /* Check Breaker */ + if(CheckCtrlBreak(BREAK_INPUT)) + { + freep(arg); + return 1; + } + /* Set the override to yes each new file */ + nOverwrite = 1; + + /* If it couldnt open the file handle, print out the error */ + if(hFile == INVALID_HANDLE_VALUE) + { + ConOutFormatMessage (GetLastError(), szSrcPath); + freep (arg); + nErrorLevel = 1; + return 1; + } + + /* Ignore the . and .. files */ + if(!_tcscmp (findBuffer.cFileName, _T(".")) || + !_tcscmp (findBuffer.cFileName, _T(".."))|| + findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + continue; + + /* Copy the base folder over to a tmp string */ + _tcscpy(tmpDestPath,szDestPath); + + /* Can't put a file into a folder that isnt there */ + if(!IsExistingDirectory(szDestPath)) + { + ConOutFormatMessage (GetLastError (), szSrcPath); + freep (arg); + nErrorLevel = 1; + return 1; + } + /* Copy over the destination path name */ + if(bSrcName) + _tcscat (tmpDestPath, findBuffer.cFileName); + else + { + /* If there is no wildcard you can use the name the user entered */ + if(_tcschr (PreserveName, _T('*')) == NULL) + { + _tcscat (tmpDestPath, PreserveName); + } + else + { + /* The following lines of copy were written by someone else + (most likely Eric Khoul) and it was taken from ren.c */ + LPTSTR p,q,r; + TCHAR DoneFile[MAX_PATH]; + /* build destination file name */ + p = findBuffer.cFileName; + q = PreserveName; + r = DoneFile; + while(*q != 0) + { + if (*q == '*') + { + q++; + while (*p != 0 && *p != *q) + { + *r = *p; + p++; + r++; + } + } + else if (*q == '?') + { + q++; + if (*p != 0) + { + *r = *p; + p++; + r++; + } + } + else + { + *r = *q; + if (*p != 0) + p++; + q++; + r++; + } + } + *r = 0; + /* Add the filename to the tmp string path */ + _tcscat (tmpDestPath, DoneFile); + } + } + + /* Build the string path to the source file */ + _tcscpy(tmpSrcPath,szSrcPath); + _tcscat (tmpSrcPath, findBuffer.cFileName); + + /* Check to see if the file is the same file */ + if(!bTouch && !_tcscmp (tmpSrcPath, tmpDestPath)) + { + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg); nErrorLevel = 1; break; } - /* Handle any overriding / prompting that needs to be done */ - if(((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch) - nOverwrite = CopyOverwrite(tmpDestPath); - if(nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) - continue; - if(nOverwrite == PROMPT_ALL || (nOverwrite == PROMPT_YES && bAppend)) - dwFlags |= COPY_NO_PROMPT; - - /* Tell weather the copy was successful or not */ - if(copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch)) - { - nFiles++; - /* only print source name when more then one file */ - if(_tcschr (arg[nSrc], _T('+')) != NULL || _tcschr (arg[nSrc], _T('*')) != NULL) - ConOutPrintf(_T("%s\n"),findBuffer.cFileName); - //LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); - } - else - { - /* print out the error message */ - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); - ConOutFormatMessage (GetLastError(), szSrcPath); - nErrorLevel = 1; - } - - /* Loop through all wildcard files */ - }while(FindNextFile (hFile, &findBuffer)); - /* Loop through all files in src string with a + */ - }while(!bDone); - - /* print out the number of files copied */ - LoadString(CMD_ModuleHandle, STRING_COPY_FILE, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, nFiles); - - FindClose(hFile); - if (arg!=NULL) - freep(arg); - - return 0; + /* Handle any overriding / prompting that needs to be done */ + if(((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch) + nOverwrite = CopyOverwrite(tmpDestPath); + if(nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) + continue; + if(nOverwrite == PROMPT_ALL || (nOverwrite == PROMPT_YES && bAppend)) + dwFlags |= COPY_NO_PROMPT; + + /* Tell weather the copy was successful or not */ + if(copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch)) + { + nFiles++; + /* only print source name when more then one file */ + if(_tcschr (arg[nSrc], _T('+')) != NULL || _tcschr (arg[nSrc], _T('*')) != NULL) + ConOutPrintf(_T("%s\n"),findBuffer.cFileName); + //LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); + } + else + { + /* print out the error message */ + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg); + ConOutFormatMessage (GetLastError(), szSrcPath); + nErrorLevel = 1; + } + + /* Loop through all wildcard files */ + } while(FindNextFile (hFile, &findBuffer)); + + /* Loop through all files in src string with a + */ + } while(!bDone); + + /* print out the number of files copied */ + LoadString(CMD_ModuleHandle, STRING_COPY_FILE, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, nFiles); + + FindClose(hFile); + + if (arg != NULL) + freep(arg); + + return 0; } - #endif /* INCLUDE_CMD_COPY */

1 0

[peterw] 30697: - Fix reladdr2line.cmd.
by peterw＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: peterw Date: Fri Nov 23 19:19:57 2007 New Revision: 30697 URL: http://svn.reactos.org/svn/reactos?rev=30697&view=rev Log: - Fix reladdr2line.cmd. Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Fri Nov 23 19:19:57 2007 @@ -45,8 +45,8 @@ echo ERROR: You must specify a path/file to examine. goto :EOC ) -if not exist "%_1%\." ( - echo ERROR: The path specified doesn't seem to exist. +if "%_2%" == "" ( + echo ERROR: You must specify a address to analyze. goto :EOC ) echo %_1% @@ -70,10 +70,6 @@ ) if "%_2%" == "" ( set /p _2="Please enter the address you would like to analyze: " - if "%_2%" == "" ( - echo ERROR: You must specify a address to analyze. - goto :EOC - ) ) goto :EOF

1 0

[cfinck] 30696: When someone tries to copy a file over itself, show an error message. We already had such a check in the code, but after Brandon's copy.c rewrite in r16561, it never got called. I removed the old check now and put a new one at the right position. See issue #2827 for more details.
by cfinck＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: cfinck Date: Fri Nov 23 18:53:57 2007 New Revision: 30696 URL: http://svn.reactos.org/svn/reactos?rev=30696&view=rev Log: When someone tries to copy a file over itself, show an error message. We already had such a check in the code, but after Brandon's copy.c rewrite in r16561, it never got called. I removed the old check now and put a new one at the right position. See issue #2827 for more details. Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Fri Nov 23 18:53:57 2007 @@ -173,16 +173,6 @@ } else if (!append) { - if (!_tcscmp (dest, source)) - { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, source); - - CloseHandle (hFileSrc); - nErrorLevel = 1; - return 0; - } - #ifdef _DEBUG DebugPrintf (_T("SetFileAttributes (%s, FILE_ATTRIBUTE_NORMAL);\n"), dest); #endif @@ -830,7 +820,13 @@ /* Check to see if the file is the same file */ if(!bTouch && !_tcscmp (tmpSrcPath, tmpDestPath)) - continue; + { + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg); + + nErrorLevel = 1; + break; + } /* Handle any overriding / prompting that needs to be done */ if(((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch)

1 0

[fireball] 30695: - Remove hack in CmpLinkHiveToMaster and make it support the "Allocate" boolean parameter. - Enable code in CmiInitHives to take advantage of the new link code when using the SYSTEM hive on the bootcd/setup. - Don't skip CmpCreateControlSet anymore, just add a simple hack to hard-code Current to 001. - Remove CmiInitControlSetLink since CmpCrateControlSet now does the work - Enable code in CmpInitializeSystemHive to use CmpInitializeHive(HINIT_CREATE) when creating a new SYSTEM
by fireball＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: fireball Date: Fri Nov 23 18:26:27 2007 New Revision: 30695 URL: http://svn.reactos.org/svn/reactos?rev=30695&view=rev Log: - Remove hack in CmpLinkHiveToMaster and make it support the "Allocate" boolean parameter. - Enable code in CmiInitHives to take advantage of the new link code when using the SYSTEM hive on the bootcd/setup. - Don't skip CmpCreateControlSet anymore, just add a simple hack to hard-code Current to 001. - Remove CmiInitControlSetLink since CmpCrateControlSet now does the work - Enable code in CmpInitializeSystemHive to use CmpInitializeHive(HINIT_CREATE) when creating a new SYSTEM hive, since we now have new link code that supports the "Allocate" flag. - This means we now have a working SYSTEM hive on the Boot CD as well since early bootup, and not only when NtInitializeRegistry is called - Do bootcd vs hard-disk boot registry path setup in CmpGetRegistryPath instead of in-line. Modified: trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Fri Nov 23 18:26:27 2007 @@ -115,9 +115,6 @@ CM_PARSE_CONTEXT ParseContext = {0}; PAGED_CODE(); - /* TEMPHACK: Don't do anything if we don't actually have a hive */ - if (Allocate) return STATUS_SUCCESS; - /* Setup the object attributes */ InitializeObjectAttributes(&ObjectAttributes, LinkName, @@ -130,8 +127,17 @@ ParseContext.CreateOperation = TRUE; ParseContext.ChildHive.KeyHive = &RegistryHive->Hive; - /* Because of CmCreateRootNode, ReactOS Hack */ - ParseContext.ChildHive.KeyCell = RegistryHive->Hive.BaseBlock->RootCell; + /* Check if we have a root keycell or if we need to create it */ + if (Allocate) + { + /* Create it */ + ParseContext.ChildHive.KeyCell = HCELL_NIL; + } + else + { + /* We have one */ + ParseContext.ChildHive.KeyCell = RegistryHive->Hive.BaseBlock->RootCell; + } /* Capture all the info */ Status = ObpCaptureObjectAttributes(&ObjectAttributes, @@ -181,7 +187,7 @@ NULL, RemainingPath, KernelMode, - REG_OPTION_VOLATILE, + 0, &ParseContext, ParentKey->KeyControlBlock, (PVOID*)&NewKey); @@ -217,142 +223,23 @@ return STATUS_SUCCESS; } -static NTSTATUS -CmiInitControlSetLink (VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ControlSetKeyName = RTL_CONSTANT_STRING( - L"\\Registry\\Machine\\SYSTEM\\ControlSet001"); - UNICODE_STRING ControlSetLinkName = RTL_CONSTANT_STRING( - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet"); - UNICODE_STRING ControlSetValueName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); - HANDLE KeyHandle; - NTSTATUS Status; - - /* Create 'ControlSet001' key */ - InitializeObjectAttributes (&ObjectAttributes, - &ControlSetKeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwCreateKey (&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ZwCreateKey() failed (Status %lx)\n", Status); - return Status; - } - ZwClose (KeyHandle); - - /* Link 'CurrentControlSet' to 'ControlSet001' key */ - InitializeObjectAttributes (&ObjectAttributes, - &ControlSetLinkName, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_OPENLINK, - NULL, - NULL); - Status = ZwCreateKey (&KeyHandle, - KEY_ALL_ACCESS | KEY_CREATE_LINK, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ZwCreateKey() failed (Status %lx)\n", Status); - return Status; - } - - Status = ZwSetValueKey (KeyHandle, - &ControlSetValueName, - 0, - REG_LINK, - (PVOID)ControlSetKeyName.Buffer, - ControlSetKeyName.Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ZwSetValueKey() failed (Status %lx)\n", Status); - } - ZwClose (KeyHandle); - - return STATUS_SUCCESS; -} +NTSTATUS +NTAPI +CmpGetRegistryPath(IN PWCHAR ConfigPath); NTSTATUS CmiInitHives(BOOLEAN SetupBoot) { - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING FileName; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"InstallPath"); - HANDLE KeyHandle; - NTSTATUS Status; - WCHAR ConfigPath[MAX_PATH]; - - ULONG BufferSize; - ULONG ResultSize; PWSTR EndPtr; PCMHIVE CmHive; BOOLEAN Allocate = TRUE; + UNICODE_STRING FileName, KeyName; DPRINT("CmiInitHives() called\n"); - if (SetupBoot == TRUE) - { - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwOpenKey() failed (Status %lx)\n", Status); - return(Status); - } - - BufferSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 4096; - ValueInfo = ExAllocatePool(PagedPool, BufferSize); - if (ValueInfo == NULL) - { - ZwClose(KeyHandle); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueInfo, - BufferSize, - &ResultSize); - ZwClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - ExFreePool(ValueInfo); - return(Status); - } - - RtlCopyMemory(ConfigPath, - ValueInfo->Data, - ValueInfo->DataLength); - ConfigPath[ValueInfo->DataLength / sizeof(WCHAR)] = (WCHAR)0; - ExFreePool(ValueInfo); - } - else - { - wcscpy(ConfigPath, L"\\SystemRoot"); - } - wcscat(ConfigPath, L"\\system32\\config"); + CmpGetRegistryPath(ConfigPath); DPRINT("ConfigPath: %S\n", ConfigPath); EndPtr = ConfigPath + wcslen(ConfigPath); @@ -401,10 +288,6 @@ /* Connect the SYSTEM hive only if it has been created */ if (SetupBoot == TRUE) { - wcscpy(EndPtr, REG_SYSTEM_FILE_NAME); - RtlInitUnicodeString(&FileName, ConfigPath); - DPRINT ("ConfigPath: %S\n", ConfigPath); -#if 0 HANDLE PrimaryHandle, LogHandle; ULONG PrimaryDisposition, SecondaryDisposition; ULONG ClusterSize, Length; @@ -439,7 +322,7 @@ CmHive->FileHandles[HFILE_TYPE_PRIMARY] = PrimaryHandle; /* Allow lazy flushing since the handles are there */ - ASSERT(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH); + //ASSERT(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH); CmHive->Hive.HiveFlags &= ~HIVE_NOLAZYFLUSH; /* Get the real size of the hive */ @@ -454,28 +337,6 @@ /* This shouldn't fail */ ASSERT(FALSE); } - - /* Setup the key name for the SECURITY hive */ - RtlInitUnicodeString (&KeyName, REG_SYSTEM_KEY_NAME); -#else - /* Load the hive */ - Status = CmpInitHiveFromFile(&FileName, - 0, - &CmHive, - &Allocate, - 0); - - /* Setup the key name for the SECURITY hive */ - RtlInitUnicodeString (&KeyName, REG_SYSTEM_KEY_NAME); - - Status = CmpLinkHiveToMaster(&KeyName, - NULL, - CmHive, - FALSE, - NULL); - - Status = CmiInitControlSetLink (); -#endif } /* Connect the DEFAULT hive */ Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Fri Nov 23 18:26:27 2007 @@ -152,11 +152,10 @@ CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName, ValueName; + UNICODE_STRING KeyName, ValueName = {0}; HANDLE KeyHandle; NTSTATUS Status; ASSERT(LoaderBlock != NULL); - if (ExpInTextModeSetup) return STATUS_SUCCESS; /* Setup attributes for loader options */ RtlInitUnicodeString(&KeyName, @@ -198,7 +197,7 @@ NtClose(KeyHandle); /* Return the status */ - return Status; + return (ExpInTextModeSetup ? STATUS_SUCCESS : Status); } NTSTATUS @@ -222,7 +221,6 @@ ULONG ResultLength, Disposition; PLOADER_PARAMETER_EXTENSION LoaderExtension; PAGED_CODE(); - if (ExpInTextModeSetup) return STATUS_SUCCESS; /* Open the select key */ InitializeObjectAttributes(&ObjectAttributes, @@ -231,7 +229,19 @@ NULL, NULL); Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) + { + /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ + if (!LoaderBlock->RegistryBase) + { + /* Use hard-coded setting */ + ControlSet = 1; + goto UseSet; + } + + /* Fail for real boots */ + return Status; + } /* Open the current value */ RtlInitUnicodeString(&KeyName, L"Current"); @@ -249,6 +259,7 @@ ControlSet = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); /* Create the current control set key */ +UseSet: RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\System\\CurrentControlSet"); InitializeObjectAttributes(&ObjectAttributes, @@ -499,10 +510,9 @@ else { /* Create it */ -#if 0 Status = CmpInitializeHive(&SystemHive, HINIT_CREATE, - 0, //HIVE_NOLAZYFLUSH, + HIVE_NOLAZYFLUSH, HFILE_TYPE_LOG, NULL, NULL, @@ -514,7 +524,7 @@ /* Set the hive filename */ RtlCreateUnicodeString(&SystemHive->FileFullPath, SYSTEM_REG_FILE); -#endif + /* Tell CmpLinkHiveToMaster to allocate a hive */ Allocate = TRUE; } @@ -750,11 +760,83 @@ return TRUE; } +NTSTATUS +NTAPI +CmpGetRegistryPath(IN PWCHAR ConfigPath) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE KeyHandle; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"InstallPath"); + ULONG BufferSize,ResultSize; + + /* Check if we are booted in setup */ + if (ExpInTextModeSetup) + { + /* Setup the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + /* Open the key */ + Status = ZwOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return Status; + + /* Allocate the buffer */ + BufferSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 4096; + ValueInfo = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_CM); + if (!ValueInfo) + { + /* Fail */ + ZwClose(KeyHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Query the value */ + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + BufferSize, + &ResultSize); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ExFreePool(ValueInfo); + return Status; + } + + /* Copy the config path and null-terminate it */ + RtlCopyMemory(ConfigPath, + ValueInfo->Data, + ValueInfo->DataLength); + ConfigPath[ValueInfo->DataLength / sizeof(WCHAR)] = UNICODE_NULL; + ExFreePool(ValueInfo); + } + else + { + /* Just use default path */ + wcscpy(ConfigPath, L"\\SystemRoot"); + } + + /* Add registry path */ + wcscat(ConfigPath, L"\\System32\\Config"); + + /* Done */ + return STATUS_SUCCESS; +} + VOID NTAPI CmpLoadHiveThread(IN PVOID StartContext) { - WCHAR FileBuffer[MAX_PATH], RegBuffer[MAX_PATH]; + WCHAR FileBuffer[MAX_PATH], RegBuffer[MAX_PATH], ConfigPath[MAX_PATH]; UNICODE_STRING TempName, FileName, RegName; ULONG FileStart, RegStart, i, ErrorResponse, ClusterSize, WorkerCount; ULONG PrimaryDisposition, SecondaryDisposition, Length; @@ -777,7 +859,8 @@ RtlInitEmptyUnicodeString(&RegName, RegBuffer, MAX_PATH); /* Now build the system root path */ - RtlInitUnicodeString(&TempName, L"\\SystemRoot\\System32\\Config\\"); + CmpGetRegistryPath(ConfigPath); + RtlInitUnicodeString(&TempName, ConfigPath); RtlAppendStringToString((PSTRING)&FileName, (PSTRING)&TempName); FileStart = FileName.Length;

1 0

[fireball] 30694: - Major cleanup of code inside CmiConnectHive: - Don't derefernece the parent key since we need to keep a reference to it - Set the hive dirty flag to clean after a connect - Simplify code - Move code as part of CmpLinkHivetoMAster - Use new function CmpCreateLinkNode instead of CmpDoCreate - Fix some asserts in CmpCreateLinkNode since we don't lock the KCB yet.
by fireball＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: fireball Date: Fri Nov 23 17:15:04 2007 New Revision: 30694 URL: http://svn.reactos.org/svn/reactos?rev=30694&view=rev Log: - Major cleanup of code inside CmiConnectHive: - Don't derefernece the parent key since we need to keep a reference to it - Set the hive dirty flag to clean after a connect - Simplify code - Move code as part of CmpLinkHivetoMAster - Use new function CmpCreateLinkNode instead of CmpDoCreate - Fix some asserts in CmpCreateLinkNode since we don't lock the KCB yet. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=30694… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Fri Nov 23 17:15:04 2007 @@ -86,26 +86,9 @@ VOID CmiAddKeyToList(IN PKEY_OBJECT ParentKey, IN PKEY_OBJECT NewKey); - -NTSTATUS -CmiLoadHive(POBJECT_ATTRIBUTES KeyObjectAttributes, - PCUNICODE_STRING FileName, - ULONG Flags); - -NTSTATUS -CmiScanKeyForValue(IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN PUNICODE_STRING ValueName, - OUT PCM_KEY_VALUE *ValueCell, - OUT HCELL_INDEX *VBOffset); - VOID NTAPI CmpLazyFlush(VOID); - -NTSTATUS -CmiConnectHive(POBJECT_ATTRIBUTES KeyObjectAttributes, - PCMHIVE RegistryHive); NTSTATUS CmiInitHives(BOOLEAN SetupBoot); Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Fri Nov 23 17:15:04 2007 @@ -92,6 +92,7 @@ /* Insert it into the global list (we don't have KCBs here) */ InsertTailList(&CmiKeyObjectListHead, &KeyObject->KeyBodyList); + /* Release hive lock */ ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); } @@ -105,8 +106,16 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor) { OBJECT_ATTRIBUTES ObjectAttributes; - - /* Don't do anything if we don't actually have a hive */ + UNICODE_STRING RemainingPath; + PKEY_OBJECT ParentKey; + PKEY_OBJECT NewKey; + NTSTATUS Status; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; + CM_PARSE_CONTEXT ParseContext = {0}; + PAGED_CODE(); + + /* TEMPHACK: Don't do anything if we don't actually have a hive */ if (Allocate) return STATUS_SUCCESS; /* Setup the object attributes */ @@ -115,40 +124,24 @@ OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, RootDirectory, SecurityDescriptor); - - /* Connect the hive */ - return CmiConnectHive(&ObjectAttributes, RegistryHive); -} - -NTSTATUS -CmiConnectHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN PCMHIVE RegistryHive) -{ - UNICODE_STRING RemainingPath; - PKEY_OBJECT ParentKey; - PKEY_OBJECT NewKey; - NTSTATUS Status; - PWSTR SubName; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - - DPRINT("CmiConnectHive(%p, %p) called.\n", - KeyObjectAttributes, RegistryHive); - + + /* Setup the parse context */ + ParseContext.CreateLink = TRUE; + ParseContext.CreateOperation = TRUE; + ParseContext.ChildHive.KeyHive = &RegistryHive->Hive; + + /* Because of CmCreateRootNode, ReactOS Hack */ + ParseContext.ChildHive.KeyCell = RegistryHive->Hive.BaseBlock->RootCell; + /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(KeyObjectAttributes, + Status = ObpCaptureObjectAttributes(&ObjectAttributes, KernelMode, FALSE, &ObjectCreateInfo, &ObjectName); - - if (!NT_SUCCESS(Status)) - { - DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); - return Status; - } - + if (!NT_SUCCESS(Status)) return Status; + + /* Do the parse */ Status = CmFindObject(&ObjectCreateInfo, &ObjectName, (PVOID*)&ParentKey, @@ -156,93 +149,72 @@ CmpKeyObjectType, NULL, NULL); - /* Yields a new reference */ - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - + + /* Let go of captured attributes and name */ + ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); + + /* Get out of here if we failed */ + if (!NT_SUCCESS(Status)) return Status; + + /* Scan for no name */ + if (!(RemainingPath.Length) || (RemainingPath.Buffer[0] == UNICODE_NULL)) + { + /* Fail */ + ObDereferenceObject(ParentKey); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Scan for leading backslash */ + while ((RemainingPath.Length) && + (*RemainingPath.Buffer == OBJ_NAME_PATH_SEPARATOR)) + { + /* Ignore it */ + RemainingPath.Length -= sizeof(WCHAR); + RemainingPath.MaximumLength -= sizeof(WCHAR); + RemainingPath.Buffer++; + } + + /* Create the link node */ + Status = CmpCreateLinkNode(ParentKey->KeyControlBlock->KeyHive, + ParentKey->KeyControlBlock->KeyCell, + NULL, + RemainingPath, + KernelMode, + REG_OPTION_VOLATILE, + &ParseContext, + ParentKey->KeyControlBlock, + (PVOID*)&NewKey); if (!NT_SUCCESS(Status)) { + /* Failed */ + DPRINT1("CmpLinkHiveToMaster failed: %lx\n", Status); + ObDereferenceObject(ParentKey); return Status; } - - DPRINT ("RemainingPath %wZ\n", &RemainingPath); - - if ((RemainingPath.Buffer == NULL) || (RemainingPath.Buffer[0] == 0)) - { - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return STATUS_OBJECT_NAME_COLLISION; - } - - /* Ignore leading backslash */ - SubName = RemainingPath.Buffer; - if (*SubName == L'\\') - SubName++; - - /* If RemainingPath contains \ we must return error - because CmiConnectHive() can not create trees */ - if (wcschr (SubName, L'\\') != NULL) - { - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - DPRINT("RemainingPath %wZ ParentKey %p\n", - &RemainingPath, ParentKey); - - DPRINT ("SubName %S\n", SubName); - - /* Create the key */ - Status = CmpDoCreate(ParentKey->KeyControlBlock->KeyHive, - ParentKey->KeyControlBlock->KeyCell, - NULL, - &RemainingPath, - KernelMode, - NULL, - REG_OPTION_VOLATILE, - ParentKey->KeyControlBlock, - NULL, - (PVOID*)&NewKey); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CmiAddSubKey() failed (Status %lx)\n", Status); - ObDereferenceObject (NewKey); - ObDereferenceObject (ParentKey); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewKey->KeyControlBlock->KeyCell = RegistryHive->Hive.BaseBlock->RootCell; - NewKey->KeyControlBlock->KeyHive = &RegistryHive->Hive; - - Status = RtlpCreateUnicodeString(&NewKey->Name, - SubName, NonPagedPool); - RtlFreeUnicodeString(&RemainingPath); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); - ObDereferenceObject (NewKey); - ObDereferenceObject (ParentKey); - return STATUS_INSUFFICIENT_RESOURCES; - } - + /* Free the create information */ ObpFreeAndReleaseCapturedAttributes(OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo); OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo = NULL; - - /* FN1 */ - ObReferenceObject (NewKey); - - CmiAddKeyToList (ParentKey, NewKey); - ObDereferenceObject (ParentKey); - - VERIFY_KEY_OBJECT(NewKey); - - /* We're holding a pointer to the parent key .. We must keep it - * referenced */ - /* Note: Do not dereference NewKey here! */ - - return STATUS_SUCCESS; + + /* Mark the hive as clean */ + RegistryHive->Hive.DirtyFlag = FALSE; + + /* Update KCB information */ + NewKey->KeyControlBlock->KeyCell = RegistryHive->Hive.BaseBlock->RootCell; + NewKey->KeyControlBlock->KeyHive = &RegistryHive->Hive; + + /* Build the key name */ + RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &RemainingPath, + &NewKey->Name); + + /* Reference the new key */ + ObReferenceObject(NewKey); + + /* Link this key to the parent */ + CmiAddKeyToList(ParentKey, NewKey); + return STATUS_SUCCESS; } static NTSTATUS Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Fri Nov 23 17:15:04 2007 @@ -455,10 +455,10 @@ ULONG CreateOptions; ULONG Disposition; CM_KEY_REFERENCE ChildHive; + HANDLE PredefinedHandle; BOOLEAN CreateLink; - BOOLEAN Flag2; - HANDLE PredefinedHandle; - ULONG PostActions; + BOOLEAN CreateOperation; + PCMHIVE OriginatingPoint; } CM_PARSE_CONTEXT, *PCM_PARSE_CONTEXT; // @@ -1016,6 +1016,20 @@ IN ULONG CreateOptions, IN PCM_KEY_CONTROL_BLOCK ParentKcb, IN PCMHIVE OriginatingHive OPTIONAL, + OUT PVOID *Object +); + +NTSTATUS +NTAPI +CmpCreateLinkNode( + IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN PACCESS_STATE AccessState, + IN UNICODE_STRING Name, + IN KPROCESSOR_MODE AccessMode, + IN ULONG CreateOptions, + IN PCM_PARSE_CONTEXT Context, + IN PCM_KEY_CONTROL_BLOCK ParentKcb, OUT PVOID *Object ); Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Fri Nov 23 17:15:04 2007 @@ -444,14 +444,14 @@ } /* If we have a KCB, make sure it's locked */ - ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); - - /* Create the KCB */ + //ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); + + /* Create the KCB. FIXME: Use lock flag */ Kcb = CmpCreateKeyControlBlock(Hive, Cell, Node, *CachedKcb, 0, KeyName); if (!Kcb) return STATUS_INSUFFICIENT_RESOURCES; /* Make sure it's also locked, and set the pointer */ - ASSERT(CmpIsKcbLockedExclusive(Kcb)); + //ASSERT(CmpIsKcbLockedExclusive(Kcb)); *CachedKcb = Kcb; /* Allocate the key object */

1 0

[arty] 30693: tcpip: Factor out common datagram receive code. Actually implement datagram cancellation. afd: Reorganize IRP cancellation and simplify socket shutdown. Fix datagram recv with no address differently (and better). Overall: fix hang after ping.
by arty＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: arty Date: Fri Nov 23 16:52:56 2007 New Revision: 30693 URL: http://svn.reactos.org/svn/reactos?rev=30693&view=rev Log: tcpip: Factor out common datagram receive code. Actually implement datagram cancellation. afd: Reorganize IRP cancellation and simplify socket shutdown. Fix datagram recv with no address differently (and better). Overall: fix hang after ping. Modified: trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/tcpip/include/datagram.h trunk/reactos/drivers/network/tcpip/include/rawip.h trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/include/udp.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c Fri Nov 23 16:52:56 2007 @@ -46,7 +46,7 @@ BOOLEAN Write, BOOLEAN LockAddress ) { UINT i; /* Copy the buffer array so we don't lose it */ - UINT Lock = (LockAddress && AddressLen) ? 2 : 0; + UINT Lock = LockAddress ? 2 : 0; UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); PMDL NewMdl; @@ -65,6 +65,9 @@ NewBuf[Count].buf = (PVOID)AddressLen; NewBuf[Count].len = sizeof(*AddressLen); Count++; + } else if( LockAddress ) { + RtlZeroMemory(NewBuf, sizeof(*NewBuf) * 2); + Count += 2; } } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE,("Access violation copying buffer info " Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c (original) +++ trunk/reactos/drivers/network/afd/afd/main.c Fri Nov 23 16:52:56 2007 @@ -152,50 +152,7 @@ } VOID DestroySocket( PAFD_FCB FCB ) { - UINT i; - BOOLEAN ReturnEarly = FALSE; - PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; - AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); - - if( !SocketAcquireStateLock( FCB ) ) return; - - FCB->State = SOCKET_STATE_CLOSED; - - InFlightRequest[0] = &FCB->ListenIrp; - InFlightRequest[1] = &FCB->ReceiveIrp; - InFlightRequest[2] = &FCB->SendIrp; - - /* Return early here because we might be called in the mean time. */ - if( FCB->Critical || - FCB->ListenIrp.InFlightRequest || - FCB->ReceiveIrp.InFlightRequest || - FCB->SendIrp.InFlightRequest ) { - AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x)\n", - FCB->ListenIrp.InFlightRequest, - FCB->ReceiveIrp.InFlightRequest, - FCB->SendIrp.InFlightRequest)); - ReturnEarly = TRUE; - } - - /* After PoolReeval, this FCB should not be involved in any outstanding - * poll requests */ - - /* Cancel our pending requests */ - for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { - NTSTATUS Status = STATUS_NO_SUCH_FILE; - if( InFlightRequest[i]->InFlightRequest ) { - AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", - i, InFlightRequest[i]->InFlightRequest)); - InFlightRequest[i]->InFlightRequest->IoStatus.Status = Status; - InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0; - IoCancelIrp( InFlightRequest[i]->InFlightRequest ); - } - } - - SocketStateUnlock( FCB ); - - if( ReturnEarly ) return; if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); @@ -218,8 +175,12 @@ AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp) { + UINT i; + AFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; + + if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp, FALSE); AFD_DbgPrint(MID_TRACE, ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); @@ -233,15 +194,56 @@ if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); FileObject->FsContext = NULL; + + FCB->State = SOCKET_STATE_CLOSED; + SocketStateUnlock(FCB); + + InFlightRequest[0] = FCB->ListenIrp; + InFlightRequest[1] = FCB->ReceiveIrp; + InFlightRequest[2] = FCB->SendIrp; + + /* Return early here because we might be called in the mean time. */ + if( !(FCB->Critical || + FCB->ListenIrp.InFlightRequest || + FCB->ReceiveIrp.InFlightRequest || + FCB->SendIrp.InFlightRequest) ) { + AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x)\n", + FCB->ListenIrp.InFlightRequest, + FCB->ReceiveIrp.InFlightRequest, + FCB->SendIrp.InFlightRequest)); + SocketStateUnlock(FCB); + DestroySocket(FCB); + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + else + { + /* After PoolReeval, this FCB should not be involved in any outstanding + * poll requests */ + + /* Cancel our pending requests */ + for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { + NTSTATUS Status = STATUS_NO_SUCH_FILE; + if( InFlightRequest[i].InFlightRequest ) { + AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", + i, InFlightRequest[i].InFlightRequest)); + InFlightRequest[i].InFlightRequest->IoStatus.Status = Status; + InFlightRequest[i].InFlightRequest->IoStatus.Information = 0; + IoCancelIrp( InFlightRequest[i].InFlightRequest ); + } + } + + FCB->PendingClose = Irp; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + DestroySocket( FCB ); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - AFD_DbgPrint(MID_TRACE, ("Returning success.\n")); - return STATUS_SUCCESS; + return Irp->IoStatus.Status; } static NTSTATUS STDCALL Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c (original) +++ trunk/reactos/drivers/network/afd/afd/read.c Fri Nov 23 16:52:56 2007 @@ -231,7 +231,6 @@ if( FCB->State == SOCKET_STATE_CLOSED ) { AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); SocketStateUnlock( FCB ); - DestroySocket( FCB ); return STATUS_SUCCESS; } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); @@ -435,13 +434,12 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); + FCB->ReceiveIrp.InFlightRequest = NULL; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_UNSUCCESSFUL; - - FCB->ReceiveIrp.InFlightRequest = NULL; if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); - DestroySocket( FCB ); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c (original) +++ trunk/reactos/drivers/network/afd/afd/write.c Fri Nov 23 16:52:56 2007 @@ -47,7 +47,6 @@ if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); - DestroySocket( FCB ); return STATUS_SUCCESS; } @@ -178,12 +177,6 @@ FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ - if( FCB->State == SOCKET_STATE_CLOSED ) { - SocketStateUnlock( FCB ); - DestroySocket( FCB ); - return STATUS_SUCCESS; - } - SocketStateUnlock( FCB ); return STATUS_SUCCESS; Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h (original) +++ trunk/reactos/drivers/network/afd/include/afd.h Fri Nov 23 16:52:56 2007 @@ -147,6 +147,7 @@ PVOID Context; DWORD PollState; UINT ContextSize; + PIRP PendingClose; LIST_ENTRY PendingIrpList[MAX_FUNCTIONS]; LIST_ENTRY DatagramList; LIST_ENTRY PendingConnections; Modified: trunk/reactos/drivers/network/tcpip/include/datagram.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/datagram.h (original) +++ trunk/reactos/drivers/network/tcpip/include/datagram.h Fri Nov 23 16:52:56 2007 @@ -9,6 +9,21 @@ #include <titypes.h> +NTSTATUS DGReceiveDatagram( + PADDRESS_FILE AddrFile, + PTDI_CONNECTION_INFORMATION ConnInfo, + PCHAR Buffer, + ULONG ReceiveLength, + ULONG ReceiveFlags, + PTDI_CONNECTION_INFORMATION ReturnInfo, + PULONG BytesReceived, + PDATAGRAM_COMPLETION_ROUTINE Complete, + PVOID Context, + PIRP Irp); + +VOID DGRemoveIRP( + PADDRESS_FILE AddrFile, + PIRP Irp); VOID DGDeliverData( PADDRESS_FILE AddrFile, Modified: trunk/reactos/drivers/network/tcpip/include/rawip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/rawip.h (original) +++ trunk/reactos/drivers/network/tcpip/include/rawip.h Fri Nov 23 16:52:56 2007 @@ -6,8 +6,6 @@ */ #ifndef __RAWIP_H #define __RAWIP_H - - NTSTATUS RawIPSendDatagram( PADDRESS_FILE AddrFile, Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/titypes.h (original) +++ trunk/reactos/drivers/network/tcpip/include/titypes.h Fri Nov 23 16:52:56 2007 @@ -113,6 +113,7 @@ typedef DATAGRAM_COMPLETION_ROUTINE PDATAGRAM_COMPLETION_ROUTINE; typedef struct _DATAGRAM_RECEIVE_REQUEST { + struct _ADDRESS_FILE *AddressFile; /* AddressFile on behalf of */ LIST_ENTRY ListEntry; /* Entry on list */ IP_ADDRESS RemoteAddress; /* Remote address we receive from (NULL means any) */ USHORT RemotePort; /* Remote port we receive from (0 means any) */ @@ -123,6 +124,7 @@ PVOID Context; /* Pointer to context information */ DATAGRAM_COMPLETION_ROUTINE UserComplete; /* Completion routine */ PVOID UserContext; /* Pointer to context information */ + PIRP Irp; /* IRP on behalf of */ } DATAGRAM_RECEIVE_REQUEST, *PDATAGRAM_RECEIVE_REQUEST; /* Datagram build routine prototype */ Modified: trunk/reactos/drivers/network/tcpip/include/udp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/udp.h (original) +++ trunk/reactos/drivers/network/tcpip/include/udp.h Fri Nov 23 16:52:56 2007 @@ -50,17 +50,6 @@ ULONG DataSize, PULONG DataUsed ); -NTSTATUS UDPReceiveDatagram( - PADDRESS_FILE AddrFile, - PTDI_CONNECTION_INFORMATION ConnInfo, - PCHAR Buffer, - ULONG ReceiveLength, - ULONG ReceiveFlags, - PTDI_CONNECTION_INFORMATION ReturnInfo, - PULONG BytesReceived, - PDATAGRAM_COMPLETION_ROUTINE Complete, - PVOID Context); - VOID UDPReceive( PIP_INTERFACE Interface, PIP_PACKET IPPacket); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Fri Nov 23 16:52:56 2007 @@ -53,34 +53,6 @@ return IRPFinish(Irp, STATUS_CANCELLED); } - - -VOID DispCancelComplete( - PVOID Context) -/* - * FUNCTION: Completes a cancel request - * ARGUMENTS: - * Context = Pointer to context information (FILE_OBJECT) - */ -{ - /*KIRQL OldIrql;*/ - PFILE_OBJECT FileObject; - PTRANSPORT_CONTEXT TranContext; - - TI_DbgPrint(DEBUG_IRP, ("Called.\n")); - - FileObject = (PFILE_OBJECT)Context; - TranContext = (PTRANSPORT_CONTEXT)FileObject->FsContext; - - /* Set the cleanup event */ - KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); - - /* We are expected to release the cancel spin lock */ - /*IoReleaseCancelSpinLock(OldIrql);*/ - - TI_DbgPrint(DEBUG_IRP, ("Leaving.\n")); -} - VOID DispDataRequestComplete( PVOID Context, @@ -156,8 +128,14 @@ TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); - - DispCancelComplete(DisType->FileObject); +} + +VOID DispDoPacketCancel( PVOID Data ) { + TI_DbgPrint(DEBUG_IRP, ("Called.\n")); + PIRP *IrpP = (PIRP *)Data, Irp = *IrpP; + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); } VOID NTAPI DispCancelRequest( @@ -176,6 +154,7 @@ UCHAR MinorFunction; DISCONNECT_TYPE DisType; PVOID WorkItem; + PADDRESS_FILE AddrFile; /*NTSTATUS Status = STATUS_SUCCESS;*/ TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -209,26 +188,26 @@ if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType ) ) ASSERT(0); - break; + return; case TDI_SEND_DATAGRAM: + AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; Irp->IoStatus.Status = STATUS_CANCELLED; if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); break; } - - /*DGCancelSendRequest(TranContext->Handle.AddressHandle, Irp);*/ + /* Nothing to do. We don't keep them around. */ break; case TDI_RECEIVE_DATAGRAM: + AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; Irp->IoStatus.Status = STATUS_CANCELLED; if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n")); break; } - - /*DGCancelReceiveRequest(TranContext->Handle.AddressHandle, Irp);*/ + DGRemoveIRP(AddrFile, Irp); break; default: @@ -236,11 +215,9 @@ break; } - if( Irp->IoStatus.Status == STATUS_PENDING ) - IoMarkIrpPending(Irp); - IoReleaseCancelSpinLock(Irp->CancelIrql); - + IoCompleteRequest(Irp, IO_NO_INCREMENT); + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -284,9 +261,6 @@ IoReleaseCancelSpinLock(Irp->CancelIrql); DispDataRequestComplete(Irp, STATUS_CANCELLED, 0); - - DispCancelComplete(FileObject); - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -822,7 +796,6 @@ return Status; } - NTSTATUS DispTdiReceiveDatagram( PIRP Irp) /* @@ -839,6 +812,7 @@ TDI_REQUEST Request; NTSTATUS Status; ULONG BytesReceived; + PADDRESS_FILE AddrFile; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -852,6 +826,8 @@ return STATUS_INVALID_ADDRESS; } + AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; + /* Initialize a receive request */ Request.Handle.AddressHandle = TranContext->Handle.AddressHandle; Request.RequestNotifyObject = DispDataRequestComplete; @@ -871,20 +847,21 @@ &DataBuffer, &BufferSize ); - Status = UDPReceiveDatagram( - Request.Handle.AddressHandle, - DgramInfo->ReceiveDatagramInformation, - DataBuffer, - DgramInfo->ReceiveLength, - DgramInfo->ReceiveFlags, - DgramInfo->ReturnDatagramInformation, - &BytesReceived, - (PDATAGRAM_COMPLETION_ROUTINE)DispDataRequestComplete, - Irp); - if (Status != STATUS_PENDING) { - DispDataRequestComplete(Irp, Status, BytesReceived); - } else - IoMarkIrpPending(Irp); + Status = DGReceiveDatagram( + AddrFile, + DgramInfo->ReceiveDatagramInformation, + DataBuffer, + DgramInfo->ReceiveLength, + DgramInfo->ReceiveFlags, + DgramInfo->ReturnDatagramInformation, + &BytesReceived, + (PDATAGRAM_COMPLETION_ROUTINE)DispDataRequestComplete, + Irp, + Irp); + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, BytesReceived); + } else + IoMarkIrpPending(Irp); } TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c Fri Nov 23 16:52:56 2007 @@ -146,7 +146,6 @@ } CP Context->CancelIrps = FALSE; - KeInitializeEvent(&Context->CleanupEvent, NotificationEvent, FALSE); CP IrpSp = IoGetCurrentIrpStackLocation(Irp); IrpSp->FileObject->FsContext = Context; @@ -274,20 +273,11 @@ { PIRP Irp; PIO_STACK_LOCATION IrpSp; - PTRANSPORT_CONTEXT TranContext; - KIRQL OldIrql; Irp = (PIRP)Context; IrpSp = IoGetCurrentIrpStackLocation(Irp); - TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; Irp->IoStatus.Status = Status; - - IoAcquireCancelSpinLock(&OldIrql); - - KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); - - IoReleaseCancelSpinLock(OldIrql); } @@ -321,7 +311,6 @@ IoAcquireCancelSpinLock(&OldIrql); Context->CancelIrps = TRUE; - KeResetEvent(&Context->CleanupEvent); IoReleaseCancelSpinLock(OldIrql); @@ -355,12 +344,6 @@ return STATUS_INVALID_PARAMETER; } - - if (Status != STATUS_PENDING) - TiCleanupFileObjectComplete(Irp, Status); - - KeWaitForSingleObject(&Context->CleanupEvent, - UserRequest, KernelMode, FALSE, NULL); return Irp->IoStatus.Status; } Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c Fri Nov 23 16:52:56 2007 @@ -9,6 +9,36 @@ */ #include "precomp.h" + +VOID DGRemoveIRP( + PADDRESS_FILE AddrFile, + PIRP Irp) +{ + PLIST_ENTRY ListEntry; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; + + TI_DbgPrint(MAX_TRACE, ("Called (Cancel IRP %08x for file %08x).\n", + Irp, AddrFile)); + + for( ListEntry = AddrFile->ReceiveQueue.Flink; + ListEntry != &AddrFile->ReceiveQueue; + ListEntry = ListEntry->Flink ) + { + ReceiveRequest = CONTAINING_RECORD + (ListEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); + + TI_DbgPrint(MAX_TRACE, ("Request: %08x?\n", ReceiveRequest)); + + if (ReceiveRequest->Irp == Irp) + { + RemoveEntryList(&ReceiveRequest->ListEntry); + exFreePool(ReceiveRequest); + break; + } + } + + TI_DbgPrint(MAX_TRACE, ("Done.\n")); +} VOID DGDeliverData( PADDRESS_FILE AddrFile, @@ -153,3 +183,110 @@ TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } + +VOID DGReceiveComplete(PVOID Context, NTSTATUS Status, ULONG Count) { + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest = + (PDATAGRAM_RECEIVE_REQUEST)Context; + TI_DbgPrint(MAX_TRACE,("Called (%08x:%08x)\n", Status, Count)); + ReceiveRequest->UserComplete( ReceiveRequest->UserContext, Status, Count ); + exFreePool( ReceiveRequest ); + TI_DbgPrint(MAX_TRACE,("Done\n")); +} + +NTSTATUS DGReceiveDatagram( + PADDRESS_FILE AddrFile, + PTDI_CONNECTION_INFORMATION ConnInfo, + PCHAR BufferData, + ULONG ReceiveLength, + ULONG ReceiveFlags, + PTDI_CONNECTION_INFORMATION ReturnInfo, + PULONG BytesReceived, + PDATAGRAM_COMPLETION_ROUTINE Complete, + PVOID Context, + PIRP Irp) +/* + * FUNCTION: Attempts to receive an DG datagram from a remote address + * ARGUMENTS: + * Request = Pointer to TDI request + * ConnInfo = Pointer to connection information + * Buffer = Pointer to NDIS buffer chain to store received data + * ReceiveLength = Maximum size to use of buffer, 0 if all can be used + * ReceiveFlags = Receive flags (None, Normal, Peek) + * ReturnInfo = Pointer to structure for return information + * BytesReceive = Pointer to structure for number of bytes received + * RETURNS: + * Status of operation + * NOTES: + * This is the high level interface for receiving DG datagrams + */ +{ + KIRQL OldIrql; + NTSTATUS Status; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; + + TI_DbgPrint(MAX_TRACE, ("Called.\n")); + + TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); + + if (AF_IS_VALID(AddrFile)) + { + ReceiveRequest = exAllocatePool(NonPagedPool, sizeof(DATAGRAM_RECEIVE_REQUEST)); + if (ReceiveRequest) + { + /* Initialize a receive request */ + + /* Extract the remote address filter from the request (if any) */ + if ((ConnInfo->RemoteAddressLength != 0) && + (ConnInfo->RemoteAddress)) + { + Status = AddrGetAddress(ConnInfo->RemoteAddress, + &ReceiveRequest->RemoteAddress, + &ReceiveRequest->RemotePort); + if (!NT_SUCCESS(Status)) + { + TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + exFreePool(ReceiveRequest); + return Status; + } + } + else + { + ReceiveRequest->RemotePort = 0; + } + ReceiveRequest->ReturnInfo = ReturnInfo; + ReceiveRequest->Buffer = BufferData; + ReceiveRequest->BufferSize = ReceiveLength; + ReceiveRequest->UserComplete = Complete; + ReceiveRequest->UserContext = Context; + ReceiveRequest->Complete = + (PDATAGRAM_COMPLETION_ROUTINE)DGReceiveComplete; + ReceiveRequest->Context = ReceiveRequest; + ReceiveRequest->AddressFile = AddrFile; + ReceiveRequest->Irp = Irp; + + /* Queue receive request */ + InsertTailList(&AddrFile->ReceiveQueue, &ReceiveRequest->ListEntry); + AF_SET_PENDING(AddrFile, AFF_RECEIVE); + + TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + + TI_DbgPrint(MAX_TRACE, ("Leaving (pending %08x).\n", ReceiveRequest)); + + return STATUS_PENDING; + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + Status = STATUS_INVALID_ADDRESS; + } + + TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + + TI_DbgPrint(MAX_TRACE, ("Leaving with errors (0x%X).\n", Status)); + + return Status; +} Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c Fri Nov 23 16:52:56 2007 @@ -228,110 +228,6 @@ return STATUS_SUCCESS; } -VOID RawIpReceiveComplete(PVOID Context, NTSTATUS Status, ULONG Count) { - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest = - (PDATAGRAM_RECEIVE_REQUEST)Context; - TI_DbgPrint(MAX_TRACE,("Called\n")); - ReceiveRequest->UserComplete( ReceiveRequest->UserContext, Status, Count ); - exFreePool( ReceiveRequest ); - TI_DbgPrint(MAX_TRACE,("Done\n")); -} - -NTSTATUS RawIPReceiveDatagram( - PADDRESS_FILE AddrFile, - PTDI_CONNECTION_INFORMATION ConnInfo, - PCHAR BufferData, - ULONG ReceiveLength, - ULONG ReceiveFlags, - PTDI_CONNECTION_INFORMATION ReturnInfo, - PULONG BytesReceived, - PDATAGRAM_COMPLETION_ROUTINE Complete, - PVOID Context) -/* - * FUNCTION: Attempts to receive an RawIp datagram from a remote address - * ARGUMENTS: - * Request = Pointer to TDI request - * ConnInfo = Pointer to connection information - * Buffer = Pointer to NDIS buffer chain to store received data - * ReceiveLength = Maximum size to use of buffer, 0 if all can be used - * ReceiveFlags = Receive flags (None, Normal, Peek) - * ReturnInfo = Pointer to structure for return information - * BytesReceive = Pointer to structure for number of bytes received - * RETURNS: - * Status of operation - * NOTES: - * This is the high level interface for receiving RawIp datagrams - */ -{ - KIRQL OldIrql; - NTSTATUS Status; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; - - TI_DbgPrint(MAX_TRACE, ("Called.\n")); - - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - if (AF_IS_VALID(AddrFile)) - { - ReceiveRequest = exAllocatePool(NonPagedPool, sizeof(DATAGRAM_RECEIVE_REQUEST)); - if (ReceiveRequest) - { - /* Initialize a receive request */ - - /* Extract the remote address filter from the request (if any) */ - if ((ConnInfo->RemoteAddressLength != 0) && - (ConnInfo->RemoteAddress)) - { - Status = AddrGetAddress(ConnInfo->RemoteAddress, - &ReceiveRequest->RemoteAddress, - &ReceiveRequest->RemotePort); - if (!NT_SUCCESS(Status)) - { - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - exFreePool(ReceiveRequest); - return Status; - } - } - else - { - ReceiveRequest->RemotePort = 0; - } - ReceiveRequest->ReturnInfo = ReturnInfo; - ReceiveRequest->Buffer = BufferData; - ReceiveRequest->BufferSize = ReceiveLength; - ReceiveRequest->UserComplete = Complete; - ReceiveRequest->UserContext = Context; - ReceiveRequest->Complete = - (PDATAGRAM_COMPLETION_ROUTINE)RawIpReceiveComplete; - ReceiveRequest->Context = ReceiveRequest; - - /* Queue receive request */ - InsertTailList(&AddrFile->ReceiveQueue, &ReceiveRequest->ListEntry); - AF_SET_PENDING(AddrFile, AFF_RECEIVE); - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - TI_DbgPrint(MAX_TRACE, ("Leaving (pending).\n")); - - return STATUS_PENDING; - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - } - else - { - Status = STATUS_INVALID_ADDRESS; - } - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - TI_DbgPrint(MAX_TRACE, ("Leaving with errors (0x%X).\n", Status)); - - return Status; -} - VOID RawIpReceive(PIP_INTERFACE Interface, PIP_PACKET IPPacket) /* Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c Fri Nov 23 16:52:56 2007 @@ -201,110 +201,6 @@ IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ); return STATUS_SUCCESS; -} - -VOID UDPReceiveComplete(PVOID Context, NTSTATUS Status, ULONG Count) { - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest = - (PDATAGRAM_RECEIVE_REQUEST)Context; - TI_DbgPrint(MAX_TRACE,("Called\n")); - ReceiveRequest->UserComplete( ReceiveRequest->UserContext, Status, Count ); - exFreePool( ReceiveRequest ); - TI_DbgPrint(MAX_TRACE,("Done\n")); -} - -NTSTATUS UDPReceiveDatagram( - PADDRESS_FILE AddrFile, - PTDI_CONNECTION_INFORMATION ConnInfo, - PCHAR BufferData, - ULONG ReceiveLength, - ULONG ReceiveFlags, - PTDI_CONNECTION_INFORMATION ReturnInfo, - PULONG BytesReceived, - PDATAGRAM_COMPLETION_ROUTINE Complete, - PVOID Context) -/* - * FUNCTION: Attempts to receive an UDP datagram from a remote address - * ARGUMENTS: - * Request = Pointer to TDI request - * ConnInfo = Pointer to connection information - * Buffer = Pointer to NDIS buffer chain to store received data - * ReceiveLength = Maximum size to use of buffer, 0 if all can be used - * ReceiveFlags = Receive flags (None, Normal, Peek) - * ReturnInfo = Pointer to structure for return information - * BytesReceive = Pointer to structure for number of bytes received - * RETURNS: - * Status of operation - * NOTES: - * This is the high level interface for receiving UDP datagrams - */ -{ - KIRQL OldIrql; - NTSTATUS Status; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; - - TI_DbgPrint(MAX_TRACE, ("Called.\n")); - - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - if (AF_IS_VALID(AddrFile)) - { - ReceiveRequest = exAllocatePool(NonPagedPool, sizeof(DATAGRAM_RECEIVE_REQUEST)); - if (ReceiveRequest) - { - /* Initialize a receive request */ - - /* Extract the remote address filter from the request (if any) */ - if ((ConnInfo->RemoteAddressLength != 0) && - (ConnInfo->RemoteAddress)) - { - Status = AddrGetAddress(ConnInfo->RemoteAddress, - &ReceiveRequest->RemoteAddress, - &ReceiveRequest->RemotePort); - if (!NT_SUCCESS(Status)) - { - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - exFreePool(ReceiveRequest); - return Status; - } - } - else - { - ReceiveRequest->RemotePort = 0; - } - ReceiveRequest->ReturnInfo = ReturnInfo; - ReceiveRequest->Buffer = BufferData; - ReceiveRequest->BufferSize = ReceiveLength; - ReceiveRequest->UserComplete = Complete; - ReceiveRequest->UserContext = Context; - ReceiveRequest->Complete = - (PDATAGRAM_COMPLETION_ROUTINE)UDPReceiveComplete; - ReceiveRequest->Context = ReceiveRequest; - - /* Queue receive request */ - InsertTailList(&AddrFile->ReceiveQueue, &ReceiveRequest->ListEntry); - AF_SET_PENDING(AddrFile, AFF_RECEIVE); - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - TI_DbgPrint(MAX_TRACE, ("Leaving (pending).\n")); - - return STATUS_PENDING; - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - } - else - { - Status = STATUS_INVALID_ADDRESS; - } - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - TI_DbgPrint(MAX_TRACE, ("Leaving with errors (0x%X).\n", Status)); - - return Status; }

1 0

[fireball] 30692: - Fix typos.
by fireball＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: fireball Date: Fri Nov 23 16:48:25 2007 New Revision: 30692 URL: http://svn.reactos.org/svn/reactos?rev=30692&view=rev Log: - Fix typos. Modified: trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc Fri Nov 23 16:48:25 2007 @@ -13,21 +13,21 @@ 4103 "%1(%2!d!) : îæèäàåòñÿ öåëî÷èñëåííûé ïàðàìåòð" 4104 "%1(%2!d!) : '%3' : íåäîïóñòèìûé òèï" 4105 "Íåäîñòàòî÷íî ïàìÿòè äëÿ âûïîëíåíèÿ ñöåíàðèÿ." - 4106 "%1(%2!d!) : '%3' : êðèòè÷åññêàÿ âíóòðåííÿ îøèáêà." + 4106 "%1(%2!d!) : '%3' : êðèòè÷åñêàÿ âíóòðåííÿÿ îøèáêà." 4107 "%1(%2!d!) : '%3' : íåäîïóñòèìûé ïàðàìåòð" 4108 "%1(%2!d!) : '%3' : íåäîïóñòèìûé ïàðàìåòð 'set ipaddr'" 4109 "%1(%2!d!) : '%3' : íåäîïóñòèìûé ïàðàìåòð 'set port'" 4110 "%1(%2!d!) : '%3' : íåäîïóñòèìûé ÷èñëîâîé äèàïàçîí" - 4111 "%1(%2!d!) : '%3' : íåäîïóñòèìûé ïàðàìåò 'set screen'" + 4111 "%1(%2!d!) : '%3' : íåäîïóñòèìûé ïàðàìåòð 'set screen'" 4112 "%1(%2!d!) : '%3' : îæèäàåòñÿ '('" 4113 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü öåëî÷èñëåííûì" 4114 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü ñòðîêîâûì" - 4115 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü áóëåâñêèì" + 4115 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü áóëåâûì" 4116 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü öåëî÷èñëåííûì èëè ñòðîêîâûì" 4117 "%1(%2!d!) : '%3' : íåñîîòâåòñòâèå òèïîâ" 4118 "%1(%2!d!) : '%3' : èäåíòèôèêàòîð óæå îïðåäåëåí" 4119 "%1(%2!d!) : '%3' : èäåíòèôèêàòîð íå îïðåäåëåí" 4120 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü òèïîì ìåòêè" 4121 "%1(%2!d!) : äåëåíèå íà íîëü" - 4122 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü öåëî÷èñëåííûì, ñòðîêîâûì èëè áóëåâñêèì" + 4122 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü öåëî÷èñëåííûì, ñòðîêîâûì èëè áóëåâûì" END

1 0

[fireball] 30691: - Add a check for an incorrect virtual size. Currently ReactOS's floppy.sys has such an incorrect section.
by fireball＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: fireball Date: Fri Nov 23 16:39:31 2007 New Revision: 30691 URL: http://svn.reactos.org/svn/reactos?rev=30691&view=rev Log: - Add a check for an incorrect virtual size. Currently ReactOS's floppy.sys has such an incorrect section. Modified: trunk/reactos/lib/rossym/frommem.c Modified: trunk/reactos/lib/rossym/frommem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/frommem.c?rev=3… ============================================================================== --- trunk/reactos/lib/rossym/frommem.c (original) +++ trunk/reactos/lib/rossym/frommem.c Fri Nov 23 16:39:31 2007 @@ -24,8 +24,9 @@ PIMAGE_DOS_HEADER DosHeader; PIMAGE_NT_HEADERS NtHeaders; PIMAGE_SECTION_HEADER SectionHeader; - unsigned SectionIndex; - char SectionName[IMAGE_SIZEOF_SHORT_NAME]; + ULONG SectionIndex; + BOOLEAN RosSymSectionFound = FALSE; + CHAR SectionName[IMAGE_SIZEOF_SHORT_NAME]; /* Check if MZ header is valid */ DosHeader = (PIMAGE_DOS_HEADER) ImageStart; @@ -58,11 +59,13 @@ { if (0 == memcmp(SectionName, SectionHeader->Name, IMAGE_SIZEOF_SHORT_NAME)) { + RosSymSectionFound = TRUE; break; } SectionHeader++; } - if (NtHeaders->FileHeader.NumberOfSections <= SectionIndex) + + if (!RosSymSectionFound) { DPRINT("No %s section found\n", ROSSYM_SECTION_NAME); return FALSE; @@ -76,6 +79,12 @@ return FALSE; } + if (SectionHeader->VirtualAddress + SectionHeader->Misc.VirtualSize > ImageSize) + { + DPRINT("Bad %s section virtual size!\n", ROSSYM_SECTION_NAME); + return FALSE; + } + /* Load it */ return RosSymCreateFromRaw((char *) ImageStart + SectionHeader->VirtualAddress, SectionHeader->SizeOfRawData, RosSymInfo);

1 0

[cwittich] 30689: link to secur32 - will be needed by newer wine versions
by cwittich＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: cwittich Date: Fri Nov 23 13:10:21 2007 New Revision: 30689 URL: http://svn.reactos.org/svn/reactos?rev=30689&view=rev Log: link to secur32 - will be needed by newer wine versions Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.rbuild (original) +++ trunk/reactos/dll/win32/wininet/wininet.rbuild Fri Nov 23 13:10:21 2007 @@ -17,6 +17,7 @@ <library>mpr</library> <library>ws2_32</library> <library>crypt32</library> + <library>secur32</library> <file>cookie.c</file> <file>dialogs.c</file> <file>ftp.c</file>

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