Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-28 19:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] setupapi: Enable compilation with long types.

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

wine commit id e498e0ec9bf5a3f9cdb965f8668888697ac642ae by Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
winesync 2023-10-02 22:29:33 +02:00 committed by Hermès Bélusca-Maïto
parent 7d6df771c8
commit 5ff377c9ab
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
9 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dll/win32/setupapi/dialog.c
View file

@ -88,7 +88,7 @@ static void promptdisk_ok(HWND hwnd, struct promptdisk_params *params)
if(params->PathRequiredSize)
{
*params->PathRequiredSize = requiredSize;
TRACE("returning PathRequiredSize=%d\n",*params->PathRequiredSize);
TRACE("returning PathRequiredSize=%ld\n",*params->PathRequiredSize);
}
if(!params->PathBuffer)
{
@ -174,7 +174,7 @@ UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskNa
WCHAR *FileSoughtW, *TagFileW, PathBufferW[MAX_PATH];
UINT ret, length;
TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_a(DialogTitle),
TRACE("%p, %s, %s, %s, %s, %s, 0x%08lx, %p, %ld, %p\n", hwndParent, debugstr_a(DialogTitle),
debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought),
debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize,
PathRequiredSize);
@ -218,7 +218,7 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk
struct promptdisk_params params;
UINT ret;
TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_w(DialogTitle),
TRACE("%p, %s, %s, %s, %s, %s, 0x%08lx, %p, %ld, %p\n", hwndParent, debugstr_w(DialogTitle),
debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought),
debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize,
PathRequiredSize);

4
dll/win32/setupapi/dirid.c
View file

@ -165,7 +165,7 @@ static const WCHAR *create_printer_dirid( DWORD dirid )
return create_system_dirid( DIRID_COLOR );
case 66004: /* asp files directory */
default:
FIXME( "unsupported dirid %d\n", dirid );
FIXME( "unsupported dirid %ld\n", dirid );
return get_unknown_dirid();
}
len = (lstrlenW(buffer) + 1) * sizeof(WCHAR);
@ -180,7 +180,7 @@ static const WCHAR *get_csidl_dir( DWORD csidl )
if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE ))
{
FIXME( "CSIDL %x not found\n", csidl );
FIXME( "CSIDL %lx not found\n", csidl );
return get_unknown_dirid();
}
len = (lstrlenW(buffer) + 1) * sizeof(WCHAR);

2
dll/win32/setupapi/diskspace.c
View file

@ -42,7 +42,7 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT
WCHAR *ptr;
LPDISKSPACELIST list=NULL;
TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags);
TRACE("(%p, %lu, 0x%08x)\n", Reserved1, Reserved2, Flags);
if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK)
{

10
dll/win32/setupapi/parser.c
View file

@ -1504,7 +1504,7 @@ LONG WINAPI SetupGetLineCountW( HINF hinf, PCWSTR section )
if (ret == -1) ret = 0;
ret += file->sections[section_index]->nb_lines;
}
TRACE( "(%p,%s) returning %d\n", hinf, debugstr_w(section), ret );
TRACE( "(%p,%s) returning %ld\n", hinf, debugstr_w(section), ret );
SetLastError( (ret == -1) ? ERROR_SECTION_NOT_FOUND : 0 );
return ret;
}
@ -1547,7 +1547,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON
context->Section = section_index;
context->Line = index;
SetLastError( 0 );
TRACE( "(%p,%s): returning %d/%d\n",
TRACE( "(%p,%s): returning %d/%ld\n",
hinf, debugstr_w(section), section_index, index );
return TRUE;
}
@ -1891,7 +1891,7 @@ BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer,
}
PARSER_string_substA( file, field->text, buffer, size );
TRACE( "context %p/%p/%d/%d index %d returning %s\n",
TRACE( "context %p/%p/%d/%d index %ld returning %s\n",
context->Inf, context->CurrentInf, context->Section, context->Line,
index, debugstr_a(buffer) );
}
@ -1922,7 +1922,7 @@ BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer
}
PARSER_string_substW( file, field->text, buffer, size );
TRACE( "context %p/%p/%d/%d index %d returning %s\n",
TRACE( "context %p/%p/%d/%d index %ld returning %s\n",
context->Inf, context->CurrentInf, context->Section, context->Line,
index, debugstr_w(buffer) );
}
@ -2021,7 +2021,7 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer,
}
buffer[i - index] = value;
}
TRACE( "%p/%p/%d/%d index %d\n",
TRACE( "%p/%p/%d/%d index %ld\n",
context->Inf, context->CurrentInf, context->Section, context->Line, index );
return TRUE;
}

