From e52296ccb8519b6841b23f933a90b518f29cefc7 Mon Sep 17 00:00:00 2001
From: Michael Jung <mjung@iss.tu-darmstadt.de>
Date: Sat, 7 May 2005 14:50:16 +0000
Subject: [PATCH] The unixfs extension doesn't have a distinguished '/' node
 anymore. Moved UI string into the resources.

---
 programs/winecfg/De.rc      | 1 +
 programs/winecfg/En.rc      | 1 +
 programs/winecfg/driveui.c  | 8 +++++---
 programs/winecfg/resource.h | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index 60cafef2550..e3dfdbbe260 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -144,4 +144,5 @@ BEGIN
     IDS_TAB_GENERAL         "Allgemein"
     IDS_TAB_DLLS            "Bibliotheken"
     IDS_TAB_DRIVES          "Laufwerke"
+    IDS_CHOOSE_PATH         "Bitte wählen Sie ein Unix-Verzeichnis für das Laufwerk."
 END
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index dfc59353c37..62efd5e5abe 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -146,4 +146,5 @@ BEGIN
     IDS_TAB_GENERAL         "General"
     IDS_TAB_DLLS            "Libraries"
     IDS_TAB_DRIVES          "Drives"
+    IDS_CHOOSE_PATH         "Select the unix directory to be mapped, please."
 END
diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c
index bce6a256a25..7f9cffc60de 100644
--- a/programs/winecfg/driveui.c
+++ b/programs/winecfg/driveui.c
@@ -521,12 +521,13 @@ static void browse_for_folder(HWND dialog)
 {
     static WCHAR wszUnixRootDisplayName[] = 
         { ':',':','{','C','C','7','0','2','E','B','2','-','7','D','C','5','-','1','1','D','9','-',
-          'C','6','8','7','-','0','0','0','4','2','3','8','A','0','1','C','D','}','\\','/', 0 };
+          'C','6','8','7','-','0','0','0','4','2','3','8','A','0','1','C','D','}', 0 };
+    char pszChoosePath[256];
     BROWSEINFOA bi = {
         dialog,
         NULL,
         NULL,
-        "Select the unix directory to be mapped, please.",
+        pszChoosePath,
         0,
         NULL,
         0,
@@ -535,6 +536,8 @@ static void browse_for_folder(HWND dialog)
     IShellFolder *pDesktop;
     LPITEMIDLIST pidlUnixRoot, pidlSelectedPath;
     HRESULT hr;
+   
+    LoadString(GetModuleHandle(NULL), IDS_CHOOSE_PATH, pszChoosePath, 256);
     
     hr = SHGetDesktopFolder(&pDesktop);
     if (!SUCCEEDED(hr)) return;
@@ -548,7 +551,6 @@ static void browse_for_folder(HWND dialog)
 
     bi.pidlRoot = pidlUnixRoot;
     pidlSelectedPath = SHBrowseForFolderA(&bi);
-    
     SHFree(pidlUnixRoot);
     
     if (pidlSelectedPath) {
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 81118547b25..c4fa2be21b1 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -27,6 +27,7 @@
 #define IDS_TAB_GENERAL                 2
 #define IDS_TAB_DLLS                    3
 #define IDS_TAB_DRIVES                  4
+#define IDS_CHOOSE_PATH                 5
 #define IDD_MAINDLG                     101
 #define IDB_WINE                        104
 #define IDD_ABOUTCFG                    107