Add LaunchApp() function and launchApp System call for launching a new process from the GUI or command line. Replace relevant sections of console commands with LaunchApp() calls.

Add string representation of an edit control's contents.
Allow Run Window to launch an application.
Copy image name to GUI_NEW_CONSOLE_APP_DATA and replace pointer to image name with a buffer to hold the name (prevents a crash).
Update a few functions to be "const-correct."

Author: tthomps

MyOS_1/Console_Shell.c

@@ -29,6 +29,7 @@
 #include "Drivers/Virtio_GPU.h"
 #include "myos_io.h"
 #include "Drivers\Keyboard.h"
+#include "../MyOS_GUI_Shell/GUI_Kernel_Shell.h"
 
 int inputPosition = 0;
 #define COMMAND_HISTORY_SIZE        10
@@ -919,54 +920,14 @@ void Shell_Process_command(void)
             return;
         }
 
-        // TEMPTEMP we've hardcoded some memory starting at 0x800000. This was identity mapped when paging was enabled.
-        uint8_t *exeBuffer = (uint8_t*)0x800000;
+        // TEMPTEMP apps should start at 0x80 0000
+        uint32_t exeBuffer = 0x800000;
 
         // reset keyboard input buffer
         keyReadIndex = keyWriteIndex = 0;
-
-        // Get the size of the executable file
-        uint32_t fileSize;
-        if (!TFTP_GetFileSize(tftpServerIP, subCommand, &fileSize))
-        {
-            terminal_writestring("Failed to determine size of ");
-            terminal_writestring(subCommand);
-            terminal_newline();
-            return;
-        }
-
-        // Allocate a buffer for the executable file
-        uint8_t *peBuffer = malloc(fileSize);
-        if (!peBuffer)
-        {
-            terminal_writestring("Not enough memory to open executable file\n");
-            return;
-        }
-
-        //uint32_t peFileSize;
-
-        if (debugLevel)
-            terminal_dumpHex(peBuffer, 32);
-
-        // Download the executable
-        if (!TFTP_GetFile(tftpServerIP, subCommand, peBuffer, fileSize, NULL))
-        {
-            terminal_writestring("Error reading ");
-            terminal_writestring(subCommand);
-            terminal_writestring(" from server!\n");
-            return;
-        }
-
-        if (debugLevel)
-            terminal_dumpHex(peBuffer, 32);
-
-        // Run the executable
-        if (!loadAndRunPE(exeBuffer, (DOS_Header*)peBuffer, subCommand, exclusive))
-            terminal_writestring("Error running executable\n");
-
-        // Free the memory for the pe
-        free(peBuffer);
-
+        
+        LaunchApp(subCommand, exclusive, exeBuffer);
+        
         terminal_resume();
 
         if (debugLevel)
@@ -1027,56 +988,12 @@ void Shell_Process_command(void)
             return;
         }
 
-        // TEMPTEMP we've hardcoded some memory starting at 0xC00000. This was identity mapped when paging was enabled.
-        uint8_t *exeBuffer = (uint8_t*)0xC00000;
-
         // reset keyboard input buffer
         keyReadIndex = keyWriteIndex = 0;
 
-        // Get the size of the executable file
-        uint32_t fileSize;
-        if (!TFTP_GetFileSize(tftpServerIP, subCommand, &fileSize))
-        {
-            terminal_writestring("Failed to determine size of ");
-            terminal_writestring(subCommand);
-            terminal_newline();
-            return;
-        }
-
-        // Allocate a buffer for the executable file
-        uint8_t *peBuffer = malloc(fileSize);
-        if (!peBuffer)
-        {
-            terminal_writestring("Not enough memory to open executable file\n");
-            return;
-        }
-
-        //uint32_t peFileSize;
-
-        if (debugLevel)
-            terminal_dumpHex(peBuffer, 32);
-
-        // Download the executable
-        if (!TFTP_GetFile(tftpServerIP, subCommand, peBuffer, fileSize, NULL))
-        {
-            terminal_writestring("Error reading ");
-            terminal_writestring(subCommand);
-            terminal_writestring(" from server!\n");
-            return;
-        }
-
-        if (debugLevel)
-            terminal_dumpHex(peBuffer, 32);
-
-
-        // Run the executable
-        if (!loadAndRunPE(exeBuffer, (DOS_Header*)peBuffer, subCommand, exclusive))
-            terminal_writestring("Error running executable\n");
-
-
-        // Free the memory for the pe
-        free(peBuffer);
-
+        // TEMPTEMP we've hardcoded some memory starting at 0xC00000. This was identity mapped when paging was enabled.
+        LaunchApp(subCommand, exclusive, GUI_BASE_ADDRESS);
+                
         terminal_resume();
 
         if (debugLevel)

