display for Windows

Author: ge69dal

Windows/NASM/macro.o

@@ -58,6 +58,42 @@ CEXTERN puts
 CEXTERN fputs
 CEXTERN fflush
 
+CEXTERN update
+%macro updateDisplay 1.nolist
+ sasmMacroFunc
+ push eax
+ push ecx
+ push edx
+ ALIGN_STACK 4
+push %1
+ call update
+ UNALIGN_STACK
+ pop edx
+ pop ecx
+ pop eax
+ sasmMacroFuncE
+%endmacro
+
+CEXTERN setup
+%macro setupDisplay 4.nolist
+ sasmMacroFunc
+ push eax
+ push ecx
+ push edx
+ ALIGN_STACK 16
+push %4
+push %3
+push %2
+push %1
+ call setup
+ UNALIGN_STACK
+ pop edx
+ pop ecx
+ pop eax
+ sasmMacroFuncE
+%endmacro
+
+
 CEXTERN get_stdin
 CEXTERN get_stdout
 

Windows/include/io.inc

@@ -65,15 +65,13 @@ DisplayWindow::DisplayWindow(QWidget *parent) :
  this->setFixedSize(500,525);
 }
 
-void DisplayWindow::changeDisplay(int msgid){
+void DisplayWindow::changeDisplay(int msgid, HANDLE hCreateNamedPipe){
  this->setFixedSize(537,562);
  displayPicture = new QImage(512, 512, QImage::Format_RGB32);
  displayPicture->fill(qRgb(255, 255, 255));
  displayImageLabel->setPixmap(QPixmap::fromImage(*displayPicture));
  buffer.resize(512*512);
  memset(buffer.data(), 0xff, 512*512);
- #ifdef Q_OS_WIN32
- #else
  this->msgid = msgid;
  res_x = 512;
  res_y = 512;
@@ -84,7 +82,67 @@ void DisplayWindow::changeDisplay(int msgid){
  displayPicture->fill(qRgb(0, 0, 0));
  displayImageLabel->setPixmap(QPixmap::fromImage(*displayPicture));
  programExecutionTime.start();
- while(1){
+ #ifdef Q_OS_WIN32
+if(!ConnectNamedPipe(hCreateNamedPipe, NULL))
+emit printLog(QString("Connection Failed with Error (")+QString::number(GetLastError())+")\n", Qt::red);
+while(1){
+DWORD dwNoBytesRead;
+BOOL readSuccess = ReadFile(
+hCreateNamedPipe,
+message.mesg_text,
+8184,
+&dwNoBytesRead,
+NULL);
+if(!readSuccess){
+if(GetLastError()!=109)
+emit printLog(QString("Read Failed with Error (")+QString::number(GetLastError())+")\n", Qt::red);
+break;
+}
+if(message.mesg_text[0]==3){
+res_x = message.mesg_text[1];
+ res_y = message.mesg_text[5];
+ for(int i = 1; i < 4; i++){
+ res_x += message.mesg_text[1+i] << (8*i);
+ res_y += message.mesg_text[5+i] << (8*i);
+ }
+ mode = message.mesg_text[9];
+ fps = message.mesg_text[10];
+ if(mode)
+ buffer.resize(res_x*res_y*3);
+ else
+ buffer.resize(res_x*res_y);
+ displayPicture = new QImage(res_x*zoom, res_y*zoom, QImage::Format_RGB32);
+ displayPicture->fill(qRgb(0, 0, 0));
+ displayImageLabel->setPixmap(QPixmap::fromImage(*displayPicture));
+ this->setFixedSize(displayPicture->size()+QSize(25,50));
+ continue;
+}
+// display the message and print on display
+ int needed_bytes = (mode) ? res_x*res_y*3 : res_x*res_y;
+ for(int i = 0; i < needed_bytes; i+=8184){
+dwNoBytesRead = 0;
+BOOL readSuccess = ReadFile(
+hCreateNamedPipe,
+message.mesg_text,
+8184,
+&dwNoBytesRead,
+NULL);
+if(!readSuccess){
+emit printLog(QString("Read Failed with Error (")+QString::number(GetLastError())+")\n", Qt::red);
+break;
+}
+ memcpy(buffer.data()+i, &message.mesg_text[0], std::min(8184, needed_bytes-i));
+	}
+ updateDisplay();
+qint64 elapsed_time = programExecutionTime.elapsed();
+ if(elapsed_time < 1000/fps)
+ usleep(1000/fps - elapsed_time);
+ displayImageLabel->setPixmap(QPixmap::fromImage(*displayPicture));
+ programExecutionTime.start();
+ }
+CloseHandle(hCreateNamedPipe);
+#else
+while(1){
  // msgrcv to receive message
  msgrcv(msgid, &message, sizeof(message), 0, 0);
 
@@ -118,19 +176,46 @@ void DisplayWindow::changeDisplay(int msgid){
  memcpy(buffer.data()+i, &message.mesg_text[0], std::min(8184, needed_bytes-i));
 	}
  updateDisplay();
- qint64 elapsed_time = programExecutionTime.elapsed();
+qint64 elapsed_time = programExecutionTime.elapsed();
  if(elapsed_time < 1000/fps)
  usleep(1000/fps - elapsed_time);
  displayImageLabel->setPixmap(QPixmap::fromImage(*displayPicture));
  programExecutionTime.start();
  }
  msgctl(msgid, IPC_RMID, NULL);
+#endif
  emit closeDisplay();
- #endif
 }
 
 void DisplayWindow::finish(int msgid){
  #ifdef Q_OS_WIN32
+/*char c[8184];
+c[0] = 2;
+HANDLE hFile = CreateFileW(
+ L"\\\\.\\pipe\\SASMPIPE",
+GENERIC_WRITE,
+FILE_SHARE_READ | FILE_SHARE_WRITE,
+NULL,
+OPEN_EXISTING,
+0,
+NULL);
+if(hFile == INVALID_HANDLE_VALUE){
+emit printLog(QString("Could not create file object (")+QString::number(GetLastError())+")\n", Qt::red);
+return;
+}
+DWORD dwNoBytesWrote = 0;
+BOOL writeSuccess = WriteFile(
+hFile,
+c,
+sizeof(c),
+&dwNoBytesWrote,
+NULL);
+if(!writeSuccess){
+emit printLog(QString("Could not write to file (")+QString::number(GetLastError())+")\n", Qt::red);
+}
+if(!FlushFileBuffers(hFile)){
+emit printLog(QString("Could not flush the file (")+QString::number(GetLastError())+")\n", Qt::red);
+}*/
  #else
  mesg_buffer end;
  end.mesg_type = 2;

displayWindow.cpp

@@ -52,23 +52,27 @@
 #include <unistd.h>
 #include <vector>
 #ifdef Q_OS_WIN32
+#include <windows.h>
+#include <conio.h>
+#include <tchar.h>
 #else
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #endif
+#define BUF_SIZE 256
 
 class DisplayWindow : public QWidget
 {
  Q_OBJECT
 public:
  struct mesg_buffer {
  long mesg_type;
- uint8_t mesg_text[8184];
+ char mesg_text[8184];
  } message;
 
  explicit DisplayWindow(QWidget *parent = 0);
  ~DisplayWindow();
- void changeDisplay(int msgid);
+ void changeDisplay(int msgid, HANDLE hCreateNamedPipe);
  void finish(int msgid);
  void updateDisplay();
 
@@ -94,6 +98,7 @@ void zoomSettingsChanged(int value);
  void displayChanged(void);
  void closeSignal();
  void closeDisplay();
+void printLog(QString msg, QColor color = QColor(Qt::black));
 };
 
 #endif

displayWindow.h

@@ -12,7 +12,7 @@
 ** (at your option) any later version.
 **
 ** SASM is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** but WITHOUT ANY WARRANTY; without even the implieddwarranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 ** GNU General Public License for more details.
 **
@@ -1058,19 +1058,34 @@ void MainWindow::runProgram()
  runProcess->setStandardInputFile(input);
 
  // start display
- #ifdef Q_OS_WIN32
- #else
  if (!displayWindow) {
  displayWindow = new DisplayWindow;
  displayWindow->setWindowIcon(QIcon(":images/mainIcon.png"));
  displayWindow->setWindowFlags(Qt::Widget | Qt::MSWindowsFixedSizeDialogHint);
  displayWindow->activateWindow();
  }
- if (settings.value("display", false).toBool())
- displayWindow->show();
+ if (settings.value("display", false).toBool()){
+displayWindow->show();
+}
+#ifdef Q_OS_WIN32
+// --- TODO ---
+HANDLE hCreateNamedPipe = CreateNamedPipe(
+TEXT("\\\\.\\pipe\\sasmpipe"),
+PIPE_ACCESS_INBOUND,
+PIPE_TYPE_BYTE|PIPE_READMODE_MESSAGE|PIPE_WAIT,
+PIPE_UNLIMITED_INSTANCES,
+8184,
+8184,
+0,
+NULL);
+if(hCreateNamedPipe == INVALID_HANDLE_VALUE){
+printLog(QString("Couldnt create Pipe\n"), Qt::red);
+}
+consumer = new std::thread(&DisplayWindow::changeDisplay, displayWindow, -1, hCreateNamedPipe);
+ #else
  key_t key = ftok("/tmp", 65);
  msgid = msgget(key, 0666 | IPC_CREAT);
- consumer = new std::thread(&DisplayWindow::changeDisplay, displayWindow, msgid);
+ consumer = new std::thread(&DisplayWindow::changeDisplay, displayWindow, msgid, nullptr);
  #endif
 
  //! Run program in code directory if it exists
@@ -1223,28 +1238,39 @@ void MainWindow::debug()
  QString inputPath = Common::pathInTemp("input.txt");
  inputPath.replace("\\", "/");
 
- // start display Linux
-	#ifdef Q_OS_WIN32
-#else
-if (!displayWindow) {
+ // start display
+if (!displayWindow) {
  displayWindow = new DisplayWindow;
  displayWindow->setWindowIcon(QIcon(":images/mainIcon.png"));
- //displayWindow->setFixedSize(500,525);
- //displayWindow->setFixedSize(600,625);
  displayWindow->setWindowFlags(Qt::Widget | Qt::MSWindowsFixedSizeDialogHint);
  displayWindow->activateWindow();
- //displaywdg->setParent(this);
  }
  if (settings.value("display", false).toBool())
  displayWindow->show();
- key_t key = ftok("/tmp", 65); //returned -1
+#ifdef Q_OS_WIN32
+HANDLE hCreateNamedPipe = CreateNamedPipe(
+L"\\\\.\\pipe\\sasmpipe",
+PIPE_ACCESS_INBOUND,
+PIPE_TYPE_MESSAGE|PIPE_READMODE_MESSAGE|PIPE_WAIT,
+PIPE_UNLIMITED_INSTANCES,
+8184,
+8184,
+0,
+NULL);
+if(hCreateNamedPipe == INVALID_HANDLE_VALUE){
+printLog(QString("Couldnt create Pipe"+QString::number(GetLastError()))+"\n", Qt::red);
+}
+consumer = new std::thread(&DisplayWindow::changeDisplay, displayWindow, -1, hCreateNamedPipe);
+#else
+ key_t key = ftok("/tmp", 65);
 	msgid = msgget(key, 0666 | IPC_CREAT);
-	consumer = new std::thread(&DisplayWindow::changeDisplay, displayWindow, msgid);
+	consumer = new std::thread(&DisplayWindow::changeDisplay, displayWindow, msgid, nullptr);
 	#endif
 
  debugger = new Debugger(compilerOut, exePath, workingDirectoryPath, inputPath, assembler, 0, settings.value("sasmverbose", false).toBool(), settings.value("mi", false).toBool());
 // connect print signals for output in Debugger
  connect(debugger, SIGNAL(printLog(QString,QColor)), this, SLOT(printLog(QString,QColor)));
+connect(displayWindow, SIGNAL(printLog(QString,QColor)), this, SLOT(printLog(QString,QColor))); // remove
  connect(debugger, SIGNAL(printOutput(QString)), this, SLOT(printOutput(QString)));
  connect(debugger, SIGNAL(highlightLine(int)), code, SLOT(updateDebugLine(int)));
  connect(debugger, SIGNAL(finished()), this, SLOT(debugExit()), Qt::QueuedConnection);

mainwindow.cpp

@@ -80,6 +80,7 @@
 #include "displayWindow.h"
 #include <unistd.h>
 #ifdef Q_OS_WIN32
+#include <Windows.h>
 #else
 #include <sys/ipc.h>
 #include <sys/msg.h>