From dbfac2ee12f1e3a989c761a68502e390bf532e83 Mon Sep 17 00:00:00 2001 From: Kevin Koltzau Date: Mon, 22 Aug 2005 10:18:17 +0000 Subject: [PATCH] Fix 'cast to pointer from integer of different size' warnings in 64bit. --- dlls/atl/registrar.c | 4 ++-- dlls/uxtheme/msstyles.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 5be5e772f88..80d4ee87ed2 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -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 = { diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 65633f19941..81fcf62a129 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -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);