From dd11e1096cc666e2abac30aab9209478b41d99d3 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Mon, 13 Dec 2021 11:56:25 +0800
Subject: [PATCH] python home set at windows os,fix path string encoding

---
 DSView/pv/appcontrol.cpp              | 7 +++++--
 libsigrokdecode4DSL/libsigrokdecode.h | 2 +-
 libsigrokdecode4DSL/srd.c             | 2 +-
 qtpro/DSView.pro.user                 | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/DSView/pv/appcontrol.cpp b/DSView/pv/appcontrol.cpp
index 15c0e52d..23fd92d0 100644
--- a/DSView/pv/appcontrol.cpp
+++ b/DSView/pv/appcontrol.cpp
@@ -77,19 +77,22 @@ bool AppControl::Init()
     QString resdir = GetResourceDir();
 	sr_set_firmware_resource_dir(resdir.toUtf8().data());
 
+     
+
 #ifdef _WIN32
     QString pythonHome = GetAppDataDir() + "/Python";   
     QDir pydir;
     if (pydir.exists(pythonHome)){
-          srd_set_python_home(pythonHome.toUtf8().data());
+        const wchar_t *pyhome = reinterpret_cast<const wchar_t*>(pythonHome.utf16());
+        srd_set_python_home(pyhome);
     }else{
         qDebug()<<"python home directory not exists,"<<pythonHome;        
     }
   
 #endif
     
-    QString dir = GetAppDataDir() + "/decoders";
     char path[256] = {0};
+    QString dir = GetAppDataDir() + "/decoders";   
     strcpy(path, dir.toUtf8().data());
 
     // Initialise libsigrokdecode
diff --git a/libsigrokdecode4DSL/libsigrokdecode.h b/libsigrokdecode4DSL/libsigrokdecode.h
index d66cc74e..77d8a216 100755
--- a/libsigrokdecode4DSL/libsigrokdecode.h
+++ b/libsigrokdecode4DSL/libsigrokdecode.h
@@ -361,7 +361,7 @@ struct srd_pd_callback {
 SRD_API int srd_init(const char *path);
 SRD_API int srd_exit(void);
 SRD_API GSList *srd_searchpaths_get(void);
-SRD_API void srd_set_python_home(const char *path);
+SRD_API void srd_set_python_home(const wchar_t *path);
 
 /* session.c */
 SRD_API int srd_session_new(struct srd_session **sess);
diff --git a/libsigrokdecode4DSL/srd.c b/libsigrokdecode4DSL/srd.c
index caec1fd0..b070ab24 100755
--- a/libsigrokdecode4DSL/srd.c
+++ b/libsigrokdecode4DSL/srd.c
@@ -387,7 +387,7 @@ SRD_API GSList *srd_searchpaths_get(void)
 }
 
 //set python home directory
-SRD_API void srd_set_python_home(const char *path)
+SRD_API void srd_set_python_home(const wchar_t *path)
 {
 	Py_SetPythonHome((wchar_t*)path);
 }
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 536a527e..69735a38 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-12-10T18:13:59. -->
+<!-- Written by QtCreator 4.11.0, 2021-12-13T10:43:31. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -93,7 +93,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>