24
dll/win32/setupapi/query.c
View file

@ -160,7 +160,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl,
BOOL ret;
DWORD infSize;
TRACE("(%p, %d, %p, %d, %p)\n", InfSpec, SearchControl, ReturnBuffer,
TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer,
ReturnBufferSize, RequiredSize);
if (!InfSpec)
@ -187,7 +187,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl,
inf = search_for_inf(InfSpec, SearchControl);
break;
case INFINFO_INF_PATH_LIST_SEARCH:
FIXME("Unhandled search control: %d\n", SearchControl);
FIXME("Unhandled search control: %ld\n", SearchControl);
if (RequiredSize)
*RequiredSize = 0;
@ -281,7 +281,7 @@ BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation,
DWORD len;
LPWSTR ptr;
TRACE("(%p, %u, %p, %d, %p) Stub!\n", InfInformation, InfIndex,
TRACE("(%p, %u, %p, %ld, %p) Stub!\n", InfInformation, InfIndex,
ReturnBuffer, ReturnBufferSize, RequiredSize);
if (!InfInformation)
@ -325,7 +325,7 @@ BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR f
DWORD required;
INT size;
TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_a(filename), source_id,
TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(filename), source_id,
buffer, buffer_size, required_size);
if (filename && *filename && !(filenameW = strdupAtoW( filename )))
@ -424,7 +424,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR
INFCONTEXT ctx;
WCHAR *end, *source_id_str;
TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_w(filename), source_id,
TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id,
buffer, buffer_size, required_size);
if (!context) context = &ctx;
@ -468,7 +468,7 @@ BOOL WINAPI SetupGetSourceInfoA( HINF hinf, UINT source_id, UINT info,
DWORD required;
INT size;
TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size,
TRACE("%p, %d, %d, %p, %ld, %p\n", hinf, source_id, info, buffer, buffer_size,
required_size);
if (!SetupGetSourceInfoW( hinf, source_id, info, NULL, 0, &required ))
@ -515,7 +515,7 @@ BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info,
static const WCHAR fmt[] = {'%','d',0};
DWORD index;
TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size,
TRACE("%p, %d, %d, %p, %ld, %p\n", hinf, source_id, info, buffer, buffer_size,
required_size);
swprintf( source_id_str, ARRAY_SIZE(source_id_str), fmt, source_id );
@ -570,7 +570,7 @@ BOOL WINAPI SetupGetTargetPathA( HINF hinf, PINFCONTEXT context, PCSTR section,
DWORD required;
INT size;
TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_a(section), buffer,
TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(section), buffer,
buffer_size, required_size);
if (section && !(sectionW = strdupAtoW( section )))
@ -623,7 +623,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section,
unsigned int size;
BOOL ret = FALSE;
TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer,
TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(section), buffer,
buffer_size, required_size);
if (context) ret = SetupFindFirstLineW( hinf, destination_dirs, NULL, context );
@ -671,7 +671,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationA(
if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo))
{
WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize);
WARN("incorrect OriginalFileInfo->cbSize of %ld\n", OriginalFileInfo->cbSize);
SetLastError( ERROR_INVALID_USER_BUFFER );
return FALSE;
}
@ -709,7 +709,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW(
if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo))
{
WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize);
WARN("incorrect OriginalFileInfo->cbSize of %ld\n", OriginalFileInfo->cbSize);
SetLastError(ERROR_INVALID_USER_BUFFER);
return FALSE;
}
@ -767,7 +767,7 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW(
PCWSTR LocaleName, PWSTR ReturnBuffer, DWORD ReturnBufferSize,
PDWORD RequiredSize)
{
FIXME("stub: %s %p %s %p %u %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize);
FIXME("stub: %s %p %s %p %lu %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;

32
dll/win32/setupapi/queue.c
View file

@ -917,7 +917,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf,
BOOL ret;
DWORD len;
TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#x.\n",
TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#lx.\n",
queue, debugstr_w(src_root), hinf, hlist, debugstr_w(section), style);
if (!src_root)
@ -1244,7 +1244,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
DWORD dwLastError;
#endif
TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style);
TRACE("copy %s to %s style 0x%lx\n",debugstr_w(source),debugstr_w(target),style);
#ifdef __REACTOS__
/* Get a temp file name */
@ -1374,7 +1374,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
{
FILEPATHS_W filepaths;
TRACE("Versions: Source %i.%i target %i.%i\n",
TRACE("Versions: Source %li.%li target %li.%li\n",
SourceInfo->dwFileVersionMS, SourceInfo->dwFileVersionLS,
TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS);
@ -1427,7 +1427,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE |
SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP))
{
ERR("Unsupported style(s) 0x%x\n",style);
ERR("Unsupported style(s) 0x%lx\n",style);
}
if (docopy)
@ -1457,7 +1457,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
rc = MoveFileExW(TempFile, target, MOVEFILE_DELAY_UNTIL_REBOOT);
#endif
}
if (!rc) WARN( "failed to copy, err %u\n", GetLastError() );
if (!rc) WARN( "failed to copy, err %lu\n", GetLastError() );
}
else
SetLastError(ERROR_SUCCESS);
@ -1482,7 +1482,7 @@ BOOL WINAPI SetupInstallFileExA( HINF hinf, PINFCONTEXT inf_context, PCSTR sourc
struct callback_WtoA_context ctx;
UNICODE_STRING sourceW, rootW, destW;
TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root),
TRACE("%p %p %s %s %s %lx %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root),
debugstr_a(dest), style, handler, context, in_use);
sourceW.Buffer = rootW.Buffer = destW.Buffer = NULL;
@ -1533,7 +1533,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour
WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH];
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 %lx %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root),
debugstr_w(dest), style, handler, context, in_use);
if (in_use) FIXME("no file in use support\n");
@ -1888,7 +1888,7 @@ BOOL WINAPI SetupScanFileQueueA( HSPFILEQ handle, DWORD flags, HWND window,
{
struct callback_WtoA_context ctx;
TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result);
TRACE("%p %lx %p %p %p %p\n", handle, flags, window, handler, context, result);
ctx.orig_context = context;
ctx.orig_handler = handler;
@ -1909,7 +1909,7 @@ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window,
UINT notification = 0;
BOOL ret = FALSE;
TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result);
TRACE("%p %lx %p %p %p %p\n", handle, flags, window, handler, context, result);
*result = FALSE;
@ -1920,7 +1920,7 @@ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window,
if (flags & ~(SPQ_SCAN_USE_CALLBACK | SPQ_SCAN_USE_CALLBACKEX))
{
FIXME("flags %x not fully implemented\n", flags);
FIXME("flags %lx not fully implemented\n", flags);
}
paths.Source = paths.Target = NULL;
@ -2071,10 +2071,10 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
TRACE( "end queue\n" );
return 0;
case SPFILENOTIFY_STARTSUBQUEUE:
TRACE( "start subqueue %ld count %ld\n", param1, param2 );
TRACE( "start subqueue %Id count %Id\n", param1, param2 );
return TRUE;
case SPFILENOTIFY_ENDSUBQUEUE:
TRACE( "end subqueue %ld\n", param1 );
TRACE( "end subqueue %Id\n", param1 );
return 0;
case SPFILENOTIFY_STARTDELETE:
TRACE( "start delete %s\n", debugstr_a(paths->Target) );
@ -2114,7 +2114,7 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
return FILEOP_DOIT;
}
default:
FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 );
FIXME( "notification %d params %Ix,%Ix\n", notification, param1, param2 );
break;
}
return 0;
@ -2139,10 +2139,10 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
TRACE( "end queue\n" );
return 0;
case SPFILENOTIFY_STARTSUBQUEUE:
TRACE( "start subqueue %ld count %ld\n", param1, param2 );
TRACE( "start subqueue %Id count %Id\n", param1, param2 );
return TRUE;
case SPFILENOTIFY_ENDSUBQUEUE:
TRACE( "end subqueue %ld\n", param1 );
TRACE( "end subqueue %Id\n", param1 );
return 0;
case SPFILENOTIFY_STARTDELETE:
TRACE( "start delete %s\n", debugstr_w(paths->Target) );
@ -2183,7 +2183,7 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
return FILEOP_DOIT;
}
default:
FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 );
FIXME( "notification %d params %Ix,%Ix\n", notification, param1, param2 );
break;
}
return 0;

