windows-tests-torture-20090226

LICENSE MIT

fix error message

create a file of the specified size

diff --git a/src/WINNT/tests/torture/Source/WinThreads.c b/src/WINNT/tests/torture/Source/WinThreads.c
index 3979057cfccb1345cdf39faf2c9981f3f5724764..5ec893fc904b72e3fbb62475e1e94d2b37d9cdff 100644 (file)
--- a/src/WINNT/tests/torture/Source/WinThreads.c
+++ b/src/WINNT/tests/torture/Source/WinThreads.c
@@ -386,7 +386,7 @@ BOOL run_netbench(int client, char *ClientText, char *PathToSecondDir)
             printf("ERROR: You are using a dbench 1 load file\n");
             if (GetHandleInformation((HANDLE)hWinEventHandle, &dwFlags))
                 break;
-               }
+        }
         if (!strcmp(params[0], "BM_SETUP"))
         {
             bm_state = BM_SETUP;

diff --git a/src/WINNT/tests/torture/Source/nbio.c b/src/WINNT/tests/torture/Source/nbio.c
index 74760a10da41454c7b429be926b3c33d9fcc6a6c..b00cac173254b1e5364a94dfc967d142c5cd4aa9 100644 (file)
--- a/src/WINNT/tests/torture/Source/nbio.c
+++ b/src/WINNT/tests/torture/Source/nbio.c
@@ -286,7 +286,7 @@ int nb_CreateFile(char *path, DWORD size)
     sprintf(FileName, "Thread_%05d.log", ProcessNumber);
     if (strlen(path) == 0)
     {
-        return(LeaveThread(1, "nb_DeleteFile failed no path specified\n", CMD_CREATEFILE));
+        return(LeaveThread(1, "nb_CreateFile failed no path specified\n", CMD_CREATEFILE));
     }
 
     strcpy(NewPath, path);
@@ -312,7 +312,7 @@ int nb_CreateFile(char *path, DWORD size)
     }
     EndFirstTimer(CMD_CREATEFILE, 1);
     Moved = SetFilePointer(fHandle,
-                           size,
+                           size - sizeof(Buffer) <= 0 ? 0 : size - sizeof(Buffer),
                            NULL,
                            FILE_BEGIN);
     memset(Buffer, 'A', sizeof(Buffer));