Fix 'cast to pointer from integer of different size' warnings in

64bit.
oldstable
Kevin Koltzau 2005-08-22 10:18:17 +00:00 committed by Alexandre Julliard
parent 1b2adad892
commit dbfac2ee12
2 changed files with 3 additions and 3 deletions

View File

@ -634,7 +634,7 @@ static HRESULT WINAPI Registrar_ResourceRegister(IRegistrar* iface, LPCOLESTR re
{
Registrar *This = (Registrar*)iface;
TRACE("(%p)->(%s %d %s)\n", iface, debugstr_w(resFileName), nID, debugstr_w(szType));
return resource_register(This, resFileName, (LPOLESTR)nID, szType, TRUE);
return resource_register(This, resFileName, MAKEINTRESOURCEW(nID), szType, TRUE);
}
static HRESULT WINAPI Registrar_ResourceUnregister(IRegistrar* iface, LPCOLESTR resFileName,
@ -642,7 +642,7 @@ static HRESULT WINAPI Registrar_ResourceUnregister(IRegistrar* iface, LPCOLESTR
{
Registrar *This = (Registrar*)iface;
TRACE("(%p)->(%s %d %s)\n", This, debugstr_w(resFileName), nID, debugstr_w(szType));
return resource_register(This, resFileName, (LPOLESTR)nID, szType, FALSE);
return resource_register(This, resFileName, MAKEINTRESOURCEW(nID), szType, FALSE);
}
static const IRegistrarVtbl RegistrarVtbl = {

View File

@ -711,7 +711,7 @@ void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics)
}
else if (setMetrics && (iPropertyId == TMT_FLATMENUS)) {
BOOL flatMenus = (*lpValue == 'T') || (*lpValue == 't');
SystemParametersInfoW (SPI_SETFLATMENU, 0, (PVOID)flatMenus, 0);
SystemParametersInfoW (SPI_SETFLATMENU, 0, (PVOID)(INT_PTR)flatMenus, 0);
}
/* Catch all metrics, including colors */
MSSTYLES_AddMetric(tf, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen);