Persist non open UNC drives

Author: Hermann Schinagl

src/wfdlgs.c

@@ -116,6 +116,8 @@ SaveWindows(HWND hwndMain)
                szPath,
                aDriveInfo[drive].szRoot,
                drive - OFFSET_UNC);
+            
+            aDriveInfo[drive].bDirtyPersist = TRUE;
          }
 
          // the dir is an ANSI string (?)
@@ -136,6 +138,8 @@ SaveWindows(HWND hwndMain)
       goto DO_AGAIN;
    }
 
+   SaveUNCDrives();
+
    // Save CachedPath and GotoCachePunctuation
    WritePrivateProfileString(szSettings, szCachedPath, szCachedPathIni, szTheINIFile);
    WritePrivateProfileString(szSettings, szGotoCachePunctuation, szPunctuation, szTheINIFile);

src/wfinit.c

@@ -876,6 +876,8 @@ CreateSavedWindows()
 
    } while (*buf);
 
+   LoadUNCDrives();
+
    //
    // if nothing was saved create a tree for the current drive
    //

src/wfutil.c

@@ -1646,10 +1646,52 @@ DRIVE FindUNCDrive(LPCTSTR path, PDWORD pdwFreeDriveSlot)
    return 0;
 }
 
+VOID SaveUNCDrives()
+{
+   TCHAR szUNCBuf[MAXPATHLEN];
+   for (DWORD dwDriveIndex = OFFSET_UNC; dwDriveIndex < MAX_DRIVES; ++dwDriveIndex) {
+
+      TCHAR szUNCKey[MAXPATHLEN];
+      wsprintf(szUNCKey, szUNCKeyFormat, dwDriveIndex - OFFSET_UNC);
+
+      if (aDriveInfo[dwDriveIndex].bDirtyPersist == FALSE && aDriveInfo[dwDriveIndex].szRoot[0])
+      {
+         // For UNC path we need to save the name of the root and the drive id too
+         wsprintf(szUNCBuf, TEXT("%s"),
+            aDriveInfo[dwDriveIndex].szRoot);
+
+         WritePrivateProfileString(szSettings, szUNCKey, szUNCBuf, szTheINIFile);
+      } else {
+         WritePrivateProfileString(szSettings, szUNCKey, NULL, szTheINIFile);
+         aDriveInfo[dwDriveIndex].bDirtyPersist = FALSE;
+      }
+
+   }
+}
+
+VOID LoadUNCDrives()
+{
+   TCHAR szUNCBuf[MAXPATHLEN];
+   for (DWORD dwDriveIndex = OFFSET_UNC; dwDriveIndex < MAX_DRIVES; ++dwDriveIndex) {
+
+      TCHAR szUNCKey[MAXPATHLEN];
+      wsprintf(szUNCKey, szUNCKeyFormat, dwDriveIndex - OFFSET_UNC);
+
+      GetPrivateProfileString(szSettings, szUNCKey, szNULL, szUNCBuf, COUNTOF(szUNCBuf), szTheINIFile);
+      if (szUNCBuf[0])
+         SetUNCDrive(szUNCBuf, dwDriveIndex);
+   }
+}
+
 VOID SetUNCDrive(LPTSTR path, DWORD aFreeDriveSlot)
 {
    lstrcpy(aDriveInfo[aFreeDriveSlot].szRoot, path);
    lstrcpy(aDriveInfo[aFreeDriveSlot].szRootBackslash, path);
+
+   // Force drive to be Network drive
+   aDriveInfo[aFreeDriveSlot].uType = DRIVE_REMOTE;
+   aDriveInfo[aFreeDriveSlot].iOffset = GetDriveOffset(aFreeDriveSlot);
+
    AddBackslash(aDriveInfo[aFreeDriveSlot].szRootBackslash);
 }
 

src/winfile.h

@@ -443,6 +443,8 @@ DRIVE RemoveUNCDrive(LPCTSTR path);
 DRIVE FindUNCDrive(LPCTSTR path, PDWORD pdwFreeDriveSlot);
 BOOL FindUNCLoop(LPCTSTR path);
 VOID SetUNCDrive(LPTSTR path, DWORD aFreeDriveSlot);
+VOID SaveUNCDrives();
+VOID LoadUNCDrives();
 
 // WFDIR.C
 
@@ -956,6 +958,7 @@ typedef struct _DRIVE_INFO {
 
    TCHAR szRoot[MAXPATHLEN];
    TCHAR szRootBackslash[MAXPATHLEN];
+   BOOL bDirtyPersist;
 } DRIVEINFO, *PDRIVEINFO;
 
 #define SC_SPLIT            100
@@ -1230,6 +1233,7 @@ Extern TCHAR        szChangeNotifyTime[]    EQ( TEXT("ChangeNotifyTime") );
 Extern UINT         uChangeNotifyTime       EQ( 3000 );
 
 Extern TCHAR        szDirKeyFormat[]        EQ( TEXT("dir%d") );
+Extern TCHAR        szUNCKeyFormat[]        EQ(TEXT("unc%d"));
 Extern TCHAR        szWindow[]              EQ( TEXT("Window") );
 Extern TCHAR        szWindows[]             EQ( TEXT("Windows") );