MyOS_1/Executables/PE32.c

@@ -120,7 +120,7 @@ bool loadAndRunPE(uint8_t *executableDestination, DOS_Header *mzAddress, const c
         newPageDirectory = pageDir;
 
     // TEMPTEMP - zero out 5 0x1000 sections of memory (tailored to TestApp1.exe)
-    memset(physicalLocation, 0, 0x5000);
+    memset((void*)physicalLocation, 0, 0x5000);
 
     // Get the address of the first section
     IMAGE_SECTION_HEADER *sectionHeader = (IMAGE_SECTION_HEADER*)((uint32_t)directory + sizeof(IMAGE_DATA_DIRECTORY));
@@ -177,7 +177,6 @@ bool loadAndRunPE(uint8_t *executableDestination, DOS_Header *mzAddress, const c
 
     if (multiEnable)
     {
-        // TEMP: use kernel page directory
         DispatchNewTask((uint32_t)entryPoint, newPageDirectory, 0x20000, imageName, exclusive);
     }
     else

MyOS_1/GUI_Kernel.c

@@ -3,6 +3,7 @@
 #include "GUI_Messages.h"
 #include "Tasks/Context.h"
 #include "printf.h"
+#include "misc.h"
 
 GUI_CALLBACK guiCallback = NULL;
 
@@ -37,7 +38,9 @@ void GUI_CreateConsoleWindowForApp(uint32_t taskNumber)
 {
     // Construct the message data
     GUI_NEW_CONSOLE_APP_DATA data;
-    data.appName = tasks[taskNumber].imageName;
+    //data.appName = tasks[taskNumber].imageName;
+    memset(data.appName, 0, MAX_IMAGE_NAME_LENGTH);
+    strncpy(data.appName, tasks[taskNumber].imageName, MAX_IMAGE_NAME_LENGTH - 1);
 
     (*guiCallback)(tasks[taskNumber].PID, GUI_MSG_NEW_CONSOLE_APP, &data);
 }

MyOS_1/GUI_Messages.h

@@ -7,13 +7,14 @@
 // END OF MESSAGES
 
 #define MAX_GUI_CONSOLE_STRING_LENGTH   512
+#define MAX_IMAGE_NAME_LENGTH   32
 
 // DATA TYPES USED BY MESSAGES
 
 // Data type used by GUI_MSG_NEW_CONSOLE_APP messages
 typedef struct GUI_NEW_CONSOLE_APP_DATA
 {
-    const char *appName;
+    char appName[MAX_IMAGE_NAME_LENGTH];
     // TODO: We may as well send the terminal contents over in the same message
 } GUI_NEW_CONSOLE_APP_DATA;
 

MyOS_1/Interrupts/IDT.c

@@ -97,6 +97,9 @@ void IDT_Init(void)
     // Set handler for the GUI telling the kernel how to send the GUI messages
     Set_IDT_Entry((unsigned long)gui_register_callback_interrupt_handler, SYSCALL_REGISTER_GUI_CALLBACK);
 
+    // Set handler for launching an app
+    Set_IDT_Entry((unsigned long)launch_app_interrupt_handler, SYSCALL_LAUNCH_APP);
+
     /* fill the IDT descriptor */
     IDT_ptr.base = (uint32_t)IDT;
     IDT_ptr.size = (sizeof(IDT_ENTRY) * 256);

MyOS_1/Interrupts/Interrupts.c

@@ -512,6 +512,32 @@ void _declspec(naked) hide_shell_display_interrupt_handler(int eflags, int cs)
     }
 }
 
