Author: akhaldi Date: Wed Apr 30 11:59:11 2014 New Revision: 63052
URL: http://svn.reactos.org/svn/reactos?rev=63052&view=rev Log: [ADVPACK_WINETEST] * Sync with Wine 1.7.17. CORE-8080
Modified: trunk/rostests/winetests/advpack/CMakeLists.txt trunk/rostests/winetests/advpack/advpack.c trunk/rostests/winetests/advpack/files.c trunk/rostests/winetests/advpack/install.c
Modified: trunk/rostests/winetests/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/CMakeLis... ============================================================================== --- trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] Wed Apr 30 11:59:11 2014 @@ -8,7 +8,7 @@ testlist.c)
add_executable(advpack_winetest ${SOURCE}) -target_link_libraries(advpack_winetest wine) +target_link_libraries(advpack_winetest) set_module_type(advpack_winetest win32cui) -add_importlibs(advpack_winetest advpack cabinet advapi32 msvcrt kernel32 ntdll) +add_importlibs(advpack_winetest advpack cabinet advapi32 msvcrt kernel32) add_cd_file(TARGET advpack_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack.... ============================================================================== --- trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] Wed Apr 30 11:59:11 2014 @@ -38,15 +38,15 @@
/* defines for the SetPerUserSecValues tests */ #define GUID_KEY "SOFTWARE\Microsoft\Active Setup\Installed Components\guid" -#define REG_VAL_EXISTS(key, value) !RegQueryValueEx(key, value, NULL, NULL, NULL, NULL) -#define OPEN_GUID_KEY() !RegOpenKey(HKEY_LOCAL_MACHINE, GUID_KEY, &guid) +#define REG_VAL_EXISTS(key, value) !RegQueryValueExA(key, value, NULL, NULL, NULL, NULL) +#define OPEN_GUID_KEY() !RegOpenKeyA(HKEY_LOCAL_MACHINE, GUID_KEY, &guid)
static HMODULE hAdvPack; static HRESULT (WINAPI *pCloseINFEngine)(HINF); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); static HRESULT (WINAPI *pGetVersionFromFile)(LPCSTR,LPDWORD,LPDWORD,BOOL); static HRESULT (WINAPI *pOpenINFEngine)(PCSTR,PCSTR,DWORD,HINF*,PVOID); -static HRESULT (WINAPI *pSetPerUserSecValues)(PPERUSERSECTION pPerUser); +static HRESULT (WINAPI *pSetPerUserSecValues)(PPERUSERSECTIONA pPerUser); static HRESULT (WINAPI *pTranslateInfString)(LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD,LPDWORD,LPVOID); static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD,PDWORD,PVOID);
@@ -153,45 +153,45 @@ ok (hr == E_FAIL, "DelNode called with empty pathname should return E_FAIL\n");
/* Test deletion of a file. */ - hn = CreateFile("DelNodeTestFile1", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestFile1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hr = pDelNode(lstrcat(currDir, "\DelNodeTestFile1"), 0); + hr = pDelNode(lstrcatA(currDir, "\DelNodeTestFile1"), 0); ok (hr == S_OK, "DelNode failed deleting a single file\n"); currDir[currDirLen] = '\0';
/* Test deletion of an empty directory. */ CreateDirectoryA("DelNodeTestDir", NULL); - hr = pDelNode(lstrcat(currDir, "\DelNodeTestDir"), 0); + hr = pDelNode(lstrcatA(currDir, "\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting an empty directory\n"); currDir[currDirLen] = '\0';
/* Test deletion of a directory containing one file. */ CreateDirectoryA("DelNodeTestDir", NULL); - hn = CreateFile("DelNodeTestDir\DelNodeTestFile1", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestDir\DelNodeTestFile1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hr = pDelNode(lstrcat(currDir, "\DelNodeTestDir"), 0); + hr = pDelNode(lstrcatA(currDir, "\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting a directory containing one file\n"); currDir[currDirLen] = '\0';
/* Test deletion of a directory containing multiple files. */ CreateDirectoryA("DelNodeTestDir", NULL); - hn = CreateFile("DelNodeTestDir\DelNodeTestFile1", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestDir\DelNodeTestFile1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hn = CreateFile("DelNodeTestDir\DelNodeTestFile2", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestDir\DelNodeTestFile2", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hn = CreateFile("DelNodeTestDir\DelNodeTestFile3", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestDir\DelNodeTestFile3", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hr = pDelNode(lstrcat(currDir, "\DelNodeTestDir"), 0); + hr = pDelNode(lstrcatA(currDir, "\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting a directory containing multiple files\n"); currDir[currDirLen] = '\0'; } @@ -211,8 +211,8 @@ char data[1024]; char *ptr = data; DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(inf_file, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(inf_file, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
append_str(&ptr, "[Version]\n"); append_str(&ptr, "Signature="$Chicago$"\n"); @@ -325,8 +325,8 @@ ok(dwSize == 25, "Expected size 25, got %d\n", dwSize); }
- DeleteFile("c:\a.inf"); - DeleteFile(inf_file); + DeleteFileA("c:\a.inf"); + DeleteFileA(inf_file); }
static void translateinfstringex_test(void) @@ -450,7 +450,7 @@ hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result1", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + ok(!lstrcmpiA(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); @@ -461,14 +461,14 @@ hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result2", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + ok(!lstrcmpiA(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size);
{ char drive[MAX_PATH]; - lstrcpy(drive, PROG_FILES_ROOT); + lstrcpyA(drive, PROG_FILES_ROOT); drive[3] = 0x00; /* Just keep the system drive plus '' */
memset(buffer, 'a', APP_PATH_LEN); @@ -477,7 +477,7 @@ hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result3", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpi(buffer, drive), + ok(!lstrcmpiA(buffer, drive), "Expected %s, got %s\n", drive, buffer); ok(size == strlen(drive)+1, "Expected size %d, got %d\n", lstrlenA(drive)+1, size); @@ -494,7 +494,7 @@ char data[1024]; char *ptr = data; DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(inf_file, GENERIC_WRITE, 0, NULL, + HANDLE hf = CreateFileA(inf_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
append_str(&ptr, "[Version]\n"); @@ -535,7 +535,7 @@ hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result2", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + ok(!lstrcmpiA(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); @@ -552,10 +552,10 @@ DWORD size = MAX_PATH; char check[MAX_PATH];
- if (RegQueryValueEx(hkey, name, NULL, NULL, (LPBYTE)check, &size)) + if (RegQueryValueExA(hkey, name, NULL, NULL, (LPBYTE)check, &size)) return FALSE;
- return !lstrcmp(check, value); + return !lstrcmpA(check, value); }
static BOOL check_reg_dword(HKEY hkey, LPCSTR name, DWORD value) @@ -563,7 +563,7 @@ DWORD size = sizeof(DWORD); DWORD check;
- if (RegQueryValueEx(hkey, name, NULL, NULL, (LPBYTE)&check, &size)) + if (RegQueryValueExA(hkey, name, NULL, NULL, (LPBYTE)&check, &size)) return FALSE;
return (check == value); @@ -571,15 +571,15 @@
static void setperusersecvalues_test(void) { - PERUSERSECTION peruser; + PERUSERSECTIONA peruser; HRESULT hr; HKEY guid;
- lstrcpy(peruser.szDispName, "displayname"); - lstrcpy(peruser.szLocale, "locale"); - lstrcpy(peruser.szStub, "stub"); - lstrcpy(peruser.szVersion, "1,1,1,1"); - lstrcpy(peruser.szCompID, "compid"); + lstrcpyA(peruser.szDispName, "displayname"); + lstrcpyA(peruser.szLocale, "locale"); + lstrcpyA(peruser.szStub, "stub"); + lstrcpyA(peruser.szVersion, "1,1,1,1"); + lstrcpyA(peruser.szCompID, "compid"); peruser.dwIsInstalled = 1; peruser.bRollback = FALSE;
@@ -600,7 +600,7 @@ ok(!OPEN_GUID_KEY(), "Expected guid key to not exist\n");
/* set initial values */ - lstrcpy(peruser.szGUID, "guid"); + lstrcpyA(peruser.szGUID, "guid"); hr = pSetPerUserSecValues(&peruser); if (hr == E_FAIL) { @@ -622,7 +622,7 @@ ok(!REG_VAL_EXISTS(guid, "RealStubPath"), "Expected RealStubPath to not exist\n");
/* raise the version, but bRollback is FALSE, so vals not saved */ - lstrcpy(peruser.szVersion, "2,1,1,1"); + lstrcpyA(peruser.szVersion, "2,1,1,1"); hr = pSetPerUserSecValues(&peruser); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); @@ -639,7 +639,7 @@
/* raise the version again, bRollback is TRUE so vals are saved */ peruser.bRollback = TRUE; - lstrcpy(peruser.szVersion, "3,1,1,1"); + lstrcpyA(peruser.szVersion, "3,1,1,1"); hr = pSetPerUserSecValues(&peruser); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); @@ -659,7 +659,7 @@ "Expected real stub\n"); }
- RegDeleteKey(HKEY_LOCAL_MACHINE, GUID_KEY); + RegDeleteKeyA(HKEY_LOCAL_MACHINE, GUID_KEY); }
START_TEST(advpack) @@ -670,8 +670,8 @@ /* Make sure we create the temporary file in a directory * were we have enough rights */ - GetTempPath(MAX_PATH, inf_file); - lstrcat(inf_file,"test.inf"); + GetTempPathA(MAX_PATH, inf_file); + lstrcatA(inf_file,"test.inf");
get_progfiles_dir();
Modified: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c?... ============================================================================== --- trunk/rostests/winetests/advpack/files.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/files.c [iso-8859-1] Wed Apr 30 11:59:11 2014 @@ -142,7 +142,7 @@ /* create the INF file */ res = pAddDelBackupEntry("one\0two\0three\0", "c:\", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); - if (GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES) { ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); ok(DeleteFileA(path), "Expected path to exist\n"); @@ -317,8 +317,8 @@ DWORD attrs; BOOL res;
- handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName);
@@ -328,7 +328,7 @@ FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime);
- attrs = GetFileAttributes(pszName); + attrs = GetFileAttributesA(pszName); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n");
return (INT_PTR)handle; @@ -502,7 +502,7 @@ HMODULE hmod; char destFolder[MAX_PATH];
- hmod = LoadLibrary("setupapi.dll"); + hmod = LoadLibraryA("setupapi.dll"); if (!hmod) { skip("setupapi.dll not present\n"); @@ -558,7 +558,7 @@ init_function_pointers();
GetCurrentDirectoryA(MAX_PATH, prev_path); - GetTempPath(MAX_PATH, temp_path); + GetTempPathA(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path);
lstrcpyA(CURR_DIR, temp_path);
Modified: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install.... ============================================================================== --- trunk/rostests/winetests/advpack/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/install.c [iso-8859-1] Wed Apr 30 11:59:11 2014 @@ -65,8 +65,8 @@ static void create_inf_file(LPCSTR filename) { DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
static const char data[] = "[Version]\n" @@ -131,10 +131,10 @@ create_inf_file("one\test.inf");
/* try a full path to the INF, with working dir provided */ - lstrcpy(path, CURR_DIR); - lstrcat(path, "\one\test.inf"); - lstrcpy(dir, CURR_DIR); - lstrcat(dir, "\one"); + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\one\test.inf"); + lstrcpyA(dir, CURR_DIR); + lstrcatA(dir, "\one"); hr = pRunSetupCommand(NULL, path, "DefaultInstall", dir, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", hr);
@@ -212,9 +212,9 @@ create_inf_file("one\test.inf");
/* try a full path to the INF */ - lstrcpy(cmdline, CURR_DIR); - lstrcat(cmdline, "\"); - lstrcat(cmdline, "one\test.inf,DefaultInstall,,4"); + lstrcpyA(cmdline, CURR_DIR); + lstrcatA(cmdline, "\"); + lstrcatA(cmdline, "one\test.inf,DefaultInstall,,4"); hr = pLaunchINFSection(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr);
@@ -238,16 +238,16 @@ create_inf_file("test.inf");
/* try an invalid CAB filename with an absolute INF name */ - lstrcpy(cmdline, CURR_DIR); - lstrcat(cmdline, "\"); - lstrcat(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + lstrcpyA(cmdline, CURR_DIR); + lstrcatA(cmdline, "\"); + lstrcatA(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr);
/* try quoting the parameters */ - lstrcpy(cmdline, """); - lstrcat(cmdline, CURR_DIR); - lstrcat(cmdline, "\test.inf","DefaultInstall","c:,imacab.cab","4""); + lstrcpyA(cmdline, """); + lstrcatA(cmdline, CURR_DIR); + lstrcatA(cmdline, "\test.inf","DefaultInstall","c:,imacab.cab","4""); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr);
@@ -257,7 +257,7 @@ if (winetest_interactive) { /* try an invalid CAB filename with a relative INF name */ - lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + lstrcpyA(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); } @@ -280,7 +280,7 @@ }
GetCurrentDirectoryA(MAX_PATH, prev_path); - GetTempPath(MAX_PATH, temp_path); + GetTempPathA(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path);
lstrcpyA(CURR_DIR, temp_path);
-
akhaldi＠svn.reactos.org