update rcheevos version; address compile warnings (#401)

Makefile

@@ -73,7 +73,8 @@ OBJS=\
 	src/miniz/miniz_tinfl.o \
 	src/miniz/miniz_zip.o \
 	src/rcheevos/src/rcheevos/consoleinfo.o \
-	src/rcheevos/src/rcheevos/rc_libretro.o \
+	src/rcheevos/src/rc_libretro.o \
+	src/rcheevos/src/rhash/aes.o \
 	src/rcheevos/src/rhash/cdreader.o \
 	src/rcheevos/src/rhash/md5.o \
 	src/rcheevos/src/rhash/hash.o \
@@ -99,7 +100,7 @@ ifdef HAVE_CHD
           src/HashCHD.o
 endif
 
-src/rcheevos/src/rcheevos/rc_libretro.o: CFLAGS += -I./src/libretro
+src/rcheevos/src/rc_libretro.o: CFLAGS += -I./src/libretro
 
 src/components/Config.o: CFLAGS += -I./src/libretro
 

Makefile.RAHasher

@@ -28,6 +28,7 @@ OBJS=\
 	src/miniz/miniz_tdef.o \
 	src/miniz/miniz_tinfl.o \
 	src/miniz/miniz_zip.o \
+	src/rcheevos/src/rhash/aes.o \
 	src/rcheevos/src/rhash/cdreader.o \
 	src/rcheevos/src/rhash/hash.o \
 	src/rcheevos/src/rhash/md5.o \

src/Hash.cpp

@@ -24,7 +24,7 @@ along with RALibretro.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <RA_Interface.h>
 #include <rc_hash.h>
-#include <rcheevos/src/rcheevos/rc_libretro.h>
+#include <rcheevos/src/rc_libretro.h>
 
 #include <memory.h>
 #include <string.h>

src/KeyBinds.cpp

@@ -1683,7 +1683,7 @@ class InputDialog : public Dialog
       ud.dialog = this;
       ud.hwnd = hwnd;
 
-      jsonsax_result_t res = jsonsax_parse((char*)json.c_str(), &ud, [](void* udata, jsonsax_event_t event, const char* str, size_t num)
+      jsonsax_parse((char*)json.c_str(), &ud, [](void* udata, jsonsax_event_t event, const char* str, size_t num)
       {
         auto* ud = (Deserialize*)udata;
 

src/Memory.cpp

@@ -23,7 +23,7 @@ along with RALibretro.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <RA_Interface.h>
 #include <rcheevos.h>
-#include <rcheevos/src/rcheevos/rc_libretro.h>
+#include <rcheevos/src/rc_libretro.h>
 
 #include <time.h>
 

src/RAHasher.cpp

@@ -164,7 +164,7 @@ static int process_files(int consoleId, const std::string& pattern)
   WIN32_FIND_DATAA fileData;
   HANDLE hFind;
 
-  if (path == pattern) /* no backslash found.scan is in current directory */
+  if (path == pattern) /* no backslash found. scan is in current directory */
     path = ".";
 
   hFind = FindFirstFileA(pattern.c_str(), &fileData);

src/RAHasher.vcxproj

@@ -169,6 +169,7 @@
     <ClCompile Include="miniz\miniz_tinfl.c" />
     <ClCompile Include="miniz\miniz_zip.c" />
     <ClCompile Include="RAHasher.cpp" />
+    <ClCompile Include="rcheevos\src\rhash\aes.c" />
     <ClCompile Include="rcheevos\src\rhash\cdreader.c" />
     <ClCompile Include="rcheevos\src\rhash\hash.c">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)rhash</ObjectFileName>

src/RAHasher.vcxproj.filters

@@ -60,6 +60,9 @@
     <ClCompile Include="HashCHD.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="rcheevos\src\rhash\aes.c">
+      <Filter>Source Files\rhash</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="rcheevos\include\rhash.h">

src/RALibretro.vcxproj

@@ -217,9 +217,10 @@ $(ProjectDir)RAInterface\CopyOverlay.bat $(SolutionDir)\bin64</Command>
     <ClCompile Include="RAInterface\RA_Interface.cpp" />
     <ClCompile Include="RA_Implementation.cpp" />
     <ClCompile Include="rcheevos\src\rcheevos\consoleinfo.c" />
-    <ClCompile Include="rcheevos\src\rcheevos\rc_libretro.c">
+    <ClCompile Include="rcheevos\src\rc_libretro.c">
       <AdditionalIncludeDirectories>$(SolutionDir)src\libretro;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <ClCompile Include="rcheevos\src\rhash\aes.c" />
     <ClCompile Include="rcheevos\src\rhash\cdreader.c" />
     <ClCompile Include="rcheevos\src\rhash\hash.c">
       <ObjectFileName>$(IntDir)rhash</ObjectFileName>

src/RALibretro.vcxproj.filters

@@ -150,15 +150,18 @@
     <ClCompile Include="States.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\rc_libretro.c">
-      <Filter>Source Files\rcheevos</Filter>
-    </ClCompile>
     <ClCompile Include="HashCHD.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="components\Microphone.cpp">
       <Filter>Source Files\components</Filter>
     </ClCompile>
+    <ClCompile Include="rcheevos\src\rc_libretro.c">
+      <Filter>Source Files\rcheevos</Filter>
+    </ClCompile>
+    <ClCompile Include="rcheevos\src\rhash\aes.c">
+      <Filter>Source Files\rhash</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="About.h">

src/Util.cpp

@@ -129,7 +129,12 @@ FILE* util::openFile(Logger* logger, const std::string& path, const char* mode)
 #endif
 
   if (!file && logger)
-    log_errno(logger, "opening", path.c_str());
+  {
+    if (errno == ENOENT)
+      logger->warn(TAG "File not found: %s", path.c_str());
+    else
+      log_errno(logger, "opening", path.c_str());
+  }
 
   return file;
 }

src/components/Config.cpp

@@ -23,7 +23,7 @@ along with RALibretro.  If not, see <http://www.gnu.org/licenses/>.
 #include "jsonsax/jsonsax.h"
 #include "RA_Interface.h"
 
-#include <rcheevos/src/rcheevos/rc_libretro.h>
+#include <rcheevos/src/rc_libretro.h>
 #include <rcheevos/include/rc_consoles.h>
 
 #ifdef _WINDOWS
@@ -623,7 +623,7 @@ bool Config::deserializeEmulatorSettings(const char* json)
 void Config::ConfigDialog::updateVariables()
 {
   int id = 0;
-  for (int i = 0; i < variables.size(); ++i)
+  for (size_t i = 0; i < variables.size(); ++i)
   {
     auto& var = variables[i];
     if (var->_category != category)
@@ -637,7 +637,7 @@ void Config::ConfigDialog::updateVariables()
     HWND hComboBox = GetDlgItem(hwnd, 51000 + id);
     SendMessageW(hComboBox, CB_RESETCONTENT, 0, 0);
 
-    for (int j = 0; j < var->_options.size(); ++j)
+    for (size_t j = 0; j < var->_options.size(); ++j)
     {
       unicodeString = util::utf8ToUChar(var->_options[j]);
       SendMessageW(hComboBox, CB_ADDSTRING, 0, (LPARAM)unicodeString.c_str());
@@ -662,7 +662,7 @@ void Config::ConfigDialog::updateVariables()
 void Config::ConfigDialog::retrieveData(HWND hwnd)
 {
   int id = 0;
-  for (int i = 0; i < variables.size(); ++i)
+  for (size_t i = 0; i < variables.size(); ++i)
   {
     auto& var = variables[i];
     if (var->_category != category)
@@ -772,7 +772,6 @@ void Config::showDialog(const std::string& coreName, Input& input)
     WORD row = 0;
     WORD id = 0;
     int generalCount = db.variables.size();
-    int selectedCategoryIndex;
 
     for (auto& category : _categories)
     {
@@ -812,7 +811,7 @@ void Config::showDialog(const std::string& coreName, Input& input)
     const WORD columns = ((WORD)db.maxCount + MAX_ROWS - 1) / MAX_ROWS;
     const WORD rows = ((WORD)db.maxCount + columns - 1) / columns;
 
-    for (unsigned i = 0; i < db.maxCount; ++i)
+    for (int i = 0; i < db.maxCount; ++i)
     {
       db.addLabel("Label", 50000 + id, x, y + 2, HEADER_WIDTH - 5, 8);
       db.addCombobox(51000 + id, x + HEADER_WIDTH + 5, y, VALUE_WIDTH, LINE_HEIGHT, 100,

src/components/Input.cpp

@@ -550,7 +550,7 @@ int16_t Input::read(unsigned port, unsigned device, unsigned index, unsigned id)
     {
       case RETRO_DEVICE_JOYPAD:
         port_device = _devices[port];
-        if (port_device > _info[port].size())
+        if (port_device >(int) _info[port].size())
           return 0;
 
         if (id == RETRO_DEVICE_ID_JOYPAD_MASK)
@@ -560,7 +560,7 @@ int16_t Input::read(unsigned port, unsigned device, unsigned index, unsigned id)
 
       case RETRO_DEVICE_ANALOG:
         port_device = _devices[port];
-        if (port_device > _info[port].size())
+        if (port_device > (int)_info[port].size())
           return 0;
 
         return _info[port][port_device]._axis[index << 1 | id];

src/components/Microphone.cpp

@@ -68,7 +68,7 @@ void Microphone::recordCallback(void* data, Uint8* stream, int len)
   size_t output_size;
   int16_t* output;
 
-  if (sdlData->deviceSpec.freq == sdlData->coreRate)
+  if (sdlData->deviceSpec.freq == (int)sdlData->coreRate)
   {
     /* no resampling needed */
     output = (int16_t*)samples;

src/libretro/Core.cpp

@@ -1124,7 +1124,7 @@ static bool extensionMatches(const char* extensions, const std::string& extensio
     while (*ptr && *ptr != '|')
       ++ptr;
 
-    if ((ptr - start) == extension.length() && strnicmp(start, extension.c_str(), extension.length()) == 0)
+    if ((size_t)(ptr - start) == extension.length() && strnicmp(start, extension.c_str(), extension.length()) == 0)
       return true;
 
     if (*ptr == '|')