+void _declspec(naked) launch_app_interrupt_handler(int eflags, int cs, const char *appFilename, bool exclusive, bool *pRetVal)
+{
+    // supress warning about unused parameters
+    (void)eflags, (void)cs;
+
+    // prologue
+    _asm
+    {
+        push ebp
+        mov ebp, esp
+
+        //pushad
+    }
+
+    *pRetVal = LaunchApp(appFilename, exclusive, 0x800000);
+
+    // epilogue
+    _asm
+    {
+        //popad
+
+        pop ebp
+        iretd
+    }
+}
+
 void  _declspec(naked) page_allocator_interrupt_handler(int eflags, int cs, unsigned int pages, unsigned int *pPagesAllocated, uint32_t *pRetVal)
 {
     // supress warning about unused parameters

MyOS_1/Interrupts/Interrupts.h

@@ -49,6 +49,8 @@ void Interrupts_Init();
 
 void keyboard_interrupt_handler(void);
 
+void launch_app_interrupt_handler(int eflags, int cs, const char *appFilename, bool exclusive, bool *pRetVal);
+
 void page_allocator_interrupt_handler(int eflags, int cs, unsigned int pages, unsigned int *pPagesAllocated, uint32_t *pRetVal);
 
 void page_fault_handler(void);

MyOS_1/Interrupts/System_Calls.c

@@ -124,6 +124,25 @@ long int SystemCallFTell(FILE * stream)
     return retVal;
 }
 
