Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 20:36:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync advpack winetest to wine 1.1.11

Browse source 
svn path=/trunk/; revision=38409
This commit is contained in:
Christoph von Wittich 2008-12-28 10:36:50 +00:00
parent 90081c908c
commit fa9df3812d
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rostests/winetests/advpack/advpack.c
View file

@ -264,7 +264,7 @@ static void translateinfstring_test(void)
if(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) if(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND))
{ {
trace("WinNT 3.51 detected. Skipping tests for TranslateInfString()\n"); win_skip("WinNT 3.51 detected. Skipping tests for TranslateInfString()\n");
return; return;
} }
@ -325,6 +325,13 @@ static void translateinfstringex_test(void)
char buffer[MAX_PATH]; char buffer[MAX_PATH];
DWORD size = MAX_PATH; DWORD size = MAX_PATH;
hr = pOpenINFEngine(inf_file, NULL, 0, &hinf, NULL);
if (hr == E_UNEXPECTED)
{
skip("Skipping tests on win9x because of brokenness\n");
return;
}
create_inf_file(); create_inf_file();
/* need to see if there are any flags */ /* need to see if there are any flags */

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

@ -97,6 +97,7 @@ static BOOL check_ini_file_attr(LPSTR filename)
static void test_AddDelBackupEntry(void) static void test_AddDelBackupEntry(void)
{ {
BOOL ret;
HRESULT res; HRESULT res;
CHAR path[MAX_PATH]; CHAR path[MAX_PATH];
CHAR windir[MAX_PATH]; CHAR windir[MAX_PATH];
@ -165,7 +166,10 @@ static void test_AddDelBackupEntry(void)
res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY); res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY);
SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL);
ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(res == S_OK, "Expected S_OK, got %d\n", res);
ok(DeleteFileA(path), "Expected path to exist\n"); ret = DeleteFileA(path);
ok(ret == TRUE ||
broken(ret == FALSE), /* win98 */
"Expected path to exist\n");
} }
/* the FCI callbacks */ /* the FCI callbacks */

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

@ -55,27 +55,20 @@ static BOOL is_spapi_err(DWORD err)
return (((err & SPAPI_MASK) ^ SPAPI_PREFIX) == 0); return (((err & SPAPI_MASK) ^ SPAPI_PREFIX) == 0);
} }
static void append_str(char **str, const char *data)
{
sprintf(*str, data);
*str += strlen(*str);
}
static void create_inf_file(LPCSTR filename) static void create_inf_file(LPCSTR filename)
{ {
char data[1024];
char *ptr = data;
DWORD dwNumberOfBytesWritten; DWORD dwNumberOfBytesWritten;
HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL,
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
append_str(&ptr, "[Version]\n"); static const char data[] =
append_str(&ptr, "Signature=\"$Chicago$\"\n"); "[Version]\n"
append_str(&ptr, "AdvancedINF=2.5\n"); "Signature=\"$Chicago$\"\n"
append_str(&ptr, "[DefaultInstall]\n"); "AdvancedINF=2.5\n"
append_str(&ptr, "CheckAdminRights=1\n"); "[DefaultInstall]\n"
"CheckAdminRights=1\n";
WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL);
CloseHandle(hf); CloseHandle(hf);
} }