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: |
30375f51d117cab09fb37c575465fead |
User & Date: | jan.nijtmans 2011-08-16 13:03:43 |
Context
2011-08-16
| ||
13:17 | [Bug 3388350] mingw64 compiler warnings check-in: 49d005d8 user: jan.nijtmans tags: core-8-5-branch | |
13:03 | [Bug 3388350] mingw64 compiler warnings check-in: 30375f51 user: jan.nijtmans tags: core-8-5-branch | |
12:22 | [Bug 3388350] mingw64 compiler warnings check-in: 3aea88a4 user: jan.nijtmans tags: core-8-4-branch | |
08:15 | [Bug 3388350] mingw64 compiler warnings check-in: 96f28c8c user: jan.nijtmans tags: core-8-5-branch | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 8 9 10 11 12 13 | 2011-08-16 Jan Nijtmans <[email protected]> * win/tkWinDialog.c: [Bug 3388350] mingw64 compiler warnings * win/tkWinDraw.c * win/tkWinSend.c * win/tkWinSendCom.c 2011-08-13 Jan Nijtmans <[email protected]> * generic/tkBitmap.c: [Bug 3388350] mingw64 compiler warnings * generic/tkConsole.c * unix/tkUnixMenubu.c * win/tkWinButton.c | > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | 2011-08-16 Jan Nijtmans <[email protected]> * win/tkWinDialog.c: [Bug 3388350] mingw64 compiler warnings * win/tkWinDraw.c * win/tkWinSend.c * win/tkWinSendCom.c * win/tkWinColor.c * win/tkWinDialog.c * win/tkWinEmbed.c * win/tkWinMenu.c * win/tkWinPixmap.c * win/tkWinTest.c * win/tkWinWindow.c * win/tkWinWm.c * win/tkWinX.c * win/stubs.c * generic/tkAtom.c * generic/tkSelect.c 2011-08-13 Jan Nijtmans <[email protected]> * generic/tkBitmap.c: [Bug 3388350] mingw64 compiler warnings * generic/tkConsole.c * unix/tkUnixMenubu.c * win/tkWinButton.c |
︙ | ︙ |
Changes to generic/tkAtom.c.
︙ | ︙ | |||
89 90 91 92 93 94 95 | hPtr = Tcl_CreateHashEntry(&dispPtr->nameTable, name, &isNew); if (isNew) { Tcl_HashEntry *hPtr2; Atom atom; atom = XInternAtom(dispPtr->display, name, False); | | | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | hPtr = Tcl_CreateHashEntry(&dispPtr->nameTable, name, &isNew); if (isNew) { Tcl_HashEntry *hPtr2; Atom atom; atom = XInternAtom(dispPtr->display, name, False); Tcl_SetHashValue(hPtr, INT2PTR(atom)); hPtr2 = Tcl_CreateHashEntry(&dispPtr->atomTable, INT2PTR(atom), &isNew); Tcl_SetHashValue(hPtr2, Tcl_GetHashKey(&dispPtr->nameTable, hPtr)); } return (Atom) PTR2INT(Tcl_GetHashValue(hPtr)); } /* *-------------------------------------------------------------- * * Tk_GetAtomName -- * |
︙ | ︙ | |||
131 132 133 134 135 136 137 | register Tcl_HashEntry *hPtr; dispPtr = ((TkWindow *) tkwin)->dispPtr; if (!dispPtr->atomInit) { AtomInit(dispPtr); } | | | | | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | register Tcl_HashEntry *hPtr; dispPtr = ((TkWindow *) tkwin)->dispPtr; if (!dispPtr->atomInit) { AtomInit(dispPtr); } hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, INT2PTR(atom)); if (hPtr == NULL) { char *name; Tk_ErrorHandler handler; int isNew, mustFree; handler = Tk_CreateErrorHandler(dispPtr->display, BadAtom, -1, -1, NULL, (ClientData) NULL); name = XGetAtomName(dispPtr->display, atom); mustFree = 1; if (name == NULL) { name = "?bad atom?"; mustFree = 0; } Tk_DeleteErrorHandler(handler); hPtr = Tcl_CreateHashEntry(&dispPtr->nameTable, name, &isNew); Tcl_SetHashValue(hPtr, INT2PTR(atom)); if (mustFree) { XFree(name); } name = Tcl_GetHashKey(&dispPtr->nameTable, hPtr); hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, INT2PTR(atom), &isNew); Tcl_SetHashValue(hPtr, name); } return Tcl_GetHashValue(hPtr); } /* *-------------------------------------------------------------- |
︙ | ︙ | |||
189 190 191 192 193 194 195 | Tcl_InitHashTable(&dispPtr->nameTable, TCL_STRING_KEYS); Tcl_InitHashTable(&dispPtr->atomTable, TCL_ONE_WORD_KEYS); for (atom = 1; atom <= XA_LAST_PREDEFINED; atom++) { char *name; int isNew; | | | | | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | Tcl_InitHashTable(&dispPtr->nameTable, TCL_STRING_KEYS); Tcl_InitHashTable(&dispPtr->atomTable, TCL_ONE_WORD_KEYS); for (atom = 1; atom <= XA_LAST_PREDEFINED; atom++) { char *name; int isNew; hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, INT2PTR(atom)); if (hPtr != NULL) { continue; } name = atomNameArray[atom - 1]; hPtr = Tcl_CreateHashEntry(&dispPtr->nameTable, name, &isNew); Tcl_SetHashValue(hPtr, INT2PTR(atom)); name = Tcl_GetHashKey(&dispPtr->nameTable, hPtr); hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, INT2PTR(atom), &isNew); Tcl_SetHashValue(hPtr, name); } } /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: */ |
Changes to generic/tkSelect.c.
︙ | ︙ | |||
166 167 168 169 170 171 172 | selPtr->clientData = clientData; if (format == XA_STRING) { selPtr->size = 8; } else { selPtr->size = 32; } | | | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | selPtr->clientData = clientData; if (format == XA_STRING) { selPtr->size = 8; } else { selPtr->size = 32; } if ((target == XA_STRING) && (winPtr->dispPtr->utf8Atom != (Atom) 0)) { /* * If the user asked for a STRING handler and we understand * UTF8_STRING, we implicitly create a UTF8_STRING handler for them. */ target = winPtr->dispPtr->utf8Atom; for (selPtr = winPtr->selHandlerList; ; selPtr = selPtr->nextPtr) { |
︙ | ︙ | |||
279 280 281 282 283 284 285 | if (prevPtr == NULL) { winPtr->selHandlerList = selPtr->nextPtr; } else { prevPtr->nextPtr = selPtr->nextPtr; } | | | 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 | if (prevPtr == NULL) { winPtr->selHandlerList = selPtr->nextPtr; } else { prevPtr->nextPtr = selPtr->nextPtr; } if ((target == XA_STRING) && (winPtr->dispPtr->utf8Atom != (Atom) 0)) { /* * If the user asked for a STRING handler and we understand * UTF8_STRING, we may have implicitly created a UTF8_STRING handler * for them. Look for it and delete it as necessary. */ TkSelHandler *utf8selPtr; |
︙ | ︙ | |||
1189 1190 1191 1192 1193 1194 1195 | * necessary on Unix systems. For more information, see: * http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11 */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) dispPtr->utf8Atom = Tk_InternAtom(tkwin, "UTF8_STRING"); #else | | | 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 | * necessary on Unix systems. For more information, see: * http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11 */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) dispPtr->utf8Atom = Tk_InternAtom(tkwin, "UTF8_STRING"); #else dispPtr->utf8Atom = (Atom) 0; #endif } /* *---------------------------------------------------------------------- * * TkSelClearSelection -- |
︙ | ︙ |
Changes to win/stubs.c.
︙ | ︙ | |||
25 26 27 28 29 30 31 | Status XStringListToTextProperty( char **list, int count, XTextProperty *text_prop_return) { | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | Status XStringListToTextProperty( char **list, int count, XTextProperty *text_prop_return) { return (Status) 0; } /* * From Xlib.h */ void |
︙ | ︙ | |||
144 145 146 147 148 149 150 | Status XGetWMColormapWindows( Display *display, Window w, Window **windows_return, int *count_return) { | | | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | Status XGetWMColormapWindows( Display *display, Window w, Window **windows_return, int *count_return) { return (Status) 0; } int XIconifyWindow( Display *display, Window w, int screen_number) |
︙ | ︙ |
Changes to win/tkWinColor.c.
︙ | ︙ | |||
382 383 384 385 386 387 388 | ResizePalette(cmap->palette, cmap->size); SetPaletteEntries(cmap->palette, cmap->size - 1, 1, &entry); } } color->pixel = PALETTERGB(entry.peRed, entry.peGreen, entry.peBlue); entryPtr = Tcl_CreateHashEntry(&cmap->refCounts, | | | | | 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | ResizePalette(cmap->palette, cmap->size); SetPaletteEntries(cmap->palette, cmap->size - 1, 1, &entry); } } color->pixel = PALETTERGB(entry.peRed, entry.peGreen, entry.peBlue); entryPtr = Tcl_CreateHashEntry(&cmap->refCounts, INT2PTR(color->pixel), &new); if (new) { refCount = 1; } else { refCount = (PTR2INT(Tcl_GetHashValue(entryPtr))) + 1; } Tcl_SetHashValue(entryPtr, INT2PTR(refCount)); } else { /* * Determine what color will actually be used on non-colormap systems. */ color->pixel = GetNearestColor(dc, RGB(entry.peRed, entry.peGreen, entry.peBlue)); |
︙ | ︙ | |||
448 449 450 451 452 453 454 | if (GetDeviceCaps(dc, RASTERCAPS) & RC_PALETTE) { /* * This is really slow for large values of npixels. */ for (i = 0; i < npixels; i++) { | | | | | 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 | if (GetDeviceCaps(dc, RASTERCAPS) & RC_PALETTE) { /* * This is really slow for large values of npixels. */ for (i = 0; i < npixels; i++) { entryPtr = Tcl_FindHashEntry(&cmap->refCounts, INT2PTR(pixels[i])); if (!entryPtr) { Tcl_Panic("Tried to free a color that isn't allocated."); } refCount = PTR2INT(Tcl_GetHashValue(entryPtr)) - 1; if (refCount == 0) { cref = pixels[i] & 0x00ffffff; index = GetNearestPaletteIndex(cmap->palette, cref); GetPaletteEntries(cmap->palette, index, 1, &entry); if (cref == RGB(entry.peRed, entry.peGreen, entry.peBlue)) { count = cmap->size - index; entries = (PALETTEENTRY *) ckalloc(sizeof(PALETTEENTRY) * count); GetPaletteEntries(cmap->palette, index+1, count, entries); SetPaletteEntries(cmap->palette, index, count, entries); ckfree((char *) entries); cmap->size--; } else { Tcl_Panic("Tried to free a color that isn't allocated."); } Tcl_DeleteHashEntry(entryPtr); } else { Tcl_SetHashValue(entryPtr, INT2PTR(refCount)); } } } ReleaseDC(NULL, dc); } /* |
︙ | ︙ | |||
531 532 533 534 535 536 537 | /* * Add hash entries for each of the static colors. */ Tcl_InitHashTable(&cmap->refCounts, TCL_ONE_WORD_KEYS); for (i = 0; i < logPalettePtr->palNumEntries; i++) { entryPtr = logPalettePtr->palPalEntry + i; | | | | | 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 | /* * Add hash entries for each of the static colors. */ Tcl_InitHashTable(&cmap->refCounts, TCL_ONE_WORD_KEYS); for (i = 0; i < logPalettePtr->palNumEntries; i++) { entryPtr = logPalettePtr->palPalEntry + i; hashPtr = Tcl_CreateHashEntry(&cmap->refCounts, INT2PTR(PALETTERGB( entryPtr->peRed, entryPtr->peGreen, entryPtr->peBlue)), &new); Tcl_SetHashValue(hashPtr, INT2PTR(1)); } return (Colormap)cmap; } /* *---------------------------------------------------------------------- |
︙ | ︙ |
Changes to win/tkWinDialog.c.
︙ | ︙ | |||
1028 1029 1030 1031 1032 1033 1034 | if ((selsize > 1) && (dirsize > 0)) { if (ofnData->dynFileBufferSize < buffersize) { buffer = (WCHAR *) ckrealloc((char *) buffer, buffersize); ofnData->dynFileBufferSize = buffersize; ofnData->dynFileBuffer = (char *) buffer; } | | | | 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 | if ((selsize > 1) && (dirsize > 0)) { if (ofnData->dynFileBufferSize < buffersize) { buffer = (WCHAR *) ckrealloc((char *) buffer, buffersize); ofnData->dynFileBufferSize = buffersize; ofnData->dynFileBuffer = (char *) buffer; } SendMessageW(hdlg, CDM_GETFOLDERPATH, dirsize, PTR2INT(buffer)); buffer += dirsize; SendMessageW(hdlg, CDM_GETSPEC, selsize, PTR2INT(buffer)); /* * If there are multiple files, delete the quotes and change * every second quote to NULL terminator */ if (buffer[0] == '"') { |
︙ | ︙ | |||
1576 1577 1578 1579 1580 1581 1582 | if ((selsize > 1) && (dirsize > 0)) { if (ofnData->dynFileBufferSize < buffersize) { buffer = ckrealloc(buffer, buffersize); ofnData->dynFileBufferSize = buffersize; ofnData->dynFileBuffer = buffer; } | | | | 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 | if ((selsize > 1) && (dirsize > 0)) { if (ofnData->dynFileBufferSize < buffersize) { buffer = ckrealloc(buffer, buffersize); ofnData->dynFileBufferSize = buffersize; ofnData->dynFileBuffer = buffer; } SendMessage(hdlg, CDM_GETFOLDERPATH, dirsize, PTR2INT(buffer)); buffer += dirsize; SendMessage(hdlg, CDM_GETSPEC, selsize, PTR2INT(buffer)); /* * If there are multiple files, delete the quotes and change * every second quote to NULL terminator. */ if (buffer[0] == '"') { |
︙ | ︙ |
Changes to win/tkWinEmbed.c.
︙ | ︙ | |||
255 256 257 258 259 260 261 | } return TCL_OK; } if (Tcl_GetInt(interp, string, &id) != TCL_OK) { return TCL_ERROR; } | | | | | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | } return TCL_OK; } if (Tcl_GetInt(interp, string, &id) != TCL_OK) { return TCL_ERROR; } hwnd = (HWND) INT2PTR(id); if ((HWND)winPtr->privatePtr == hwnd) { return TCL_OK; } /* * Check if the window is a valid handle. If it is invalid, return * TCL_ERROR and potentially leave an error message in the interp's * result. */ if (!IsWindow(hwnd)) { if (interp != NULL) { Tcl_AppendResult(interp, "window \"", string, "\" doesn't exist", NULL); } return TCL_ERROR; } id = SendMessage(hwnd, TK_INFO, TK_CONTAINER_VERIFY, 0); if (id == PTR2INT(hwnd)) { if (!SendMessage(hwnd, TK_INFO, TK_CONTAINER_ISAVAILABLE, 0)) { Tcl_AppendResult(interp, "The container is already in use", NULL); return TCL_ERROR; } } else if (id == -PTR2INT(hwnd)) { Tcl_AppendResult(interp, "the window to use is not a Tk container", NULL); return TCL_ERROR; } else { /* * Proceed if the user decide to do so because it can be a legacy * container application. However we may have to return a TCL_ERROR in |
︙ | ︙ | |||
453 454 455 456 457 458 459 | */ switch(wParam) { case TK_CONTAINER_ISAVAILABLE: result = containerPtr->embeddedHWnd == NULL? 1:0; break; case TK_CONTAINER_VERIFY: | | | 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 | */ switch(wParam) { case TK_CONTAINER_ISAVAILABLE: result = containerPtr->embeddedHWnd == NULL? 1:0; break; case TK_CONTAINER_VERIFY: result = PTR2INT(containerPtr->parentHWnd); break; default: result = 0; } break; case TK_ATTACHWINDOW: |
︙ | ︙ | |||
491 492 493 494 495 496 497 | if (winPtr) { winPtr->flags |= TK_BOTH_HALVES; containerPtr->embeddedPtr = winPtr; containerPtr->parentPtr->flags |= TK_BOTH_HALVES; } containerPtr->embeddedHWnd = (HWND)wParam; } | | | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 | if (winPtr) { winPtr->flags |= TK_BOTH_HALVES; containerPtr->embeddedPtr = winPtr; containerPtr->parentPtr->flags |= TK_BOTH_HALVES; } containerPtr->embeddedHWnd = (HWND)wParam; } result = PTR2INT(containerPtr->parentHWnd); } else { result = 0; } break; case TK_DETACHWINDOW: /* |
︙ | ︙ | |||
564 565 566 567 568 569 570 | * * Return vlaue: * * A handle of the frame window. If it is not availble, a zero is * returned. */ if (topwinPtr) { | | | | 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 | * * Return vlaue: * * A handle of the frame window. If it is not availble, a zero is * returned. */ if (topwinPtr) { result = PTR2INT(GetParent(containerPtr->parentHWnd)); } else { topwinPtr = containerPtr->parentPtr; while (!(topwinPtr->flags & TK_TOP_HIERARCHY)) { topwinPtr = topwinPtr->parentPtr; } if (topwinPtr && topwinPtr->window) { result = PTR2INT(GetParent(Tk_GetHWND(topwinPtr->window))); } else { result = 0; } } break; case TK_CLAIMFOCUS: |
︙ | ︙ | |||
755 756 757 758 759 760 761 | } } else { if ((message == TK_INFO) && (wParam == TK_CONTAINER_VERIFY)) { /* * Reply the message sender: this is not a Tk container */ | | | 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 | } } else { if ((message == TK_INFO) && (wParam == TK_CONTAINER_VERIFY)) { /* * Reply the message sender: this is not a Tk container */ return -PTR2INT(hwnd); } else { result = 0; } } return result; } |
︙ | ︙ |
Changes to win/tkWinMenu.c.
︙ | ︙ | |||
436 437 438 439 440 441 442 | if (NULL != winMenuHdl) { if (!(menuPtr->menuFlags & MENU_RECONFIGURE_PENDING)) { menuPtr->menuFlags |= MENU_RECONFIGURE_PENDING; Tcl_DoWhenIdle(ReconfigureWindowsMenu, (ClientData) menuPtr); } } | | | 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 | if (NULL != winMenuHdl) { if (!(menuPtr->menuFlags & MENU_RECONFIGURE_PENDING)) { menuPtr->menuFlags |= MENU_RECONFIGURE_PENDING; Tcl_DoWhenIdle(ReconfigureWindowsMenu, (ClientData) menuPtr); } } FreeID((WORD) PTR2UINT(mePtr->platformEntryData)); mePtr->platformEntryData = NULL; } /* *---------------------------------------------------------------------- * * GetEntryText -- |
︙ | ︙ | |||
625 626 627 628 629 630 631 | flags |= MF_SEPARATOR; } if (mePtr->columnBreak) { flags |= MF_MENUBREAK; } | | | | 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 | flags |= MF_SEPARATOR; } if (mePtr->columnBreak) { flags |= MF_MENUBREAK; } itemID = PTR2UINT(mePtr->platformEntryData); if ((mePtr->type == CASCADE_ENTRY) && (mePtr->childMenuRefPtr != NULL) && (mePtr->childMenuRefPtr->menuPtr != NULL)) { HMENU childMenuHdl = (HMENU) mePtr->childMenuRefPtr->menuPtr ->platformData; if (childMenuHdl != NULL) { /* * Win32 draws the popup arrow in the wrong color for a * disabled cascade menu, so do it by hand. Given it is * disabled, there's no need for it to be connected to its * child. */ if (mePtr->state != ENTRY_DISABLED) { flags |= MF_POPUP; /* * If the MF_POPUP flag is set, then the id is interpreted * as the handle of a submenu. */ itemID = PTR2UINT(childMenuHdl); } } if ((menuPtr->menuType == MENUBAR) && !(mePtr->childMenuRefPtr->menuPtr->menuFlags & MENU_SYSTEM_MENU)) { Tcl_DString ds; TkMenuReferences *menuRefPtr; |
︙ | ︙ | |||
856 857 858 859 860 861 862 | } if (!(menuPtr->menuFlags & MENU_RECONFIGURE_PENDING)) { menuPtr->menuFlags |= MENU_RECONFIGURE_PENDING; Tcl_DoWhenIdle(ReconfigureWindowsMenu, (ClientData) menuPtr); } | | | 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 | } if (!(menuPtr->menuFlags & MENU_RECONFIGURE_PENDING)) { menuPtr->menuFlags |= MENU_RECONFIGURE_PENDING; Tcl_DoWhenIdle(ReconfigureWindowsMenu, (ClientData) menuPtr); } mePtr->platformEntryData = (TkMenuPlatformEntryData) UINT2PTR(commandID); return TCL_OK; } /* *---------------------------------------------------------------------- * |
︙ | ︙ |
Changes to win/tkWinPixmap.c.
︙ | ︙ | |||
55 56 57 58 59 60 61 | } } else { newTwdPtr->bitmap.colormap = twdPtr->bitmap.colormap; } screen = &display->screens[0]; planes = 1; if (depth == screen->root_depth) { | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | } } else { newTwdPtr->bitmap.colormap = twdPtr->bitmap.colormap; } screen = &display->screens[0]; planes = 1; if (depth == screen->root_depth) { planes = PTR2INT(screen->ext_data); depth /= planes; } newTwdPtr->bitmap.handle = CreateBitmap(width, height, (DWORD) planes, (DWORD) depth, NULL); /* * CreateBitmap tries to use memory on the graphics card. If it fails, |
︙ | ︙ |
Changes to win/tkWinTest.c.
︙ | ︙ | |||
269 270 271 272 273 274 275 | return TCL_OK; } if (argc < 4) { return TCL_ERROR; } | | | 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | return TCL_OK; } if (argc < 4) { return TCL_ERROR; } hwnd = (HWND) INT2PTR(strtol(argv[1], &rest, 0)); if (rest == argv[1]) { hwnd = FindWindow(NULL, argv[1]); if (hwnd == NULL) { Tcl_SetResult(interp, "no such window", TCL_STATIC); return TCL_ERROR; } } |
︙ | ︙ | |||
386 387 388 389 390 391 392 | hwnd = FindWindowA(class, title); if (hwnd == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to find window: ", -1)); AppendSystemError(interp, GetLastError()); r = TCL_ERROR; } else { | | | | 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 | hwnd = FindWindowA(class, title); if (hwnd == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to find window: ", -1)); AppendSystemError(interp, GetLastError()); r = TCL_ERROR; } else { Tcl_SetObjResult(interp, Tcl_NewLongObj(PTR2INT(hwnd))); } return r; } static BOOL CALLBACK EnumChildrenProc(HWND hwnd, LPARAM lParam) { Tcl_Obj *listObj = (Tcl_Obj *)lParam; Tcl_ListObjAppendElement(NULL, listObj, Tcl_NewLongObj(PTR2INT(hwnd))); return TRUE; } static int TestgetwindowinfoObjCmd( ClientData clientData, Tcl_Interp *interp, |
︙ | ︙ | |||
422 423 424 425 426 427 428 | return TCL_ERROR; } if (Tcl_GetLongFromObj(interp, objv[1], &hwnd) != TCL_OK) return TCL_ERROR; if (tkWinProcs->useWide) { | | | | | | | | 422 423 424 425 426 427 428 429 430 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 | return TCL_ERROR; } if (Tcl_GetLongFromObj(interp, objv[1], &hwnd) != TCL_OK) return TCL_ERROR; if (tkWinProcs->useWide) { cch = GetClassNameW(INT2PTR(hwnd), (LPWSTR)buf, sizeof(buf)/sizeof(WCHAR)); classObj = Tcl_NewUnicodeObj((LPWSTR)buf, cch); } else { cch = GetClassNameA(INT2PTR(hwnd), (LPSTR)buf, sizeof(buf)); classObj = Tcl_NewStringObj((LPSTR)buf, cch); } if (cch == 0) { Tcl_SetResult(interp, "failed to get class name: ", TCL_STATIC); AppendSystemError(interp, GetLastError()); return TCL_ERROR; } resObj = Tcl_NewListObj(0, NULL); Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("class", -1)); Tcl_ListObjAppendElement(interp, resObj, classObj); Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("id", -1)); Tcl_ListObjAppendElement(interp, resObj, Tcl_NewLongObj(GetWindowLong(INT2PTR(hwnd), GWL_ID))); cch = tkWinProcs->getWindowText(INT2PTR(hwnd), (LPTSTR)buf, cchBuf); if (tkWinProcs->useWide) { textObj = Tcl_NewUnicodeObj((LPCWSTR)buf, cch); } else { textObj = Tcl_NewStringObj((LPCSTR)buf, cch); } Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("text", -1)); Tcl_ListObjAppendElement(interp, resObj, textObj); Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("parent", -1)); Tcl_ListObjAppendElement(interp, resObj, Tcl_NewLongObj(PTR2INT(GetParent(INT2PTR(hwnd))))); childrenObj = Tcl_NewListObj(0, NULL); EnumChildWindows(INT2PTR(hwnd), EnumChildrenProc, (LPARAM)childrenObj); Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("children", -1)); Tcl_ListObjAppendElement(interp, resObj, childrenObj); Tcl_SetObjResult(interp, resObj); return TCL_OK; } |
︙ | ︙ |
Changes to win/tkWinWindow.c.
︙ | ︙ | |||
205 206 207 208 209 210 211 | TkpScanWindowId( Tcl_Interp *interp, /* Interpreter to use for error reporting. */ CONST char *string, /* String containing a (possibly signed) * integer in a form acceptable to strtol. */ Window *idPtr) /* Place to store converted result. */ { Tk_Window tkwin; | | | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | TkpScanWindowId( Tcl_Interp *interp, /* Interpreter to use for error reporting. */ CONST char *string, /* String containing a (possibly signed) * integer in a form acceptable to strtol. */ Window *idPtr) /* Place to store converted result. */ { Tk_Window tkwin; void *number, *numberPtr = &number; /* * We want sscanf for the 64-bit check, but if that doesn't work, then * Tcl_GetInt manages the error correctly. */ if ( |
︙ | ︙ |
Changes to win/tkWinWm.c.
︙ | ︙ | |||
1998 1999 2000 2001 2002 2003 2004 | wmPtr->reqGridWidth = wmPtr->reqGridHeight = -1; wmPtr->gravity = NorthWestGravity; wmPtr->width = -1; wmPtr->height = -1; wmPtr->x = winPtr->changes.x; wmPtr->y = winPtr->changes.y; wmPtr->crefObj = NULL; | | | 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 | wmPtr->reqGridWidth = wmPtr->reqGridHeight = -1; wmPtr->gravity = NorthWestGravity; wmPtr->width = -1; wmPtr->height = -1; wmPtr->x = winPtr->changes.x; wmPtr->y = winPtr->changes.y; wmPtr->crefObj = NULL; wmPtr->colorref = (COLORREF)0; wmPtr->alpha = 1.0; wmPtr->configWidth = -1; wmPtr->configHeight = -1; wmPtr->flags = WM_NEVER_MAPPED; wmPtr->nextPtr = winPtr->dispPtr->firstWmPtr; winPtr->dispPtr->firstWmPtr = wmPtr; |
︙ | ︙ | |||
2257 2258 2259 2260 2261 2262 2263 | (LPARAM) NULL); hBigIcon = (HICON) SendMessage(oldWrapper, WM_GETICON, ICON_BIG, (LPARAM) NULL); } if (oldWrapper && (oldWrapper != wmPtr->wrapper) && (oldWrapper != GetDesktopWindow())) { | | | 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 | (LPARAM) NULL); hBigIcon = (HICON) SendMessage(oldWrapper, WM_GETICON, ICON_BIG, (LPARAM) NULL); } if (oldWrapper && (oldWrapper != wmPtr->wrapper) && (oldWrapper != GetDesktopWindow())) { SetWindowLongPtr(oldWrapper, GWLP_USERDATA, (LONG) 0); if (wmPtr->numTransients > 0) { /* * Unset the current wrapper as the parent for all transient * children for whom this is the master */ |
︙ | ︙ | |||
3751 3752 3753 3754 3755 3756 3757 | if (Tk_WindowId((Tk_Window) winPtr) == None) { Tk_MakeWindowExist((Tk_Window) winPtr); } hwnd = wmPtr->wrapper; if (hwnd == NULL) { hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) winPtr)); } | | | 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 | if (Tk_WindowId((Tk_Window) winPtr) == None) { Tk_MakeWindowExist((Tk_Window) winPtr); } hwnd = wmPtr->wrapper; if (hwnd == NULL) { hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) winPtr)); } sprintf(buf, "0x%x", PTR2UINT(hwnd)); Tcl_SetResult(interp, buf, TCL_VOLATILE); return TCL_OK; } /* *---------------------------------------------------------------------- * |
︙ | ︙ |
Changes to win/tkWinX.c.
︙ | ︙ | |||
292 293 294 295 296 297 298 | Tcl_Panic("Unable to register TkChild class"); } /* * Initialize input language info */ | | | | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | Tcl_Panic("Unable to register TkChild class"); } /* * Initialize input language info */ if (GetLocaleInfo(LANGIDFROMLCID(PTR2INT(GetKeyboardLayout(0))), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (LPTSTR) &lpCP, sizeof(lpCP)/sizeof(TCHAR)) && TranslateCharsetInfo(INT2PTR(lpCP), &lpCs, TCI_SRCCODEPAGE)) { UpdateInputLanguage((int) lpCs.ciCharset); } /* * Make sure we cleanup on finalize. */ |
︙ | ︙ | |||
515 516 517 518 519 520 521 | * information: the number of color planes and the number of pixels per * plane. Need to remember both quantities so that when constructing an * HBITMAP for offscreen rendering, we can specify the correct value for * the number of planes. Otherwise the HBITMAP won't be compatible with * the HWND and we'll just get blank spots copied onto the screen. */ | | | | 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | * information: the number of color planes and the number of pixels per * plane. Need to remember both quantities so that when constructing an * HBITMAP for offscreen rendering, we can specify the correct value for * the number of planes. Otherwise the HBITMAP won't be compatible with * the HWND and we'll just get blank spots copied onto the screen. */ screen->ext_data = INT2PTR(GetDeviceCaps(dc, PLANES)); screen->root_depth = GetDeviceCaps(dc, BITSPIXEL) * PTR2INT(screen->ext_data); if (screen->root_visual != NULL) { ckfree((char *) screen->root_visual); } screen->root_visual = (Visual *) ckalloc(sizeof(Visual)); screen->root_visual->visualid = 0; if (GetDeviceCaps(dc, RASTERCAPS) & RC_PALETTE) { |
︙ | ︙ | |||
1448 1449 1450 1451 1452 1453 1454 | CHARSETINFO charsetInfo; Tcl_Encoding encoding; char codepage[4 + TCL_INTEGER_SPACE]; if (keyInputCharset == charset) { return; } | | | 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 | CHARSETINFO charsetInfo; Tcl_Encoding encoding; char codepage[4 + TCL_INTEGER_SPACE]; if (keyInputCharset == charset) { return; } if (TranslateCharsetInfo(INT2PTR(charset), &charsetInfo, TCI_SRCCHARSET) == 0) { /* * Some mysterious failure. */ return; } |
︙ | ︙ | |||
1991 1992 1993 1994 1995 1996 1997 | inp.type = INPUT_MOUSE; inp.mi.dx = 0; inp.mi.dy = 0; inp.mi.mouseData = 0; inp.mi.dwFlags = MOUSEEVENTF_MOVE; inp.mi.time = 0; | | | 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 | inp.type = INPUT_MOUSE; inp.mi.dx = 0; inp.mi.dy = 0; inp.mi.mouseData = 0; inp.mi.dwFlags = MOUSEEVENTF_MOVE; inp.mi.time = 0; inp.mi.dwExtraInfo = (DWORD) 0; SendInput(1, &inp, sizeof(inp)); } /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: */ |
Changes to win/ttkWinMonitor.c.
︙ | ︙ | |||
88 89 90 91 92 93 94 | wc.lpszMenuName = name; wc.lpszClassName = name; if (RegisterClassEx(&wc)) { hwnd = CreateWindow( name, title, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hinst, NULL ); | | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | wc.lpszMenuName = name; wc.lpszClassName = name; if (RegisterClassEx(&wc)) { hwnd = CreateWindow( name, title, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hinst, NULL ); SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)interp); ShowWindow(hwnd, SW_HIDE); UpdateWindow(hwnd); } return hwnd; } static void |
︙ | ︙ |