nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Start trying to clean up the Windows x64 build (trunk only)

Browse Source
This commit is contained in:
nethack.allison
2012-01-11 01:15:37 +00:00
parent b97d53fb30
commit 783413bb57
11 changed files with 145 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/win32/mhstatus.c
+4 -5
View File
@@ -1,5 +1,4 @@
/* NetHack 3.5 mhstatus.c $Date$ $Revision$ */
/* SCCS Id: @(#)mhstatus.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */
@@ -64,7 +63,7 @@ HWND mswin_init_status_window () {
if( !data ) panic("out of memory");
ZeroMemory(data, sizeof(NHStatusWindow));
SetWindowLong(ret, GWL_USERDATA, (LONG)data);
SetWindowLongPtr(ret, GWLP_USERDATA, (LONG)data);
return ret;
}
@@ -96,7 +95,7 @@ LRESULT CALLBACK StatusWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP
HDC hdc;
PNHStatusWindow data;
data = (PNHStatusWindow)GetWindowLong(hWnd, GWL_USERDATA);
data = (PNHStatusWindow)GetWindowLong(hWnd, GWLP_USERDATA);
switch (message)
{
case WM_MSNH_COMMAND: {
@@ -174,7 +173,7 @@ LRESULT CALLBACK StatusWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP
case WM_DESTROY:
free(data);
SetWindowLong(hWnd, GWL_USERDATA, (LONG)0);
SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG)0);
break;
case WM_SETFOCUS:
@@ -198,7 +197,7 @@ void mswin_status_window_size (HWND hWnd, LPSIZE sz)
sz->cx = rt.right - rt.left;
sz->cy = rt.bottom - rt.top;
data = (PNHStatusWindow)GetWindowLong(hWnd, GWL_USERDATA);
data = (PNHStatusWindow)GetWindowLong(hWnd, GWLP_USERDATA);
if(data) {
hdc = GetDC(hWnd);
saveFont = SelectObject(hdc, mswin_get_font(NHW_STATUS, ATR_NONE, hdc, FALSE));