Fixes

Author: r57zone

TOVR/C++/TOVR/TOVR.cpp

@@ -2,8 +2,8 @@
 //========== https://github.com/TrueOpenVR ==========
 
 #include "stdafx.h"
+#include <atlstr.h> 
 //#include <Windows.h>
-#include <atlstr.h>  
 
 #define DLLEXPORT extern "C" __declspec(dllexport)
 
@@ -41,11 +41,6 @@ _GetControllersData DriverGetControllersData;
 _SetControllerData DriverSetControllerData;
 _SetCentering DriverSetCentering;
 
-DLLEXPORT DWORD __stdcall GetHMDData(__out THMD *myHMD);
-DLLEXPORT DWORD __stdcall GetControllersData(__out TController *myController, __out TController *myController2);
-DLLEXPORT DWORD __stdcall SetControllerData(__in int dwIndex, __in WORD MotorSpeed);
-DLLEXPORT DWORD __stdcall SetCentering(__in int dwIndex);
-
 HMODULE hDll;
 
 void Init() {
@@ -86,6 +81,10 @@ void Init() {
 				DriverGetControllersData = (_GetControllersData)GetProcAddress(hDll, "GetControllersData");
 				DriverSetControllerData = (_SetControllerData)GetProcAddress(hDll, "SetControllerData");
 				DriverSetCentering = (_SetCentering)GetProcAddress(hDll, "SetCentering");
+
+				if (DriverGetHMDData == NULL || DriverGetControllersData == NULL || DriverSetControllerData == NULL || DriverSetCentering == NULL)
+					hDll = NULL;
+
 			}
 		}
 	}
@@ -108,7 +107,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReser
 			break;
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 DLLEXPORT DWORD __stdcall GetHMDData(__out THMD *myHMD)

TOVR/Delphi/TOVR.dpr

@@ -7,7 +7,6 @@ uses
   SysUtils, Windows, Registry;
 
 type
-  //HMD
   PHMD = ^THMD;
   _HMDData = record
     X: double;
@@ -20,7 +19,6 @@ type
   HMD = _HMDData;
   THMD = HMD;
 
-  //Controllers
   PController = ^TController;
   _Controller = record
     X: double;
@@ -110,6 +108,9 @@ begin
           @DriverGetControllersData:=GetProcAddress(DllHandle, 'GetControllersData');
           @DriverSetControllerData:=GetProcAddress(DllHandle, 'SetControllerData');
           @DriverSetCentering:=GetProcAddress(DllHandle, 'SetCentering');
+
+          if (addr(DriverGetHMDData) = nil) or (addr(DriverGetControllersData) = nil) or (addr(DriverSetControllerData) = nil) or (addr(DriverSetCentering) = nil) then
+					  DllHandle:=0;
         end;
       end;