Index: winetests/kernel32/directory.c
===================================================================
--- winetests/kernel32/directory.c	(revision 67443)
+++ winetests/kernel32/directory.c	(working copy)
@@ -159,7 +159,7 @@
     char tmpdir[MAX_PATH];
     BOOL ret;
 
-    ret = CreateDirectoryA(NULL, NULL);
+    ret = CreateDirectoryA(NULL, NULL); 
     ok(ret == FALSE && (GetLastError() == ERROR_PATH_NOT_FOUND ||
                         GetLastError() == ERROR_INVALID_PARAMETER),
        "CreateDirectoryA(NULL): ret=%d err=%d\n", ret, GetLastError());
@@ -192,7 +192,7 @@
        "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
 
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me");
+    lstrcatA(tmpdir, "Please Remove Me 2");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE,       "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
 
@@ -220,7 +220,7 @@
     RemoveDirectoryA(tmpdir);
 
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me/Please Remove Me");
+    lstrcatA(tmpdir, "Please Remove Me 2/Please Remove Me 2");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, 
        "CreateDirectoryA(%s): ret=%d err=%d\n", tmpdir, ret, GetLastError());
@@ -230,12 +230,12 @@
      * The directory should be created without the dot.
      */
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me.");
+    lstrcatA(tmpdir, "Please Remove Me 2.");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE,
        "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
 
-    lstrcatA(tmpdir, "/Please Remove Me");
+    lstrcatA(tmpdir, "/Please Remove Me 2");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE,
        "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
@@ -244,7 +244,7 @@
        "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
 
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me");
+    lstrcatA(tmpdir, "Please Remove Me 2");
     ret = RemoveDirectoryA(tmpdir);
     ok(ret == TRUE,
        "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
@@ -253,12 +253,12 @@
      * The directory should be created without the trailing dots.
      */
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me..");
+    lstrcatA(tmpdir, "Please Remove Me 2..");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE,
        "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
 
-    lstrcatA(tmpdir, "/Please Remove Me");
+    lstrcatA(tmpdir, "/Please Remove Me 2");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE || /* On Win98 */
        (ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND), /* On NT! */
@@ -271,7 +271,7 @@
     }
 
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me");
+    lstrcatA(tmpdir, "Please Remove Me 2");
     ret = RemoveDirectoryA(tmpdir);
     ok(ret == TRUE,
        "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
@@ -280,12 +280,12 @@
      * The directory should be created without the trailing space.
      */
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me ");
+    lstrcatA(tmpdir, "Please Remove Me 2 ");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE,
        "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
 
-    lstrcatA(tmpdir, "/Please Remove Me");
+    lstrcatA(tmpdir, "/Please Remove Me 2");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE || /* On Win98 */
        (ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND), /* On NT! */
@@ -298,7 +298,7 @@
     }
 
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me");
+    lstrcatA(tmpdir, "Please Remove Me 2");
     ret = RemoveDirectoryA(tmpdir);
     ok(ret == TRUE,
        "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
@@ -307,12 +307,12 @@
      * The directory should be created without the trailing spaces.
      */
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me  ");
+    lstrcatA(tmpdir, "Please Remove Me 2  ");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE,
        "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
 
-    lstrcatA(tmpdir, "/Please Remove Me");
+    lstrcatA(tmpdir, "/Please Remove Me 2");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE || /* On Win98 */
        (ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND), /* On NT! */
@@ -325,7 +325,7 @@
     }
 
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me");
+    lstrcatA(tmpdir, "Please Remove Me 2");
     ret = RemoveDirectoryA(tmpdir);
     ok(ret == TRUE,
        "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError());
@@ -336,7 +336,7 @@
     WCHAR tmpdir[MAX_PATH];
     BOOL ret;
     static const WCHAR empty_strW[] = { 0 };
-    static const WCHAR tmp_dir_name[] = {'P','l','e','a','s','e',' ','R','e','m','o','v','e',' ','M','e',0};
+    static const WCHAR tmp_dir_name[] = {'P','l','e','a','s','e',' ','R','e','m','o','v','e',' ','M','e',' ','2',0};
     static const WCHAR dotW[] = {'.',0};
     static const WCHAR slashW[] = {'/',0};
     static const WCHAR dotdotW[] = {'.','.',0};
@@ -421,7 +421,7 @@
     BOOL ret;
 
     GetTempPathA(MAX_PATH, tmpdir);
-    lstrcatA(tmpdir, "Please Remove Me");
+    lstrcatA(tmpdir, "Please Remove Me 2");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == TRUE, "CreateDirectoryA should always succeed\n");
 
@@ -447,7 +447,7 @@
 {
     WCHAR tmpdir[MAX_PATH];
     BOOL ret;
-    static const WCHAR tmp_dir_name[] = {'P','l','e','a','s','e',' ','R','e','m','o','v','e',' ','M','e',0};
+    static const WCHAR tmp_dir_name[] = {'P','l','e','a','s','e',' ','R','e','m','o','v','e',' ','M','e',' ','2',0};
     static const WCHAR questionW[] = {'?',0};
 
     GetTempPathW(MAX_PATH, tmpdir);