Add ability to set LVRT module path (#331)

* Add functions to allow setting path to the LVRT module used for callback functions. * Add LV function to set LVRT Module Path Signed-off-by: Jeff Plotzke <jplotzke@konrad-technologies.com> * Revert "Add LV function to set LVRT Module Path" (accidently saved in LV2021) This reverts commit fe19e8a. * Add LabVIEW functions to set LVRT module path Signed-off-by: Jeff Plotzke <jplotzke@konrad-technologies.com> --------- Signed-off-by: Jeff Plotzke <jplotzke@konrad-technologies.com> Co-authored-by: pratheekshasn <37623222+pratheekshasn@users.noreply.github.com>
ni · Jan 10, 2024 · 1cf129f · 1cf129f
1 parent 5c1cbb6
commit 1cf129f
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 10 deletions.
diff --git a/labview source/gRPC lv Support/Shared/Set LVRT Module Path.vi b/labview source/gRPC lv Support/Shared/Set LVRT Module Path.vi
diff --git a/labview source/gRPC lv Support/grpc-lvsupport.lvlib b/labview source/gRPC lv Support/grpc-lvsupport.lvlib
@@ -105,6 +105,7 @@
 	<Item Name="Shared" Type="Folder">
 		<Item Name="grpcId.ctl" Type="VI" URL="../Shared/grpcId.ctl"/>
 		<Item Name="Any.ctl" Type="VI" URL="../Shared/Any.ctl"/>
+		<Item Name="Set LVRT Module Path.vi" Type="VI" URL="../Shared/Set LVRT Module Path.vi"/>
 		<Item Name="Wait On Occurence.vi" Type="VI" URL="../Shared/Wait On Occurence.vi"/>
 		<Item Name="TranslateGrpcError.vi" Type="VI" URL="../Shared/TranslateGrpcError.vi"/>
 	</Item>

diff --git a/src/grpc_interop.cc b/src/grpc_interop.cc
@@ -456,3 +456,19 @@ LIBRARY_EXPORT int32_t IsCancelled(grpc_labview::gRPCid** id)
     }
     return data->_call->IsCancelled();
 }
+
+//---------------------------------------------------------------------
+// Allows for definition of the LVRT DLL path to be used for callback functions
+// This function should be called prior to any other gRPC functions in this library
+   //---------------------------------------------------------------------
+LIBRARY_EXPORT int32_t SetLVRTModulePath(const char* modulePath)
+{
+    if (modulePath == nullptr)
+    {
+        return -1;
+    }
+
+	grpc_labview::SetLVRTModulePath(modulePath);
+
+	return 0;    
+}
diff --git a/src/lv_interop.cc b/src/lv_interop.cc
@@ -30,10 +30,21 @@ static PostLVUserEvent_T PostLVUserEvent = nullptr;
 static Occur_T Occur = nullptr;
 static RTSetCleanupProc_T RTSetCleanupProc = nullptr;
 
+static std::string ModulePath = "";
+
 namespace grpc_labview
 {
     grpc_labview::PointerManager<grpc_labview::gRPCid> gPointerManager;
 
+	//---------------------------------------------------------------------
+	// Allows for definition of the LVRT DLL path to be used for callback functions
+	// This function should be called prior to calling InitCallbacks()
+    //---------------------------------------------------------------------
+	void SetLVRTModulePath(std::string modulePath)
+	{
+		ModulePath = modulePath;
+	}
+
 #ifdef _WIN32
 
     //---------------------------------------------------------------------
@@ -45,15 +56,25 @@ namespace grpc_labview
             return;
         }
 
-        auto lvModule = GetModuleHandle("LabVIEW.exe");
-        if (lvModule == nullptr)
-        {
-            lvModule = GetModuleHandle("lvffrt.dll");
-        }
-        if (lvModule == nullptr)
-        {
-            lvModule = GetModuleHandle("lvrt.dll");
-        }
+		HMODULE lvModule;
+
+		if(ModulePath != "")
+		{
+			lvModule = GetModuleHandle(ModulePath.c_str());
+		}
+		else
+		{
+			lvModule = GetModuleHandle("LabVIEW.exe");
+			if (lvModule == nullptr)
+			{
+				lvModule = GetModuleHandle("lvffrt.dll");
+			}
+			if (lvModule == nullptr)
+			{
+				lvModule = GetModuleHandle("lvrt.dll");
+			}
+		}
+
         NumericArrayResizeImp = (NumericArrayResize_T)GetProcAddress(lvModule, "NumericArrayResize");
         PostLVUserEvent = (PostLVUserEvent_T)GetProcAddress(lvModule, "PostLVUserEvent");
         Occur = (Occur_T)GetProcAddress(lvModule, "Occur");

diff --git a/src/lv_interop.h b/src/lv_interop.h
@@ -109,7 +109,8 @@ namespace grpc_labview
 
     //---------------------------------------------------------------------
     //---------------------------------------------------------------------
-    void InitCallbacks();
+    void SetLVRTModulePath(std::string modulePath);
+	void InitCallbacks();
     void SetLVString(LStrHandle* lvString, std::string str);
     std::string GetLVString(LStrHandle lvString);
     int NumericArrayResize(int32_t typeCode, int32_t numDims, void* handle, size_t size);