ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Win64 printf format warning fixes.

This commit is contained in:
Michael Stefaniuc 2006-10-13 23:32:50 +02:00 committed by Alexandre Julliard
parent 9d2a804f9b
commit 79ecfaf52f
14 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/setupapi/Makefile.in
View File

@ -1,4 +1,4 @@
EXTRADEFS = -D_SETUPAPI_ -DWINE_NO_LONG_AS_INT EXTRADEFS = -D_SETUPAPI_
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

28
dlls/setupapi/devinst.c
View File

@ -213,7 +213,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExW(
NULL, NULL,
NULL, NULL,
NULL); NULL);
TRACE("RegEnumKeyExW() returns %ld\n", lError); TRACE("RegEnumKeyExW() returns %d\n", lError);
if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA)
{ {
TRACE("Key name: %p\n", szKeyName); TRACE("Key name: %p\n", szKeyName);
@ -415,7 +415,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW(
NULL, NULL,
NULL, NULL,
NULL); NULL);
TRACE("RegEnumKeyExW() returns %ld\n", lError); TRACE("RegEnumKeyExW() returns %d\n", lError);
if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA)
{ {
TRACE("Key name: %p\n", szKeyName); TRACE("Key name: %p\n", szKeyName);
@ -748,7 +748,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(
DWORD CreationFlags, DWORD CreationFlags,
PSP_DEVINFO_DATA DeviceInfoData) PSP_DEVINFO_DATA DeviceInfoData)
{ {
TRACE("%p %s %s %s %p %lx %p\n", DeviceInfoSet, debugstr_w(DeviceName), TRACE("%p %s %s %s %p %x %p\n", DeviceInfoSet, debugstr_w(DeviceName),
debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), debugstr_guid(ClassGuid), debugstr_w(DeviceDescription),
hwndParent, CreationFlags, DeviceInfoData); hwndParent, CreationFlags, DeviceInfoData);
@ -765,7 +765,7 @@ BOOL WINAPI SetupDiEnumDeviceInfo(
DWORD index, DWORD index,
PSP_DEVINFO_DATA info) PSP_DEVINFO_DATA info)
{ {
FIXME("%p %ld %p\n", devinfo, index, info); FIXME("%p %d %p\n", devinfo, index, info);
if(info==NULL) if(info==NULL)
return FALSE; return FALSE;
@ -931,7 +931,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW(
Reserved); Reserved);
if (hKey == INVALID_HANDLE_VALUE) if (hKey == INVALID_HANDLE_VALUE)
{ {
WARN("SetupDiOpenClassRegKeyExW() failed (Error %lu)\n", GetLastError()); WARN("SetupDiOpenClassRegKeyExW() failed (Error %u)\n", GetLastError());
return FALSE; return FALSE;
} }
@ -1010,7 +1010,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsW(
{ {
HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;
TRACE("%s %s %p 0x%08lx\n", debugstr_guid(class), debugstr_w(enumstr), TRACE("%s %s %p 0x%08x\n", debugstr_guid(class), debugstr_w(enumstr),
parent, flags); parent, flags);
if(flags & DIGCF_DEVICEINTERFACE) if(flags & DIGCF_DEVICEINTERFACE)
@ -1064,7 +1064,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces(
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
FIXME("%p, %p, %s, 0x%08lx, %p\n", devinfo, DeviceInfoData, FIXME("%p, %p, %s, 0x%08x, %p\n", devinfo, DeviceInfoData,
debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData); debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData);
if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE)
@ -1127,7 +1127,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
FIXME("(%p, %p, %p, %ld, %p, %p)\n", DeviceInfoSet, FIXME("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet,
DeviceInterfaceData, DeviceInterfaceDetailData, DeviceInterfaceData, DeviceInterfaceDetailData,
DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData);
@ -1146,7 +1146,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
PDWORD RequiredSize, PDWORD RequiredSize,
PSP_DEVINFO_DATA DeviceInfoData) PSP_DEVINFO_DATA DeviceInfoData)
{ {
FIXME("(%p, %p, %p, %ld, %p, %p): stub\n", DeviceInfoSet, FIXME("(%p, %p, %p, %d, %p, %p): stub\n", DeviceInfoSet,
DeviceInterfaceData, DeviceInterfaceDetailData, DeviceInterfaceData, DeviceInterfaceDetailData,
DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData);
return FALSE; return FALSE;
@ -1164,7 +1164,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(
DWORD PropertyBufferSize, DWORD PropertyBufferSize,
PDWORD RequiredSize) PDWORD RequiredSize)
{ {
FIXME("%04lx %p %ld %p %p %ld %p\n", (DWORD)devinfo, DeviceInfoData, FIXME("%04x %p %d %p %p %d %p\n", (DWORD)devinfo, DeviceInfoData,
Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize,
RequiredSize); RequiredSize);
return FALSE; return FALSE;
@ -1486,7 +1486,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceW(
DWORD OpenFlags, DWORD OpenFlags,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
{ {
FIXME("%p %s %08lx %p\n", FIXME("%p %s %08x %p\n",
DeviceInfoSet, debugstr_w(DevicePath), OpenFlags, DeviceInterfaceData); DeviceInfoSet, debugstr_w(DevicePath), OpenFlags, DeviceInterfaceData);
return FALSE; return FALSE;
} }
@ -1500,7 +1500,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA(
DWORD OpenFlags, DWORD OpenFlags,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
{ {
FIXME("%p %s %08lx %p\n", DeviceInfoSet, FIXME("%p %s %08x %p\n", DeviceInfoSet,
debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData); debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData);
return FALSE; return FALSE;
} }
@ -1514,7 +1514,7 @@ BOOL WINAPI SetupDiSetClassInstallParamsA(
PSP_CLASSINSTALL_HEADER ClassInstallParams, PSP_CLASSINSTALL_HEADER ClassInstallParams,
DWORD ClassInstallParamsSize) DWORD ClassInstallParamsSize)
{ {
FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData, FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData,
ClassInstallParams->InstallFunction, ClassInstallParamsSize); ClassInstallParams->InstallFunction, ClassInstallParamsSize);
return FALSE; return FALSE;
} }
@ -1554,7 +1554,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(
DWORD KeyType, DWORD KeyType,
REGSAM samDesired) REGSAM samDesired)
{ {
FIXME("%p %p %ld %ld %ld %lx\n", DeviceInfoSet, DeviceInfoData, FIXME("%p %p %d %d %d %x\n", DeviceInfoSet, DeviceInfoData,
Scope, HwProfile, KeyType, samDesired); Scope, HwProfile, KeyType, samDesired);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }

2
dlls/setupapi/devinst16.c
View File

@ -103,7 +103,7 @@ RETERR16 WINAPI DiCreateDeviceInfo16(LPLPDEVICE_INFO16 lplpdi,
LPCSTR lpszClassName, HWND16 hwndParent) LPCSTR lpszClassName, HWND16 hwndParent)
{ {
LPDEVICE_INFO16 lpdi; LPDEVICE_INFO16 lpdi;
FIXME("(%p %s %08lx %x %s %s %x): stub\n", lplpdi, FIXME("(%p %s %08x %x %s %s %x): stub\n", lplpdi,
debugstr_a(lpszDescription), dnDevnode, hkey, debugstr_a(lpszDescription), dnDevnode, hkey,
debugstr_a(lpszRegsubkey), debugstr_a(lpszClassName), hwndParent); debugstr_a(lpszRegsubkey), debugstr_a(lpszClassName), hwndParent);
lpdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEVICE_INFO16)); lpdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEVICE_INFO16));

2
dlls/setupapi/dirid.c
View File

@ -156,7 +156,7 @@ static const WCHAR *get_csidl_dir( DWORD csidl )
if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE )) if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE ))
{ {
FIXME( "CSIDL %lx not found\n", csidl ); FIXME( "CSIDL %x not found\n", csidl );
return get_unknown_dirid(); return get_unknown_dirid();
} }
len = (strlenW(buffer) + 1) * sizeof(WCHAR); len = (strlenW(buffer) + 1) * sizeof(WCHAR);

