Commit dbfac2ee authored by Kevin Koltzau's avatar Kevin Koltzau Committed by Alexandre Julliard

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

64bit.
parent 1b2adad8
...@@ -634,7 +634,7 @@ static HRESULT WINAPI Registrar_ResourceRegister(IRegistrar* iface, LPCOLESTR re ...@@ -634,7 +634,7 @@ static HRESULT WINAPI Registrar_ResourceRegister(IRegistrar* iface, LPCOLESTR re
{ {
Registrar *This = (Registrar*)iface; Registrar *This = (Registrar*)iface;
TRACE("(%p)->(%s %d %s)\n", iface, debugstr_w(resFileName), nID, debugstr_w(szType)); 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, static HRESULT WINAPI Registrar_ResourceUnregister(IRegistrar* iface, LPCOLESTR resFileName,
...@@ -642,7 +642,7 @@ static HRESULT WINAPI Registrar_ResourceUnregister(IRegistrar* iface, LPCOLESTR ...@@ -642,7 +642,7 @@ static HRESULT WINAPI Registrar_ResourceUnregister(IRegistrar* iface, LPCOLESTR
{ {
Registrar *This = (Registrar*)iface; Registrar *This = (Registrar*)iface;
TRACE("(%p)->(%s %d %s)\n", This, debugstr_w(resFileName), nID, debugstr_w(szType)); 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 = { static const IRegistrarVtbl RegistrarVtbl = {
......
...@@ -711,7 +711,7 @@ void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) ...@@ -711,7 +711,7 @@ void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics)
} }
else if (setMetrics && (iPropertyId == TMT_FLATMENUS)) { else if (setMetrics && (iPropertyId == TMT_FLATMENUS)) {
BOOL flatMenus = (*lpValue == 'T') || (*lpValue == 't'); 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 */ /* Catch all metrics, including colors */
MSSTYLES_AddMetric(tf, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen); MSSTYLES_AddMetric(tf, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment