WebSVN – Games.Chess Giants – Diff – /config.cpp

    smiley_t *smiley;
    char *file_buffer;
    wchar_t temp_string[MAX_PATH];
 //   wchar_t smiley_pathname[MAX_PATH];
    wchar_t *smiley_name;
+   size_t smiley_namelen;
    int candidate_index;
    int language_index;
    int program_index;
    int smiley_index;
    int file_length;
    want_custombackground = (INIFile_ReadEntryAsBool (inifile, L"theme", L"use custom background", false) > 0);
    READ_WIDESTRING (custombackground_pathname, inifile, L"theme", L"custom background picture", L"");
    // [engine]
    Config_LoadEngines (); // discover all engine parameters from the engines folder
+   READ_WIDESTRING (temp_string, inifile, L"engine", L"program", L"Stockfish");
    for (program_index = 0; program_index < options.engine.program_count; program_index++)
-   {
-      READ_WIDESTRING (temp_string, inifile, L"engine", L"program", L"Stockfish");
       if (_wcsicmp (temp_string, options.engine.programs[program_index].folder) == 0)
+         break; // identify the preferred engine by its folder name, break as soon as we find it
+   if (program_index == options.engine.program_count)
+      program_index = 0; // if the preferred engine isn't available, fallback on the first one
+   if (kernel32_version < options.engine.programs[program_index].kernel32_minver)
+   {
+      // if we can't select this engine because we're running an outdated Windows version, fallback on the first suitable one
+      for (program_index = 0; program_index < options.engine.program_count; program_index++)
+         if (kernel32_version >= options.engine.programs[program_index].kernel32_minver)
-         break; // identify the preferred engine, break as soon as we find it
+            break; // identify a suitable engine, break as soon as we find it
+      if (program_index == options.engine.program_count)
+         program_index = 0; // if NO engine is available, fallback on the first one
+   }
-   options.engine.selected_program = (program_index < options.engine.program_count ? program_index : 0); // consistency check
+   options.engine.selected_program = program_index;
    options.engine.depth = INIFile_ReadEntryAsLong (inifile, L"engine", L"allowed depth", 10);
    options.engine.max_depth = INIFile_ReadEntryAsLong (inifile, L"engine", L"maximum depth", 20);
    options.engine.blunder_chances = INIFile_ReadEntryAsLong (inifile, L"engine", L"blunder chances", 5);
    options.engine.obstinacy_level = INIFile_ReadEntryAsLong (inifile, L"engine", L"obstinacy", -1);
    options.engine.is_expert_mode = (INIFile_ReadEntryAsBool (inifile, L"engine", L"expert mode", false) > 0);
    candidate_index = 0;
    while ((smiley_name = INIFile_GetEntryName (inifile, L"smilies", candidate_index)) != NULL)
+   {
       candidate_index++; // advance in the smiley entries list
-      if ((smiley_name == NULL) || (smiley_name[0] == 0))
+      if ((smiley_name == NULL) || (smiley_name[0] == 0) || ((smiley_name[0] == L'"') && (smiley_name[1] == L'"')))
          continue; // discard bogus smilies
       // for each smiley we can read, reallocate smilies array to hold one smiley more
       smilies = (smiley_t *) SAFE_realloc (smilies, smiley_count, smiley_count + 1, sizeof (smiley_t), false);
       smiley = &smilies[smiley_count]; // quick access to smiley
-      // read the smiley name and enclose it between a leading and trailing space
+      // read the smiley's corresponding picture file *BEFORE* we clean the smiley name from its possible quotes (thus altering the key name)
-      swprintf_s (smiley->name, WCHAR_SIZEOF (smiley->name), L" %s ", smiley_name);
-      // now read the smiley's corresponding picture file
       READ_WIDESTRING (smiley->filename, inifile, L"smilies", smiley_name, L"smile.txt");
+      // now clean the smiley name and make sure it is enclosed between a leading and trailing space
+      wcscpy_s (smiley->name, WCHAR_SIZEOF (smiley->name), smiley_name); // save cleaned up smiley name
+      smiley_namelen = wcslen (smiley->name);
+      if ((smiley->name[0] == L'"') && (smiley->name[smiley_namelen - 1] == L'"'))
+      {
+         smiley->name[0] = L' '; // if it's enclosed by quotes, convert these to spaces
+         smiley->name[smiley_namelen - 1] = L' ';
+      }
+      if (smiley->name[0] != L' ')
+      {
+         memmove (&smiley->name[1], smiley->name, (smiley_namelen + 1) * sizeof (wchar_t)); // if it doesn't begin with a space, insert one
+         smiley->name[0] = L' ';
+         smiley_namelen++;
+      }
+      if (smiley->name[smiley_namelen - 1] != L' ')
+      {
+         smiley->name[smiley_namelen] = L' '; // if it doesn't end with a space, append one
+         smiley->name[smiley_namelen + 1] = 0;
+         smiley_namelen++;
+      }
       // is this filename the same as another smiley we know already ?
       for (smiley_index = 0; smiley_index < smiley_count; smiley_index++)
          if (wcscmp (smilies[smiley_index].filename, smiley->filename) == 0)
             break; // break as soon as we find a match
    // this function loads the engine-specific parameters. The best place to call it is at the beginning
    // of a game versus the computer, just before the engine executable process is started.
    wchar_t temp_string[MAX_PATH];
    engineprogram_t *engineprogram;
+   int version_numbers[4];
    void *engine_inifile;
    WIN32_FIND_DATA wfd;
    HANDLE hFind;
    wchar_t *ptr;
       // basic program information
       wcscpy_s (engineprogram->folder, sizeof (engineprogram->folder), wfd.cFileName); // save engine program's folder name
       READ_WIDESTRING (engineprogram->friendly_name, engine_inifile, L"program", L"name", L"Crafty v24.0");
       READ_WIDESTRING (engineprogram->executable_name, engine_inifile, L"program", L"executable", L"crafty.exe");
       READ_WIDESTRING (engineprogram->executable_arguments, engine_inifile, L"program", L"arguments", L"");
+      READ_WIDESTRING (temp_string, engine_inifile, L"program", L"winver", L"5.1");
+      if (iswdigit (temp_string[0])) wcscat_s (temp_string, WCHAR_SIZEOF (temp_string), L"."); // make sure version string has enough numbers
+      wcscat_s (temp_string, WCHAR_SIZEOF (temp_string), L"0.0.0.0"); // make sure version string has enough numbers
+      swscanf_s (temp_string, L"%d.%d.%d.%d", &version_numbers[0], &version_numbers[1], &version_numbers[2], &version_numbers[3]);
+      engineprogram->kernel32_minver = (((uint64_t) version_numbers[0]) << 48) | (((uint64_t) version_numbers[1]) << 32) | (((uint64_t) version_numbers[2]) << 16) | (((uint64_t) version_numbers[3]) << 0);
       // reply string patterns
       READ_WIDESTRING (engineprogram->replystring_move, engine_inifile, L"reply strings", L"move", L"): ");
       // engine commands

Subversion Repositories Games.Chess Giants

Games.Chess Giants/config.cpp – Rev 185 → 192