Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/mscoree/Makefile.in | 1 - dlls/mscoree/config.c | 28 ++++++++++++++-------------- dlls/mscoree/cordebug.c | 22 +++++++++++----------- dlls/mscoree/corruntimehost.c | 26 +++++++++++++------------- dlls/mscoree/metadata.c | 18 +++++++++--------- dlls/mscoree/metahost.c | 22 +++++++++++----------- dlls/mscoree/mscoree_main.c | 32 ++++++++++++++++---------------- 7 files changed, 74 insertions(+), 75 deletions(-)
diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 05f14aa2462..95639bd0fc4 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mscoree.dll IMPORTS = dbghelp uuid shell32 advapi32 ole32 oleaut32 shlwapi
diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index b6aa647d876..f733c1756ed 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -96,7 +96,7 @@ static ULONG WINAPI ConfigStream_AddRef(IStream *iface) ConfigStream *This = impl_from_IStream(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref);
return ref; } @@ -106,7 +106,7 @@ static ULONG WINAPI ConfigStream_Release(IStream *iface) ConfigStream *This = impl_from_IStream(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%u\n",This, ref); + TRACE("(%p) ref=%lu\n",This, ref);
if (!ref) { @@ -122,11 +122,11 @@ static HRESULT WINAPI ConfigStream_Read(IStream *iface, void *buf, ULONG size, U ConfigStream *This = impl_from_IStream(iface); DWORD read = 0;
- TRACE("(%p)->(%p %u %p)\n", This, buf, size, ret_read); + TRACE("(%p)->(%p %lu %p)\n", This, buf, size, ret_read);
if (!ReadFile(This->file, buf, size, &read, NULL)) { - WARN("error %d reading file\n", GetLastError()); + WARN("error %ld reading file\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); }
@@ -137,7 +137,7 @@ static HRESULT WINAPI ConfigStream_Read(IStream *iface, void *buf, ULONG size, U static HRESULT WINAPI ConfigStream_Write(IStream *iface, const void *buf, ULONG size, ULONG *written) { ConfigStream *This = impl_from_IStream(iface); - TRACE("(%p)->(%p %u %p)\n", This, buf, size, written); + TRACE("(%p)->(%p %lu %p)\n", This, buf, size, written); return E_FAIL; }
@@ -145,14 +145,14 @@ static HRESULT WINAPI ConfigStream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *pNewPos) { ConfigStream *This = impl_from_IStream(iface); - TRACE("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, pNewPos); + TRACE("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, pNewPos); return E_NOTIMPL; }
static HRESULT WINAPI ConfigStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { ConfigStream *This = impl_from_IStream(iface); - TRACE("(%p)->(%d)\n", This, libNewSize.u.LowPart); + TRACE("(%p)->(%ld)\n", This, libNewSize.u.LowPart); return E_NOTIMPL; }
@@ -160,14 +160,14 @@ static HRESULT WINAPI ConfigStream_CopyTo(IStream *iface, IStream *stream, ULARG ULARGE_INTEGER *read, ULARGE_INTEGER *written) { ConfigStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%p %d %p %p)\n", This, stream, size.u.LowPart, read, written); + FIXME("(%p)->(%p %ld %p %p)\n", This, stream, size.u.LowPart, read, written); return E_NOTIMPL; }
static HRESULT WINAPI ConfigStream_Commit(IStream *iface, DWORD flags) { ConfigStream *This = impl_from_IStream(iface); - FIXME("(%p,%d)\n", This, flags); + FIXME("(%p,%ld)\n", This, flags); return E_NOTIMPL; }
@@ -182,14 +182,14 @@ static HRESULT WINAPI ConfigStream_LockUnlockRegion(IStream *iface, ULARGE_INTEG ULARGE_INTEGER cb, DWORD dwLockType) { ConfigStream *This = impl_from_IStream(iface); - TRACE("(%p,%d,%d,%d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + TRACE("(%p,%ld,%ld,%ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); return E_NOTIMPL; }
static HRESULT WINAPI ConfigStream_Stat(IStream *iface, STATSTG *lpStat, DWORD grfStatFlag) { ConfigStream *This = impl_from_IStream(iface); - FIXME("(%p,%p,%d)\n", This, lpStat, grfStatFlag); + FIXME("(%p,%p,%ld)\n", This, lpStat, grfStatFlag); return E_NOTIMPL; }
@@ -586,21 +586,21 @@ static ULONG WINAPI ConfigFileHandler_Error_Release(ISAXErrorHandler *iface) static HRESULT WINAPI ConfigFileHandler_error(ISAXErrorHandler *iface, ISAXLocator * pLocator, const WCHAR * pErrorMessage, HRESULT hrErrorCode) { - WARN("%s,%x\n", debugstr_w(pErrorMessage), hrErrorCode); + WARN("%s,%lx\n", debugstr_w(pErrorMessage), hrErrorCode); return S_OK; }
static HRESULT WINAPI ConfigFileHandler_fatalError(ISAXErrorHandler *iface, ISAXLocator * pLocator, const WCHAR * pErrorMessage, HRESULT hrErrorCode) { - WARN("%s,%x\n", debugstr_w(pErrorMessage), hrErrorCode); + WARN("%s,%lx\n", debugstr_w(pErrorMessage), hrErrorCode); return S_OK; }
static HRESULT WINAPI ConfigFileHandler_ignorableWarning(ISAXErrorHandler *iface, ISAXLocator * pLocator, const WCHAR * pErrorMessage, HRESULT hrErrorCode) { - WARN("%s,%x\n", debugstr_w(pErrorMessage), hrErrorCode); + WARN("%s,%lx\n", debugstr_w(pErrorMessage), hrErrorCode); return S_OK; }
diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 15e7fad8fa5..56465f35711 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -98,7 +98,7 @@ static ULONG WINAPI cordebugprocess_AddRef(ICorDebugProcess *iface) DebugProcess *This = impl_from_ICorDebugProcess(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref);
return ref; } @@ -108,7 +108,7 @@ static ULONG WINAPI cordebugprocess_Release(ICorDebugProcess *iface) DebugProcess *This = impl_from_ICorDebugProcess(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref);
if (ref == 0) { @@ -466,7 +466,7 @@ static HRESULT WINAPI process_enum_QueryInterface(ICorDebugProcessEnum *iface, R static ULONG WINAPI process_enum_AddRef(ICorDebugProcessEnum *iface) { CorDebug *This = impl_from_ICorDebugProcessEnum(iface); - TRACE("%p ref=%u\n", This, This->ref); + TRACE("%p ref=%lu\n", This, This->ref);
return ICorDebug_AddRef(&This->ICorDebug_iface); } @@ -474,7 +474,7 @@ static ULONG WINAPI process_enum_AddRef(ICorDebugProcessEnum *iface) static ULONG WINAPI process_enum_Release(ICorDebugProcessEnum *iface) { CorDebug *This = impl_from_ICorDebugProcessEnum(iface); - TRACE("%p ref=%u\n", This, This->ref); + TRACE("%p ref=%lu\n", This, This->ref);
return ICorDebug_Release(&This->ICorDebug_iface); } @@ -517,7 +517,7 @@ static HRESULT WINAPI process_enum_Next(ICorDebugProcessEnum *iface, ULONG celt, ICorDebugProcess * processes[], ULONG *pceltFetched) { CorDebug *This = impl_from_ICorDebugProcessEnum(iface); - FIXME("stub %p %d %p %p\n", This, celt, processes, pceltFetched); + FIXME("stub %p %ld %p %p\n", This, celt, processes, pceltFetched); return E_NOTIMPL; }
@@ -561,7 +561,7 @@ static ULONG WINAPI CorDebug_AddRef(ICorDebug *iface) CorDebug *This = impl_from_ICorDebug( iface ); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref);
return ref; } @@ -571,7 +571,7 @@ static ULONG WINAPI CorDebug_Release(ICorDebug *iface) CorDebug *This = impl_from_ICorDebug( iface ); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref);
if (ref == 0) { @@ -673,7 +673,7 @@ static HRESULT WINAPI CorDebug_CreateProcess(ICorDebug *iface, LPCWSTR lpApplica ICorDebugProcess *pDebugProcess; HRESULT hr;
- TRACE("stub %p %s %s %p %p %d %d %p %s %p %p %d %p\n", This, debugstr_w(lpApplicationName), + TRACE("stub %p %s %s %p %p %d %ld %p %s %p %p %d %p\n", This, debugstr_w(lpApplicationName), debugstr_w(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), lpStartupInfo, lpProcessInformation, debuggingFlags, ppProcess); @@ -711,7 +711,7 @@ static HRESULT WINAPI CorDebug_DebugActiveProcess(ICorDebug *iface, DWORD id, BO ICorDebugProcess **ppProcess) { CorDebug *This = impl_from_ICorDebug( iface ); - FIXME("stub %p %d %d %p\n", This, id, win32Attach, ppProcess); + FIXME("stub %p %ld %d %p\n", This, id, win32Attach, ppProcess); return E_NOTIMPL; }
@@ -732,7 +732,7 @@ static HRESULT WINAPI CorDebug_EnumerateProcesses( ICorDebug *iface, ICorDebugPr static HRESULT WINAPI CorDebug_GetProcess(ICorDebug *iface, DWORD dwProcessId, ICorDebugProcess **ppProcess) { CorDebug *This = impl_from_ICorDebug( iface ); - FIXME("stub %p %d %p\n", This, dwProcessId, ppProcess); + FIXME("stub %p %ld %p\n", This, dwProcessId, ppProcess); return E_NOTIMPL; }
@@ -740,7 +740,7 @@ static HRESULT WINAPI CorDebug_CanLaunchOrAttach(ICorDebug *iface, DWORD dwProce BOOL win32DebuggingEnabled) { CorDebug *This = impl_from_ICorDebug( iface ); - FIXME("stub %p %d %d\n", This, dwProcessId, win32DebuggingEnabled); + FIXME("stub %p %ld %d\n", This, dwProcessId, win32DebuggingEnabled); return S_OK; }
diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 3b23ce33e40..54b72091bf5 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -296,7 +296,7 @@ static HRESULT RuntimeHost_Invoke(RuntimeHost *This, MonoDomain *domain, hr = RuntimeHost_DoInvoke(This, domain, methodname, method, obj, args, result); if (FAILED(hr)) { - ERR("Method %s.%s:%s raised an exception, hr=%x\n", namespace, typename, methodname, hr); + ERR("Method %s.%s:%s raised an exception, hr=%lx\n", namespace, typename, methodname, hr); }
domain_restore(prev_domain); @@ -340,7 +340,7 @@ static HRESULT RuntimeHost_VirtualInvoke(RuntimeHost *This, MonoDomain *domain, hr = RuntimeHost_DoInvoke(This, domain, methodname, method, obj, args, result); if (FAILED(hr)) { - ERR("Method %s.%s:%s raised an exception, hr=%x\n", namespace, typename, methodname, hr); + ERR("Method %s.%s:%s raised an exception, hr=%lx\n", namespace, typename, methodname, hr); }
domain_restore(prev_domain); @@ -482,7 +482,7 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) hr = RuntimeHost_GetDefaultDomain(This, NULL, &domain); if (FAILED(hr)) { - ERR("Cannot get domain, hr=%x\n", hr); + ERR("Cannot get domain, hr=%lx\n", hr); return; }
@@ -842,14 +842,14 @@ static HRESULT WINAPI CLRRuntimeHost_GetCLRControl(ICLRRuntimeHost* iface, static HRESULT WINAPI CLRRuntimeHost_UnloadAppDomain(ICLRRuntimeHost* iface, DWORD dwAppDomainId, BOOL fWaitUntilDone) { - FIXME("(%p,%u,%i)\n", iface, dwAppDomainId, fWaitUntilDone); + FIXME("(%p,%lu,%i)\n", iface, dwAppDomainId, fWaitUntilDone); return E_NOTIMPL; }
static HRESULT WINAPI CLRRuntimeHost_ExecuteInAppDomain(ICLRRuntimeHost* iface, DWORD dwAppDomainId, FExecuteInAppDomainCallback pCallback, void *cookie) { - FIXME("(%p,%u,%p,%p)\n", iface, dwAppDomainId, pCallback, cookie); + FIXME("(%p,%lu,%p,%p)\n", iface, dwAppDomainId, pCallback, cookie); return E_NOTIMPL; }
@@ -864,7 +864,7 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteApplication(ICLRRuntimeHost* iface, LPCWSTR pwzAppFullName, DWORD dwManifestPaths, LPCWSTR *ppwzManifestPaths, DWORD dwActivationData, LPCWSTR *ppwzActivationData, int *pReturnValue) { - FIXME("(%p,%s,%u,%u)\n", iface, debugstr_w(pwzAppFullName), dwManifestPaths, dwActivationData); + FIXME("(%p,%s,%lu,%lu)\n", iface, debugstr_w(pwzAppFullName), dwManifestPaths, dwActivationData); return E_NOTIMPL; }
@@ -1248,7 +1248,7 @@ DWORD WINAPI GetTokenForVTableEntry(HINSTANCE hinst, BYTE **ppVTEntry) } LeaveCriticalSection(&fixup_list_cs);
- TRACE("<-- %x\n", result); + TRACE("<-- %lx\n", result); return result; }
@@ -1329,7 +1329,7 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup)
if (!fixup->done) { - ERR("unable to fixup vtable, hr=%x, status=%d\n", hr, status); + ERR("unable to fixup vtable, hr=%lx, status=%d\n", hr, status); /* If we returned now, we'd get an infinite loop. */ assert(0); } @@ -1414,7 +1414,7 @@ static void FixupVTable(HMODULE hmodule) assembly_release(assembly); } else - ERR("failed to read CLR headers, hr=%x\n", hr); + ERR("failed to read CLR headers, hr=%lx\n", hr); }
__int32 WINAPI _CorExeMain(void) @@ -1535,7 +1535,7 @@ BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) ASSEMBLY *assembly=NULL; HRESULT hr;
- TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
hr = assembly_from_hmodule(&assembly, hinstDLL); if (SUCCEEDED(hr)) @@ -1555,7 +1555,7 @@ BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return NativeEntryPoint(hinstDLL, fdwReason, lpvReserved); } else - ERR("failed to read CLR headers, hr=%x\n", hr); + ERR("failed to read CLR headers, hr=%lx\n", hr);
return TRUE; } @@ -1663,7 +1663,7 @@ static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UIN { DWORD error = GetLastError(); if (error != ERROR_SXS_KEY_NOT_FOUND) - ERR("Failed to find guid: %d\n", error); + ERR("Failed to find guid: %ld\n", error); goto end; }
@@ -1672,7 +1672,7 @@ static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UIN if (!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info)) { - ERR("QueryActCtxW failed: %d!\n", GetLastError()); + ERR("QueryActCtxW failed: %ld!\n", GetLastError()); goto end; }
diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index 4853dd0c6b9..de64d0298a1 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -78,7 +78,7 @@ static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) MetaDataDispenser *This = impl_from_IMetaDataDispenserEx(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref);
return ref; } @@ -88,7 +88,7 @@ static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) MetaDataDispenser *This = impl_from_IMetaDataDispenserEx(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref);
if (ref == 0) { @@ -101,7 +101,7 @@ static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) static HRESULT WINAPI MetaDataDispenser_DefineScope(IMetaDataDispenserEx* iface, REFCLSID rclsid, DWORD dwCreateFlags, REFIID riid, IUnknown **ppIUnk) { - FIXME("%p %s %x %s %p\n", iface, debugstr_guid(rclsid), dwCreateFlags, + FIXME("%p %s %lx %s %p\n", iface, debugstr_guid(rclsid), dwCreateFlags, debugstr_guid(riid), ppIUnk); return E_NOTIMPL; } @@ -109,7 +109,7 @@ static HRESULT WINAPI MetaDataDispenser_DefineScope(IMetaDataDispenserEx* iface, static HRESULT WINAPI MetaDataDispenser_OpenScope(IMetaDataDispenserEx* iface, LPCWSTR szScope, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) { - FIXME("%p %s %x %s %p\n", iface, debugstr_w(szScope), dwOpenFlags, + FIXME("%p %s %lx %s %p\n", iface, debugstr_w(szScope), dwOpenFlags, debugstr_guid(riid), ppIUnk); return E_NOTIMPL; } @@ -117,7 +117,7 @@ static HRESULT WINAPI MetaDataDispenser_OpenScope(IMetaDataDispenserEx* iface, static HRESULT WINAPI MetaDataDispenser_OpenScopeOnMemory(IMetaDataDispenserEx* iface, const void *pData, ULONG cbData, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) { - FIXME("%p %p %u %x %s %p\n", iface, pData, cbData, dwOpenFlags, + FIXME("%p %p %lu %lx %s %p\n", iface, pData, cbData, dwOpenFlags, debugstr_guid(riid), ppIUnk); return E_NOTIMPL; } @@ -139,14 +139,14 @@ static HRESULT WINAPI MetaDataDispenser_GetOption(IMetaDataDispenserEx* iface, static HRESULT WINAPI MetaDataDispenser_OpenScopeOnITypeInfo(IMetaDataDispenserEx* iface, ITypeInfo *pITI, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) { - FIXME("%p %p %u %s %p\n", iface, pITI, dwOpenFlags, debugstr_guid(riid), ppIUnk); + FIXME("%p %p %lu %s %p\n", iface, pITI, dwOpenFlags, debugstr_guid(riid), ppIUnk); return E_NOTIMPL; }
static HRESULT WINAPI MetaDataDispenser_GetCORSystemDirectory(IMetaDataDispenserEx* iface, LPWSTR szBuffer, DWORD cchBuffer, DWORD *pchBuffer) { - FIXME("%p %p %u %p\n", iface, szBuffer, cchBuffer, pchBuffer); + FIXME("%p %p %lu %p\n", iface, szBuffer, cchBuffer, pchBuffer); return E_NOTIMPL; }
@@ -154,7 +154,7 @@ static HRESULT WINAPI MetaDataDispenser_FindAssembly(IMetaDataDispenserEx* iface LPCWSTR szAppBase, LPCWSTR szPrivateBin, LPCWSTR szGlobalBin, LPCWSTR szAssemblyName, LPWSTR szName, ULONG cchName, ULONG *pcName) { - FIXME("%p %s %s %s %s %p %u %p\n", iface, debugstr_w(szAppBase), + FIXME("%p %s %s %s %s %p %lu %p\n", iface, debugstr_w(szAppBase), debugstr_w(szPrivateBin), debugstr_w(szGlobalBin), debugstr_w(szAssemblyName), szName, cchName, pcName); return E_NOTIMPL; @@ -164,7 +164,7 @@ static HRESULT WINAPI MetaDataDispenser_FindAssemblyModule(IMetaDataDispenserEx* LPCWSTR szAppBase, LPCWSTR szPrivateBin, LPCWSTR szGlobalBin, LPCWSTR szAssemblyName, LPCWSTR szModuleName, LPWSTR szName, ULONG cchName, ULONG *pcName) { - FIXME("%p %s %s %s %s %s %p %u %p\n", iface, debugstr_w(szAppBase), + FIXME("%p %s %s %s %s %s %p %lu %p\n", iface, debugstr_w(szAppBase), debugstr_w(szPrivateBin), debugstr_w(szGlobalBin), debugstr_w(szAssemblyName), debugstr_w(szModuleName), szName, cchName, pcName); return E_NOTIMPL; diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 33ed2462125..8e28ad2f8db 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -489,7 +489,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetVersionString(ICLRRuntimeInfo* iface,
TRACE("%p %p %p\n", iface, pwzBuffer, pcchBuffer);
- size = snprintf(version, sizeof(version), "v%u.%u.%u", This->major, This->minor, This->build); + size = snprintf(version, sizeof(version), "v%lu.%lu.%lu", This->major, This->minor, This->build);
assert(size <= sizeof(version));
@@ -578,7 +578,7 @@ static HRESULT WINAPI CLRRuntimeInfo_IsLoaded(ICLRRuntimeInfo* iface, static HRESULT WINAPI CLRRuntimeInfo_LoadErrorString(ICLRRuntimeInfo* iface, UINT iResourceID, LPWSTR pwzBuffer, DWORD *pcchBuffer, LONG iLocaleid) { - FIXME("%p %u %p %p %x\n", iface, iResourceID, pwzBuffer, pcchBuffer, iLocaleid); + FIXME("%p %u %p %p %lx\n", iface, iResourceID, pwzBuffer, pcchBuffer, iLocaleid);
return E_NOTIMPL; } @@ -635,7 +635,7 @@ static HRESULT WINAPI CLRRuntimeInfo_IsLoadable(ICLRRuntimeInfo* iface, static HRESULT WINAPI CLRRuntimeInfo_SetDefaultStartupFlags(ICLRRuntimeInfo* iface, DWORD dwStartupFlags, LPCWSTR pwzHostConfigFile) { - FIXME("%p %x %s\n", iface, dwStartupFlags, debugstr_w(pwzHostConfigFile)); + FIXME("%p %lx %s\n", iface, dwStartupFlags, debugstr_w(pwzHostConfigFile));
return E_NOTIMPL; } @@ -901,7 +901,7 @@ static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; } @@ -911,7 +911,7 @@ static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) { @@ -929,7 +929,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, HRESULT hr=S_OK; IUnknown *item;
- TRACE("(%p,%u,%p,%p)\n", iface, celt, rgelt, pceltFetched); + TRACE("(%p,%lu,%p,%p)\n", iface, celt, rgelt, pceltFetched);
while (num_fetched < celt) { @@ -957,7 +957,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) ULONG num_fetched = 0; HRESULT hr=S_OK;
- TRACE("(%p,%u)\n", iface, celt); + TRACE("(%p,%lu)\n", iface, celt);
while (num_fetched < celt) { @@ -1338,7 +1338,7 @@ static HRESULT WINAPI metahostpolicy_GetRequestedRuntime(ICLRMetaHostPolicy *ifa ICLRRuntimeInfo_Release(result); }
- TRACE("<- 0x%08x\n", hr); + TRACE("<- 0x%08lx\n", hr);
return hr; } @@ -1820,10 +1820,10 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, parsed_config_file parsed_config;
if (startup_flags & ~supported_startup_flags) - FIXME("unsupported startup flags %x\n", startup_flags & ~supported_startup_flags); + FIXME("unsupported startup flags %lx\n", startup_flags & ~supported_startup_flags);
if (runtimeinfo_flags & ~supported_runtime_flags) - FIXME("unsupported runtimeinfo flags %x\n", runtimeinfo_flags & ~supported_runtime_flags); + FIXME("unsupported runtimeinfo flags %lx\n", runtimeinfo_flags & ~supported_runtime_flags);
if (exefile && !exefile[0]) exefile = NULL; @@ -1859,7 +1859,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, } else { - WARN("failed to parse config file %s, hr=%x\n", debugstr_w(config_file), hr); + WARN("failed to parse config file %s, hr=%lx\n", debugstr_w(config_file), hr); }
free_parsed_config_file(&parsed_config); diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0352b633cc9..e19d50595b4 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -133,7 +133,7 @@ static ULONG WINAPI mscorecf_AddRef(IClassFactory *iface ) mscorecf *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref);
return ref; } @@ -143,7 +143,7 @@ static ULONG WINAPI mscorecf_Release(IClassFactory *iface ) mscorecf *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref);
if (ref == 0) { @@ -176,7 +176,7 @@ static HRESULT WINAPI mscorecf_CreateInstance(IClassFactory *iface,LPUNKNOWN pOu } else { - WARN("Cannot create an instance object. 0x%08x\n", hr); + WARN("Cannot create an instance object. 0x%08lx\n", hr); } return hr; } @@ -204,7 +204,7 @@ HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor HRESULT ret; ICLRRuntimeInfo *info;
- TRACE("(%s, %s, %s, %p, %d, %s, %s, %p)\n", debugstr_w(pwszVersion), + TRACE("(%s, %s, %s, %p, %ld, %s, %s, %p)\n", debugstr_w(pwszVersion), debugstr_w(pwszBuildFlavor), debugstr_w(pwszHostConfigFile), pReserved, startupFlags, debugstr_guid(rclsid), debugstr_guid(riid), ppv);
@@ -264,7 +264,7 @@ void CDECL mono_print_handler_fn(const char *string, INT is_stdout)
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) { @@ -297,7 +297,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
__int32 WINAPI _CorExeMain2(PBYTE ptrMemory, DWORD cntMemory, LPWSTR imageName, LPWSTR loaderName, LPWSTR cmdLine) { - TRACE("(%p, %u, %s, %s, %s)\n", ptrMemory, cntMemory, debugstr_w(imageName), debugstr_w(loaderName), debugstr_w(cmdLine)); + TRACE("(%p, %lu, %s, %s, %s)\n", ptrMemory, cntMemory, debugstr_w(imageName), debugstr_w(loaderName), debugstr_w(cmdLine)); FIXME("Directly running .NET applications not supported.\n"); return -1; } @@ -324,7 +324,7 @@ HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwL ICLRRuntimeInfo *info; HRESULT ret;
- TRACE("(%p, %d, %p)!\n", pbuffer, cchBuffer, dwLength); + TRACE("(%p, %ld, %p)!\n", pbuffer, cchBuffer, dwLength);
if (!dwLength || !pbuffer) return E_POINTER; @@ -347,7 +347,7 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) ICLRRuntimeInfo *info; HRESULT ret;
- TRACE("(%p, %d, %p)!\n", pbuffer, cchBuffer, dwLength); + TRACE("(%p, %ld, %p)!\n", pbuffer, cchBuffer, dwLength);
if (!dwLength || !pbuffer) return E_POINTER; @@ -390,7 +390,7 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST ICLRRuntimeInfo *info; DWORD length_dummy;
- TRACE("(%s, %s, %s, 0x%08x, 0x%08x, %p, 0x%08x, %p, %p, 0x%08x, %p)\n", debugstr_w(pExe), + TRACE("(%s, %s, %s, 0x%08lx, 0x%08lx, %p, 0x%08lx, %p, %p, 0x%08lx, %p)\n", debugstr_w(pExe), debugstr_w(pwszVersion), debugstr_w(pConfigurationFile), startupFlags, runtimeInfoFlags, pDirectory, dwDirectory, dwDirectoryLength, pVersion, cchBuffer, dwlength);
@@ -422,7 +422,7 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST
HRESULT WINAPI GetRequestedRuntimeVersion(LPWSTR pExe, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) { - TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), pVersion, cchBuffer, dwlength); + TRACE("(%s, %p, %ld, %p)\n", debugstr_w(pExe), pVersion, cchBuffer, dwlength);
if(!dwlength) return E_POINTER; @@ -438,7 +438,7 @@ HRESULT WINAPI GetRealProcAddress(LPCSTR procname, void **ppv)
HRESULT WINAPI GetFileVersion(LPCWSTR szFilename, LPWSTR szBuffer, DWORD cchBuffer, DWORD *dwLength) { - TRACE("(%s, %p, %d, %p)\n", debugstr_w(szFilename), szBuffer, cchBuffer, dwLength); + TRACE("(%s, %p, %ld, %p)\n", debugstr_w(szFilename), szBuffer, cchBuffer, dwLength);
if (!szFilename || !dwLength) return E_POINTER; @@ -495,7 +495,7 @@ HRESULT WINAPI LockClrVersion(FLockClrVersionCallback hostCallback, FLockClrVers
HRESULT WINAPI CoInitializeCor(DWORD fFlags) { - FIXME("(0x%08x): stub\n", fFlags); + FIXME("(0x%08lx): stub\n", fFlags); return S_OK; }
@@ -507,7 +507,7 @@ HRESULT WINAPI GetAssemblyMDImport(LPCWSTR szFileName, REFIID riid, IUnknown **p
HRESULT WINAPI GetVersionFromProcess(HANDLE hProcess, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwLength) { - FIXME("(%p, %p, %d, %p): stub\n", hProcess, pVersion, cchBuffer, dwLength); + FIXME("(%p, %p, %ld, %p): stub\n", hProcess, pVersion, cchBuffer, dwLength); return E_NOTIMPL; }
@@ -518,7 +518,7 @@ HRESULT WINAPI LoadStringRCEx(LCID culture, UINT resId, LPWSTR pBuffer, int iBuf return E_INVALIDARG; pBuffer[0] = 0; if (resId) { - FIXME("(%d, %x, %p, %d, %d, %p): semi-stub\n", culture, resId, pBuffer, iBufLen, bQuiet, pBufLen); + FIXME("(%ld, %x, %p, %d, %d, %p): semi-stub\n", culture, resId, pBuffer, iBufLen, bQuiet, pBufLen); res = E_NOTIMPL; } else @@ -539,7 +539,7 @@ HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD HRESULT ret; ICLRRuntimeInfo *info;
- TRACE("%s %s %d %s %s %p\n", debugstr_w(szVersion), debugstr_w(szBuildFlavor), nflags, debugstr_guid( rslsid ), + TRACE("%s %s %ld %s %s %p\n", debugstr_w(szVersion), debugstr_w(szBuildFlavor), nflags, debugstr_guid( rslsid ), debugstr_guid( riid ), ppv);
*ppv = NULL; @@ -614,7 +614,7 @@ STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject)
BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD *pOutFlags) { - FIXME("(%s, 0x%X, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags); + FIXME("(%s, 0x%lX, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags); return FALSE; }