fiddlerwoaroof/crawl - Change 5DTGRF4G4T2CAUCZHTPNM6FF2XJHUYMWF74MATNVJC5QYSOPNOPQC

Fixed Win32 tiles crash due to lack of args.

Added Win32 tiles command line parsing and connected console output for stdout/stderr.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3255 c06c8d41-db1a-0410-9941-cceddc491573

Created by ennewalker on January 12, 2008

5DTGRF4G4T2CAUCZHTPNM6FF2XJHUYMWF74MATNVJC5QYSOPNOPQC

Dependencies

[2] 25CH7HH4LKXFIZ75YNMXS3TSXO6O27DYSOPLOD45K4OCNFWLS4LQC

In channels

main

Change contents

Replacement in crawl-ref/source/libwt.cc at line 1 [2.5775228]
B:BD[2.5775228] → [2.5775229:5775259]
[2.5775228]
[2.5775259]
```
#define _WIN32_WINNT 0x0501
```
Insertion in crawl-ref/source/libwt.cc at line 18 [2.5775228]
[2.5775532]
[2.5775532]
```
#include <fcntl.h>
```
Insertion in crawl-ref/source/libwt.cc at line 22 [2.5775228]
[2.5775570]
[2.5775570]
```
#include "debug.h"
```
Deletion in crawl-ref/source/libwt.cc at line 30 [2.5775228]
B:BD[2.5775690] → [2.5775690:5775700]
```
// acr.cc
```
Replacement in crawl-ref/source/libwt.cc at line 77 [2.5775228]
B:BD[2.5776729] → [2.5776729:5776771]
```
	    int *x1, int *y1, int *x2, int *y2);
```
[2.5776729]
[2.5776771]
```
        int *x1, int *y1, int *x2, int *y2);
```
Deletion in crawl-ref/source/libwt.cc at line 83 [2.5775228]
B:BD[2.5776865] → [2.5776865:5776881]
```
#ifdef USE_TILE
```
Deletion in crawl-ref/source/libwt.cc at line 87 [2.5775228]
B:BD[2.5776914] → [2.5776914:5776943]
Replacement in crawl-ref/source/libwt.cc at line 93 [2.5775228]
B:BD[2.5777189] → [2.5777189:5777265]
[2.5777189]
[2.5777265]
```
    WORD chcol;
```

Replacement in crawl-ref/source/libwt.cc at line 95 [2.5775228]

B:BD[2.5777326] → [2.5777326:5777552]

[2.5777326]

[2.5777552]

    lpPalettes[1] = (LPBYTE)GlobalAlloc(GPTR, 256 * sizeof(RGBQUAD) );
    lpPalettes[2] = (LPBYTE)GlobalAlloc(GPTR, 256 * sizeof(RGBQUAD) );

Deletion in crawl-ref/source/libwt.cc at line 99 [2.5775228]
B:BD[2.5777588] → [2.5777588:5777619]
Replacement in crawl-ref/source/libwt.cc at line 102 [2.5775228]
B:BD[2.5777799] → [2.5777799:5777850]
```
	LPBYTE ptr = lpPalettes[1] + i * sizeof(RGBQUAD);
```
[2.5777799]
[2.5777850]
```
    LPBYTE ptr = lpPalettes[1] + i * sizeof(RGBQUAD);
```
Replacement in crawl-ref/source/libwt.cc at line 107 [2.5775228]
B:BD[2.5777963] → [2.5777963:5778036]
[2.5777963]
[2.5778036]
```
    ptr = lpPalettes[2] + i * sizeof(RGBQUAD);
```
Deletion in crawl-ref/source/libwt.cc at line 111 [2.5775228]
B:BD[2.5778092] → [2.5778092:5778099]
```
#endif
```
Replacement in crawl-ref/source/libwt.cc at line 129 [2.5775228]
B:BD[2.5778450] → [2.5778450:5778606]
[2.5778450]
[2.5778606]
```
    GlobalFree(lpPalettes[1]);
    GlobalFree(lpPalettes[2]);
```
Replacement in crawl-ref/source/libwt.cc at line 135 [2.5775228]
B:BD[2.5778696] → [2.5778696:5778737]
```
	    int *x1, int *y1, int *x2, int *y2)
```
[2.5778696]
[2.5778737]
```
        int *x1, int *y1, int *x2, int *y2)
```
Deletion in crawl-ref/source/libwt.cc at line 166 [2.5775228]
B:BD[2.5779258] → [2.5779258:5779271]
```
//FAR PASCAL
```
Replacement in crawl-ref/source/libwt.cc at line 167 [2.5775228]
B:BD[2.5779336] → [2.5779336:5779399]
```
                     LPSTR     lpCmdLine, int       nCmdShow )
```
[2.5779336]
[2.5779399]
```
    LPSTR lpCmdLine, int nCmdShow )
```