10
dlls/setupapi/install.c
View File

@ -336,7 +336,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context
if (type == REG_DWORD) if (type == REG_DWORD)
{ {
DWORD dw = str ? strtoulW( str, NULL, 0 ) : 0; DWORD dw = str ? strtoulW( str, NULL, 0 ) : 0;
TRACE( "setting dword %s to %lx\n", debugstr_w(value), dw ); TRACE( "setting dword %s to %x\n", debugstr_w(value), dw );
RegSetValueExW( hkey, value, 0, type, (BYTE *)&dw, sizeof(dw) ); RegSetValueExW( hkey, value, 0, type, (BYTE *)&dw, sizeof(dw) );
} }
else else
@ -356,7 +356,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context
if (size) if (size)
{ {
if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE;
TRACE( "setting binary data %s len %ld\n", debugstr_w(value), size ); TRACE( "setting binary data %s len %d\n", debugstr_w(value), size );
SetupGetBinaryField( context, 5, data, size, NULL ); SetupGetBinaryField( context, 5, data, size, NULL );
} }
RegSetValueExW( hkey, value, 0, type, data, size ); RegSetValueExW( hkey, value, 0, type, data, size );
@ -531,7 +531,7 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR *
if (FAILED(res)) if (FAILED(res))
{ {
WARN( "calling %s in %s returned error %lx\n", entry_point, debugstr_w(path), res ); WARN( "calling %s in %s returned error %x\n", entry_point, debugstr_w(path), res );
status.FailureCode = SPREG_REGSVR; status.FailureCode = SPREG_REGSVR;
status.Win32Error = res; status.Win32Error = res;
goto done; goto done;
@ -555,7 +555,7 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR *
if (FAILED(res)) if (FAILED(res))
{ {
WARN( "calling DllInstall in %s returned error %lx\n", debugstr_w(path), res ); WARN( "calling DllInstall in %s returned error %x\n", debugstr_w(path), res );
status.FailureCode = SPREG_REGSVR; status.FailureCode = SPREG_REGSVR;
status.Win32Error = res; status.Win32Error = res;
goto done; goto done;
@ -778,7 +778,7 @@ static BOOL iterate_section_fields( HINF hinf, PCWSTR section, PCWSTR key,
goto done; goto done;
if (!callback( hinf, buffer, arg )) if (!callback( hinf, buffer, arg ))
{ {
WARN("callback failed for %s %s err %ld\n", WARN("callback failed for %s %s err %d\n",
debugstr_w(section), debugstr_w(buffer), GetLastError() ); debugstr_w(section), debugstr_w(buffer), GetLastError() );
goto done; goto done;
} }

6
dlls/setupapi/misc.c
View File

@ -68,7 +68,7 @@ VOID WINAPI MyFree(LPVOID lpMem)
*/ */
LPVOID WINAPI MyMalloc(DWORD dwSize) LPVOID WINAPI MyMalloc(DWORD dwSize)
{ {
TRACE("%lu\n", dwSize); TRACE("%u\n", dwSize);
return HeapAlloc(GetProcessHeap(), 0, dwSize); return HeapAlloc(GetProcessHeap(), 0, dwSize);
} }
@ -93,7 +93,7 @@ LPVOID WINAPI MyMalloc(DWORD dwSize)
*/ */
LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize) LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize)
{ {
TRACE("%p %lu\n", lpSrc, dwSize); TRACE("%p %u\n", lpSrc, dwSize);
if (lpSrc == NULL) if (lpSrc == NULL)
return HeapAlloc(GetProcessHeap(), 0, dwSize); return HeapAlloc(GetProcessHeap(), 0, dwSize);
@ -858,6 +858,6 @@ void WINAPI pSetupSetGlobalFlags( DWORD flags )
*/ */
DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout ) DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout )
{ {
FIXME("%ld\n", dwTimeout); FIXME("%d\n", dwTimeout);
return WAIT_OBJECT_0; return WAIT_OBJECT_0;
} }

10
dlls/setupapi/parser.c
View File

@ -1265,7 +1265,7 @@ LONG WINAPI SetupGetLineCountW( HINF hinf, PCWSTR section )
if (ret == -1) ret = 0; if (ret == -1) ret = 0;
ret += file->sections[section_index]->nb_lines; ret += file->sections[section_index]->nb_lines;
} }
TRACE( "(%p,%s) returning %ld\n", hinf, debugstr_w(section), ret ); TRACE( "(%p,%s) returning %d\n", hinf, debugstr_w(section), ret );
SetLastError( (ret == -1) ? ERROR_SECTION_NOT_FOUND : 0 ); SetLastError( (ret == -1) ? ERROR_SECTION_NOT_FOUND : 0 );
return ret; return ret;
} }
@ -1310,7 +1310,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON
context->Section = section_index; context->Section = section_index;
context->Line = index; context->Line = index;
SetLastError( 0 ); SetLastError( 0 );
TRACE( "(%p,%s): returning %d/%ld\n", TRACE( "(%p,%s): returning %d/%d\n",
hinf, debugstr_w(section), section_index, index ); hinf, debugstr_w(section), section_index, index );
return TRUE; return TRUE;
} }
@ -1652,7 +1652,7 @@ BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer,
} }
PARSER_string_substA( file, field->text, buffer, size ); PARSER_string_substA( file, field->text, buffer, size );
TRACE( "context %p/%p/%d/%d index %ld returning %s\n", TRACE( "context %p/%p/%d/%d index %d returning %s\n",
context->Inf, context->CurrentInf, context->Section, context->Line, context->Inf, context->CurrentInf, context->Section, context->Line,
index, debugstr_a(buffer) ); index, debugstr_a(buffer) );
} }
@ -1683,7 +1683,7 @@ BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer
} }
PARSER_string_substW( file, field->text, buffer, size ); PARSER_string_substW( file, field->text, buffer, size );
TRACE( "context %p/%p/%d/%d index %ld returning %s\n", TRACE( "context %p/%p/%d/%d index %d returning %s\n",
context->Inf, context->CurrentInf, context->Section, context->Line, context->Inf, context->CurrentInf, context->Section, context->Line,
index, debugstr_w(buffer) ); index, debugstr_w(buffer) );
} }
@ -1770,7 +1770,7 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer,
} }
if (TRACE_ON(setupapi)) if (TRACE_ON(setupapi))
{ {
TRACE( "%p/%p/%d/%d index %ld returning", TRACE( "%p/%p/%d/%d index %d returning",
context->Inf, context->CurrentInf, context->Section, context->Line, index ); context->Inf, context->CurrentInf, context->Section, context->Line, index );
for (i = index; i < line->nb_fields; i++) TRACE( " %02x", buffer[i - index] ); for (i = index; i < line->nb_fields; i++) TRACE( " %02x", buffer[i - index] );
TRACE( "\n" ); TRACE( "\n" );

6
dlls/setupapi/query.c
View File

@ -132,7 +132,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl,
BOOL ret; BOOL ret;
DWORD infSize; DWORD infSize;
TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer, TRACE("(%p, %d, %p, %d, %p)\n", InfSpec, SearchControl, ReturnBuffer,
ReturnBufferSize, RequiredSize); ReturnBufferSize, RequiredSize);
if (!InfSpec) if (!InfSpec)
@ -159,7 +159,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl,
inf = search_for_inf(InfSpec, SearchControl); inf = search_for_inf(InfSpec, SearchControl);
break; break;
case INFINFO_INF_PATH_LIST_SEARCH: case INFINFO_INF_PATH_LIST_SEARCH:
FIXME("Unhandled search control: %ld\n", SearchControl); FIXME("Unhandled search control: %d\n", SearchControl);
if (RequiredSize) if (RequiredSize)
*RequiredSize = 0; *RequiredSize = 0;
@ -251,7 +251,7 @@ BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation,
DWORD len; DWORD len;
LPWSTR ptr; LPWSTR ptr;
TRACE("(%p, %u, %p, %ld, %p) Stub!\n", InfInformation, InfIndex, TRACE("(%p, %u, %p, %d, %p) Stub!\n", InfInformation, InfIndex,
ReturnBuffer, ReturnBufferSize, RequiredSize); ReturnBuffer, ReturnBufferSize, RequiredSize);
if (!InfInformation) if (!InfInformation)

8
dlls/setupapi/queue.c
View File

@ -951,7 +951,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
BOOL rc = FALSE; BOOL rc = FALSE;
BOOL docopy = TRUE; BOOL docopy = TRUE;
TRACE("copy %s to %s style 0x%lx\n",debugstr_w(source),debugstr_w(target),style); TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style);
/* before copy processing */ /* before copy processing */
if (style & SP_COPY_REPLACEONLY) if (style & SP_COPY_REPLACEONLY)
@ -982,7 +982,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
VersionSizeTarget = GetFileVersionInfoSizeW(target,&zero); VersionSizeTarget = GetFileVersionInfoSizeW(target,&zero);
} }
TRACE("SizeTarget %li ... SizeSource %li\n",VersionSizeTarget, TRACE("SizeTarget %i ... SizeSource %i\n",VersionSizeTarget,
VersionSizeSource); VersionSizeSource);
if (VersionSizeSource && VersionSizeTarget) if (VersionSizeSource && VersionSizeTarget)
@ -1015,7 +1015,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
{ {
FILEPATHS_W filepaths; FILEPATHS_W filepaths;
TRACE("Versions: Source %li.%li target %li.%li\n", TRACE("Versions: Source %i.%i target %i.%i\n",
SourceInfo->dwFileVersionMS, SourceInfo->dwFileVersionLS, SourceInfo->dwFileVersionMS, SourceInfo->dwFileVersionLS,
TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS); TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS);
@ -1068,7 +1068,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 | if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE |
SP_COPY_IN_USE_NEEDS_REBOOT | SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP)) SP_COPY_IN_USE_NEEDS_REBOOT | SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP))
{ {
ERR("Unsupported style(s) 0x%lx\n",style); ERR("Unsupported style(s) 0x%x\n",style);
} }
if (docopy) if (docopy)

