--- np2/win9x/subwind.h	2004/04/07 13:15:40	1.3
+++ np2/win9x/subwind.h	2007/11/11 07:11:27	1.7
@@ -1,39 +1,57 @@
 
-#if !defined(SUPPORT_KEYDISP)
-#define kdispwin_initialize(i)	(TRUE)
-#define	kdispwin_create()
-#define	kdispwin_destroy()
-#define	kdispwin_gethwnd()		(NULL)
-#define	kdispwin_draw(c)
-#define	kdispwin_readini()
-#define	kdispwin_writeini()
-#else
-BOOL kdispwin_initialize(HINSTANCE hPreInst);
-void kdispwin_create(void);
+#if defined(SUPPORT_KEYDISP)
+BOOL kdispwin_initialize(HINSTANCE hInstance);
+void kdispwin_create(HINSTANCE hInstance);
 void kdispwin_destroy(void);
 HWND kdispwin_gethwnd(void);
 void kdispwin_draw(BYTE cnt);
 void kdispwin_readini(void);
 void kdispwin_writeini(void);
+#else
+#define kdispwin_initialize(i)	(SUCCESS)
+#define	kdispwin_create(i)
+#define	kdispwin_destroy()
+#define	kdispwin_gethwnd()		(NULL)
+#define	kdispwin_draw(c)
+#define	kdispwin_readini()
+#define	kdispwin_writeini()
 #endif
 
-#if !defined(SUPPORT_SOFTKBD)
-#define	skbdwin_initialize(i)	(TRUE)
-#define	skbdwin_deinitialize()
-#define	skbdwin_create()
-#define	skbdwin_destroy()
-#define	skbdwin_gethwnd()		(NULL)
-#define	skbdwin_process()
-#define	skbdwin_readini()
-#define	skbdwin_writeini()
+#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
+BOOL mdbgwin_initialize(HINSTANCE hInstance);
+void mdbgwin_create(HINSTANCE hInstance);
+void mdbgwin_destroy(void);
+void mdbgwin_process(void);
+HWND mdbgwin_gethwnd(void);
+void mdbgwin_readini(void);
+void mdbgwin_writeini(void);
 #else
-BOOL skbdwin_initialize(HINSTANCE hPreInst);
+#define mdbgwin_initialize(i)	(SUCCESS)
+#define	mdbgwin_create(i)
+#define	mdbgwin_destroy()
+#define	mdbgwin_process()
+#define	mdbgwin_gethwnd()		(NULL)
+#define mdbgwin_readini()
+#define mdbgwin_writeini()
+#endif
+
+#if defined(SUPPORT_SOFTKBD)
+BOOL skbdwin_initialize(HINSTANCE hInstance);
 void skbdwin_deinitialize(void);
-void skbdwin_create(void);
+void skbdwin_create(HINSTANCE hInstance);
 void skbdwin_destroy(void);
 HWND skbdwin_gethwnd(void);
 void skbdwin_process(void);
 void skbdwin_readini(void);
 void skbdwin_writeini(void);
+#else
+#define	skbdwin_initialize(i)	(SUCCESS)
+#define	skbdwin_deinitialize()
+#define	skbdwin_create(i)
+#define	skbdwin_destroy()
+#define	skbdwin_gethwnd()		(NULL)
+#define	skbdwin_process()
+#define	skbdwin_readini()
+#define	skbdwin_writeini()
 #endif