From 8f30711aa2b98ee460541362dc23dee97e3853a1 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sat, 22 Feb 2020 10:42:29 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20FAR=E3=83=9D=E3=82=A4?=
 =?utf8?q?=E3=83=B3=E3=82=BF=E3=82=92*=E6=8A=B9=E6=AE=BA*=20/=20*Genocide*?=
 =?utf8?q?=20FAR=20pointers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main-win.c | 19 ++++++++-----------
 src/readdib.c  | 14 +++++++-------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/main-win.c b/src/main-win.c
index e4becee41..58e8a5cf6 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -3971,7 +3971,7 @@ static bool process_keydown(WPARAM wParam, LPARAM lParam)
 /*!
  * todo WNDCLASSに影響があるのでplayer_type*の追加は保留
  */
-LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	PAINTSTRUCT ps;
 	HDC hdc;
@@ -3992,10 +3992,10 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
 	}
 	case WM_GETMINMAXINFO:
 	{
-		MINMAXINFO FAR *lpmmi;
+		MINMAXINFO *lpmmi;
 		RECT rc;
 
-		lpmmi = (MINMAXINFO FAR *)lParam;
+		lpmmi = (MINMAXINFO*)lParam;
 		if (!td) return 1;
 
 		rc.left = rc.top = 0;
@@ -4322,8 +4322,7 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
 /*!
  * todo WNDCLASSに影響があるのでplayer_type*の追加は保留
  */
-LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg,
-	WPARAM wParam, LPARAM lParam)
+LRESULT PASCAL AngbandListProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	term_data *td;
 	PAINTSTRUCT ps;
@@ -4343,10 +4342,10 @@ LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg,
 	}
 	case WM_GETMINMAXINFO:
 	{
-		MINMAXINFO FAR *lpmmi;
+		MINMAXINFO *lpmmi;
 		RECT rc;
 
-		lpmmi = (MINMAXINFO FAR *)lParam;
+		lpmmi = (MINMAXINFO*)lParam;
 		if (!td) return 1;
 
 		rc.left = rc.top = 0;
@@ -4447,8 +4446,7 @@ LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg,
 
 #define MOUSE_SENS 40
 
-LRESULT FAR PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg,
-	WPARAM wParam, LPARAM lParam)
+LRESULT PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	static int iMouse = 0;
 	static WORD xMouse = 0;
@@ -4694,8 +4692,7 @@ static bool is_already_running(void)
 /*!
  * @brief (Windows固有)Windowsアプリケーションとしてのエントリポイント
  */
-int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
-	LPSTR lpCmdLine, int nCmdShow)
+int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow)
 {
 	WNDCLASS wc;
 	HDC hdc;
diff --git a/src/readdib.c b/src/readdib.c
index 1039246cf..ae6bcf495 100644
--- a/src/readdib.c
+++ b/src/readdib.c
@@ -68,7 +68,7 @@ void global_free(DIBINIT *pInfo, INT_PTR *fh, BOOL unlock_needed);
  * 取得できたデータ量をバイトで返す。0ならば何らかのエラー。
  * Returns number of bytes requested, or zero if something went wrong.
  */
-static DWORD PASCAL lread(int fh, VOID FAR *pv, DWORD ul)
+static DWORD PASCAL lread(int fh, void *pv, DWORD ul)
 {
 	DWORD ulT = ul;
 	BYTE huge *hp = pv;
@@ -96,7 +96,7 @@ static DWORD PASCAL lread(int fh, VOID FAR *pv, DWORD ul)
 static HPALETTE PASCAL NEAR MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
 {
 	PLOGPALETTE npPal;
-	RGBQUAD FAR *lpRGB;
+	RGBQUAD *lpRGB;
 	HPALETTE hLogPal;
 	WORD i;
 
@@ -115,7 +115,7 @@ static HPALETTE PASCAL NEAR MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
 		npPal->palNumEntries = (WORD)lpInfo->biClrUsed;
 
 		/* get pointer to the color table */
-		lpRGB = (RGBQUAD FAR *)((LPSTR)lpInfo + lpInfo->biSize);
+		lpRGB = (RGBQUAD*)((LPSTR)lpInfo + lpInfo->biSize);
 
 		/* copy colors from the color table to the LogPalette structure */
 		for (i = 0; i < (WORD)lpInfo->biClrUsed; i++, lpRGB++)
@@ -322,13 +322,13 @@ BOOL ReadDIB(HWND hWnd, LPSTR lpFileName, DIBINIT *pInfo)
 	else
 	{
 		signed int i;
-		RGBQUAD FAR *pQuad;
-		RGBTRIPLE FAR *pTriple;
+		RGBQUAD *pQuad;
+		RGBTRIPLE *pTriple;
 
 		_lread(fh, (LPSTR)(lpbi) + lpbi->biSize, nNumColors * sizeof(RGBTRIPLE));
 
-		pQuad = (RGBQUAD FAR *)((LPSTR)lpbi + lpbi->biSize);
-		pTriple = (RGBTRIPLE FAR *) pQuad;
+		pQuad = (RGBQUAD*)((LPSTR)lpbi + lpbi->biSize);
+		pTriple = (RGBTRIPLE*) pQuad;
 		for (i = nNumColors - 1; i >= 0; i--)
 		{
 			pQuad[i].rgbRed = pTriple[i].rgbtRed;
-- 
2.11.0