more fixes

ASDAlexander77 · May 28, 2020 · 87612b1 · 87612b1
1 parent 58f38ff
commit 87612b1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/Experiment/SimpleVulkanApp/.vscode/settings.json b/Experiment/SimpleVulkanApp/.vscode/settings.json
@@ -81,6 +81,7 @@
         "queue": "cpp",
         "shared_mutex": "cpp",
         "stack": "cpp",
-        "xtree": "cpp"
+        "xtree": "cpp",
+        "*.rh": "cpp"
     }
 }
diff --git a/Experiment/SimpleVulkanApp/src/appwindow.ts b/Experiment/SimpleVulkanApp/src/appwindow.ts
@@ -17,6 +17,7 @@ enum Messages {
     Destroy = 0x0002,
     Size = 0x0005,
     Paint = 0x000f,
+    Close = 0x0010,
     KeyDown = 0x0100,
     Erasebkgnd = 0x0014
 }
@@ -37,6 +38,9 @@ export class AppWindow {
 
     protected onMessage(uMsg: uint64_t, wParam: uint64_t, lParam: uint64_t): uint32_t {
         switch (uMsg) {
+            case Messages.Close:
+                close_window(0);
+                break;
             case Messages.Erasebkgnd:
                 return 1;
             case Messages.Paint:
@@ -58,6 +62,6 @@ export class AppWindow {
                 return 0;
         }
 
-        return 0;
+        return 0xffff;
     }
 }
diff --git a/Experiment/SimpleVulkanApp/src/native/window.win32.cpp b/Experiment/SimpleVulkanApp/src/native/window.win32.cpp
@@ -70,15 +70,21 @@ intptr_t create_window(js::string title, intptr_t parent_hwnd, callback_function
     return reinterpret_cast<intptr_t>(hwnd);
 }
 
-void messages_loop() {
+int messages_loop() {
     MSG msg = { };
     while (GetMessage(&msg, NULL, 0, 0))
     {
+        if (msg.message == WM_QUIT) {
+            return (int)msg.wParam;
+        } 
+
         TranslateMessage(&msg);
         DispatchMessage(&msg);
 
         RedrawWindow(main_hwnd, nullptr, nullptr, RDW_INTERNALPAINT);
     }
+
+    return 0;
 }
 
 extern void Main(void);
@@ -91,11 +97,9 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR pCmdLine, int nCmdSh
     register_window_class();
 
     // main inject
-    Main();
+    Main();    
 
-    messages_loop();
-
-    return 0;
+    return messages_loop();
 }
 
 LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -111,7 +115,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
                 delete callback_function_ptr;                
         }
 
-        if (result) {
+        if (result != 0xffff) {
             return result;
         }
     }