Replacement in crawl-ref/source/libwt.cc at line 175 [2.5775228]

B:BD[2.5779486] → [2.5779486:5779613]

    // after handing the controll to the main code,
    // libgui_init , libgui_init_sys will be called
    old_main(0, NULL);

[2.5779486]

[2.5779613]

    // Redirect output to the console
    AttachConsole(ATTACH_PARENT_PROCESS);
    freopen("CONOUT$", "wb", stdout);
    freopen("CONOUT$", "wb", stderr);
    // I'll be damned if I have to parse lpCmdLine myself...
    int argc;
    LPWSTR *wargv = CommandLineToArgvW(GetCommandLineW(), &argc);
    char **argv = new char*[argc];
    int args_len = wcslen(GetCommandLineW()) + argc;
    char *args = new char[args_len];
    char *ptr = args;
    for (int i = 0; i < argc; i++)
    {
        wsprintfA(ptr, "%S", wargv[i]);
        argv[i] = ptr;
        ptr += strlen(argv[i]) + 1;
    }
    ASSERT(ptr <= args + args_len);
    old_main(argc, argv);
    delete args;
    delete argv;
    FreeConsole();

Replacement in crawl-ref/source/libwt.cc at line 241 [2.5775228]

B:BD[2.5780587] → [2.5780587:5780677]

	CK_END,  CK_DOWN,   CK_PGDN,
	CK_LEFT, CK_INSERT, CK_RIGHT,
	CK_HOME, CK_UP,     CK_PGUP

[2.5780587]

[2.5780677]

        CK_END,  CK_DOWN,   CK_PGDN,
        CK_LEFT, CK_INSERT, CK_RIGHT,
        CK_HOME, CK_UP,     CK_PGUP

Replacement in crawl-ref/source/libwt.cc at line 252 [2.5775228]

B:BD[2.5780773] → [2.5780773:5780909]

[2.5780773]

[2.5780909]

            // Example taken from
            // http://black.sakura.ne.jp/~third/system/winapi/common10.html

Replacement in crawl-ref/source/libwt.cc at line 262 [2.5775228]
B:BD[2.5781261] → [2.5781261:5781304]
```
        GetClientRect(hWnd , &tiTip.rect);
```
[2.5781261]
[2.5781304]
```
            GetClientRect(hWnd , &tiTip.rect);
```

Replacement in crawl-ref/source/libwt.cc at line 264 [2.5775228]

B:BD[2.5781305] → [2.5781305:5781384]

        tiTip.cbSize = sizeof (TOOLINFO);
        tiTip.uFlags = TTF_SUBCLASS;

[2.5781305]

[2.5781384]

            tiTip.cbSize = sizeof (TOOLINFO);
            tiTip.uFlags = TTF_SUBCLASS;

Replacement in crawl-ref/source/libwt.cc at line 268 [2.5775228]

B:BD[2.5781453] → [2.5781453:5781513]

		"This text will tell you" EOL
		" what you are pointing";

[2.5781453]

[2.5781513]

                "This text will tell you" EOL
                " what you are pointing";

Replacement in crawl-ref/source/libwt.cc at line 271 [2.5775228]

B:BD[2.5781579] → [2.5781579:5781669]

	    // Allow line wrap
	    SendMessage(hTool, TTM_SETMAXTIPWIDTH, 0, DF_TOOLTIP_WIDTH);