+bool SystemCallLaunchApp(const char * appFileName, bool exclusive)
+{
+    bool retVal;
+    bool *pRetVal = &retVal;
+    int exclusiveInt = exclusive;
+    const int pointerSize = sizeof(const char *) + sizeof(int) + sizeof(bool *);
+
+    __asm
+    {
+        push[pRetVal]            // push arguments onto stack
+        push[exclusiveInt]
+        push[appFileName]
+        int SYSCALL_LAUNCH_APP   // call launch_app_interrupt_handler(appFilename, exclusiveInt, pRetVal)
+        add esp, pointerSize     // restore value of stack pointer
+    }
+
+    return retVal;
+}
+
 // Get graphics info
 void SystemCallGetGraphicsInfo(bool *graphicsMode, int *width, int *height)
 {

MyOS_1/Interrupts/System_Calls.h

@@ -30,6 +30,7 @@ extern "C" {
 #define SYSCALL_GET_MOUSE_STATE     240
 #define SYSCALL_HIDE_SHELL_DISPLAY  239
 #define SYSCALL_REGISTER_GUI_CALLBACK   238
+#define SYSCALL_LAUNCH_APP          237
 
 void SystemCallExit();
 #define exit SystemCallExit
@@ -49,6 +50,9 @@ int SystemCallFSeek(FILE * stream, long int offset, int origin);
 long int SystemCallFTell(FILE * stream);
 #define ftell SystemCallFTell
 
+bool SystemCallLaunchApp(const char *appFileName, bool exclusive);
+#define launchApp SystemCallLaunchApp
+
 void SystemCallPageAllocator(unsigned int pages, unsigned int *pPagesAllocated, uint32_t *pRreturnVal);
 #define pageAllocator SystemCallPageAllocator
 

MyOS_1/Networking/TFTP.c

@@ -31,7 +31,7 @@ bool TFTP_TransactionComplete()
 // TODO: Implement timeout, error-checking
 // TODO: Fix hanging if an invalid serverIP is given
 // actualFileSize can be NULL if the caller doesn't care about the size
-bool TFTP_GetFile(uint32_t serverIP, char *filename, uint8_t *destinationBuffer, uint32_t maxFileSize, uint32_t *actualFileSize)
+bool TFTP_GetFile(uint32_t serverIP, const char *filename, uint8_t *destinationBuffer, uint32_t maxFileSize, uint32_t *actualFileSize)
 {
     if(actualFileSize)
         *actualFileSize = 0;
@@ -77,7 +77,7 @@ bool TFTP_GetFile(uint32_t serverIP, char *filename, uint8_t *destinationBuffer,
 
 // TODO: Same as above
 // Retrieves the size of a file. This can take a while for large files, because we actually have to retrieve the entire file to know its size.
-bool TFTP_GetFileSize(uint32_t serverIP, char *filename, uint32_t *pActualFileSize)
+bool TFTP_GetFileSize(uint32_t serverIP, const char *filename, uint32_t *pActualFileSize)
 {
     // Ensure pActualFileSize is a valid pointer
     if (!pActualFileSize)
@@ -111,7 +111,7 @@ bool TFTP_GetFileSize(uint32_t serverIP, char *filename, uint32_t *pActualFileSi
 }
 
 // source port is used to keep track of different transactions
-uint16_t TFTP_RequestFile(uint32_t serverIP, char *filename, char *transferMode, uint8_t *sourceMAC)
+uint16_t TFTP_RequestFile(uint32_t serverIP, const char *filename, const char *transferMode, uint8_t *sourceMAC)
 {
     TFTP_RequestHeader *tftpData;
     size_t filenameLength = strlen(filename) + 1; // length of filename plus null terminator
@@ -148,7 +148,7 @@ uint16_t TFTP_RequestFile(uint32_t serverIP, char *filename, char *transferMode,
 
 // source port is used to keep track of different transactions
 // TODO: Seems like Qemu and VirtualBox don't support writing files via TFTP so I can't finish this :(
-uint16_t TFTP_WriteFile(uint32_t serverIP, char *filename, char *transferMode, uint8_t *sourceMAC)
+uint16_t TFTP_WriteFile(uint32_t serverIP, const char *filename, const char *transferMode, uint8_t *sourceMAC)
 {
     TFTP_RequestHeader *tftpData;
     size_t filenameLength = strlen(filename) + 1; // length of filename plus null terminator

MyOS_1/Networking/TFTP.h

@@ -84,12 +84,12 @@ extern bool tftpHideErrors;
 extern uint32_t tftpServerIP;
 
 
-bool TFTP_GetFile(uint32_t serverIP, char *filename, uint8_t *destinationBuffer, uint32_t maxFileSize, uint32_t *actualFileSize);
+bool TFTP_GetFile(uint32_t serverIP, const char *filename, uint8_t *destinationBuffer, uint32_t maxFileSize, uint32_t *actualFileSize);
 
-bool TFTP_GetFileSize(uint32_t serverIP, char *filename, uint32_t *pActualFileSize);
+bool TFTP_GetFileSize(uint32_t serverIP, const char *filename, uint32_t *pActualFileSize);
 
-uint16_t TFTP_RequestFile(uint32_t serverIP, char *filename, char *transferMode, uint8_t *sourceMAC);
+uint16_t TFTP_RequestFile(uint32_t serverIP, const char *filename, const char *transferMode, uint8_t *sourceMAC);
 
 void TFTP_ProcessPacket(TFTP_Header *packet, uint16_t sourcePort, uint16_t destinationPort, uint16_t packetLength, uint8_t *sourceMAC);
 
-uint16_t TFTP_WriteFile(uint32_t serverIP, char *filename, char *transferMode, uint8_t *sourceMAC);
+uint16_t TFTP_WriteFile(uint32_t serverIP, const char *filename, const char *transferMode, uint8_t *sourceMAC);

MyOS_1/Tasks/Context.h

@@ -61,4 +61,6 @@ extern bool multiEnable; // TEMPTEMP
 
 void DispatchNewTask(uint32_t programStart, PAGE_DIRECTORY_ENTRY *newPageDirectory, uint32_t stackSize, const char *imageName, bool exclusive);
 
+bool LaunchApp(const char *appName, int exclusive, uint32_t exeLocation);
+
 void SwitchTask(uint32_t taskIndex);