4
dll/win32/setupapi/setupcab.c
View file

@ -166,7 +166,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
case fdintPARTIAL_FILE:
return 0;
case fdintCOPY_FILE:
TRACE("Copy file %s, length %d, date %#x, time %#x, attributes %#x.\n",
TRACE("Copy file %s, length %ld, date %#x, time %#x, attributes %#x.\n",
debugstr_a(pfdin->psz1), pfdin->cb, pfdin->date, pfdin->time, pfdin->attribs);
fici.NameInCabinet = pfdin->psz1;
fici.FileSize = pfdin->cb;
@ -247,7 +247,7 @@ BOOL WINAPI SetupIterateCabinetA(const char *file, DWORD reserved,
HFDI hfdi;
BOOL ret;
TRACE("file %s, reserved %#x, callback %p, context %p.\n",
TRACE("file %s, reserved %#lx, callback %p, context %p.\n",
debugstr_a(file), reserved, callback, context);
if (!file)

14
dll/win32/setupapi/stringtable_wine.c
View file

@ -138,7 +138,7 @@ HSTRING_TABLE WINAPI StringTableInitializeEx(ULONG max_extra_size, DWORD reserve
{
struct stringtable *table;
TRACE("(%d %x)\n", max_extra_size, reserved);
TRACE("(%ld %lx)\n", max_extra_size, reserved);
table = MyMalloc(sizeof(*table));
if (!table) return NULL;
@ -261,7 +261,7 @@ BOOL WINAPI StringTableGetExtraData(HSTRING_TABLE hTable, ULONG id, void *extra,
struct stringtable *table = (struct stringtable*)hTable;
char *extraptr;
TRACE("%p %u %p %u\n", table, id, extra, extra_size);
TRACE("%p %lu %p %lu\n", table, id, extra, extra_size);
if (!table)
return FALSE;
@ -306,7 +306,7 @@ DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE hTable, LPWSTR string, DWOR
DWORD offset;
int cmp;
TRACE("%p->%p %s %x %p, %x\n", table, table->data, debugstr_w(string), flags, extra, extra_size);
TRACE("%p->%p %s %lx %p, %lx\n", table, table->data, debugstr_w(string), flags, extra, extra_size);
if (!table)
return -1;
@ -391,7 +391,7 @@ DWORD WINAPI StringTableAddStringEx(HSTRING_TABLE hTable, LPWSTR string,
WCHAR *ptrW;
int len;
TRACE("%p %s %x %p, %u\n", hTable, debugstr_w(string), flags, extra, extra_size);
TRACE("%p %s %lx %p, %lu\n", hTable, debugstr_w(string), flags, extra, extra_size);
if (!table)
return -1;
@ -482,7 +482,7 @@ BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE hTable, DWORD id, void *extra,
struct stringtable *table = (struct stringtable*)hTable;
char *extraptr;
TRACE("%p %d %p %u\n", hTable, id, extra, extra_size);
TRACE("%p %ld %p %lu\n", hTable, id, extra, extra_size);
if (!table)
return FALSE;
@ -521,7 +521,7 @@ LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE hTable, ULONG id)
struct stringtable *table = (struct stringtable*)hTable;
static WCHAR empty[] = {0};
TRACE("%p %d\n", table, id);
TRACE("%p %ld\n", table, id);
if (!table)
return NULL;
@ -554,7 +554,7 @@ BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE hTable, ULONG id, LPWSTR buf
WCHAR *ptrW;
int len;
TRACE("%p %x %p %p\n", table, id, buff, buflen);
TRACE("%p %lx %p %p\n", table, id, buff, buflen);
if (!table) {
*buflen = 0;

2
sdk/tools/winesync/setupapi.cfg
View file

@ -10,4 +10,4 @@ files:
dlls/setupapi/setupcab.c: dll/win32/setupapi/setupcab.c
dlls/setupapi/stringtable.c: dll/win32/setupapi/stringtable_wine.c
tags:
wine: 506ce2ae6bc2fc1395da402a8ed0de4527fa7e24
wine: e498e0ec9bf5a3f9cdb965f8668888697ac642ae