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

Roll back the win/win32 tree to the way it was before x64 attempt

Browse Source
This commit is contained in:
nhmall
2015-02-26 22:09:31 -05:00
parent 18ca81d963
commit e1dfe9c48a
12 changed files with 141 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/win32/mhrip.c
+7 -7
View File
@@ -27,7 +27,7 @@ typedef struct mswin_nethack_text_window {
TCHAR* rip_text;
} NHRIPWindow, *PNHRIPWindow;
LRESULT CALLBACK NHRIPWndProc(HWND, UINT, WPARAM, LPARAM);
BOOL CALLBACK NHRIPWndProc(HWND, UINT, WPARAM, LPARAM);
static void onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam);
HWND mswin_init_RIP_window () {
@@ -46,7 +46,7 @@ HWND mswin_init_RIP_window () {
if( !data ) panic("out of memory");
ZeroMemory(data, sizeof(NHRIPWindow));
SetWindowLongPtr(ret, GWLP_USERDATA, (LONG)data);
SetWindowLong(ret, GWL_USERDATA, (LONG)data);
return ret;
}
@@ -62,7 +62,7 @@ void mswin_display_RIP_window (HWND hWnd)
HDC hdc;
HFONT OldFont;
data = (PNHRIPWindow)GetWindowLongPtr(hWnd, GWLP_USERDATA);
data = (PNHRIPWindow)GetWindowLong(hWnd, GWL_USERDATA);
GetNHApp()->hPopupWnd = hWnd;
mapWnd = mswin_hwnd_from_winid(WIN_MAP);
@@ -117,12 +117,12 @@ void mswin_display_RIP_window (HWND hWnd)
GetNHApp()->hPopupWnd = NULL;
}
LRESULT CALLBACK NHRIPWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
BOOL CALLBACK NHRIPWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
HDC hdc;
PNHRIPWindow data;
data = (PNHRIPWindow)GetWindowLongPtr(hWnd, GWLP_USERDATA);
data = (PNHRIPWindow)GetWindowLong(hWnd, GWL_USERDATA);
switch (message)
{
case WM_INITDIALOG:
@@ -217,7 +217,7 @@ LRESULT CALLBACK NHRIPWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
if( data->rip_text ) free(data->rip_text);
if (data->rip_bmp != NULL) DeleteObject(data->rip_bmp);
free(data);
SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG)0);
SetWindowLong(hWnd, GWL_USERDATA, (LONG)0);
}
break;
@@ -229,7 +229,7 @@ void onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
{
PNHRIPWindow data;
static int InRipText = 1;
data = (PNHRIPWindow)GetWindowLongPtr(hWnd, GWLP_USERDATA);
data = (PNHRIPWindow)GetWindowLong(hWnd, GWL_USERDATA);
switch( wParam ) {
case MSNH_MSG_PUTSTR: {
PMSNHMsgPutstr msg_data = (PMSNHMsgPutstr)lParam;