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

[ADVPACK_WINETEST]: Sync with Wine 1.5.19.

Browse source 
svn path=/trunk/; revision=57862
This commit is contained in:
Amine Khaldi 2012-12-10 14:29:16 +00:00
parent 368132c7ca
commit d6ace1bfbc
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rostests/winetests/advpack/CMakeLists.txt
View file

@ -1,7 +1,5 @@
add_definitions(
-D__ROS_LONG64__
-D_DLL -D__USE_CRTIMP)
add_definitions(-D__ROS_LONG64__)
list(APPEND SOURCE
advpack.c
@ -10,9 +8,7 @@ list(APPEND SOURCE
testlist.c)
add_executable(advpack_winetest ${SOURCE})
target_link_libraries(advpack_winetest wine)
set_module_type(advpack_winetest win32cui)
add_importlibs(advpack_winetest cabinet advapi32 msvcrt kernel32 ntdll)
add_importlibs(advpack_winetest advpack cabinet advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET advpack_winetest DESTINATION reactos/bin FOR all)

22
rostests/winetests/advpack/files.c
View file

@ -32,6 +32,7 @@
static HMODULE hAdvPack;
static HRESULT (WINAPI *pAddDelBackupEntry)(LPCSTR, LPCSTR, LPCSTR, DWORD);
static HRESULT (WINAPI *pExtractFiles)(LPCSTR, LPCSTR, DWORD, LPCSTR, LPVOID, DWORD);
static HRESULT (WINAPI *pExtractFilesW)(const WCHAR*,const WCHAR*,DWORD,const WCHAR*,void*,DWORD);
static HRESULT (WINAPI *pAdvInstallFile)(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,DWORD,DWORD);
static CHAR CURR_DIR[MAX_PATH];
@ -44,6 +45,7 @@ static void init_function_pointers(void)
{
pAddDelBackupEntry = (void *)GetProcAddress(hAdvPack, "AddDelBackupEntry");
pExtractFiles = (void *)GetProcAddress(hAdvPack, "ExtractFiles");
pExtractFilesW = (void *)GetProcAddress(hAdvPack, "ExtractFilesW");
pAdvInstallFile = (void*)GetProcAddress(hAdvPack, "AdvInstallFile");
}
}
@ -468,13 +470,29 @@ static void test_ExtractFiles(void)
ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n");
ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n");
ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n");
if(pExtractFilesW) {
static const WCHAR extract_cabW[] = {'e','x','t','r','a','c','t','.','c','a','b',0};
static const WCHAR destW[] = {'d','e','s','t',0};
static const WCHAR file_listW[] =
{'a','.','t','x','t',':','t','e','s','t','d','i','r','\\','c','.','t','x','t',0};
hr = pExtractFilesW(extract_cabW, destW, 0, file_listW, NULL, 0);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n");
ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n");
ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n");
ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n");
ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n");
}else {
win_skip("ExtractFilesW not available\n");
}
}
static void test_AdvInstallFile(void)
{
HRESULT hr;
HMODULE hmod;
char CURR_DIR[MAX_PATH];
char destFolder[MAX_PATH];
hmod = LoadLibrary("setupapi.dll");
@ -486,8 +504,6 @@ static void test_AdvInstallFile(void)
FreeLibrary(hmod);
GetCurrentDirectoryA(MAX_PATH, CURR_DIR);
lstrcpyA(destFolder, CURR_DIR);
lstrcatA(destFolder, "\\");
lstrcatA(destFolder, "dest");

6
rostests/winetests/advpack/install.c
View file

@ -259,6 +259,12 @@ START_TEST(install)
if (!init_function_pointers())
return;
if (!IsNTAdmin(0, NULL))
{
skip("Most tests need admin rights\n");
return;
}
GetCurrentDirectoryA(MAX_PATH, prev_path);
GetTempPath(MAX_PATH, temp_path);
SetCurrentDirectoryA(temp_path);