Merge remote-tracking branch 'benma/libserver'

BitBoxSwiss · Mar 5, 2024 · 192e22d · 192e22d
2 parents 0f7362d + d68b673
commit 192e22d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 69 deletions.
diff --git a/frontends/qt/BitBox.pro b/frontends/qt/BitBox.pro
@@ -56,7 +56,8 @@ SOURCES += \
         main.cpp \
         filedialog.cpp
 
-HEADERS += libserver.h webclass.h filedialog.h
+# server/libserver.h is generated by building server.go, see the Makefiles in server/.
+HEADERS += server/libserver.h webclass.h filedialog.h
 
 unix:macx {
     # Those frameworks are needed for Go's http/net packages.

diff --git a/frontends/qt/libserver.h b/frontends/qt/libserver.h
diff --git a/frontends/qt/main.cpp b/frontends/qt/main.cpp
@@ -43,7 +43,7 @@
 #include <string.h>
 
 #include "filedialog.h"
-#include "libserver.h"
+#include "server/libserver.h"
 #include "webclass.h"
 
 #define APPNAME "BitBoxApp"

diff --git a/frontends/qt/server/server.go b/frontends/qt/server/server.go
@@ -44,7 +44,12 @@ static char* getSaveFilename(getSaveFilenameCallback f, const char* suggestedfil
     return f(suggestedfilename);
 }
 
-// see frontends/qt/libserver.h for doc comments
+// equivalent to C.free but suitable for releasing a memory malloc'ed
+// in a non-posix portable environment, incompatible with cgo.
+// this is especially important on windows where the standard C runtime
+// memory management used by cgo and mingw is different from win32 API used
+// when compiling C++ code with MSVC. hence, the memory allocated with malloc
+// in C++ must always be freed by this function in Go instead of C.free.
 typedef void (*cppHeapFree) (void* ptr);
 static void customHeapFree(cppHeapFree f, void* ptr) {
 	f(ptr);
@@ -85,7 +90,7 @@ func (communication *nativeCommunication) PushNotify(msg string) {
 }
 
 //export backendCall
-func backendCall(queryID C.int, s *C.char) {
+func backendCall(queryID C.int, s *C.cchar_t) {
 	bridgecommon.BackendCall(int(queryID), C.GoString(s))
 }
 
@@ -104,7 +109,7 @@ func serve(
 	pushNotificationsFn C.pushNotificationsCallback,
 	responseFn C.responseCallback,
 	notifyUserFn C.notifyUserCallback,
-	preferredLocale *C.char,
+	preferredLocale *C.cchar_t,
 	getSaveFilenameFn C.getSaveFilenameCallback,
 ) {
 	log := logging.Get().WithGroup("server")

diff --git a/frontends/qt/webclass.h b/frontends/qt/webclass.h
@@ -14,7 +14,7 @@
 
 #include <QApplication>
 
-#include "libserver.h"
+#include "server/libserver.h"
 
 class WebClass : public QObject
 {