fix casecmp defines and uniformly use casecmp in code:

str[n]casecmp used to be brokenly defined as str[n]cmp. even strnicmp ended up being defined as strcmp. should be fixed now.

Author: sezero

src/libmodplug/stdafx.h

@@ -46,9 +46,14 @@
 
 inline void ProcessPlugins(int n) {}
 
-#define strncasecmp(a,b,c) strncmp(a,b,c)
-#define strcasecmp(a,b) strcmp(a,b)
-#define strnicmp(a,b,c)	strncasecmp(a,b,c)
+#undef strcasecmp
+#undef strncasecmp
+#undef stricmp
+#undef strnicmp
+#define strcasecmp(a,b) _stricmp(a,b)
+#define strncasecmp(a,b,c) _strnicmp(a,b,c)
+#define stricmp(a,b) _stricmp(a,b)
+#define strnicmp(a,b,c) _strnicmp(a,b,c)
 #define HAVE_SINF 1
 
 #ifndef isblank
@@ -96,10 +101,12 @@ inline LONG MulDiv (long a, long b, long c)
 #define lstrcpyn strncpy
 #define lstrcpy strcpy
 #define lstrcmp strcmp
+#define wsprintf sprintf
+
 #define WAVE_FORMAT_PCM 1
 
 #define GHND 0
-
+#define GlobalFreePtr(p) free((void *)(p))
 inline int8_t * GlobalAllocPtr(unsigned int, size_t size)
 {
  int8_t * p = (int8_t *) malloc(size);
@@ -110,11 +117,6 @@ inline int8_t * GlobalAllocPtr(unsigned int, size_t size)
 
 inline void ProcessPlugins(int n) {}
 
-#define GlobalFreePtr(p) free((void *)(p))
-
-#define strnicmp(a,b,c)	strncasecmp(a,b,c)
-#define wsprintfsprintf
-
 #ifndef FALSE
 #define FALSEfalse
 #endif

src/load_mod.cpp

@@ -341,7 +341,7 @@ BOOL CSoundFile::ReadMod(const BYTE *lpStream, DWORD dwMemLength)
 LPSTR p = (LPSTR)(lpStream+dwMemPos);
 UINT flags = 0;
 if (dwMemPos + 5 >= dwMemLength) break;
-if (!strnicmp(p, "ADPCM", 5))
+if (!strncasecmp(p, "ADPCM", 5))
 {
 flags = 3;
 p += 5;

src/load_stm.cpp

@@ -64,8 +64,8 @@ BOOL CSoundFile::ReadSTM(const BYTE *lpStream, DWORD dwMemLength)
 
 if ((!lpStream) || (dwMemLength < sizeof(STMHEADER))) return FALSE;
 if ((phdr->filetype != 2) || (phdr->unused != 0x1A)
- || ((strnicmp(phdr->trackername, "!SCREAM!", 8))
- && (strnicmp(phdr->trackername, "BMOD2STM", 8)))) return FALSE;
+ || ((strncasecmp(phdr->trackername, "!SCREAM!", 8))
+ && (strncasecmp(phdr->trackername, "BMOD2STM", 8)))) return FALSE;
 memcpy(m_szNames[0], phdr->songname, 20);
 // Read STM header
 m_nType = MOD_TYPE_STM;

src/load_xm.cpp

@@ -89,7 +89,7 @@ BOOL CSoundFile::ReadXM(const BYTE *lpStream, DWORD dwMemLength)
 
 m_nChannels = 0;
 if ((!lpStream) || (dwMemLength < 0x200)) return FALSE;
-if (strnicmp((LPCSTR)lpStream, "Extended Module", 15)) return FALSE;
+if (strncasecmp((LPCSTR)lpStream, "Extended Module", 15)) return FALSE;
 
 memcpy(m_szNames[0], lpStream+17, 20);
 xmhead = *(tagXMFILEHEADER *)(lpStream+60);