setupapi: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Fri Oct 13 16:32:50 CDT 2006
---
dlls/setupapi/Makefile.in | 2 +-
dlls/setupapi/devinst.c | 28 ++++++++++++++--------------
dlls/setupapi/devinst16.c | 2 +-
dlls/setupapi/dirid.c | 2 +-
dlls/setupapi/install.c | 10 +++++-----
dlls/setupapi/misc.c | 6 +++---
dlls/setupapi/parser.c | 10 +++++-----
dlls/setupapi/query.c | 6 +++---
dlls/setupapi/queue.c | 8 ++++----
dlls/setupapi/setupcab.c | 4 ++--
dlls/setupapi/setupx_main.c | 2 +-
dlls/setupapi/stringtable.c | 12 ++++++------
dlls/setupapi/stubs.c | 14 +++++++-------
dlls/setupapi/virtcopy.c | 2 +-
14 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index 9d4647c..3ecbddf 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_SETUPAPI_ -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -D_SETUPAPI_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 99a9950..86bcca1 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -213,7 +213,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExW
NULL,
NULL,
NULL);
- TRACE("RegEnumKeyExW() returns %ld\n", lError);
+ TRACE("RegEnumKeyExW() returns %d\n", lError);
if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA)
{
TRACE("Key name: %p\n", szKeyName);
@@ -415,7 +415,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW
NULL,
NULL,
NULL);
- TRACE("RegEnumKeyExW() returns %ld\n", lError);
+ TRACE("RegEnumKeyExW() returns %d\n", lError);
if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA)
{
TRACE("Key name: %p\n", szKeyName);
@@ -748,7 +748,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(
DWORD CreationFlags,
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),
hwndParent, CreationFlags, DeviceInfoData);
@@ -765,7 +765,7 @@ BOOL WINAPI SetupDiEnumDeviceInfo(
DWORD index,
PSP_DEVINFO_DATA info)
{
- FIXME("%p %ld %p\n", devinfo, index, info);
+ FIXME("%p %d %p\n", devinfo, index, info);
if(info==NULL)
return FALSE;
@@ -931,7 +931,7 @@ BOOL WINAPI SetupDiGetClassDescriptionEx
Reserved);
if (hKey == INVALID_HANDLE_VALUE)
{
- WARN("SetupDiOpenClassRegKeyExW() failed (Error %lu)\n", GetLastError());
+ WARN("SetupDiOpenClassRegKeyExW() failed (Error %u)\n", GetLastError());
return FALSE;
}
@@ -1010,7 +1010,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsW(
{
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);
if(flags & DIGCF_DEVICEINTERFACE)
@@ -1064,7 +1064,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces(
{
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);
if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE)
@@ -1127,7 +1127,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDet
{
BOOL ret = FALSE;
- FIXME("(%p, %p, %p, %ld, %p, %p)\n", DeviceInfoSet,
+ FIXME("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet,
DeviceInterfaceData, DeviceInterfaceDetailData,
DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData);
@@ -1146,7 +1146,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDet
PDWORD RequiredSize,
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,
DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData);
return FALSE;
@@ -1164,7 +1164,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryProp
DWORD PropertyBufferSize,
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,
RequiredSize);
return FALSE;
@@ -1486,7 +1486,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceW(
DWORD OpenFlags,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
{
- FIXME("%p %s %08lx %p\n",
+ FIXME("%p %s %08x %p\n",
DeviceInfoSet, debugstr_w(DevicePath), OpenFlags, DeviceInterfaceData);
return FALSE;
}
@@ -1500,7 +1500,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA(
DWORD OpenFlags,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData)
{
- FIXME("%p %s %08lx %p\n", DeviceInfoSet,
+ FIXME("%p %s %08x %p\n", DeviceInfoSet,
debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData);
return FALSE;
}
@@ -1514,7 +1514,7 @@ BOOL WINAPI SetupDiSetClassInstallParams
PSP_CLASSINSTALL_HEADER ClassInstallParams,
DWORD ClassInstallParamsSize)
{
- FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData,
+ FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData,
ClassInstallParams->InstallFunction, ClassInstallParamsSize);
return FALSE;
}
@@ -1554,7 +1554,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(
DWORD KeyType,
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);
return INVALID_HANDLE_VALUE;
}
diff --git a/dlls/setupapi/devinst16.c b/dlls/setupapi/devinst16.c
index e34bb7e..6c78aec 100644
--- a/dlls/setupapi/devinst16.c
+++ b/dlls/setupapi/devinst16.c
@@ -103,7 +103,7 @@ RETERR16 WINAPI DiCreateDeviceInfo16(LPL
LPCSTR lpszClassName, HWND16 hwndParent)
{
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(lpszRegsubkey), debugstr_a(lpszClassName), hwndParent);
lpdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEVICE_INFO16));
diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c
index 4fa6cf5..89f92fd 100644
--- a/dlls/setupapi/dirid.c
+++ b/dlls/setupapi/dirid.c
@@ -156,7 +156,7 @@ static const WCHAR *get_csidl_dir( DWORD
if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE ))
{
- FIXME( "CSIDL %lx not found\n", csidl );
+ FIXME( "CSIDL %x not found\n", csidl );
return get_unknown_dirid();
}
len = (strlenW(buffer) + 1) * sizeof(WCHAR);
diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 876a9b2..846f86c 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -336,7 +336,7 @@ static BOOL do_reg_operation( HKEY hkey,
if (type == REG_DWORD)
{
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) );
}
else
@@ -356,7 +356,7 @@ static BOOL do_reg_operation( HKEY hkey,
if (size)
{
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 );
}
RegSetValueExW( hkey, value, 0, type, data, size );
@@ -531,7 +531,7 @@ static BOOL do_register_dll( const struc
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.Win32Error = res;
goto done;
@@ -555,7 +555,7 @@ static BOOL do_register_dll( const struc
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.Win32Error = res;
goto done;
@@ -778,7 +778,7 @@ static BOOL iterate_section_fields( HINF
goto done;
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() );
goto done;
}
diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index c29da52..61b0fec 100644
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -68,7 +68,7 @@ VOID WINAPI MyFree(LPVOID lpMem)
*/
LPVOID WINAPI MyMalloc(DWORD dwSize)
{
- TRACE("%lu\n", dwSize);
+ TRACE("%u\n", dwSize);
return HeapAlloc(GetProcessHeap(), 0, dwSize);
}
@@ -93,7 +93,7 @@ LPVOID WINAPI MyMalloc(DWORD dwSize)
*/
LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize)
{
- TRACE("%p %lu\n", lpSrc, dwSize);
+ TRACE("%p %u\n", lpSrc, dwSize);
if (lpSrc == NULL)
return HeapAlloc(GetProcessHeap(), 0, dwSize);
@@ -858,6 +858,6 @@ void WINAPI pSetupSetGlobalFlags( DWORD
*/
DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout )
{
- FIXME("%ld\n", dwTimeout);
+ FIXME("%d\n", dwTimeout);
return WAIT_OBJECT_0;
}
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index 72ce612..3c2c7ad 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -1265,7 +1265,7 @@ LONG WINAPI SetupGetLineCountW( HINF hin
if (ret == -1) ret = 0;
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 );
return ret;
}
@@ -1310,7 +1310,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF h
context->Section = section_index;
context->Line = index;
SetLastError( 0 );
- TRACE( "(%p,%s): returning %d/%ld\n",
+ TRACE( "(%p,%s): returning %d/%d\n",
hinf, debugstr_w(section), section_index, index );
return TRUE;
}
@@ -1652,7 +1652,7 @@ BOOL WINAPI SetupGetStringFieldA( PINFCO
}
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,
index, debugstr_a(buffer) );
}
@@ -1683,7 +1683,7 @@ BOOL WINAPI SetupGetStringFieldW( PINFCO
}
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,
index, debugstr_w(buffer) );
}
@@ -1770,7 +1770,7 @@ BOOL WINAPI SetupGetBinaryField( PINFCON
}
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 );
for (i = index; i < line->nb_fields; i++) TRACE( " %02x", buffer[i - index] );
TRACE( "\n" );
diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c
index 3e680eb..932fb98 100644
--- a/dlls/setupapi/query.c
+++ b/dlls/setupapi/query.c
@@ -132,7 +132,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCV
BOOL ret;
DWORD infSize;
- TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer,
+ TRACE("(%p, %d, %p, %d, %p)\n", InfSpec, SearchControl, ReturnBuffer,
ReturnBufferSize, RequiredSize);
if (!InfSpec)
@@ -159,7 +159,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCV
inf = search_for_inf(InfSpec, SearchControl);
break;
case INFINFO_INF_PATH_LIST_SEARCH:
- FIXME("Unhandled search control: %ld\n", SearchControl);
+ FIXME("Unhandled search control: %d\n", SearchControl);
if (RequiredSize)
*RequiredSize = 0;
@@ -251,7 +251,7 @@ BOOL WINAPI SetupQueryInfFileInformation
DWORD len;
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);
if (!InfInformation)
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index fdcd320..3ddb552 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -951,7 +951,7 @@ static BOOL do_file_copyW( LPCWSTR sourc
BOOL rc = FALSE;
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 */
if (style & SP_COPY_REPLACEONLY)
@@ -982,7 +982,7 @@ static BOOL do_file_copyW( LPCWSTR sourc
VersionSizeTarget = GetFileVersionInfoSizeW(target,&zero);
}
- TRACE("SizeTarget %li ... SizeSource %li\n",VersionSizeTarget,
+ TRACE("SizeTarget %i ... SizeSource %i\n",VersionSizeTarget,
VersionSizeSource);
if (VersionSizeSource && VersionSizeTarget)
@@ -1015,7 +1015,7 @@ static BOOL do_file_copyW( LPCWSTR sourc
{
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,
TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS);
@@ -1068,7 +1068,7 @@ static BOOL do_file_copyW( LPCWSTR sourc
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))
{
- ERR("Unsupported style(s) 0x%lx\n",style);
+ ERR("Unsupported style(s) 0x%x\n",style);
}
if (docopy)
diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index 2522d79..e114354 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -541,7 +541,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR C
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);
if (! LoadCABINETDll())
@@ -606,7 +606,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR
DWORD fpnsize;
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);
if (!LoadCABINETDll())
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index a77626a..4aacbc8 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -94,7 +94,7 @@ DWORD WINAPI SURegQueryValueEx( HKEY hke
LPDWORD lpdwReserved, LPDWORD lpdwType,
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);
return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType,
lpbData, lpcbData );
diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c
index 8fb1964..84b1c14 100644
--- a/dlls/setupapi/stringtable.c
+++ b/dlls/setupapi/stringtable.c
@@ -215,7 +215,7 @@ StringTableAddString(HSTRING_TABLE hStri
PSTRING_TABLE pStringTable;
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;
if (pStringTable == NULL)
@@ -420,7 +420,7 @@ StringTableGetExtraData(HSTRING_TABLE hS
{
PSTRING_TABLE pStringTable;
- TRACE("%p %lx %p %lu\n",
+ TRACE("%p %x %p %u\n",
hStringTable, dwId, lpExtraData, dwExtraDataSize);
pStringTable = (PSTRING_TABLE)hStringTable;
@@ -473,7 +473,7 @@ StringTableLookUpString(HSTRING_TABLE hS
PSTRING_TABLE pStringTable;
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;
if (pStringTable == NULL)
@@ -556,7 +556,7 @@ StringTableSetExtraData(HSTRING_TABLE hS
{
PSTRING_TABLE pStringTable;
- TRACE("%p %lx %p %lu\n",
+ TRACE("%p %x %p %u\n",
hStringTable, dwId, lpExtraData, dwExtraDataSize);
pStringTable = (PSTRING_TABLE)hStringTable;
@@ -614,7 +614,7 @@ StringTableStringFromId(HSTRING_TABLE hS
PSTRING_TABLE pStringTable;
static WCHAR empty[] = {0};
- TRACE("%p %lx\n", hStringTable, dwId);
+ TRACE("%p %x\n", hStringTable, dwId);
pStringTable = (PSTRING_TABLE)hStringTable;
if (pStringTable == NULL)
@@ -655,7 +655,7 @@ StringTableStringFromIdEx(HSTRING_TABLE
DWORD dwLength;
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;
if (pStringTable == NULL)
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index a19b237..a250924 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -107,7 +107,7 @@ DWORD WINAPI CM_Disconnect_Machine(DWORD
DWORD WINAPI CM_Get_Device_ID_ListA(
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);
return CR_SUCCESS;
}
@@ -145,7 +145,7 @@ BOOL WINAPI SetupCopyOEMInfW(PCWSTR sour
BOOL WINAPI SetupGetSourceInfoA(HINF InfHandle, UINT SourceId, UINT InfoDesired,
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);
return FALSE;
}
@@ -156,7 +156,7 @@ BOOL WINAPI SetupGetSourceInfoA(HINF Inf
BOOL WINAPI SetupGetSourceInfoW(HINF InfHandle, UINT SourceId, UINT InfoDesired,
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);
return FALSE;
}
@@ -166,7 +166,7 @@ BOOL WINAPI SetupGetSourceInfoW(HINF Inf
*/
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;
}
@@ -175,7 +175,7 @@ HANDLE WINAPI SetupInitializeFileLogW(LP
*/
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;
}
@@ -193,7 +193,7 @@ BOOL WINAPI SetupTerminateFileLog(HANDLE
*/
BOOL WINAPI RegistryDelnode(DWORD x, DWORD y)
{
- FIXME("%08lx %08lx: stub\n", x, y);
+ FIXME("%08x %08x: stub\n", x, y);
return FALSE;
}
@@ -210,7 +210,7 @@ void WINAPI SetupCloseLog()
*/
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;
}
diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c
index 643b717..51a6356 100644
--- a/dlls/setupapi/virtcopy.c
+++ b/dlls/setupapi/virtcopy.c
@@ -447,7 +447,7 @@ LPCSTR WINAPI VcpExplain16(LPVIRTNODE lp
}
break;
default:
- FIXME("%ld unimplemented !\n", dwWhat);
+ FIXME("%d unimplemented !\n", dwWhat);
strcpy(buffer, "Unknown error");
break;
}
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061013/ecacc38e/attachment-0001.pgp
More information about the wine-patches
mailing list