--- mstools/samples/mcitest/mcitest.h	2018/08/09 18:22:16	1.1
+++ mstools/samples/mcitest/mcitest.h	2018/08/09 18:24:32	1.1.1.2
@@ -15,6 +15,10 @@
 |                                                                              |
 \*----------------------------------------------------------------------------*/
 
+#ifdef UNICODE
+	#define strcpy lstrcpy
+	#define strlen lstrlen
+#endif
 #include <mmsystem.h>
 
 #ifndef RC_INVOKED  /* These are defined to RC */
@@ -72,11 +76,11 @@ typedef UINT MMMESSAGE;
 
 /* mcitest.c */
 
-extern char aszAppName[];
+extern TCHAR aszAppName[];
 extern HWND hwndMainDlg;
 
 /* fileopen.c */
-extern int DlgOpen(HANDLE hModule, HWND hParent, LPSTR lpName, int count);
+extern int DlgOpen(HANDLE hModule, HWND hParent, LPTSTR lpName, int count, UINT flags);
 
 /***************************************************************************
 
@@ -87,10 +91,10 @@ extern int DlgOpen(HANDLE hModule, HWND
 #if DBG
 
     extern void dDbgSetDebugMenuLevel(int i);
-    extern void dDbgOut(LPSTR lpszFormat, ...);
-    extern int  dDbgGetLevel(LPSTR lpszModule);
-    extern void dDbgSaveLevel(LPSTR lpszModule, int level);
-    extern void dDbgAssert(LPSTR exp, LPSTR file, int line);
+    extern void dDbgOut(LPTSTR lpszFormat, ...);
+    extern int  dDbgGetLevel(LPTSTR lpszModule);
+    extern void dDbgSaveLevel(LPTSTR lpszModule, int level);
+    extern void dDbgAssert(LPTSTR exp, LPTSTR file, int line);
 
     extern int __iDebugLevel;
     DWORD __dwEval;
@@ -98,11 +102,11 @@ extern int DlgOpen(HANDLE hModule, HWND
     #define dGetDebugLevel(lpszModule) (__iDebugLevel = dDbgGetLevel(lpszModule))
     #define dSaveDebugLevel(lpszModule) (dDbgSaveLevel(lpszModule, __iDebugLevel))
 
-    #define dprintf                          dDbgOut
-    #define dprintf1 if (__iDebugLevel >= 1) dDbgOut
-    #define dprintf2 if (__iDebugLevel >= 2) dDbgOut
-    #define dprintf3 if (__iDebugLevel >= 3) dDbgOut
-    #define dprintf4 if (__iDebugLevel >= 4) dDbgOut
+    #define dprintf( _x_ )                          dDbgOut _x_
+    #define dprintf1( _x_ ) if (__iDebugLevel >= 1) dDbgOut _x_
+    #define dprintf2( _x_ ) if (__iDebugLevel >= 2) dDbgOut _x_
+    #define dprintf3( _x_ ) if (__iDebugLevel >= 3) dDbgOut _x_
+    #define dprintf4( _x_ ) if (__iDebugLevel >= 4) dDbgOut _x_
 
     #define WinAssert(exp) \
         ((exp) ? (void)0 : dDbgAssert(#exp, __FILE__, __LINE__))
@@ -116,19 +120,11 @@ extern int DlgOpen(HANDLE hModule, HWND
     #define dGetDebugLevel(lpszModule) 0
     #define dSaveDebugLevel(lpszModule) 0
 
-    #define dprintf  if (0) ((int (*)(char *, ...)) 0)
-    #define dprintf1 if (0) ((int (*)(char *, ...)) 0)
-    #define dprintf2 if (0) ((int (*)(char *, ...)) 0)
-    #define dprintf3 if (0) ((int (*)(char *, ...)) 0)
-    #define dprintf4 if (0) ((int (*)(char *, ...)) 0)
-    #define dprintf5 if (0) ((int (*)(char *, ...)) 0)
-
-//  #define dprintf  ; / ## /
-//  #define dprintf1 ; / ## /
-//  #define dprintf2 ; / ## /
-//  #define dprintf3 ; / ## /
-//  #define dprintf4 ; / ## /
-//  #define dprintf5 ; / ## /
+    #define dprintf( _x_ )
+    #define dprintf1( _x_ )
+    #define dprintf2( _x_ )
+    #define dprintf3( _x_ )
+    #define dprintf4( _x_ )
 
     #define WinAssert(exp) 0
     #define WinEval(exp) (exp)