[2.5781579]

[2.5781669]

            // Allow line wrap
            SendMessage(hTool, TTM_SETMAXTIPWIDTH, 0, DF_TOOLTIP_WIDTH);

Replacement in crawl-ref/source/libwt.cc at line 280 [2.5775228]
B:BD[2.5781799] → [2.5781799:5781825]
```
	    ev.type = EV_BUTTON;
```
[2.5781799]
[2.5781825]
```
            ev.type = EV_BUTTON;
```
Replacement in crawl-ref/source/libwt.cc at line 288 [2.5775228]
B:BD[2.5782171] → [2.5782171:5782190]
```
	    ev_push(&ev);
```
[2.5782171]
[2.5782190]
```
            ev_push(&ev);
```

Replacement in crawl-ref/source/libwt.cc at line 293 [2.5775228]

B:BD[2.5782250] → [2.5782250:5782312]

        //case WM_LBUTTONDOWN:
	{
	    ev.type = EV_UNBUTTON;

[2.5782250]

[2.5782312]

        {
            ev.type = EV_UNBUTTON;

Replacement in crawl-ref/source/libwt.cc at line 300 [2.5775228]
B:BD[2.5782514] → [2.5782514:5782533]
```
	    ev_push(&ev);
```
[2.5782514]
[2.5782533]
```
            ev_push(&ev);
```
Replacement in crawl-ref/source/libwt.cc at line 302 [2.5775228]
B:BD[2.5782555] → [2.5782555:5782558]
```
	}
```
[2.5782555]
[2.5782558]
```
        }
```
Replacement in crawl-ref/source/libwt.cc at line 309 [2.5775228]
B:BD[2.5782726] → [2.5782726:5782752]
```
	    ev.type = EV_BUTTON;
```
[2.5782726]
[2.5782752]
```
        ev.type = EV_BUTTON;
```
Replacement in crawl-ref/source/libwt.cc at line 313 [2.5775228]
B:BD[2.5782925] → [2.5782925:5782944]
```
	    ev_push(&ev);
```
[2.5782925]
[2.5782944]
```
        ev_push(&ev);
```
Replacement in crawl-ref/source/libwt.cc at line 319 [2.5775228]
B:BD[2.5783014] → [2.5783014:5783038]
```
	    ev.type = EV_MOVE;
```
[2.5783014]
[2.5783038]
```
        ev.type = EV_MOVE;
```
Replacement in crawl-ref/source/libwt.cc at line 322 [2.5775228]
B:BD[2.5783110] → [2.5783110:5783129]
```
	    ev_push(&ev);
```
[2.5783110]
[2.5783129]
```
        ev_push(&ev);
```
Replacement in crawl-ref/source/libwt.cc at line 330 [2.5775228]
B:BD[2.5783257] → [2.5783257:5783275]
```
	    int dir = 0;
```
[2.5783257]
[2.5783275]
```
        int dir = 0;
```

Replacement in crawl-ref/source/libwt.cc at line 335 [2.5775228]

B:BD[2.5783492] → [2.5783492:5783607]

	    if (ch >= VK_NUMPAD1 && ch <= VK_NUMPAD9)
	    {
		skip_key = true;
		dir = ch - VK_NUMPAD0;
	    }
	    else

[2.5783492]

[2.5783607]

        if (ch >= VK_NUMPAD1 && ch <= VK_NUMPAD9)
        {
        skip_key = true;
        dir = ch - VK_NUMPAD0;
        }
        else

Replacement in crawl-ref/source/libwt.cc at line 355 [2.5775228]
B:BD[2.5784214] → [2.5784214:5784221]
```
	    }
```
[2.5784214]
[2.5784221]
```
        }
```
Replacement in crawl-ref/source/libwt.cc at line 359 [2.5775228]
B:BD[2.5784262] → [2.5784262:5784286]
```
		ch = ck_table[dir-1];
```
[2.5784262]
[2.5784286]
```
        ch = ck_table[dir-1];
```
Replacement in crawl-ref/source/libwt.cc at line 361 [2.5775228]
B:BD[2.5784310] → [2.5784310:5784342]
```
		    ch += CK_CTRL_UP - CK_UP;
```
[2.5784310]
[2.5784342]
```
            ch += CK_CTRL_UP - CK_UP;
```
Replacement in crawl-ref/source/libwt.cc at line 363 [2.5775228]
B:BD[2.5784366] → [2.5784366:5784399]
```
		    ch += CK_SHIFT_UP - CK_UP;
```
[2.5784366]
[2.5784399]
```
            ch += CK_SHIFT_UP - CK_UP;
```

Replacement in crawl-ref/source/libwt.cc at line 367 [2.5775228]

B:BD[2.5784465] → [2.5784465:5784517]

	        ev.type = EV_KEYIN;
	        ev_push(&ev);

[2.5784465]

[2.5784517]

            ev.type = EV_KEYIN;
            ev_push(&ev);

Replacement in crawl-ref/source/libwt.cc at line 370 [2.5775228]

B:BD[2.5784543] → [2.5784543:5784855]

            } // dir!=0
	    else
	    if ( ch >= VK_PAUSE
		&& !(ch >= VK_CAPITAL && ch <= VK_SPACE)
		&& ch !=VK_PROCESSKEY
		&& ch != VK_NUMLOCK
		&& !(ch >=VK_LSHIFT && ch<= VK_RMENU)
		&& !(ch >= 0x30 && ch<= 0x39)
		&& !(ch >= 0x41 && ch<= 0x5a)
		&& !(ch >= 0xa6 && ch<= 0xe4)
	       ) result = 300+ch;

[2.5784543]

[2.5784855]

            }
        else if ( ch >= VK_PAUSE
        && !(ch >= VK_CAPITAL && ch <= VK_SPACE)
        && ch !=VK_PROCESSKEY
        && ch != VK_NUMLOCK
        && !(ch >=VK_LSHIFT && ch<= VK_RMENU)
        && !(ch >= 0x30 && ch<= 0x39)
        && !(ch >= 0x41 && ch<= 0x5a)
        && !(ch >= 0xa6 && ch<= 0xe4)
           )
            {
                result = 300+ch;
            }

