Squashed commit of the following; slight edits noted below; all credit to fuzun <[email protected]>!

Addresses PR microsoft#55.  See comments there for more details.

commit 19057a2
Author: fuzun <[email protected]>
Date:   Wed Apr 11 02:22:52 2018 +0300

    Resource file fix for VS17

commit 3ae873d
Author: fuzun <[email protected]>
Date:   Tue Apr 10 14:18:48 2018 +0300

    Unsafe casting correction

commit 1c76579
Author: fuzun <[email protected]>
Date:   Tue Apr 10 14:17:28 2018 +0300

    Fixed formats for wsprintf

commit 16eac5a
Author: fuzun <[email protected]>
Date:   Tue Apr 10 14:13:59 2018 +0300

    Added some allocation checks
	craigwi edits: wfcopy.c change not needed due to test above the code; put {} around the changes in wfdir.c

commit 309fcd8
Author: fuzun <[email protected]>
Date:   Tue Apr 10 14:06:32 2018 +0300

    Macro format fix

commit 7ba9f5d
Author: fuzun <[email protected]>
Date:   Tue Apr 10 14:01:07 2018 +0300

    Removed unnecessary code

Author: fuzun

src/lfnmisc.c

@@ -244,13 +244,9 @@ WORD I_LFNEditName( LPTSTR lpSrc, LPTSTR lpEd, LPTSTR lpRes, INT iResBufSize )
                   ( *lpSrc != CHAR_NULL ) && ( *lpSrc != delimit )) {
 #endif
 
-                  if (ResLen < iResBufSize) {
+                  *(lpRes++) = *(lpSrc++);
+                  ResLen++;
 
-                     *(lpRes++) = *(lpSrc++);
-                     ResLen++;
-                  }
-                  else
-                     return ERROR_INVALID_PARAMETER ;
                }
             }
             break;

src/res.rc

@@ -7,9 +7,15 @@
 
 ********************************************************************/
 
+// fix loading in VS per https://stackoverflow.com/questions/16537289/rc2247-cannot-open-rc-file-resource-explorer-cannot-load-resource-load-fai/18317658#18317658
+
+#define APSTUDIO_HIDDEN_SYMBOLS
 #include "winfile.h"
+#include <prsht.h>
+#undef APSTUDIO_HIDDEN_SYMBOLS
 #include "wfcopy.h"
 
+
 BITMAPS         BITMAP PRELOAD wbbitmap.bmp
 
 IDB_TOOLBAR     BITMAP PRELOAD toolbar.bmp

src/suggest.h

@@ -45,4 +45,3 @@ PDWORD FormatSuggest(DWORD dwError);
 #define DE_UPDATING         (DE_BEGIN+16)
 #define DE_DELEXTWRONGMODE  (DE_BEGIN+17)
 #define DE_REGNAME          (DE_BEGIN+18)
-

src/wfassoc.c

@@ -3464,7 +3464,7 @@ RegExtDelete(HWND hDlg, HKEY hk, PEXT pExt)
 
     dwError = RegNodeDelete(hk, pExt->szExt);
 
