From db01f729f7734138489c612780ca768643dfac6a Mon Sep 17 00:00:00 2001
From: Anthony Miles <a.miles.nz@gmail.com>
Date: Thu, 20 Jun 2019 21:49:55 +1200
Subject: [PATCH] Call DefWindowProc when WM_KEYDOWN, WM_SYSKEYDOWN are not
 handled

---
 src/core/hle/D3D8/Direct3D9/Direct3D9.cpp |  8 ++++++++
 src/gui/WndMain.cpp                       | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
index 7221bb764..989a8e772 100644
--- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
+++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
@@ -1619,6 +1619,10 @@ static LRESULT WINAPI EmuMsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
             {
                 ToggleFauxFullscreen(hWnd);
             }
+            else
+            {
+                return DefWindowProc(hWnd, msg, wParam, lParam);
+            }
         }
         break;
 
@@ -1655,6 +1659,10 @@ static LRESULT WINAPI EmuMsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
                 if(g_iWireframe++ == 2)
                     g_iWireframe = 0;
             }
+            else
+            {
+                return DefWindowProc(hWnd, msg, wParam, lParam);
+            }
         }
         break;
 
diff --git a/src/gui/WndMain.cpp b/src/gui/WndMain.cpp
index bd15e53f5..fdace4af2 100644
--- a/src/gui/WndMain.cpp
+++ b/src/gui/WndMain.cpp
@@ -381,8 +381,12 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
             {
                 SendMessage(m_hwndChild, uMsg, wParam, lParam);
             }
+            else
+            {
+				return DefWindowProc(hwnd, uMsg, wParam, lParam);
+            }
         };
-		break; // added per PVS suggestion.
+        break; // added per PVS suggestion.
 
         case WM_PAINT:
         {
@@ -514,6 +518,10 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
                     {
                         SendMessage(m_hwndChild, uMsg, wParam, lParam);
                     }
+                    else
+                    {
+                        DefWindowProc(hwnd, uMsg, wParam, lParam);
+                    }
                 }
             }
         }