From 7a7e5ccb0b482b68e68d8ca1aaf9fc099cd9839b Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 19 Apr 2013 08:41:31 -0700 Subject: [PATCH] Fix some x64 type conversion warnings. --- Core/HLE/sceKernelMemory.cpp | 4 ++-- Windows/W32Util/PropertySheet.cpp | 2 +- Windows/WndMainWindow.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index a3a87083a..25d3c0d96 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -1363,7 +1363,7 @@ int sceKernelAllocateTls(SceUID uid) for (size_t i = 0; i < tls->ntls.totalBlocks && allocBlock == -1; ++i) { if (tls->usage[i] == threadID) - allocBlock = i; + allocBlock = (int) i; } if (allocBlock == -1) @@ -1412,7 +1412,7 @@ int sceKernelFreeTls(SceUID uid) { if (tls->usage[i] == threadID) { - freeBlock = i; + freeBlock = (int) i; break; } } diff --git a/Windows/W32Util/PropertySheet.cpp b/Windows/W32Util/PropertySheet.cpp index 319521773..50f4b8d07 100644 --- a/Windows/W32Util/PropertySheet.cpp +++ b/Windows/W32Util/PropertySheet.cpp @@ -83,7 +83,7 @@ namespace W32Util sheet.dwFlags |= PSH_USEHICON; sheet.pszCaption = title.c_str(); - sheet.nPages = list.size(); + sheet.nPages = (UINT)list.size(); sheet.phpage = pages; sheet.nStartPage = startpage; sheet.pfnCallback = (PFNPROPSHEETCALLBACK)Callback; diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index d4844390f..d818fc650 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -966,7 +966,7 @@ namespace MainWindow BitBlt(hbm, hdc, 0, 0, rc.right - rc.left, rc.bottom - rc.top, rc.left, rc.top); char str[11]; GetWindowTextA(hEdit, str, 10); - DrawTextA(hdc, str, strlen(str), &clientrc, DT_CENTER|DT_SINGLELINE); + DrawTextA(hdc, str, (int)strlen(str), &clientrc, DT_CENTER|DT_SINGLELINE); return (LRESULT)GetStockObject(NULL_BRUSH); } case WM_COMMAND: