last changes: vxd works now

Author: EvilLord666

MossbauerLab.Sm2201.ExtSaveUtility/src/saveManager/autoSaveManager.cpp

@@ -366,7 +366,7 @@ void MossbauerLab::Sm2201::SaveManager::AutoSaveManager::sendKeysViaPortVxdDrive
         int result = 0;
         do
         {
-            status = _vxdAccessor->read(KEYBOARD_CMD_REG);
+            status = _vxdAccessor->read(KEYBOARD_CMD_REG, 1);
             // std::cout <<"Keyboard status: "<< status << std::endl;
             Sleep(10);
         }
@@ -375,14 +375,14 @@ void MossbauerLab::Sm2201::SaveManager::AutoSaveManager::sendKeysViaPortVxdDrive
         // send scan code for key down
         _vxdAccessor->write(KEYBOARD_CMD_REG, 0xD2, 1);
         _vxdAccessor->write(KEYBOARD_DATA_REG, (*it), 1);
-        result = _vxdAccessor->read(KEYBOARD_DATA_REG);
+        result = _vxdAccessor->read(KEYBOARD_DATA_REG, 1);
         std::cout <<"Keyboard command result for KEY DOWN: "<< result << std::endl;
         // send scan code for key up
         BYTE keyUpCode = (*it) | 128;
         Sleep(keyPause);
         _vxdAccessor->write(KEYBOARD_CMD_REG, 0xD2, 1);
         _vxdAccessor->write(KEYBOARD_DATA_REG, keyUpCode, 1);
-        result = _vxdAccessor->read(KEYBOARD_DATA_REG);
+        result = _vxdAccessor->read(KEYBOARD_DATA_REG, 1);
         std::cout <<"Keyboard command result for KEY UP: "<< result << std::endl;
     }
 }

MossbauerLab.Sm2201.ExtSaveUtility/src/utils/windows/vxdAccessor.cpp

@@ -2,8 +2,8 @@
 #include <winioctl.h>
 #include <tchar.h>
 
-#define IO32_WRITEPORT CTL_CODE(FILE_DEVICE_UNKNOWN, 1, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define IO32_READPORT CTL_CODE(FILE_DEVICE_UNKNOWN, 2, METHOD_NEITHER, FILE_ANY_ACCESS)
+#define IO32_WRITEPORT 0x1001
+#define IO32_READPORT  0x1000
 
 MossbauerLab::Utils::Windows::VxDAccessor::VxDAccessor()
 {
@@ -12,15 +12,15 @@ MossbauerLab::Utils::Windows::VxDAccessor::VxDAccessor()
 
 MossbauerLab::Utils::Windows::VxDAccessor::~VxDAccessor()
 {
-    if (_hVxD != NULL)
+    if (_hVxD != NULL && _hVxD != INVALID_HANDLE_VALUE)
         CloseHandle(_hVxD);
 }
 
 bool MossbauerLab::Utils::Windows::VxDAccessor::init()
 {
-    _hVxD = CreateFile(_T("\\\\.\\io32port.vxd"), 0, 0, NULL, 0, 
-                       FILE_FLAG_DELETE_ON_CLOSE, NULL);
-
+    _hVxD = CreateFile(_T("\\\\.\\DIO_W55"), 0, 0, 0, 
+                       CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0);
+    DWORD errCode = GetLastError();
     return _hVxD != INVALID_HANDLE_VALUE;
 }
 
@@ -29,12 +29,14 @@ DWORD MossbauerLab::Utils::Windows::VxDAccessor::read(DWORD port, BYTE size)
     if( _hVxD == NULL)
         return -1;
     MossbauerLab::Utils::Windows::TagPort32 tagPort;
+    ZeroMemory(&tagPort, sizeof(tagPort));
     tagPort.bSize = size;
-    tagPort.wPort = port;
+    tagPort.wPort = (unsigned short) port;
     DWORD portValue = 0;
-    DWORD result;
-    DeviceIoControl(_hVxD, IO32_READPORT, &tagPort, sizeof(TagPort32), 
-                    &portValue, sizeof(DWORD), &result, NULL);
+    DWORD bytesRead = 0;
+    bool readResult = DeviceIoControl(_hVxD, IO32_READPORT, &tagPort, sizeof(TagPort32), 
+                                      &portValue, sizeof(DWORD), &bytesRead, NULL);
+    DWORD errorCode = GetLastError();
     return portValue;
 }
 
@@ -44,9 +46,12 @@ bool MossbauerLab::Utils::Windows::VxDAccessor::write(DWORD port, DWORD value, B
         return false;
     DWORD result;
     MossbauerLab::Utils::Windows::TagPort32 tagPort;
+    ZeroMemory(&tagPort, sizeof(tagPort));
     tagPort.bSize = size;
-    tagPort.wPort = port;
+    tagPort.wPort = (unsigned short) port;
     tagPort.dwValue = value;
-    return DeviceIoControl(_hVxD, IO32_WRITEPORT, &tagPort, sizeof(tagPort), 
-                           NULL, 0, &result, NULL);
+    bool writeResult = DeviceIoControl(_hVxD, IO32_WRITEPORT, &tagPort, sizeof(tagPort), 
+                                       NULL, 0, &result, NULL);
+    DWORD errorCode = GetLastError();
+    return writeResult;
 }

MossbauerLab.Sm2201.ExtSaveUtility/src/utils/windows/vxdAccessor.h

@@ -1,27 +1,30 @@
 #include <windows.h>
 
+#pragma warning(disable:4786)
+#pragma comment(linker, "/IGNORE:4786")
+
 namespace MossbauerLab
 {
     namespace Utils
     {
         namespace Windows
         {
-            #pragma pack(1)
+            #pragma pack(push, 1)
             struct TagPort32
             {
                 USHORT wPort;
                 ULONG dwValue;
                 UCHAR bSize;
             };
-            #pragma pack()
+            #pragma pack(pop)
 
             class VxDAccessor
             {
             public:
                 VxDAccessor();
                 ~VxDAccessor();
                 DWORD read(DWORD port, BYTE size = 1);
-                bool write(DWORD port, DWORD value, BYTE size);
+                bool write(DWORD port, DWORD value, BYTE size = 1);
             private:
                 bool init();
             private: