Merge pull request #3 from justinfrankel/master

merge recent commits from official repo

.gitattributes

@@ -14,6 +14,7 @@
 *.bat    text eol=crlf
 *.cmd    text eol=crlf
 
+*.rc                text eol=crlf
 *.dsp               text eol=crlf
 *.dsw               text eol=crlf
 *.sln               text eol=crlf

WDL/.gitattributes

@@ -14,6 +14,7 @@
 *.bat    text eol=crlf
 *.cmd    text eol=crlf
 
+*.rc                text eol=crlf
 *.dsp               text eol=crlf
 *.dsw               text eol=crlf
 *.sln               text eol=crlf

WDL/assocarray.h

@@ -174,13 +174,15 @@ template <class KEY, class VAL> class WDL_AssocArrayImpl
     kv->val = val;
   }
 
-  void Resort()
+  void Resort(int (*new_keycmp)(KEY *k1, KEY *k2)=NULL)
   {
+    if (new_keycmp) m_keycmp = new_keycmp;
     if (m_data.GetSize() > 1 && m_keycmp)
     {
       qsort(m_data.Get(), m_data.GetSize(), sizeof(KeyVal),
         (int(*)(const void*, const void*))m_keycmp);
-      RemoveDuplicateKeys();
+      if (!new_keycmp)
+        RemoveDuplicateKeys();
     }
   }
 
@@ -393,11 +395,11 @@ template <class VAL> class WDL_LogicalSortStringKeyedArray : public WDL_StringKe
 
   ~WDL_LogicalSortStringKeyedArray() { }
 
-private:
-
   static int cmpstr(const char **a, const char **b) { return _cmpstr(*a, *b, true); }
   static int cmpistr(const char **a, const char **b) { return _cmpstr(*a, *b, false); }
 
+private:
+
   static int _cmpstr(const char *s1, const char *s2, bool case_sensitive)
   {
     // this also exists as WDL_strcmp_logical in wdlcstring.h

WDL/eel2/eel_lice.h

@@ -2558,6 +2558,12 @@ LRESULT WINAPI eel_lice_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
             st[zp]=lowera;
           }
         }
+#ifdef _WIN32
+        if (!a && (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN) && ((GetAsyncKeyState(VK_CONTROL)&0x8000)||(GetAsyncKeyState(VK_MENU)&0x8000)))
+        {
+          a = (int)MapVirtualKey((UINT)wParam,2/*MAPVK_VK_TO_CHAR*/);
+        }
+#endif
 
         if (a && uMsg != WM_KEYUP
 #ifdef _WIN32

WDL/filebrowse.cpp

@@ -117,7 +117,7 @@ bool WDL_ChooseDirectory(HWND parent, const char *text, const char *initialdir,
 #endif
 }
 
-static const char *stristr(const char* a, const char* b)
+static WDL_STATICFUNC_UNUSED const char *stristr(const char* a, const char* b)
 {
   const size_t n = strlen(a), len = strlen(b);
   for (size_t i = 0; i+len <= n; ++i) if (!strnicmp(a+i, b, len)) return a+i;
@@ -185,6 +185,8 @@ bool WDL_ChooseFileForSave(HWND parent,
   char cwd[2048];
   GetCurrentDirectory(sizeof(cwd),cwd);
 
+  while (defext && *defext == '.') defext++; // this function can be passed defext of either .wav or wav, we always want it to be the latter
+
 #ifdef _WIN32
   WDL_FileBrowse_Dis win32disfix(parent);
   char temp[4096];
@@ -213,7 +215,9 @@ bool WDL_ChooseFileForSave(HWND parent,
         {
           if(*p) p+=strlen(p)+1;
           if(!*p) break;
-          if(stristr(p, defext)) 
+          const char *ext = WDL_get_fileext(p);
+          if (*ext == '.') ext++;
+          if(!stricmp(ext,defext))
           {
             fd.setFileTypeIndex(i+1);
             break;
@@ -279,7 +283,11 @@ bool WDL_ChooseFileForSave(HWND parent,
   }
   else
   {
-    if (defext && *defext == '.') initialfile = defext; // SWELL supports default extension in filename field
+    if (defext && *defext)
+    {
+      snprintf(if_temp,sizeof(if_temp),".%s",defext); // SWELL treats initialfile of ".ext" as default extension
+      initialfile = if_temp;
+    }
   }
 
   bool r = BrowseForSaveFile(text,initialdir,initialfile,extlist,fn,fnsize);