Replacement in crawl-ref/source/libwt.cc at line 384 [2.5775228]

B:BD[2.5784856] → [2.5784856:5785069]

        if (result)
        {
            if (fs) result |= 512;
            if (fc) result |= 1024;
            if (fa) result |= 2048;
	    ev.key = result;
	    ev.type = EV_KEYIN;
	    ev_push(&ev);
        }

[2.5784856]

[2.5785069]

            if (result)
            {
                if (fs) result |= 512;
                if (fc) result |= 1024;
                if (fa) result |= 2048;
                ev.key = result;
                ev.type = EV_KEYIN;
                ev_push(&ev);
            }

Replacement in crawl-ref/source/libwt.cc at line 394 [2.5775228]
B:BD[2.5785070] → [2.5785070:5785088]
```
        return 0;
```
[2.5785070]
[2.5785088]
```
            return 0;
```
Insertion in crawl-ref/source/libwt.cc at line 398 [2.5775228]
[2.5785121]
[2.5785121]
```
        {
        if (skip_key)
```

Replacement in crawl-ref/source/libwt.cc at line 401 [2.5775228]

B:BD[2.5785131] → [2.5785131:5785196]

	    if (skip_key)
	    {
		skip_key = false;
		return 0;
	    }

[2.5785131]

[2.5785196]

        skip_key = false;
        return 0;
        }

Replacement in crawl-ref/source/libwt.cc at line 405 [2.5775228]
B:BD[2.5785230] → [2.5785230:5785274]
```
	    ev.type = EV_KEYIN;
	    ev_push(&ev);
```
[2.5785230]
[2.5785274]
```
        ev.type = EV_KEYIN;
        ev_push(&ev);
```

Deletion in crawl-ref/source/libwt.cc at line 413 [2.5775228]

