Skip to content

W
wine-winehq
Commit 54b8c8c7 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msi/tests: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c3135c63
Expand all Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
dlls/msi/tests/Makefile.in
View file @ 54b8c8c7
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = msi.dll
IMPORTS = secur32 cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32
......
dlls/msi/tests/custom.c
View file @ 54b8c8c7
......@@ -1141,7 +1141,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
r = MsiEnableUIPreview(db, &preview);
ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
sprintf(package_name, "#%u", db);
sprintf(package_name, "#%lu", db);
r = MsiOpenPackageA(package_name, &package);
ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
......
dlls/msi/tests/msi.c
View file @ 54b8c8c7
This source diff could not be displayed because it is too large. You can view the blob instead.
dlls/msi/tests/patch.c
View file @ 54b8c8c7
......@@ -681,7 +681,7 @@ static void write_tables( IStorage *stg, const struct table_data *tables, UINT n
r = IStorage_CreateStream( stg, tables[i].name, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm );
if (FAILED( r ))
{
ok( 0, "failed to create stream 0x%08x\n", r );
ok( 0, "failed to create stream %#lx\n", r );
continue;
}
......@@ -709,29 +709,29 @@ static void create_patch( const char *filename )
r = StgCreateDocfile( filenameW, mode, 0, &stg );
free( filenameW );
ok( r == S_OK, "failed to create storage 0x%08x\n", r );
ok( r == S_OK, "failed to create storage %#lx\n", r );
if (!stg)
return;
r = IStorage_SetClass( stg, &CLSID_MsiPatch );
ok( r == S_OK, "failed to set storage type 0x%08x\n", r );
ok( r == S_OK, "failed to set storage type %#lx\n", r );
write_tables( stg, table_patch_data, ARRAY_SIZE( table_patch_data ));
r = IStorage_CreateStorage( stg, p_name7, mode, 0, 0, &stg1 );
ok( r == S_OK, "failed to create substorage 0x%08x\n", r );
ok( r == S_OK, "failed to create substorage %#lx\n", r );
r = IStorage_SetClass( stg1, &CLSID_MsiTransform );
ok( r == S_OK, "failed to set storage type 0x%08x\n", r );
ok( r == S_OK, "failed to set storage type %#lx\n", r );
write_tables( stg1, table_transform1_data, ARRAY_SIZE( table_transform1_data ));
IStorage_Release( stg1 );
r = IStorage_CreateStorage( stg, p_name8, mode, 0, 0, &stg2 );
ok( r == S_OK, "failed to create substorage 0x%08x\n", r );
ok( r == S_OK, "failed to create substorage %#lx\n", r );
r = IStorage_SetClass( stg2, &CLSID_MsiTransform );
ok( r == S_OK, "failed to set storage type 0x%08x\n", r );
ok( r == S_OK, "failed to set storage type %#lx\n", r );
write_tables( stg2, table_transform2_data, ARRAY_SIZE( table_transform2_data ));
IStorage_Release( stg2 );
......@@ -774,7 +774,7 @@ static void test_simple_patch( void )
}
size = get_pf_file_size( "msitest\\patch.txt" );
ok( size == 1000, "expected 1000, got %u\n", size );
ok( size == 1000, "expected 1000, got %lu\n", size );
size = sizeof(install_source);
r = MsiGetProductInfoA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}",
......@@ -840,9 +840,9 @@ static void test_simple_patch( void )
}
size = get_pf_file_size( "msitest\\patch.txt" );
ok( size == 1002, "expected 1002, got %u\n", size );
ok( size == 1002, "expected 1002, got %lu\n", size );
size = get_pf_file_size( "msitest\\file.txt" );
ok( size == 1000, "expected 1000, got %u\n", size );
ok( size == 1000, "expected 1000, got %lu\n", size );
/* show that MsiOpenPackage applies registered patches */
r = MsiOpenPackageA( path, &hpackage );
......@@ -1064,7 +1064,7 @@ static char *get_string( MSIHANDLE hdb, UINT field, const char *query)
ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );
if (r == ERROR_SUCCESS)
{
UINT size = MAX_PATH;
DWORD size = MAX_PATH;
r = MsiRecordGetStringA( hrec, field, ret, &size );
ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
MsiCloseHandle( hrec );
......@@ -1272,7 +1272,8 @@ cleanup:
static void test_patch_registration( void )
{
UINT r, size;
UINT r;
DWORD size;
char buffer[MAX_PATH], patch_code[39];
if (!pMsiApplyPatchA || !pMsiGetPatchInfoExA || !pMsiEnumPatchesExA)
......
dlls/msi/tests/record.c
View file @ 54b8c8c7
......@@ -410,21 +410,21 @@ static void test_MsiRecordGetString(void)
sz = MAX_PATH;
r = MsiRecordGetStringA(rec, 1, NULL, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n",r);
ok(sz == 0, "Expected 0, got %d\n",sz);
ok(sz == 0, "Expected 0, got %lu\n", sz);
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiRecordGetStringA(rec, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
ok(sz == 0, "Expected 0, got %d\n", sz);
ok(sz == 0, "Expected 0, got %lu\n", sz);
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiRecordGetStringA(rec, 10, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
ok(sz == 0, "Expected 0, got %d\n", sz);
ok(sz == 0, "Expected 0, got %lu\n", sz);
MsiCloseHandle(rec);
......@@ -437,14 +437,14 @@ static void test_MsiRecordGetString(void)
sz = MAX_PATH;
r = MsiRecordGetStringA(rec, 1, NULL, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n",r);
ok(sz == 1, "Expected 1, got %d\n",sz);
ok(sz == 1, "Expected 1, got %lu\n",sz);
sz = MAX_PATH;
lstrcpyA(buf, "apple");
r = MsiRecordGetStringA(rec, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
ok(sz == 1, "Expected 1, got %d\n", sz);
ok(sz == 1, "Expected 1, got %lu\n", sz);
r = MsiRecordSetInteger(rec, 1, -5);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
......@@ -454,7 +454,7 @@ static void test_MsiRecordGetString(void)
r = MsiRecordGetStringA(rec, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "-5"), "Expected \"-5\", got \"%s\"\n", buf);
ok(sz == 2, "Expected 2, got %d\n", sz);
ok(sz == 2, "Expected 2, got %lu\n", sz);
MsiCloseHandle(rec);
}
......@@ -508,7 +508,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
ok(sz == 0, "Expected 0, got %d\n", sz);
ok(sz == 0, "Expected 0, got %lu\n", sz);
r = MsiRecordIsNull(rec, 0);
ok(r == TRUE, "Expected TRUE, got %d\n", r);
......@@ -527,7 +527,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
ok(sz == 0, "Expected 0, got %d\n", sz);
ok(sz == 0, "Expected 0, got %lu\n", sz);
r = MsiRecordIsNull(rec, 0);
ok(r == TRUE, "Expected TRUE, got %d\n", r);
......@@ -546,7 +546,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
ok(sz == 0, "Expected 0, got %d\n", sz);
ok(sz == 0, "Expected 0, got %lu\n", sz);
r = MsiRecordIsNull(rec, 0);
ok(r == TRUE, "Expected TRUE, got %d\n", r);
......@@ -556,7 +556,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "bologna"), "Expected \"bologna\", got \"%s\"\n", buf);
ok(sz == 7, "Expected 7, got %d\n", sz);
ok(sz == 7, "Expected 7, got %lu\n", sz);
MsiCloseHandle(rec);
......@@ -597,7 +597,7 @@ static void test_fieldzero(void)
r = MsiRecordGetStringA(rec, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf);
ok(sz == 5, "Expected 5, got %d\n", sz);
ok(sz == 5, "Expected 5, got %lu\n", sz);
r = MsiRecordIsNull(rec, 0);
ok(r == FALSE, "Expected FALSE, got %d\n", r);
......
dlls/msi/tests/suminfo.c
View file @ 54b8c8c7
......@@ -431,7 +431,7 @@ static void test_summary_binary(void)
"Expected empty string or \"7\", got \"%s\"\n", sval);
todo_wine {
ok(type == VT_LPSTR, "Expected VT_LPSTR, got %d\n", type);
ok(sz == 0 || sz == 1, "Expected 0 or 1, got %d\n", sz);
ok(sz == 0 || sz == 1, "Expected 0 or 1, got %lu\n", sz);
}
ival = -1;
......
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