winemine: Convert to Unicode.

programs/winemine/Makefile.in

 MODULE    = winemine.exe
-APPMODE   = -mwindows
+APPMODE   = -mwindows -municode
+EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 IMPORTS   = user32 gdi32 advapi32
 DELAYIMPORTS = shell32
 

programs/winemine/dialog.c

@@ -63,16 +63,15 @@ INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP
     switch( uMsg ) {
     case WM_INITDIALOG:
         p_board = (BOARD*) lParam;
-        SetDlgItemText( hDlg, IDC_EDITNAME,
-                p_board->best_name[p_board->difficulty] );
+        SetDlgItemTextW( hDlg, IDC_EDITNAME, p_board->best_name[p_board->difficulty] );
         return TRUE;
 
     case WM_COMMAND:
         switch( LOWORD( wParam ) ) {
         case IDOK:
-            GetDlgItemText( hDlg, IDC_EDITNAME,
-                p_board->best_name[p_board->difficulty],
-                sizeof( p_board->best_name[p_board->difficulty] ) );
+            GetDlgItemTextW( hDlg, IDC_EDITNAME,
+                             p_board->best_name[p_board->difficulty],
+                             sizeof( p_board->best_name[p_board->difficulty] ) / sizeof(WCHAR) );
             EndDialog( hDlg, 0 );
             return TRUE;
 
@@ -96,7 +95,7 @@ INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 
         /* set best names */
         for( i = 0; i < 3; i++ )
-            SetDlgItemText( hDlg, (IDC_NAME1) + i, p_board->best_name[i] );
+            SetDlgItemTextW( hDlg, (IDC_NAME1) + i, p_board->best_name[i] );
 
     	/* set best times */
         for( i = 0; i < 3; i++ )

programs/winemine/main.h

@@ -86,7 +86,7 @@ typedef struct tagBOARD
     unsigned rows;
     unsigned cols;
     unsigned mines;
-    char best_name [3][MAX_PLAYER_NAME_SIZE+1];
+    WCHAR best_name [3][MAX_PLAYER_NAME_SIZE+1];
     DWORD best_time [3];
     DIFFICULTY difficulty;
 

programs/winemine/resource.h

@@ -52,3 +52,14 @@
 #define IDS_ABOUT      1103
 
 #define IDA_WINEMINE   1201
+
+#define IDM_WINEMINE   1
+
+#define IDI_WINEMINE   1
+#define IDI_FACES      2
+#define IDI_LEDS       3
+#define IDI_MINES      4
+
+#define DLG_TIMES      1
+#define DLG_CONGRATS   2
+#define DLG_CUSTOM     3

programs/winemine/winemine.rc

@@ -29,7 +29,7 @@ STRINGTABLE {
      IDS_ABOUT,   "Copyright 2000 Joshua Thielen"
 }
 
-MENU_WINEMINE MENU
+IDM_WINEMINE MENU
 {
     POPUP "&Game" {
         MENUITEM "&New\tF2",       IDM_NEW
@@ -102,13 +102,13 @@ IDA_WINEMINE ACCELERATORS
 LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL
 
 /* @makedep: winemine.ico */
-WINEMINE ICON winemine.ico
+IDI_WINEMINE ICON winemine.ico
 
 /* @makedep: faces.bmp */
-FACES BITMAP faces.bmp
+IDI_FACES BITMAP faces.bmp
 
 /* @makedep: leds.bmp */
-LEDS BITMAP leds.bmp
+IDI_LEDS BITMAP leds.bmp
 
 /* @makedep: mines.bmp */
-MINES BITMAP mines.bmp
+IDI_MINES BITMAP mines.bmp