| Revisão | 8f30711aa2b98ee460541362dc23dee97e3853a1 (tree) |
|---|---|
| Hora | 2020-02-22 10:42:29 |
| Autor | Hourier <hourier@user...> |
| Commiter | Hourier |
[Refactor] #37353 FARポインタを*抹殺* / *Genocide* FAR pointers
src/main-win.c (diff) src/readdib.c (diff)| @@ -3971,7 +3971,7 @@ static bool process_keydown(WPARAM wParam, LPARAM lParam) | ||
| 3971 | 3971 | /*! |
| 3972 | 3972 | * todo WNDCLASSに影響があるのでplayer_type*の追加は保留 |
| 3973 | 3973 | */ |
| 3974 | -LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) | |
| 3974 | +LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) | |
| 3975 | 3975 | { |
| 3976 | 3976 | PAINTSTRUCT ps; |
| 3977 | 3977 | HDC hdc; |
| @@ -3992,10 +3992,10 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP | ||
| 3992 | 3992 | } |
| 3993 | 3993 | case WM_GETMINMAXINFO: |
| 3994 | 3994 | { |
| 3995 | - MINMAXINFO FAR *lpmmi; | |
| 3995 | + MINMAXINFO *lpmmi; | |
| 3996 | 3996 | RECT rc; |
| 3997 | 3997 | |
| 3998 | - lpmmi = (MINMAXINFO FAR *)lParam; | |
| 3998 | + lpmmi = (MINMAXINFO*)lParam; | |
| 3999 | 3999 | if (!td) return 1; |
| 4000 | 4000 | |
| 4001 | 4001 | rc.left = rc.top = 0; |
| @@ -4322,8 +4322,7 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP | ||
| 4322 | 4322 | /*! |
| 4323 | 4323 | * todo WNDCLASSに影響があるのでplayer_type*の追加は保留 |
| 4324 | 4324 | */ |
| 4325 | -LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg, | |
| 4326 | - WPARAM wParam, LPARAM lParam) | |
| 4325 | +LRESULT PASCAL AngbandListProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) | |
| 4327 | 4326 | { |
| 4328 | 4327 | term_data *td; |
| 4329 | 4328 | PAINTSTRUCT ps; |
| @@ -4343,10 +4342,10 @@ LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg, | ||
| 4343 | 4342 | } |
| 4344 | 4343 | case WM_GETMINMAXINFO: |
| 4345 | 4344 | { |
| 4346 | - MINMAXINFO FAR *lpmmi; | |
| 4345 | + MINMAXINFO *lpmmi; | |
| 4347 | 4346 | RECT rc; |
| 4348 | 4347 | |
| 4349 | - lpmmi = (MINMAXINFO FAR *)lParam; | |
| 4348 | + lpmmi = (MINMAXINFO*)lParam; | |
| 4350 | 4349 | if (!td) return 1; |
| 4351 | 4350 | |
| 4352 | 4351 | rc.left = rc.top = 0; |
| @@ -4447,8 +4446,7 @@ LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg, | ||
| 4447 | 4446 | |
| 4448 | 4447 | #define MOUSE_SENS 40 |
| 4449 | 4448 | |
| 4450 | -LRESULT FAR PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg, | |
| 4451 | - WPARAM wParam, LPARAM lParam) | |
| 4449 | +LRESULT PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) | |
| 4452 | 4450 | { |
| 4453 | 4451 | static int iMouse = 0; |
| 4454 | 4452 | static WORD xMouse = 0; |
| @@ -4694,8 +4692,7 @@ static bool is_already_running(void) | ||
| 4694 | 4692 | /*! |
| 4695 | 4693 | * @brief (Windows固有)Windowsアプリケーションとしてのエントリポイント |
| 4696 | 4694 | */ |
| 4697 | -int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, | |
| 4698 | - LPSTR lpCmdLine, int nCmdShow) | |
| 4695 | +int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow) | |
| 4699 | 4696 | { |
| 4700 | 4697 | WNDCLASS wc; |
| 4701 | 4698 | HDC hdc; |
| @@ -68,7 +68,7 @@ void global_free(DIBINIT *pInfo, INT_PTR *fh, BOOL unlock_needed); | ||
| 68 | 68 | * 取得できたデータ量をバイトで返す。0ならば何らかのエラー。 |
| 69 | 69 | * Returns number of bytes requested, or zero if something went wrong. |
| 70 | 70 | */ |
| 71 | -static DWORD PASCAL lread(int fh, VOID FAR *pv, DWORD ul) | |
| 71 | +static DWORD PASCAL lread(int fh, void *pv, DWORD ul) | |
| 72 | 72 | { |
| 73 | 73 | DWORD ulT = ul; |
| 74 | 74 | BYTE huge *hp = pv; |
| @@ -96,7 +96,7 @@ static DWORD PASCAL lread(int fh, VOID FAR *pv, DWORD ul) | ||
| 96 | 96 | static HPALETTE PASCAL NEAR MakeDIBPalette(LPBITMAPINFOHEADER lpInfo) |
| 97 | 97 | { |
| 98 | 98 | PLOGPALETTE npPal; |
| 99 | - RGBQUAD FAR *lpRGB; | |
| 99 | + RGBQUAD *lpRGB; | |
| 100 | 100 | HPALETTE hLogPal; |
| 101 | 101 | WORD i; |
| 102 | 102 |
| @@ -115,7 +115,7 @@ static HPALETTE PASCAL NEAR MakeDIBPalette(LPBITMAPINFOHEADER lpInfo) | ||
| 115 | 115 | npPal->palNumEntries = (WORD)lpInfo->biClrUsed; |
| 116 | 116 | |
| 117 | 117 | /* get pointer to the color table */ |
| 118 | - lpRGB = (RGBQUAD FAR *)((LPSTR)lpInfo + lpInfo->biSize); | |
| 118 | + lpRGB = (RGBQUAD*)((LPSTR)lpInfo + lpInfo->biSize); | |
| 119 | 119 | |
| 120 | 120 | /* copy colors from the color table to the LogPalette structure */ |
| 121 | 121 | for (i = 0; i < (WORD)lpInfo->biClrUsed; i++, lpRGB++) |
| @@ -322,13 +322,13 @@ BOOL ReadDIB(HWND hWnd, LPSTR lpFileName, DIBINIT *pInfo) | ||
| 322 | 322 | else |
| 323 | 323 | { |
| 324 | 324 | signed int i; |
| 325 | - RGBQUAD FAR *pQuad; | |
| 326 | - RGBTRIPLE FAR *pTriple; | |
| 325 | + RGBQUAD *pQuad; | |
| 326 | + RGBTRIPLE *pTriple; | |
| 327 | 327 | |
| 328 | 328 | _lread(fh, (LPSTR)(lpbi) + lpbi->biSize, nNumColors * sizeof(RGBTRIPLE)); |
| 329 | 329 | |
| 330 | - pQuad = (RGBQUAD FAR *)((LPSTR)lpbi + lpbi->biSize); | |
| 331 | - pTriple = (RGBTRIPLE FAR *) pQuad; | |
| 330 | + pQuad = (RGBQUAD*)((LPSTR)lpbi + lpbi->biSize); | |
| 331 | + pTriple = (RGBTRIPLE*) pQuad; | |
| 332 | 332 | for (i = nNumColors - 1; i >= 0; i--) |
| 333 | 333 | { |
| 334 | 334 | pQuad[i].rgbRed = pTriple[i].rgbtRed; |
Fork