4
dlls/setupapi/setupcab.c
View File

@ -541,7 +541,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
BOOL ret; BOOL ret;
TRACE("(CabinetFile == %s, Reserved == %lu, MsgHandler == ^%p, Context == ^%p)\n", TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n",
debugstr_a(CabinetFile), Reserved, MsgHandler, Context); debugstr_a(CabinetFile), Reserved, MsgHandler, Context);
if (! LoadCABINETDll()) if (! LoadCABINETDll())
@ -606,7 +606,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved,
DWORD fpnsize; DWORD fpnsize;
BOOL ret; BOOL ret;
TRACE("(CabinetFile == %s, Reserved == %lu, MsgHandler == ^%p, Context == ^%p)\n", TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n",
debugstr_w(CabinetFile), Reserved, MsgHandler, Context); debugstr_w(CabinetFile), Reserved, MsgHandler, Context);
if (!LoadCABINETDll()) if (!LoadCABINETDll())

2
dlls/setupapi/setupx_main.c
View File

@ -94,7 +94,7 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName,
LPDWORD lpdwReserved, LPDWORD lpdwType, LPDWORD lpdwReserved, LPDWORD lpdwType,
LPBYTE lpbData, LPDWORD lpcbData ) LPBYTE lpbData, LPDWORD lpcbData )
{ {
FIXME("(%p,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName), FIXME("(%p,%s,%p,%p,%p,%d), semi-stub.\n",hkey,debugstr_a(lpszValueName),
lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0); lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0);
return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType, return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType,
lpbData, lpcbData ); lpbData, lpcbData );

