Removing temporary debugging code and fixing compiler warnings.

diff --git a/sys/winnt/nttty.c b/sys/winnt/nttty.c
index 33bfbb6306e0d2f8332dfd0ac6c04720e2eb8b37..1b7d59886013e2862c72e0ff863e695f701c73da 100644 (file)
--- a/sys/winnt/nttty.c
+++ b/sys/winnt/nttty.c
@@ -1858,7 +1858,7 @@ void nethack_enter_nttty()
 
     /* load default keyboard handler */
     HKL keyboard_layout = GetKeyboardLayout(0);
-    DWORD primary_language = (DWORD) keyboard_layout & 0x3f;
+    DWORD primary_language = (UINT_PTR) keyboard_layout & 0x3f;
 
     if (primary_language == LANG_ENGLISH) {
         if (!load_keyboard_handler("nhdefkey"))

diff --git a/win/win32/mhdlg.c b/win/win32/mhdlg.c
index a91eecf2039587e08de60058372debd424529746..6bc7d4eb3373182027569b39a4580a1988fc9b0c 100644 (file)
--- a/win/win32/mhdlg.c
+++ b/win/win32/mhdlg.c
@@ -391,10 +391,6 @@ PlayerSelectorDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 break;
             case NM_KILLFOCUS:
                 {
-                    char buf[64];
-                    sprintf(buf, "KILLFOCUS %lx\n", (unsigned long) control);
-                    OutputDebugStringA(buf);
-
                     if (data->focus == data->control_race) {
                         data->focus = NULL;
                         ListView_RedrawItems(data->control_race, 0, data->race_count - 1);
@@ -406,9 +402,6 @@ PlayerSelectorDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 break;
             case NM_SETFOCUS:
                 {
-                    char buf[64];
-                    sprintf(buf, "SETFOCUS %lx\n", (unsigned long) control);
-                    OutputDebugStringA(buf);
                     data->focus = control;
 
                     if (control == data->control_race) {
@@ -716,15 +709,9 @@ plselDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
     if (lpdis->itemID < 0)
         return FALSE;
 
-    HWND control = GetDlgItem(hWnd, wParam);
+    HWND control = GetDlgItem(hWnd, (int) wParam);
     int i = lpdis->itemID;
 
-    {
-        char buf[64];
-        sprintf(buf, "DRAW %lx %d\n", (unsigned long)control, i);
-        OutputDebugStringA(buf);
-    }
-
     const char * string;
 
     boolean ok = TRUE;
@@ -774,12 +761,6 @@ plselDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
                     client_rt.left + ListView_GetColumnWidth(lpdis->hwndItem, 0),
                     lpdis->rcItem.bottom);
             DrawFocusRect(lpdis->hDC, &rect);
-
-            {
-                char buf[64];
-                sprintf(buf, "FOCUS %lx %d\n", (unsigned long)control, i);
-                OutputDebugStringA(buf);
-            }
         }
     }