Commit ba7f633f authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

advpack/tests: Compile with -D__WINESRC__.

parent f6b2aa4a
TESTDLL = advpack.dll TESTDLL = advpack.dll
IMPORTS = cabinet advapi32 advpack IMPORTS = cabinet advapi32 advpack
EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ C_SRCS = \
advpack.c \ advpack.c \
......
...@@ -135,7 +135,7 @@ static void test_AddDelBackupEntry(void) ...@@ -135,7 +135,7 @@ static void test_AddDelBackupEntry(void)
/* create the INF file */ /* create the INF file */
res = pAddDelBackupEntry("one\0two\0three\0", "c:\\", "basename", AADBE_ADD_ENTRY); res = pAddDelBackupEntry("one\0two\0three\0", "c:\\", "basename", AADBE_ADD_ENTRY);
ok(res == S_OK, "Expected S_OK, got %d\n", res); 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(check_ini_file_attr(path), "Expected ini file to be hidden\n");
ok(DeleteFileA(path), "Expected path to exist\n"); ok(DeleteFileA(path), "Expected path to exist\n");
...@@ -310,8 +310,8 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, ...@@ -310,8 +310,8 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime,
DWORD attrs; DWORD attrs;
BOOL res; BOOL res;
handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName);
...@@ -321,7 +321,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, ...@@ -321,7 +321,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime,
FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime);
FileTimeToDosDateTime(&filetime, pdate, ptime); FileTimeToDosDateTime(&filetime, pdate, ptime);
attrs = GetFileAttributes(pszName); attrs = GetFileAttributesA(pszName);
ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n");
return (INT_PTR)handle; return (INT_PTR)handle;
...@@ -551,7 +551,7 @@ START_TEST(files) ...@@ -551,7 +551,7 @@ START_TEST(files)
init_function_pointers(); init_function_pointers();
GetCurrentDirectoryA(MAX_PATH, prev_path); GetCurrentDirectoryA(MAX_PATH, prev_path);
GetTempPath(MAX_PATH, temp_path); GetTempPathA(MAX_PATH, temp_path);
SetCurrentDirectoryA(temp_path); SetCurrentDirectoryA(temp_path);
lstrcpyA(CURR_DIR, temp_path); lstrcpyA(CURR_DIR, temp_path);
......
...@@ -58,8 +58,8 @@ static BOOL is_spapi_err(DWORD err) ...@@ -58,8 +58,8 @@ static BOOL is_spapi_err(DWORD err)
static void create_inf_file(LPCSTR filename) static void create_inf_file(LPCSTR filename)
{ {
DWORD dwNumberOfBytesWritten; DWORD dwNumberOfBytesWritten;
HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL,
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
static const char data[] = static const char data[] =
"[Version]\n" "[Version]\n"
...@@ -124,10 +124,10 @@ static void test_RunSetupCommand(void) ...@@ -124,10 +124,10 @@ static void test_RunSetupCommand(void)
create_inf_file("one\\test.inf"); create_inf_file("one\\test.inf");
/* try a full path to the INF, with working dir provided */ /* try a full path to the INF, with working dir provided */
lstrcpy(path, CURR_DIR); lstrcpyA(path, CURR_DIR);
lstrcat(path, "\\one\\test.inf"); lstrcatA(path, "\\one\\test.inf");
lstrcpy(dir, CURR_DIR); lstrcpyA(dir, CURR_DIR);
lstrcat(dir, "\\one"); lstrcatA(dir, "\\one");
hr = pRunSetupCommand(NULL, path, "DefaultInstall", dir, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); 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); ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", hr);
...@@ -205,9 +205,9 @@ static void test_LaunchINFSection(void) ...@@ -205,9 +205,9 @@ static void test_LaunchINFSection(void)
create_inf_file("one\\test.inf"); create_inf_file("one\\test.inf");
/* try a full path to the INF */ /* try a full path to the INF */
lstrcpy(cmdline, CURR_DIR); lstrcpyA(cmdline, CURR_DIR);
lstrcat(cmdline, "\\"); lstrcatA(cmdline, "\\");
lstrcat(cmdline, "one\\test.inf,DefaultInstall,,4"); lstrcatA(cmdline, "one\\test.inf,DefaultInstall,,4");
hr = pLaunchINFSection(NULL, NULL, cmdline, 0); hr = pLaunchINFSection(NULL, NULL, cmdline, 0);
ok(hr == 0, "Expected 0, got %d\n", hr); ok(hr == 0, "Expected 0, got %d\n", hr);
...@@ -231,16 +231,16 @@ static void test_LaunchINFSectionEx(void) ...@@ -231,16 +231,16 @@ static void test_LaunchINFSectionEx(void)
create_inf_file("test.inf"); create_inf_file("test.inf");
/* try an invalid CAB filename with an absolute INF name */ /* try an invalid CAB filename with an absolute INF name */
lstrcpy(cmdline, CURR_DIR); lstrcpyA(cmdline, CURR_DIR);
lstrcat(cmdline, "\\"); lstrcatA(cmdline, "\\");
lstrcat(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); lstrcatA(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4");
hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0);
ok(hr == 0, "Expected 0, got %d\n", hr); ok(hr == 0, "Expected 0, got %d\n", hr);
/* try quoting the parameters */ /* try quoting the parameters */
lstrcpy(cmdline, "\""); lstrcpyA(cmdline, "\"");
lstrcat(cmdline, CURR_DIR); lstrcatA(cmdline, CURR_DIR);
lstrcat(cmdline, "\\test.inf\",\"DefaultInstall\",\"c:,imacab.cab\",\"4\""); lstrcatA(cmdline, "\\test.inf\",\"DefaultInstall\",\"c:,imacab.cab\",\"4\"");
hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0);
ok(hr == 0, "Expected 0, got %d\n", hr); ok(hr == 0, "Expected 0, got %d\n", hr);
...@@ -250,7 +250,7 @@ static void test_LaunchINFSectionEx(void) ...@@ -250,7 +250,7 @@ static void test_LaunchINFSectionEx(void)
if (winetest_interactive) if (winetest_interactive)
{ {
/* try an invalid CAB filename with a relative INF name */ /* 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); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0);
ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr);
} }
...@@ -273,7 +273,7 @@ START_TEST(install) ...@@ -273,7 +273,7 @@ START_TEST(install)
} }
GetCurrentDirectoryA(MAX_PATH, prev_path); GetCurrentDirectoryA(MAX_PATH, prev_path);
GetTempPath(MAX_PATH, temp_path); GetTempPathA(MAX_PATH, temp_path);
SetCurrentDirectoryA(temp_path); SetCurrentDirectoryA(temp_path);
lstrcpyA(CURR_DIR, temp_path); lstrcpyA(CURR_DIR, temp_path);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment