Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] msi: Use correct integral type.

Browse source 
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 337d7911bfb83b0e775a34c96b67b4e67c1fa871 by Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
winesync 2022-03-14 21:20:24 +01:00 committed by Mark Jansen
parent d683397fb9
commit 36bf554942
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
11 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dll/win32/msi/action.c
View file

@ -1960,7 +1960,7 @@ static WCHAR *create_temp_dir( MSIDATABASE *db )
if (!db->tempfolder) if (!db->tempfolder)
{ {
WCHAR tmp[MAX_PATH]; WCHAR tmp[MAX_PATH];
UINT len = ARRAY_SIZE( tmp ); DWORD len = ARRAY_SIZE( tmp );
if (msi_get_property( db, L"TempFolder", tmp, &len ) || if (msi_get_property( db, L"TempFolder", tmp, &len ) ||
GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY)
@ -7220,7 +7220,8 @@ static UINT ACTION_InstallAdminPackage( MSIPACKAGE *package )
static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) static UINT ACTION_SetODBCFolders( MSIPACKAGE *package )
{ {
MSIQUERY *view; MSIQUERY *view;
UINT r, count; UINT r;
DWORD count;
r = MSI_DatabaseOpenViewW( package->db, L"SELECT * FROM `ODBCDriver`", &view ); r = MSI_DatabaseOpenViewW( package->db, L"SELECT * FROM `ODBCDriver`", &view );
if (r == ERROR_SUCCESS) if (r == ERROR_SUCCESS)

6
dll/win32/msi/appsearch.c
View file

@ -157,7 +157,8 @@ static void free_signature( MSISIGNATURE *sig )
static WCHAR *search_file( MSIPACKAGE *package, WCHAR *path, MSISIGNATURE *sig ) static WCHAR *search_file( MSIPACKAGE *package, WCHAR *path, MSISIGNATURE *sig )
{ {
VS_FIXEDFILEINFO *info; VS_FIXEDFILEINFO *info;
DWORD attr, size; DWORD attr;
UINT size;
LPWSTR val = NULL; LPWSTR val = NULL;
LPBYTE buffer; LPBYTE buffer;
@ -622,7 +623,8 @@ static BOOL match_languages( const void *version, const WCHAR *languages )
USHORT id; USHORT id;
USHORT codepage; USHORT codepage;
} *lang; } *lang;
DWORD len, num_ids, i, j; UINT len, j;
DWORD num_ids, i;
BOOL found = FALSE; BOOL found = FALSE;
LANGID *ids; LANGID *ids;

4
dll/win32/msi/assembly.c
View file

@ -152,7 +152,7 @@ static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp )
struct assembly_name struct assembly_name
{ {
UINT count; DWORD count;
UINT index; UINT index;
WCHAR **attrs; WCHAR **attrs;
}; };
@ -268,7 +268,7 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ
IAssemblyName *name; IAssemblyName *name;
IAssemblyEnum *ret; IAssemblyEnum *ret;
WCHAR *str; WCHAR *str;
UINT len = 0; DWORD len = 0;
if (!package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) return NULL; if (!package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) return NULL;

4
dll/win32/msi/custom.c
View file

@ -219,7 +219,7 @@ WCHAR *msi_create_temp_file( MSIDATABASE *db )
if (!db->tempfolder) if (!db->tempfolder)
{ {
WCHAR tmp[MAX_PATH]; WCHAR tmp[MAX_PATH];
UINT len = ARRAY_SIZE( tmp ); DWORD len = ARRAY_SIZE( tmp );
if (msi_get_property( db, L"TempFolder", tmp, &len ) || if (msi_get_property( db, L"TempFolder", tmp, &len ) ||
GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY)
@ -669,7 +669,7 @@ static DWORD WINAPI custom_client_thread(void *arg)
HANDLE thread; HANDLE thread;
HANDLE pipe; HANDLE pipe;
DWORD size; DWORD size;
UINT rc; DWORD rc;
CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */

3
dll/win32/msi/database.c
View file

@ -1362,7 +1362,8 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec)
{ {
MSIRECORD *colnames; MSIRECORD *colnames;
LPWSTR str, val; LPWSTR str, val;
UINT r, i = 0, sz = 0; UINT r, i = 0;
DWORD sz = 0;
int cmp; int cmp;
r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &colnames); r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &colnames);

5
dll/win32/msi/files.c
View file

@ -161,7 +161,8 @@ DWORD msi_get_file_version_info( MSIPACKAGE *package, const WCHAR *path, DWORD b
VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *package, const WCHAR *filename ) VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *package, const WCHAR *filename )
{ {
VS_FIXEDFILEINFO *ptr, *ret; VS_FIXEDFILEINFO *ptr, *ret;
DWORD version_size, size; DWORD version_size;
UINT size;
void *version; void *version;
if (!(version_size = msi_get_file_version_info( package, filename, 0, NULL ))) return NULL; if (!(version_size = msi_get_file_version_info( package, filename, 0, NULL ))) return NULL;
@ -742,7 +743,7 @@ static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEP
while ((IAssemblyEnum_GetNextAssembly( iter, NULL, &name, 0 ) == S_OK)) while ((IAssemblyEnum_GetNextAssembly( iter, NULL, &name, 0 ) == S_OK))
{ {
WCHAR *displayname, *path; WCHAR *displayname, *path;
UINT len = 0; DWORD len = 0;
HRESULT hr; HRESULT hr;
hr = IAssemblyName_GetDisplayName( name, NULL, &len, 0 ); hr = IAssemblyName_GetDisplayName( name, NULL, &len, 0 );

3
dll/win32/msi/msi.c
View file

@ -3167,7 +3167,8 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen,
WCHAR *langbuf, DWORD *langlen ) WCHAR *langbuf, DWORD *langlen )
{ {
UINT ret = ERROR_MORE_DATA; UINT ret = ERROR_MORE_DATA;
DWORD len, error; UINT len;
DWORD error;
LPVOID version; LPVOID version;
VS_FIXEDFILEINFO *ffi; VS_FIXEDFILEINFO *ffi;
USHORT *lang; USHORT *lang;

3
dll/win32/msi/storages.c
View file

@ -466,7 +466,8 @@ static INT add_storages_to_table(MSISTORAGESVIEW *sv)
IEnumSTATSTG *stgenum = NULL; IEnumSTATSTG *stgenum = NULL;
STATSTG stat; STATSTG stat;
HRESULT hr; HRESULT hr;
UINT count = 0, size; UINT count = 0;
ULONG size;
hr = IStorage_EnumElements(sv->db->storage, 0, NULL, 0, &stgenum); hr = IStorage_EnumElements(sv->db->storage, 0, NULL, 0, &stgenum);
if (FAILED(hr)) if (FAILED(hr))

6
dll/win32/msi/streams.c
View file

@ -448,7 +448,8 @@ static UINT load_streams( MSIDATABASE *db )
IEnumSTATSTG *stgenum; IEnumSTATSTG *stgenum;
STATSTG stat; STATSTG stat;
HRESULT hr; HRESULT hr;
UINT count, r = ERROR_SUCCESS; ULONG count;
UINT r = ERROR_SUCCESS;
IStream *stream; IStream *stream;
hr = IStorage_EnumElements( db->storage, 0, NULL, 0, &stgenum ); hr = IStorage_EnumElements( db->storage, 0, NULL, 0, &stgenum );
@ -564,7 +565,8 @@ static HRESULT write_stream( IStream *dst, IStream *src )
char buf[4096]; char buf[4096];
STATSTG stat; STATSTG stat;
LARGE_INTEGER pos; LARGE_INTEGER pos;
UINT count, size; ULONG count;
UINT size;
hr = IStream_Stat( src, &stat, STATFLAG_NONAME ); hr = IStream_Stat( src, &stat, STATFLAG_NONAME );
if (FAILED( hr )) return hr; if (FAILED( hr )) return hr;

7
dll/win32/msi/suminfo.c
View file

@ -1124,12 +1124,12 @@ static UINT save_prop( MSISUMMARYINFO *si, HANDLE handle, UINT row )
static const char fmt_begin[] = "%u\t"; static const char fmt_begin[] = "%u\t";
static const char data_end[] = "\r\n"; static const char data_end[] = "\r\n";
static const char fmt_int[] = "%u"; static const char fmt_int[] = "%u";
UINT r, data_type, len; UINT r, data_type;
SYSTEMTIME system_time; SYSTEMTIME system_time;
FILETIME file_time; FILETIME file_time;
INT int_value; INT int_value;
awstring str; awstring str;
DWORD sz; DWORD len, sz;
str.unicode = FALSE; str.unicode = FALSE;
str.str.a = NULL; str.str.a = NULL;
@ -1267,7 +1267,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package )
{ {
MSISUMMARYINFO *si; MSISUMMARYINFO *si;
WCHAR *package_code; WCHAR *package_code;
UINT r, len; UINT r;
DWORD len;
awstring str; awstring str;
INT count; INT count;

16
dll/win32/msi/table.c
View file

@ -66,7 +66,7 @@ struct tagMSITABLE
MSICOLUMNINFO *colinfo; MSICOLUMNINFO *colinfo;
UINT col_count; UINT col_count;
MSICONDITION persistent; MSICONDITION persistent;
INT ref_count; LONG ref_count;
WCHAR name[1]; WCHAR name[1];
}; };
@ -2261,9 +2261,10 @@ static WCHAR* create_key_string(MSITABLEVIEW *tv, MSIRECORD *rec)
return key; return key;
} }
static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, UINT *len ) static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, DWORD *len )
{ {
UINT p = 0, l, i, r; UINT p = 0, i, r;
DWORD l;
l = wcslen( tv->name ); l = wcslen( tv->name );
if (name && *len > l) if (name && *len > l)
@ -2327,7 +2328,8 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT
MSIRECORD *old_rec; MSIRECORD *old_rec;
MSIQUERY *q; MSIQUERY *q;
WCHAR *key; WCHAR *key;
UINT i, p, r, len, qlen; UINT i, p, r, qlen;
DWORD len;
if (!wcscmp( tv->name, L"_Columns" )) if (!wcscmp( tv->name, L"_Columns" ))
{ {
@ -2503,7 +2505,8 @@ static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec )
L"INSERT INTO `_TransformView` (`new`, `Table`, `Current`, `Column`, `Data`) VALUES (1, '"; L"INSERT INTO `_TransformView` (`new`, `Table`, `Current`, `Column`, `Data`) VALUES (1, '";
WCHAR buf[256], *query = buf; WCHAR buf[256], *query = buf;
UINT i, p, len, r, qlen; UINT i, p, r, qlen;
DWORD len;
MSIQUERY *q; MSIQUERY *q;
qlen = p = wcslen( query_pfx ); qlen = p = wcslen( query_pfx );
@ -2946,7 +2949,8 @@ static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes)
static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname ) static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname )
{ {
UINT r, len; UINT r;
DWORD len;
WCHAR *name; WCHAR *name;
TRACE("%p %p\n", tv, rec); TRACE("%p %p\n", tv, rec);