applied patch 430452 (mingw32 compilation fixes)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/string.cpp

@@ -201,7 +201,8 @@ extern int WXDLLEXPORT wxVsnprintf(wxChar *buf, size_t len,
     int iLen = s.PrintfV(format, argptr);
     if ( iLen != -1 )
     {
-        wxStrncpy(buf, s.c_str(), iLen);
+        wxStrncpy(buf, s.c_str(), len);
+        buf[len-1] = wxT('\0');
     }
 
     return iLen;

src/msw/ole/droptgt.cpp

@@ -36,6 +36,9 @@
 
 #ifdef __WIN32__
     #if !defined(__GNUWIN32__) || wxUSE_NORLANDER_HEADERS
+        #if wxCHECK_W32API_VERSION( 1, 0 )
+            #include <windows.h>
+        #endif
         #include <shlobj.h>            // for DROPFILES structure
     #endif
 #else

src/msw/ole/uuid.cpp

@@ -29,6 +29,9 @@
 #if wxUSE_DRAG_AND_DROP
 
 // standard headers
+#if wxCHECK_W32API_VERSION( 1, 0 )
+    #include <windows.h>
+#endif
 #include  <rpc.h>                       // UUID related functions
 
 #include  "wx/msw/ole/uuid.h"