-    if (pExt->pftOrig && ERROR_SUCCESS == dwError)
+    if (ERROR_SUCCESS == dwError)
     {
         i = SendDlgItemMessage( hDlg,
                                 IDD_EXT,

src/wfcopy.c

@@ -2526,14 +2526,11 @@ WFMoveCopyDriverThread(PCOPYINFO pCopyInfo)
 #endif
                      } else {
 
-                        if (pCopyInfo->dwFunc == FUNC_MOVE) {
-
-                           //
-                           // On move, must delete destination file
-                           // on copy, the fs does this for us.
-                           //
-                           ret = SafeFileRemove (szDest);
-                        }
+                         //
+                         // On move, must delete destination file
+                         // on copy, the fs does this for us.
+                         //
+                         ret = SafeFileRemove (szDest);
 
                          //
                          //  Reset the file attributes that may have been

src/wfdir.c

@@ -1838,7 +1838,7 @@ PutSize(
     /*
      *  Convert it into a string.
      */
-    wsprintf(szBuffer, TEXT("%I64u"), pqSize->QuadPart);
+    wsprintf(szBuffer, TEXT("%lld"), pqSize->QuadPart);
 
     /*
      *  Format the string.
@@ -2900,8 +2900,10 @@ DirGetSelection(
       if (iSelType & 1)
          goto GDSExit;
 
-      if ((!bLFNTest) && ((i + 1) < iMac))
-         lstrcat(p, szBlank);
+      if ((!bLFNTest) && ((i + 1) < iMac)) {
+          if (p)
+              lstrcat(p, szBlank);
+      }
    }
 
 GDSExit:

src/wfdlgs.c

@@ -45,8 +45,7 @@ SaveWindows(HWND hwndMain)
    // WINDOWPLACEMENT coordinates for top-level windows are in Workspace coordinates;
    // we tranlate this into screen coordinates prior to saving;
    // also, the values saved for the third and fourth values are width and height.
-
-   wsprintf(buf2, TEXT("%d,%d,%d,%d, , ,%d"), rcT.left + wp.rcNormalPosition.left,
+   wsprintf(buf2, TEXT("%ld,%ld,%ld,%ld, , ,%u"), rcT.left + wp.rcNormalPosition.left,
       rcT.top + wp.rcNormalPosition.top,
       wp.rcNormalPosition.right - wp.rcNormalPosition.left,
       wp.rcNormalPosition.bottom - wp.rcNormalPosition.top,
@@ -95,8 +94,7 @@ SaveWindows(HWND hwndMain)
          //   show_window, view, sort, attribs, split, directory
 
          // NOTE: MDI child windows are in child coordinats; no translation is done.
-
-         wsprintf(buf2, TEXT("%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%s"),
+         wsprintf(buf2, TEXT("%ld,%ld,%ld,%ld,%ld,%ld,%u,%lu,%lu,%lu,%d,%s"),
             wp.rcNormalPosition.left, wp.rcNormalPosition.top,
             wp.rcNormalPosition.right, wp.rcNormalPosition.bottom,
             wp.ptMinPosition.x, wp.ptMinPosition.y,

src/wfdlgs3.c

@@ -785,7 +785,7 @@ FormatDrive( IN PVOID ThreadParameter )
          CancelInfo.Info.Format.fmMediaType,
          wszFileSystem,
          wszLabel,
-         (BOOLEAN)CancelInfo.Info.Format.fQuick,
+         (BOOLEAN)(CancelInfo.Info.Format.fQuick ? TRUE : FALSE),
          (FMIFS_CALLBACK)&Callback_Function);
    } while (CancelInfo.Info.Format.fFlags & FF_RETRY);
 
@@ -1444,7 +1444,6 @@ DrivesDlgProc(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM lParam)
          INT nCurDrive;
          DRIVEIND nIndex;
          LPTSTR lpszVolShare;
-         TCHAR szDrive[] = SZ_ACOLON;
 
          nCurDrive = GetSelectedDrive();
          nIndex = 0;

src/wfdrop.c

@@ -609,12 +609,17 @@ WF_IDropTarget * WF_IDropTarget_new(HWND hwnd)
 
   result = calloc(1, sizeof(WF_IDropTarget));
 
-  result->idt.lpVtbl = (IDropTargetVtbl*)&idt_vtbl;
+  if (result)
+  {
+	  result->idt.lpVtbl = (IDropTargetVtbl*)&idt_vtbl;
+
+	  result->m_lRefCount = 1;
+	  result->m_hWnd = hwnd;
+	  result->m_fAllowDrop = FALSE;
+
+	  // return result;
+  }
 
-  result->m_lRefCount  = 1;
-  result->m_hWnd = hwnd;
-  result->m_fAllowDrop = FALSE;
-  
   return result;
 }
 

src/wfutil.c

@@ -461,11 +461,11 @@ AddCommasInternal(LPTSTR szBuf, DWORD dw)
    // if *szComma[0] == NULL, get out now
 
    if (!szComma[0]) {
-      wsprintf(szBuf,TEXT("%ld"),dw);
+      wsprintf(szBuf,TEXT("%lu"),dw);
       return szBuf;
    }
 
-   len = wsprintf(szTemp, TEXT("%ld"), dw);
+   len = wsprintf(szTemp, TEXT("%lu"), dw);
    iCommaLen = lstrlen(szComma);
 
    pTemp = szTemp + len - 1;