[cwittich] 68623: [GDI32_APITEST] -include the testdata in all targets -load it from the correct path even when the application is using a different working directory

Author: cwittich
Date: Sat Aug  8 08:31:49 2015
New Revision: 68623

URL: http://svn.reactos.org/svn/reactos?rev=68623&view=rev
Log:
[GDI32_APITEST]
-include the testdata in all targets
-load it from the correct path even when the application is using a different working
directory

Modified:
    trunk/rostests/CMakeLists.txt
    trunk/rostests/apitests/gdi32/AddFontResource.c

Modified: trunk/rostests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=68623&…
==============================================================================
--- trunk/rostests/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/CMakeLists.txt	[iso-8859-1] Sat Aug  8 08:31:49 2015
@@ -17,7 +17,7 @@
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/testdata/)
     file(GLOB_RECURSE TESTDATA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/
${CMAKE_CURRENT_SOURCE_DIR}/testdata/*)
     foreach(item ${TESTDATA_FILES})
-        add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/${item} DESTINATION
reactos/bin/testdata NAME_ON_CD ${item} FOR regtest)
+        add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/${item} DESTINATION
reactos/bin/testdata NAME_ON_CD ${item} FOR all)
     endforeach(item)
 endif()
 

Modified: trunk/rostests/apitests/gdi32/AddFontResource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes…
==============================================================================
--- trunk/rostests/apitests/gdi32/AddFontResource.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/AddFontResource.c	[iso-8859-1] Sat Aug  8 08:31:49 2015
@@ -18,7 +18,7 @@
     CHAR szFileNameFont2A[MAX_PATH];
     int result;
 
-    GetCurrentDirectoryA(MAX_PATH,szFileNameA);
+    GetWindowsDirectoryA(szFileNameA,MAX_PATH);
 
     memcpy(szFileNameFont1A,szFileNameA,MAX_PATH );
     strcat(szFileNameFont1A, "\\bin\\testdata\\test.ttf");