X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBFolderPage.py;h=f72df83511f4ccf10cf03f66bc5d84bcd73d1174;hb=3971934daffeaa21a6cc4f2b86e38714f7e092c8;hp=6af6a651808475a05485295b4703f3da49d03dd5;hpb=b0882263114dd5cc268ce701d5e48cc94ee9bf79;p=bertos.git

diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py
index 6af6a651..f72df835 100644
--- a/wizard/BFolderPage.py
+++ b/wizard/BFolderPage.py
@@ -65,7 +65,9 @@ class BFolderPage(BWizardPage):
             self.setProjectInfo("PROJECT_PATH", unicode(self.pageContent.projectPath.text()))
             self.setProjectInfo("PROJECT_NAME", os.path.basename(unicode(self.pageContent.projectPath.text())))
             self.setProjectInfo("PROJECT_SRC_PATH", os.path.join(self.projectInfo("PROJECT_PATH"), self.projectInfo("PROJECT_NAME")))
+            self.setProjectInfo("PROJECT_SRC_PATH_FROM_MAKEFILE", self.projectInfo("PROJECT_NAME"))
             self.setProjectInfo("PROJECT_HW_PATH", os.path.join(self.projectInfo("PROJECT_PATH"), self.projectInfo("PROJECT_NAME")))
+            self.setProjectInfo("PROJECT_HW_PATH_FROM_MAKEFILE", self.projectInfo("PROJECT_NAME"))
             return True
         else:
             return False
@@ -136,10 +138,15 @@ class BFolderPage(BWizardPage):
         if stored_folder != "":
             self._destination_folder = stored_folder
         elif os.name == "nt":
-            from win32com.shell import shell, shellcon
-            self._destination_folder = shell.SHGetFolderPath(0, shellcon.CSIDL_PERSONAL, 0, 0)
-            del shell
-            del shellcon
+            def _winGetSpecialFolder(csidl):
+                from ctypes import windll, create_unicode_buffer
+                MAX_PATH = 4096
+                buf = create_unicode_buffer(MAX_PATH)
+                if not windll.shell32.SHGetSpecialFolderPathW(0, buf, csidl, False):
+                    raise WindowsError("cannot get special folder location")
+                return buf.value
+            CSIDL_PERSONAL = 5
+            self._destination_folder = _winGetSpecialFolder(CSIDL_PERSONAL)
         else:
             self._destination_folder = os.path.expanduser("~")
         self.pageContent.directoryEdit.setText(self._destination_folder)