--- Daodan/src/Patches/Win32.c	2014/04/07 10:33:27	994
+++ Daodan/src/Patches/Win32.c	2021/10/24 02:50:48	1163
@@ -2,6 +2,7 @@
 
 #include "../Daodan.h"
 #include "../Daodan_Config.h"
+#include "Input.h"
 #include "Win32.h"
 
 #include "../Oni/Oni.h"
@@ -104,10 +105,14 @@ static LRESULT CALLBACK DD_ONrPlatform_W
 				SetCursor(NULL);
 				return TRUE;
 			}
-			
+
 			break;
 	}
-	
+
+	LRESULT res;
+	if (DDrInput_WindowProc(hWnd, uMsg, wParam, lParam, &res))
+		return res;
+
 	return ONrPlatform_WindowProc(hWnd, uMsg, wParam, lParam);
 }
 
@@ -152,11 +157,11 @@ UUtError ONICALL DD_ONrPlatform_Initiali
 	}
 	else
 	{
-		ConfigOption_t* co = DDrConfig_GetOptOfType("options.border", C_BOOL);
+		ConfigOption_t* co = DDrConfig_GetOptOfType("windows.border", C_BOOL);
 		int opt_border = 0;
 		if (co && co->value.intBoolVal)
 			opt_border = 1;
-		co = DDrConfig_GetOptOfType("options.topmost", C_BOOL);
+		co = DDrConfig_GetOptOfType("windows.topmost", C_BOOL);
 		int opt_topmost = 0;
 		if (co && co->value.intBoolVal)
 			opt_topmost = 1;