12
dlls/setupapi/stringtable.c
View File

@ -215,7 +215,7 @@ StringTableAddString(HSTRING_TABLE hStringTable,
PSTRING_TABLE pStringTable; PSTRING_TABLE pStringTable;
DWORD i; DWORD i;
TRACE("%p %s %lx\n", hStringTable, debugstr_w(lpString), dwFlags); TRACE("%p %s %x\n", hStringTable, debugstr_w(lpString), dwFlags);
pStringTable = (PSTRING_TABLE)hStringTable; pStringTable = (PSTRING_TABLE)hStringTable;
if (pStringTable == NULL) if (pStringTable == NULL)
@ -420,7 +420,7 @@ StringTableGetExtraData(HSTRING_TABLE hStringTable,
{ {
PSTRING_TABLE pStringTable; PSTRING_TABLE pStringTable;
TRACE("%p %lx %p %lu\n", TRACE("%p %x %p %u\n",
hStringTable, dwId, lpExtraData, dwExtraDataSize); hStringTable, dwId, lpExtraData, dwExtraDataSize);
pStringTable = (PSTRING_TABLE)hStringTable; pStringTable = (PSTRING_TABLE)hStringTable;
@ -473,7 +473,7 @@ StringTableLookUpString(HSTRING_TABLE hStringTable,
PSTRING_TABLE pStringTable; PSTRING_TABLE pStringTable;
DWORD i; DWORD i;
TRACE("%p %s %lx\n", hStringTable, debugstr_w(lpString), dwFlags); TRACE("%p %s %x\n", hStringTable, debugstr_w(lpString), dwFlags);
pStringTable = (PSTRING_TABLE)hStringTable; pStringTable = (PSTRING_TABLE)hStringTable;
if (pStringTable == NULL) if (pStringTable == NULL)
@ -556,7 +556,7 @@ StringTableSetExtraData(HSTRING_TABLE hStringTable,
{ {
PSTRING_TABLE pStringTable; PSTRING_TABLE pStringTable;
TRACE("%p %lx %p %lu\n", TRACE("%p %x %p %u\n",
hStringTable, dwId, lpExtraData, dwExtraDataSize); hStringTable, dwId, lpExtraData, dwExtraDataSize);
pStringTable = (PSTRING_TABLE)hStringTable; pStringTable = (PSTRING_TABLE)hStringTable;
@ -614,7 +614,7 @@ StringTableStringFromId(HSTRING_TABLE hStringTable,
PSTRING_TABLE pStringTable; PSTRING_TABLE pStringTable;
static WCHAR empty[] = {0}; static WCHAR empty[] = {0};
TRACE("%p %lx\n", hStringTable, dwId); TRACE("%p %x\n", hStringTable, dwId);
pStringTable = (PSTRING_TABLE)hStringTable; pStringTable = (PSTRING_TABLE)hStringTable;
if (pStringTable == NULL) if (pStringTable == NULL)
@ -655,7 +655,7 @@ StringTableStringFromIdEx(HSTRING_TABLE hStringTable,
DWORD dwLength; DWORD dwLength;
BOOL bResult = FALSE; BOOL bResult = FALSE;
TRACE("%p %lx %p %p\n", hStringTable, dwId, lpBuffer, lpBufferLength); TRACE("%p %x %p %p\n", hStringTable, dwId, lpBuffer, lpBufferLength);
pStringTable = (PSTRING_TABLE)hStringTable; pStringTable = (PSTRING_TABLE)hStringTable;
if (pStringTable == NULL) if (pStringTable == NULL)

14
dlls/setupapi/stubs.c
View File

@ -107,7 +107,7 @@ DWORD WINAPI CM_Disconnect_Machine(DWORD handle)
DWORD WINAPI CM_Get_Device_ID_ListA( DWORD WINAPI CM_Get_Device_ID_ListA(
PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags )
{ {
FIXME("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags ); FIXME("%p %p %d %d\n", pszFilter, Buffer, BufferLen, ulFlags );
memset(Buffer,0,2); memset(Buffer,0,2);
return CR_SUCCESS; return CR_SUCCESS;
} }
@ -145,7 +145,7 @@ BOOL WINAPI SetupCopyOEMInfW(PCWSTR sourceinffile, PCWSTR sourcemedialoc,
BOOL WINAPI SetupGetSourceInfoA(HINF InfHandle, UINT SourceId, UINT InfoDesired, BOOL WINAPI SetupGetSourceInfoA(HINF InfHandle, UINT SourceId, UINT InfoDesired,
PSTR ReturnBuffer, DWORD ReturnBufferSize, LPDWORD RequiredSize) PSTR ReturnBuffer, DWORD ReturnBufferSize, LPDWORD RequiredSize)
{ {
FIXME("(%p, %d, %d, %p, %ld, %p): stub\n", InfHandle, SourceId, InfoDesired, FIXME("(%p, %d, %d, %p, %d, %p): stub\n", InfHandle, SourceId, InfoDesired,
ReturnBuffer, ReturnBufferSize, RequiredSize); ReturnBuffer, ReturnBufferSize, RequiredSize);
return FALSE; return FALSE;
} }
@ -156,7 +156,7 @@ BOOL WINAPI SetupGetSourceInfoA(HINF InfHandle, UINT SourceId, UINT InfoDesired,
BOOL WINAPI SetupGetSourceInfoW(HINF InfHandle, UINT SourceId, UINT InfoDesired, BOOL WINAPI SetupGetSourceInfoW(HINF InfHandle, UINT SourceId, UINT InfoDesired,
PWSTR ReturnBuffer, DWORD ReturnBufferSize, LPDWORD RequiredSize) PWSTR ReturnBuffer, DWORD ReturnBufferSize, LPDWORD RequiredSize)
{ {
FIXME("(%p, %d, %d, %p, %ld, %p): stub\n", InfHandle, SourceId, InfoDesired, FIXME("(%p, %d, %d, %p, %d, %p): stub\n", InfHandle, SourceId, InfoDesired,
ReturnBuffer, ReturnBufferSize, RequiredSize); ReturnBuffer, ReturnBufferSize, RequiredSize);
return FALSE; return FALSE;
} }
@ -166,7 +166,7 @@ BOOL WINAPI SetupGetSourceInfoW(HINF InfHandle, UINT SourceId, UINT InfoDesired,
*/ */
HANDLE WINAPI SetupInitializeFileLogW(LPWSTR LogFileName, DWORD Flags) HANDLE WINAPI SetupInitializeFileLogW(LPWSTR LogFileName, DWORD Flags)
{ {
FIXME("Stub %s, 0x%lx\n",debugstr_w(LogFileName),Flags); FIXME("Stub %s, 0x%x\n",debugstr_w(LogFileName),Flags);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
@ -175,7 +175,7 @@ HANDLE WINAPI SetupInitializeFileLogW(LPWSTR LogFileName, DWORD Flags)
*/ */
HANDLE WINAPI SetupInitializeFileLogA(LPSTR LogFileName, DWORD Flags) HANDLE WINAPI SetupInitializeFileLogA(LPSTR LogFileName, DWORD Flags)
{ {
FIXME("Stub %s, 0x%lx\n",debugstr_a(LogFileName),Flags); FIXME("Stub %s, 0x%x\n",debugstr_a(LogFileName),Flags);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
@ -193,7 +193,7 @@ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle)
*/ */
BOOL WINAPI RegistryDelnode(DWORD x, DWORD y) BOOL WINAPI RegistryDelnode(DWORD x, DWORD y)
{ {
FIXME("%08lx %08lx: stub\n", x, y); FIXME("%08x %08x: stub\n", x, y);
return FALSE; return FALSE;
} }
@ -210,7 +210,7 @@ void WINAPI SetupCloseLog()
*/ */
BOOL WINAPI SetupLogErrorW(PCWSTR MessageString, LogSeverity Severity) BOOL WINAPI SetupLogErrorW(PCWSTR MessageString, LogSeverity Severity)
{ {
FIXME("(%s, %ld) stub\n", debugstr_w(MessageString), Severity); FIXME("(%s, %d) stub\n", debugstr_w(MessageString), Severity);
return TRUE; return TRUE;
} }

2
dlls/setupapi/virtcopy.c
View File

@ -447,7 +447,7 @@ LPCSTR WINAPI VcpExplain16(LPVIRTNODE lpVn, DWORD dwWhat)
} }
break; break;
default: default:
FIXME("%ld unimplemented !\n", dwWhat); FIXME("%d unimplemented !\n", dwWhat);
strcpy(buffer, "Unknown error"); strcpy(buffer, "Unknown error");
break; break;
} }