Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | [Bug 3388350] mingw64 compiler warnings |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-5-branch |
Files: | files | file ages | folders |
SHA1: |
3acc34aba2b836ac09d431135e0b0c64 |
User & Date: | jan.nijtmans 2011-08-13 21:51:23 |
Context
2011-08-16
| ||
08:15 | [Bug 3388350] mingw64 compiler warnings check-in: 96f28c8c user: jan.nijtmans tags: core-8-5-branch | |
2011-08-13
| ||
22:29 | [Bug 3388350] mingw64 compiler warnings check-in: c911734f user: jan.nijtmans tags: trunk | |
21:51 | [Bug 3388350] mingw64 compiler warnings check-in: 3acc34ab user: jan.nijtmans tags: core-8-5-branch | |
20:59 | [Bug 3388350] mingw64 compiler warnings check-in: 2cc61836 user: jan.nijtmans tags: core-8-4-branch | |
2011-08-03
| ||
07:09 | [Bug 3314770] regression - Windows file dialogs not resizable check-in: d4968057 user: jan.nijtmans tags: core-8-5-branch | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2011-08-03 Jan Nijtmans <[email protected]> * win/tkWinDialog.c: [Bug 3314770] regression - Windows file dialogs not resizable 2011-07-28 Jan Nijtmans <[email protected]> | > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | 2011-08-13 Jan Nijtmans <[email protected]> * generic/tkBitmap.c: [Bug 3388350] mingw64 compiler warnings * generic/tkConsole.c * unix/tkUnixMenubu.c * win/tkWinButton.c * win/tkWinEmbed.c * win/tkWinFont.c * win/tkWinImage.c * win/tkWinKey.c * win/tkWinTest.c * win/tkWinWm.c 2011-08-03 Jan Nijtmans <[email protected]> * win/tkWinDialog.c: [Bug 3314770] regression - Windows file dialogs not resizable 2011-07-28 Jan Nijtmans <[email protected]> |
︙ | ︙ |
Changes to generic/tkBitmap.c.
︙ | ︙ | |||
19 20 21 22 23 24 25 | * * Platform-specific issue: Windows complains when the bitmaps are included, * because an array of characters is being initialized with integers as * elements. For lint purposes, the following pragmas temporarily turn off * that warning message. */ | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | * * Platform-specific issue: Windows complains when the bitmaps are included, * because an array of characters is being initialized with integers as * elements. For lint purposes, the following pragmas temporarily turn off * that warning message. */ #if defined(_MSC_VER) #pragma warning (disable : 4305) #endif #include "error.xbm" #include "gray12.xbm" #include "gray25.xbm" #include "gray50.xbm" #include "gray75.xbm" #include "hourglass.xbm" #include "info.xbm" #include "questhead.xbm" #include "question.xbm" #include "warning.xbm" #if defined(_MSC_VER) #pragma warning (default : 4305) #endif /* * One of the following data structures exists for each bitmap that is * currently in use. Each structure is indexed with both "idTable" and * "nameTable". |
︙ | ︙ |
Changes to generic/tkConsole.c.
︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 | ConsoleHandle, /* Get a handle from the device. */ NULL, /* close2proc. */ NULL, /* Always non-blocking.*/ NULL, /* flush proc. */ NULL, /* handler proc. */ NULL, /* wide seek proc */ NULL, /* thread action proc */ }; #ifdef __WIN32__ #include <windows.h> /* *---------------------------------------------------------------------- | > | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | ConsoleHandle, /* Get a handle from the device. */ NULL, /* close2proc. */ NULL, /* Always non-blocking.*/ NULL, /* flush proc. */ NULL, /* handler proc. */ NULL, /* wide seek proc */ NULL, /* thread action proc */ NULL }; #ifdef __WIN32__ #include <windows.h> /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
107 108 109 110 111 112 113 | ShouldUseConsoleChannel( int type) { DWORD handleId; /* Standard handle to retrieve. */ DCB dcb; DWORD consoleParams; DWORD fileType; | < < < < < < < < | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | ShouldUseConsoleChannel( int type) { DWORD handleId; /* Standard handle to retrieve. */ DCB dcb; DWORD consoleParams; DWORD fileType; HANDLE handle; switch (type) { case TCL_STDIN: handleId = STD_INPUT_HANDLE; break; case TCL_STDOUT: handleId = STD_OUTPUT_HANDLE; break; case TCL_STDERR: handleId = STD_ERROR_HANDLE; break; default: return 0; break; } handle = GetStdHandle(handleId); |
︙ | ︙ |
Changes to unix/tkUnixMenubu.c.
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | * The structure below defines menubutton class behavior by means of functions * that can be invoked from generic window code. */ Tk_ClassProcs tkpMenubuttonClass = { sizeof(Tk_ClassProcs), /* size */ TkMenuButtonWorldChanged, /* worldChangedProc */ }; /* *---------------------------------------------------------------------- * * TkpCreateMenuButton -- * | > > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | * The structure below defines menubutton class behavior by means of functions * that can be invoked from generic window code. */ Tk_ClassProcs tkpMenubuttonClass = { sizeof(Tk_ClassProcs), /* size */ TkMenuButtonWorldChanged, /* worldChangedProc */ NULL, NULL }; /* *---------------------------------------------------------------------- * * TkpCreateMenuButton -- * |
︙ | ︙ |
Changes to win/tkWinButton.c.
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | * The class procedure table for the button widgets. */ Tk_ClassProcs tkpButtonProcs = { sizeof(Tk_ClassProcs), /* size */ TkButtonWorldChanged, /* worldChangedProc */ CreateProc, /* createProc */ }; /* *---------------------------------------------------------------------- * * InitBoxes -- | > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | * The class procedure table for the button widgets. */ Tk_ClassProcs tkpButtonProcs = { sizeof(Tk_ClassProcs), /* size */ TkButtonWorldChanged, /* worldChangedProc */ CreateProc, /* createProc */ NULL }; /* *---------------------------------------------------------------------- * * InitBoxes -- |
︙ | ︙ |
Changes to win/tkWinEmbed.c.
︙ | ︙ | |||
732 733 734 735 736 737 738 | * lParam - N/A * * Return value * 1 + the current state or 0 if the container is not a toplevel */ if (topwinPtr) { | | | 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 | * lParam - N/A * * Return value * 1 + the current state or 0 if the container is not a toplevel */ if (topwinPtr) { if (wParam <= 3) { TkpWmSetState(topwinPtr, wParam); } result = 1+TkpWmGetState(topwinPtr); } else { result = 0; } break; |
︙ | ︙ |
Changes to win/tkWinFont.c.
︙ | ︙ | |||
2322 2323 2324 2325 2326 2327 2328 | if (TkWinGetPlatformId() == VER_PLATFORM_WIN32_NT) { Tcl_UniChar *src, *dst; /* * We can only store up to LF_FACESIZE wide characters */ | | | 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 | if (TkWinGetPlatformId() == VER_PLATFORM_WIN32_NT) { Tcl_UniChar *src, *dst; /* * We can only store up to LF_FACESIZE wide characters */ if ((size_t)Tcl_DStringLength(&ds) >= (LF_FACESIZE * sizeof(WCHAR))) { Tcl_DStringSetLength(&ds, LF_FACESIZE); } src = (Tcl_UniChar *) Tcl_DStringValue(&ds); dst = (Tcl_UniChar *) lf.lfFaceName; while (*src != '\0') { *dst++ = *src++; } |
︙ | ︙ | |||
2609 2610 2611 2612 2613 2614 2615 | cmapKey = CMAPHEX; if (swapped) { SwapLong(&cmapKey); } n = GetFontData(hdc, cmapKey, 0, &cmapTable, sizeof(cmapTable)); | | | 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 | cmapKey = CMAPHEX; if (swapped) { SwapLong(&cmapKey); } n = GetFontData(hdc, cmapKey, 0, &cmapTable, sizeof(cmapTable)); if (n != (int)GDI_ERROR) { if (swapped) { SwapShort(&cmapTable.numTables); } for (i = 0; i < cmapTable.numTables; i++) { offset = sizeof(cmapTable) + i * sizeof(encTable); GetFontData(hdc, cmapKey, (DWORD) offset, &encTable, sizeof(encTable)); |
︙ | ︙ |
Changes to win/tkWinImage.c.
︙ | ︙ | |||
64 65 66 67 68 69 70 | static unsigned long ImageGetPixel( XImage *image, int x, int y) { unsigned long pixel = 0; | | | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | static unsigned long ImageGetPixel( XImage *image, int x, int y) { unsigned long pixel = 0; unsigned char *srcPtr = (unsigned char *) &(image->data[(y * image->bytes_per_line) + ((x * image->bits_per_pixel) / NBBY)]); switch (image->bits_per_pixel) { case 32: case 24: pixel = RGB(srcPtr[2], srcPtr[1], srcPtr[0]); break; |
︙ | ︙ | |||
112 113 114 115 116 117 118 | static int PutPixel( XImage *image, int x, int y, unsigned long pixel) { | | | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | static int PutPixel( XImage *image, int x, int y, unsigned long pixel) { unsigned char *destPtr = (unsigned char *) &(image->data[(y * image->bytes_per_line) + ((x * image->bits_per_pixel) / NBBY)]); switch (image->bits_per_pixel) { case 32: /* * Pixel is DWORD: 0x00BBGGRR */ |
︙ | ︙ | |||
364 365 366 367 368 369 370 | bmInfo->bmiHeader.biClrUsed = 0; bmInfo->bmiHeader.biClrImportant = 0; if (depth == 1) { unsigned char *p, *pend; GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_PAL_COLORS); | | | | | 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 | bmInfo->bmiHeader.biClrUsed = 0; bmInfo->bmiHeader.biClrImportant = 0; if (depth == 1) { unsigned char *p, *pend; GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_PAL_COLORS); data = (unsigned char *) ckalloc(bmInfo->bmiHeader.biSizeImage); if (!data) { /* printf("Failed to allocate data area for XImage.\n"); */ ret_image = NULL; goto cleanup; } ret_image = XCreateImage(display, NULL, depth, ZPixmap, 0, (char *)data, width, height, 32, (int) ((width + 31) >> 3) & ~1); if (ret_image == NULL) { ckfree((char *)data); goto cleanup; } /* * Get the BITMAP info into the Image. */ |
︙ | ︙ | |||
400 401 402 403 404 405 406 | } } else if (depth == 8) { unsigned short *palette; unsigned int i; unsigned char *p; GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_PAL_COLORS); | | | | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 | } } else if (depth == 8) { unsigned short *palette; unsigned int i; unsigned char *p; GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_PAL_COLORS); data = (unsigned char *) ckalloc(bmInfo->bmiHeader.biSizeImage); if (!data) { /* printf("Failed to allocate data area for XImage.\n"); */ ret_image = NULL; goto cleanup; } ret_image = XCreateImage(display, NULL, 8, ZPixmap, 0, (char *)data, width, height, 8, (int) width); if (ret_image == NULL) { ckfree((char *) data); goto cleanup; } /* |
︙ | ︙ | |||
431 432 433 434 435 436 437 | p = data; palette = (unsigned short *) bmInfo->bmiColors; for (i = 0; i < bmInfo->bmiHeader.biSizeImage; i++, p++) { *p = (unsigned char) palette[*p]; } } else if (depth == 16) { GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_RGB_COLORS); | | | | | | | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 | p = data; palette = (unsigned short *) bmInfo->bmiColors; for (i = 0; i < bmInfo->bmiHeader.biSizeImage; i++, p++) { *p = (unsigned char) palette[*p]; } } else if (depth == 16) { GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_RGB_COLORS); data = (unsigned char *) ckalloc(bmInfo->bmiHeader.biSizeImage); if (!data) { /* printf("Failed to allocate data area for XImage.\n"); */ ret_image = NULL; goto cleanup; } ret_image = XCreateImage(display, NULL, 16, ZPixmap, 0, (char *) data, width, height, 16, 0 /* will be calc'ed from bitmap_pad */); if (ret_image == NULL) { ckfree((char *) data); goto cleanup; } /* * Get the BITMAP info directly into the Image. */ if (GetDIBits(hdcMem, hbmp, 0, height, ret_image->data, bmInfo, DIB_RGB_COLORS) == 0) { ckfree((char *) ret_image->data); ckfree((char *) ret_image); ret_image = NULL; goto cleanup; } } else { GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_RGB_COLORS); data = (unsigned char *) ckalloc(width * height * 4); if (!data) { /* printf("Failed to allocate data area for XImage.\n"); */ ret_image = NULL; goto cleanup; } ret_image = XCreateImage(display, NULL, 32, ZPixmap, 0, (char *) data, width, height, 0, (int) width * 4); if (ret_image == NULL) { ckfree((char *) data); goto cleanup; } if (depth <= 24) { /* * This used to handle 16 and 24 bpp, but now just handles 24. It * can likely be optimized for that. -- hobbs */ unsigned char *smallBitData, *smallBitBase, *bigBitData; unsigned int byte_width, h, w; byte_width = ((width * 3 + 3) & ~(unsigned)3); smallBitBase = (unsigned char *) ckalloc(byte_width * height); if (!smallBitBase) { ckfree((char *) ret_image->data); ckfree((char *) ret_image); ret_image = NULL; goto cleanup; } smallBitData = smallBitBase; |
︙ | ︙ | |||
507 508 509 510 511 512 513 | } /* * Copy the 24 Bit Pixmap to a 32-Bit one. */ for (h = 0; h < height; h++) { | | | 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 | } /* * Copy the 24 Bit Pixmap to a 32-Bit one. */ for (h = 0; h < height; h++) { bigBitData = (unsigned char *) (ret_image->data + h * ret_image->bytes_per_line); smallBitData = smallBitBase + h * byte_width; for (w = 0; w < width; w++) { *bigBitData++ = ((*smallBitData++)); *bigBitData++ = ((*smallBitData++)); *bigBitData++ = ((*smallBitData++)); *bigBitData++ = 0; |
︙ | ︙ |
Changes to win/tkWinKey.c.
︙ | ︙ | |||
324 325 326 327 328 329 330 | } /* * Keycode is a non-alphanumeric key, so we have to do the lookup. */ skipToAscii: | | | 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 | } /* * Keycode is a non-alphanumeric key, so we have to do the lookup. */ skipToAscii: if (keycode > MAX_KEYCODE) { return NoSymbol; } switch (keycode) { /* * Windows only gives us an undifferentiated VK_CONTROL code (for * example) when either Control key is pressed. To distinguish between * left and right, we have to query the state of one of the two to |
︙ | ︙ |
Changes to win/tkWinTest.c.
︙ | ︙ | |||
299 300 301 302 303 304 305 | if (child == NULL) { Tcl_AppendResult(interp, "could not find a control matching \"", argv[2], "\"", NULL); return TCL_ERROR; } } message = TkFindStateNum(NULL, NULL, messageMap, argv[3]); | < < < | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | if (child == NULL) { Tcl_AppendResult(interp, "could not find a control matching \"", argv[2], "\"", NULL); return TCL_ERROR; } } message = TkFindStateNum(NULL, NULL, messageMap, argv[3]); wParam = 0; lParam = 0; if (argc > 4) { wParam = strtol(argv[4], NULL, 0); } if (argc > 5) { |
︙ | ︙ |
Changes to win/tkWinWm.c.
︙ | ︙ | |||
1720 1721 1722 1723 1724 1725 1726 | goto readError; } /* * Read it in. */ | | | 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 | goto readError; } /* * Read it in. */ dwBytesRead = Tcl_Read(channel, (char *) lpIR->IconImages[i].lpBits, (int) lpIDE[i].dwBytesInRes); if (dwBytesRead != lpIDE[i].dwBytesInRes) { Tcl_AppendResult(interp, "Error reading file", NULL); goto readError; } /* |
︙ | ︙ |