From cbf728b4777962185025d7feea404b137b2d37de Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Sun, 8 Jun 2008 17:14:50 +0000
Subject: [PATCH] Synced shlwapi_winetest.exe with Wine HEAD

svn path=/trunk/; revision=33904
---
 rostests/winetests/shlwapi/istream.c      | 14 ++++++++++++--
 rostests/winetests/shlwapi/shlwapi.rbuild |  2 +-
 rostests/winetests/shlwapi/string.c       |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/rostests/winetests/shlwapi/istream.c b/rostests/winetests/shlwapi/istream.c
index ef7191ca4fb..d8aced58c3a 100644
--- a/rostests/winetests/shlwapi/istream.c
+++ b/rostests/winetests/shlwapi/istream.c
@@ -197,10 +197,15 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm)
     IStream * stream;
     HRESULT ret;
     ULONG refcount;
-    static const char * test_file = "c:\\test.txt";
+    char test_file[MAX_PATH];
+    static const CHAR testA_txt[] = "\\testA.txt";
 
     trace("SHCreateStreamOnFileA: testing mode %d, STGM flags %08x\n", mode, stgm);
 
+    /* Don't used a fixed path for the testA.txt file */
+    GetTempPathA(MAX_PATH, test_file);
+    lstrcatA(test_file, testA_txt);
+
     /* invalid arguments */
 
     stream = NULL;
@@ -284,10 +289,15 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm)
     IStream * stream;
     HRESULT ret;
     ULONG refcount;
-    static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't', '\0' };
+    WCHAR test_file[MAX_PATH];
+    static const WCHAR testW_txt[] = { '\\', 't', 'e', 's', 't', 'W', '.', 't', 'x', 't', '\0' };
 
     trace("SHCreateStreamOnFileW: testing mode %d, STGM flags %08x\n", mode, stgm);
 
+    /* Don't used a fixed path for the testW.txt file */
+    GetTempPathW(MAX_PATH, test_file);
+    lstrcatW(test_file, testW_txt);
+
     /* invalid arguments */
 
     stream = NULL;
diff --git a/rostests/winetests/shlwapi/shlwapi.rbuild b/rostests/winetests/shlwapi/shlwapi.rbuild
index 29025301b71..ac5bc5ef854 100644
--- a/rostests/winetests/shlwapi/shlwapi.rbuild
+++ b/rostests/winetests/shlwapi/shlwapi.rbuild
@@ -16,12 +16,12 @@
 	<file>url.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
+	<library>uuid</library>
 	<library>shlwapi</library>
 	<library>advapi32</library>
 	<library>ole32</library>
 	<library>oleaut32</library>
 	<library>kernel32</library>
-	<library>uuid</library>
 	<library>ntdll</library>
 </module>
 </group>
diff --git a/rostests/winetests/shlwapi/string.c b/rostests/winetests/shlwapi/string.c
index 0b4f28ba29e..79a645c2e71 100755
--- a/rostests/winetests/shlwapi/string.c
+++ b/rostests/winetests/shlwapi/string.c
@@ -957,4 +957,6 @@ START_TEST(string)
   test_SHAnsiToAnsi();
   test_SHUnicodeToUnicode();
   test_StrXXX_overflows();
+
+  CoUninitialize();
 }