comparison src/w32.c @ 24885:5f1b1f5fd7c8

(get_emacs_configuration): Use GetVersionEx to handle NT5.0 correctly. Include build number in configuration. w32heap.c (osinfo_cache): New variable.

24884:1e6ee49f9474

char *
get_emacs_configuration (void)
{
  char *arch, *oem, *os;

  /* Determine the processor type.  */
  switch (get_processor_type ()) 
    {

    }

  /* Let oem be "*" until we figure out how to decode the OEM field.  */
  oem = "*";

  os = (GetVersion () & OS_WIN95) ? "windows95" : "nt";

  sprintf (configuration_buffer, "%s-%s-%s%d.%d", arch, oem, os,
	   get_w32_major_version (), get_w32_minor_version ());
  return configuration_buffer;
}

#include <sys/timeb.h>

24885:5f1b1f5fd7c8

char *
get_emacs_configuration (void)
{
  char *arch, *oem, *os;
  int build_num;

  /* Determine the processor type.  */
  switch (get_processor_type ()) 
    {

    }

  /* Let oem be "*" until we figure out how to decode the OEM field.  */
  oem = "*";

  switch (osinfo_cache.dwPlatformId) {
  case VER_PLATFORM_WIN32_NT:
    os = "nt";
    build_num = osinfo_cache.dwBuildNumber;
    break;
  case VER_PLATFORM_WIN32_WINDOWS:
    if (osinfo_cache.dwMinorVersion == 0) {
      os = "windows95";
    } else {
      os = "windows98";
    }
    build_num = LOWORD (osinfo_cache.dwBuildNumber);
    break;
  case VER_PLATFORM_WIN32s:
    /* Not supported, should not happen. */
    os = "windows32s";
    build_num = LOWORD (osinfo_cache.dwBuildNumber);
    break;
  default:
    os = "unknown";
    build_num = 0;
    break;
  }

  if (osinfo_cache.dwPlatformId == VER_PLATFORM_WIN32_NT) {
    sprintf (configuration_buffer, "%s-%s-%s%d.%d.%d", arch, oem, os,
	     get_w32_major_version (), get_w32_minor_version (), build_num);
  } else {
    sprintf (configuration_buffer, "%s-%s-%s.%d", arch, oem, os, build_num);
  }

  return configuration_buffer;
}

#include <sys/timeb.h>