B:BD[2.5785381] → [2.5785381:5785626]

            /*
            int x1 = ps.rcPaint.left;
            int x2 = ps.rcPaint.right;
            int y1 = ps.rcPaint.top;
            int y2 = ps.rcPaint.bottom;
            int dx = xwin.dx;
            int dy = xwin.dy;
            */

Deletion in crawl-ref/source/libwt.cc at line 415 [2.5775228]
B:BD[2.5785691] → [2.5785691:5785731]
```
            //ValidateRect(hWnd, NULL);
```

Replacement in crawl-ref/source/libwt.cc at line 418 [2.5775228]

B:BD[2.5785764] → [2.5785764:5785856]

	case WM_MOVE:
	{
	    clix = LOWORD(lParam);
	    cliy = HIWORD(lParam);
	    return 0;
	}

[2.5785764]

[2.5785856]

    case WM_MOVE:
    {
        clix = LOWORD(lParam);
        cliy = HIWORD(lParam);
        return 0;
    }

Replacement in crawl-ref/source/libwt.cc at line 444 [2.5775228]
B:BD[2.5786410] → [2.5786410:5786431]
```
		libgui_shutdown();
```
[2.5786410]
[2.5786431]
```
        libgui_shutdown();
```
Replacement in crawl-ref/source/libwt.cc at line 469 [2.5775228]
B:BD[2.5786973] → [2.5786973:5786997]
```
	palette = new_palette;
```
[2.5786973]
[2.5786997]
```
    palette = new_palette;
```

Replacement in crawl-ref/source/libwt.cc at line 485 [2.5775228]

B:BD[2.5787387] → [2.5787387:5787456]

	       | CF_INITTOLOGFONTSTRUCT | CF_LIMITSIZE | CF_FORCEFONTEXIST;

[2.5787387]

[2.5787456]

        | CF_INITTOLOGFONTSTRUCT | CF_LIMITSIZE | CF_FORCEFONTEXIST;

Replacement in crawl-ref/source/libwt.cc at line 508 [2.5775228]
B:BD[2.5788150] → [2.5788150:5788164]
```
	return true;
```
[2.5788150]
[2.5788164]
```
    return true;
```

Replacement in crawl-ref/source/libwt.cc at line 537 [2.5775228]

B:BD[2.5788630] → [2.5788630:5788782]

        || PeekMessage(&msg, NULL, WM_KEYDOWN, WM_KEYDOWN, PM_NOREMOVE)
     /* || PeekMessage(&msg, NULL, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE)*/ )

[2.5788630]

[2.5788782]

        || PeekMessage(&msg, NULL, WM_KEYDOWN, WM_KEYDOWN, PM_NOREMOVE))

Fixed Win32 tiles crash due to lack of args.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/libwt.cc at line 1 [2.5775228]

Insertion in crawl-ref/source/libwt.cc at line 18 [2.5775228]

Insertion in crawl-ref/source/libwt.cc at line 22 [2.5775228]

Deletion in crawl-ref/source/libwt.cc at line 30 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 77 [2.5775228]

Deletion in crawl-ref/source/libwt.cc at line 83 [2.5775228]

Deletion in crawl-ref/source/libwt.cc at line 87 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 93 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 95 [2.5775228]

Deletion in crawl-ref/source/libwt.cc at line 99 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 102 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 107 [2.5775228]

Deletion in crawl-ref/source/libwt.cc at line 111 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 129 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 135 [2.5775228]

Deletion in crawl-ref/source/libwt.cc at line 166 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 167 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 175 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 241 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 252 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 262 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 264 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 268 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 271 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 280 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 288 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 293 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 300 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 302 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 309 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 313 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 319 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 322 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 330 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 335 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 355 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 359 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 361 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 363 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 367 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 370 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 384 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 394 [2.5775228]

Insertion in crawl-ref/source/libwt.cc at line 398 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 401 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 405 [2.5775228]

Deletion in crawl-ref/source/libwt.cc at line 413 [2.5775228]

Deletion in crawl-ref/source/libwt.cc at line 415 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 418 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 444 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 469 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 485 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 508 [2.5775228]

Replacement in crawl-ref/source/libwt.cc at line 537 [2.5775228]