[ros-diffs] [pschweitzer] 33904: Synced shlwapi_winetest.exe with Wine HEAD

[pschweitzer at svn.reactos.org]

Author: pschweitzer
Date: Sun Jun  8 12:14:50 2008
New Revision: 33904

URL: http://svn.reactos.org/svn/reactos?rev=33904&view=rev
Log:
Synced shlwapi_winetest.exe with Wine HEAD

Modified:
    trunk/rostests/winetests/shlwapi/istream.c
    trunk/rostests/winetests/shlwapi/shlwapi.rbuild
    trunk/rostests/winetests/shlwapi/string.c

Modified: trunk/rostests/winetests/shlwapi/istream.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/istream.c?rev=33904&r1=33903&r2=33904&view=diff
==============================================================================
--- trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] Sun Jun  8 12:14:50 2008
@@ -197,9 +197,14 @@
     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 */
 
@@ -284,9 +289,14 @@
     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 */
 

Modified: trunk/rostests/winetests/shlwapi/shlwapi.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shlwapi.rbuild?rev=33904&r1=33903&r2=33904&view=diff
==============================================================================
--- trunk/rostests/winetests/shlwapi/shlwapi.rbuild [iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/shlwapi.rbuild [iso-8859-1] Sun Jun  8 12:14:50 2008
@@ -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>

Modified: trunk/rostests/winetests/shlwapi/string.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.c?rev=33904&r1=33903&r2=33904&view=diff
==============================================================================
--- trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] Sun Jun  8 12:14:50 2008
@@ -957,4 +957,6 @@
   test_SHAnsiToAnsi();
   test_SHUnicodeToUnicode();
   test_StrXXX_overflows();
-}
+
+  CoUninitialize();
+}