setupapi: Use correct integral type.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
6483bf162f
commit
fd8d0babe1
|
@ -826,7 +826,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg )
|
||||||
{
|
{
|
||||||
WCHAR lnkpath[MAX_PATH];
|
WCHAR lnkpath[MAX_PATH];
|
||||||
LPWSTR cmdline=NULL, lnkpath_end;
|
LPWSTR cmdline=NULL, lnkpath_end;
|
||||||
unsigned int name_size;
|
DWORD name_size;
|
||||||
INFCONTEXT name_context, context;
|
INFCONTEXT name_context, context;
|
||||||
int attrs=0;
|
int attrs=0;
|
||||||
|
|
||||||
|
@ -846,7 +846,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg )
|
||||||
|
|
||||||
if (!(attrs & FLG_PROFITEM_GROUP) && SetupFindFirstLineW( hinf, field, L"SubDir", &context ))
|
if (!(attrs & FLG_PROFITEM_GROUP) && SetupFindFirstLineW( hinf, field, L"SubDir", &context ))
|
||||||
{
|
{
|
||||||
unsigned int subdir_size;
|
DWORD subdir_size;
|
||||||
|
|
||||||
if (!SetupGetStringFieldW( &context, 1, lnkpath_end, (lnkpath+MAX_PATH)-lnkpath_end, &subdir_size ))
|
if (!SetupGetStringFieldW( &context, 1, lnkpath_end, (lnkpath+MAX_PATH)-lnkpath_end, &subdir_size ))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -878,7 +878,8 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg )
|
||||||
/* calculate command line */
|
/* calculate command line */
|
||||||
if (SetupFindFirstLineW( hinf, field, L"CmdLine", &context ))
|
if (SetupFindFirstLineW( hinf, field, L"CmdLine", &context ))
|
||||||
{
|
{
|
||||||
unsigned int dir_len=0, subdir_size=0, filename_size=0;
|
unsigned int dir_len=0;
|
||||||
|
DWORD subdir_size=0, filename_size=0;
|
||||||
int dirid=0;
|
int dirid=0;
|
||||||
LPCWSTR dir;
|
LPCWSTR dir;
|
||||||
LPWSTR cmdline_end;
|
LPWSTR cmdline_end;
|
||||||
|
|
|
@ -1275,7 +1275,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour
|
||||||
{
|
{
|
||||||
BOOL ret, absolute = (root && *root && !(style & SP_COPY_SOURCE_ABSOLUTE));
|
BOOL ret, absolute = (root && *root && !(style & SP_COPY_SOURCE_ABSOLUTE));
|
||||||
WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH];
|
WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH];
|
||||||
unsigned int len;
|
DWORD len;
|
||||||
|
|
||||||
TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root),
|
TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root),
|
||||||
debugstr_w(dest), style, handler, context, in_use);
|
debugstr_w(dest), style, handler, context, in_use);
|
||||||
|
|
Loading…
Reference in New Issue