Fix app window buf allocation #64

Author: hikalium

src/ps2_mouse.cc

@@ -175,6 +175,21 @@ void MouseManager() {
   SheetPainter::DrawString(*debug_info_sheet, "mouse:", 8, 16, false);
   debug_info_sheet->Flush();
 
+  Sheet* debug_info_sheet2 = AllocKernelMemory<Sheet*>(sizeof(Sheet));
+  bzero(debug_info_sheet2, sizeof(Sheet));
+  uint32_t* debug_info_buf2 =
+      AllocKernelMemory<uint32_t*>(4 * debug_info_width * debug_info_height);
+  for (int y = 0; y < debug_info_height; y++) {
+    for (int x = 0; x < debug_info_width; x++) {
+      debug_info_buf2[y * debug_info_width + x] = 0xffffff;
+    }
+  }
+  debug_info_sheet2->Init(debug_info_buf2, debug_info_width, debug_info_height,
+                          debug_info_width, 0, 0);
+  debug_info_sheet2->SetParent(liumos->vram_sheet);
+  SheetPainter::DrawString(*debug_info_sheet2, "sheet2", 8, 16, false);
+  debug_info_sheet2->Flush();
+
   bool last_left_button_state = false;
   Sheet* focused = nullptr;
   int focused_ofs_x = 0, focused_ofs_y = 0;

src/syscall.cc

@@ -47,6 +47,7 @@ typedef uint32_t socklen_t;
 
 struct PerProcessSyscallData {
   Sheet* window_sheet;
+  uint32_t* window_buf;
   int num_getdents64_called;
   // for opening normal file: fd = 6
   int idx_in_root_files;
@@ -556,20 +557,28 @@ __attribute__((ms_abi)) extern "C" void SyscallHandler(uint64_t* args) {
       return;
     }
     ysize = -ysize;
+    if (ysize > 2048 || xsize > 2048) {
+      kprintf("msync: create window: window too large: %dx%d\n", xsize, ysize);
+      args[0] = static_cast<uint64_t>(-1);
+      return;
+    }
     auto pid = liumos->scheduler->GetCurrentProcess().GetID();
     auto& ppdata = per_process_syscall_data[pid];
     auto& sheet = ppdata.window_sheet;
+    auto& buf = ppdata.window_buf;
     if (!sheet) {
       kprintf("offset_to_data = %d, xsize = %d, ysize = %d\n", offset_to_data,
               xsize, ysize);
       // TODO(hikalium): allocate this backing sheet on fopen.
       sheet = AllocKernelMemory<Sheet*>(sizeof(Sheet));
+      buf = AllocKernelMemory<uint32_t*>(xsize * ysize * 4);
       bzero(sheet, sizeof(Sheet));
-      sheet->Init(reinterpret_cast<uint32_t*>(addr + offset_to_data), xsize,
-                  ysize, xsize, 0, 0);
+      sheet->Init(buf, xsize, ysize, xsize, 0, 0);
       kprintf("vram_sheet is at %p\n", liumos->vram_sheet);
       sheet->SetParent(liumos->vram_sheet);
     }
+    memcpy(buf, reinterpret_cast<uint32_t*>(addr + offset_to_data),
+           xsize * ysize * 4);
     sheet->Flush(0, 0, xsize, ysize);
     args[0] = 0;
     return;