Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-23 20:24:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDI32_APITEST]

Browse source 
-include the testdata in all targets
-load it from the correct path even when the application is using a different working directory

svn path=/trunk/; revision=68623
This commit is contained in:
Christoph von Wittich 2015-08-08 08:31:49 +00:00
parent 3b0dfe2c25
commit 1f7ffb9c1d
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rostests/CMakeLists.txt
View file

@ -17,7 +17,7 @@ add_subdirectory(winetests)
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/testdata/) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/testdata/)
file(GLOB_RECURSE TESTDATA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/testdata/ ${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}) 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) endforeach(item)
endif() endif()

2
rostests/apitests/gdi32/AddFontResource.c
View file

@ -18,7 +18,7 @@ void Test_AddFontResourceA()
CHAR szFileNameFont2A[MAX_PATH]; CHAR szFileNameFont2A[MAX_PATH];
int result; int result;
GetCurrentDirectoryA(MAX_PATH,szFileNameA); GetWindowsDirectoryA(szFileNameA,MAX_PATH);
memcpy(szFileNameFont1A,szFileNameA,MAX_PATH ); memcpy(szFileNameFont1A,szFileNameA,MAX_PATH );
strcat(szFileNameFont1A, "\\bin\\testdata\\test.ttf"); strcat(szFileNameFont1A, "\\bin\\testdata\\test.ttf");