Changeset 377
- Timestamp:
- Jul 27, 2006, 8:28:31 AM (19 years ago)
- Location:
- trunk/dll
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/arccnrs.c
r367 r377 164 164 pdcd = (DIRCNRDATA *)WinQueryWindowPtr(hwndCnr,QWL_USER); 165 165 if (!pdcd) { 166 Runtime_Error (pszSrcFile, __LINE__, "no data");166 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 167 167 return ret; 168 168 } … … 338 338 *pullTotalBytes = 0; 339 339 if (!info || !info->list) 340 Runtime_Error (pszSrcFile, __LINE__, "no data");340 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 341 341 else { 342 342 WinSendMsg(hwndCnr, … … 3699 3699 NULL); 3700 3700 if (!dcd->hwndCnr) { 3701 PostMsg(hwndClient, 3702 WM_CLOSE, 3703 MPVOID, 3704 MPVOID); 3701 Win_Error2(hwndClient,hwndClient,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 3702 PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID); 3705 3703 free(dcd); 3706 3704 hwndFrame = (HWND)0; … … 3746 3744 MPFROM2SHORT(CCHMAXPATH,0), 3747 3745 MPVOID); 3748 WinSetWindowText(dcd->hwndExtract, 3749 dcd->directory); 3750 if(!PostMsg(dcd->hwndCnr, 3751 UM_SETUP, 3752 MPVOID, 3753 MPVOID)) 3754 WinSendMsg(dcd->hwndCnr, 3755 UM_SETUP, 3756 MPVOID, 3757 MPVOID); 3758 if(FrameFlags & FCF_MENU) { 3759 if(!fToolbar) { 3760 3746 WinSetWindowText(dcd->hwndExtract,dcd->directory); 3747 if(!PostMsg(dcd->hwndCnr,UM_SETUP,MPVOID,MPVOID)) 3748 WinSendMsg(dcd->hwndCnr,UM_SETUP,MPVOID,MPVOID); 3749 if (FrameFlags & FCF_MENU) { 3750 if (!fToolbar) { 3761 3751 HWND hwndMenu = WinWindowFromID(hwndFrame,FID_MENU); 3762 3752 -
trunk/dll/autoview.c
r341 r377 654 654 NULL, 655 655 NULL); 656 if(hwndAutoObj) { 656 if (!hwndAutoObj) { 657 Win_Error2(HWND_OBJECT,HWND_DESKTOP,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 658 if(!PostMsg(hwndParent,UM_CLOSE,MPVOID,MPVOID)) 659 WinSendMsg(hwndParent,UM_CLOSE,MPVOID,MPVOID); 660 } 661 else { 657 662 WinSetWindowULong(hwndAutoObj,QWL_USER,hwndParent); 658 663 priority_normal(); … … 661 666 WinDestroyWindow(hwndAutoObj); 662 667 hwndAutoObj = (HWND)0; 663 }664 else {665 if(!PostMsg(hwndParent,UM_CLOSE,MPVOID,MPVOID))666 WinSendMsg(hwndParent,UM_CLOSE,MPVOID,MPVOID);667 668 } 668 669 WinDestroyMsgQueue(hmq2); -
trunk/dll/collect.c
r352 r377 3003 3003 WinSetWindowUShort(hwndFrame, QWS_ID, id); 3004 3004 dcd = xmallocz(sizeof(DIRCNRDATA),pszSrcFile,__LINE__); 3005 if (dcd) { 3005 if (!dcd) { 3006 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 3007 PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID); 3008 hwndFrame = (HWND) 0; 3009 } 3010 else { 3006 3011 dcd -> size = sizeof(DIRCNRDATA); 3007 3012 dcd -> id = id; … … 3036 3041 NULL, 3037 3042 NULL); 3038 if (dcd -> hwndCnr) 3039 { 3043 if (!dcd -> hwndCnr) { 3044 Win_Error2(hwndClient,hwndClient,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 3045 PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID); 3046 free(dcd); 3047 hwndFrame = (HWND) 0; 3048 } 3049 else { 3040 3050 Collector = dcd -> hwndCnr; 3041 3051 WinSetWindowPtr(dcd -> hwndCnr, QWL_USER, (PVOID) dcd); … … 3094 3104 MPVOID); 3095 3105 } 3096 else3097 {3098 PostMsg(hwndClient,3099 WM_CLOSE,3100 MPVOID,3101 MPVOID);3102 free(dcd);3103 hwndFrame = (HWND) 0;3104 }3105 }3106 else3107 {3108 PostMsg(hwndClient,3109 WM_CLOSE,3110 MPVOID,3111 MPVOID);3112 hwndFrame = (HWND) 0;3113 3106 } 3114 3107 } -
trunk/dll/common.c
r348 r377 51 51 ULONG msg, 52 52 MPARAM mp1, 53 MPARAM mp2) {54 53 MPARAM mp2) 54 { 55 55 PFNWP oldproc = (PFNWP)WinQueryWindowPtr(hwnd,0); 56 56 … … 145 145 ULONG msg, 146 146 MPARAM mp1, 147 MPARAM mp2) {148 147 MPARAM mp2) 148 { 149 149 switch(msg) { 150 150 case WM_CREATE: … … 172 172 173 173 174 void CommonTextPaint (HWND hwnd,HPS hps) {175 174 void CommonTextPaint (HWND hwnd,HPS hps) 175 { 176 176 int x; 177 177 USHORT ids[] = {DIR_FOLDERICON,DIR_TOTALS,DIR_SELECTED,DIR_VIEW, … … 187 187 188 188 189 void CommonCreateTextChildren (HWND hwnd,char *class,USHORT *ids) {190 189 void CommonCreateTextChildren (HWND hwnd,char *class,USHORT *ids) 190 { 191 191 int x; 192 192 CHAR s[33]; 193 193 ULONG attrs; 194 195 if(!hwnd || !class || !ids) 194 HWND hwndTmp; 195 196 if (!hwnd || !class || !ids) { 197 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 196 198 return; 199 } 197 200 198 201 for(x = 0;ids[x];x++) { … … 213 216 break; 214 217 } 215 WinCreateWindow(hwnd,class,s,attrs,0,0,0,0,hwnd, 216 HWND_TOP,ids[x],NULL,NULL); 217 } 218 hwndTmp = WinCreateWindow(hwnd,class,s,attrs,0,0,0,0,hwnd, 219 HWND_TOP,ids[x],NULL,NULL); 220 if (!hwndTmp) 221 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 222 } // for 218 223 } 219 224 220 225 221 void CommonDriveCmd (HWND hwnd,char *drive,USHORT cmd) {222 226 void CommonDriveCmd (HWND hwnd,char *drive,USHORT cmd) 227 { 223 228 char dv[CCHMAXPATH]; 224 229 … … 390 395 391 396 392 void CommonCreateMainChildren (HWND hwnd,SWP *swp) { 393 394 hwndStatus = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 397 void CommonCreateMainChildren (HWND hwnd,SWP *swp) 398 { 399 HWND hwndFrame = WinQueryWindow(hwnd,QW_PARENT); 400 HWND hwndTmp; 401 PFNWP oldproc; 402 403 // Create a children of frame window 404 hwndStatus = WinCreateWindow(hwndFrame, 395 405 GetPString(IDS_WCSTATUS), 396 406 "Status", … … 407 417 SV_CXSIZEBORDER) * 2), 408 418 20, 409 WinQueryWindow(hwnd,QW_PARENT),419 hwndFrame, 410 420 HWND_TOP, 411 421 MAIN_STATUS, 412 422 NULL, 413 423 NULL); 414 hwndStatus2 = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 424 if (!hwndStatus) 425 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 426 427 hwndStatus2 = WinCreateWindow(hwndFrame, 415 428 GetPString(IDS_WCSTATUS), 416 429 "Status2", … … 427 440 SV_CXSIZEBORDER) * 2), 428 441 20, 429 WinQueryWindow(hwnd,QW_PARENT),442 hwndFrame, 430 443 HWND_TOP, 431 444 MAIN_STATUS2, 432 445 NULL, 433 446 NULL); 434 435 hwndAttr = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 447 if (!hwndStatus2) 448 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 449 450 hwndAttr = WinCreateWindow(hwndFrame, 436 451 GetPString(IDS_WCSTATUS), 437 452 "Attr", … … 448 463 SV_CXSIZEBORDER) * 2), 449 464 20, 450 WinQueryWindow(hwnd,QW_PARENT),465 hwndFrame, 451 466 HWND_TOP, 452 467 IDM_ATTRS, 453 468 NULL, 454 469 NULL); 455 hwndDate = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 470 if (!hwndAttr) 471 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 472 473 hwndDate = WinCreateWindow(hwndFrame, 456 474 GetPString(IDS_WCSTATUS), 457 475 "Date", … … 468 486 SV_CXSIZEBORDER) * 2), 469 487 20, 470 WinQueryWindow(hwnd,QW_PARENT),488 hwndFrame, 471 489 HWND_TOP, 472 490 IDM_INFO, 473 491 NULL, 474 492 NULL); 475 hwndName = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 493 if (!hwndDate) 494 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 495 496 hwndName = WinCreateWindow(hwndFrame, 476 497 GetPString(IDS_WCSTATUS), 477 498 "Name", … … 488 509 SV_CXSIZEBORDER) * 2), 489 510 20, 490 WinQueryWindow(hwnd,QW_PARENT),511 hwndFrame, 491 512 HWND_TOP, 492 513 IDM_RENAME, 493 514 NULL, 494 515 NULL); 495 496 WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 516 if (!hwndName) 517 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 518 519 hwndTmp = WinCreateWindow(hwndFrame, 497 520 GetPString(IDS_WCTOOLBACK), 498 521 NullStr, … … 508 531 SV_CXSIZEBORDER) * 2), 509 532 30, 510 WinQueryWindow(hwnd,QW_PARENT),533 hwndFrame, 511 534 HWND_TOP, 512 535 MAIN_TOOLS, 513 536 NULL, 514 537 NULL); 515 hwndBack = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 538 if (!hwndTmp) 539 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 540 541 hwndBack = WinCreateWindow(hwndFrame, 516 542 GetPString(IDS_WCDRIVEBACK), 517 543 NullStr, … … 527 553 SV_CXSIZEBORDER) * 2), 528 554 30, 529 WinQueryWindow(hwnd,QW_PARENT),555 hwndFrame, 530 556 HWND_TOP, 531 557 MAIN_DRIVES, … … 533 559 NULL); 534 560 535 hwndLED = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 561 if (!hwndBack) 562 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 563 564 hwndLED = WinCreateWindow(hwndFrame, 536 565 GetPString(IDS_WCLED), 537 566 "#920", … … 541 570 12, 542 571 12, 543 WinQueryWindow(hwnd,QW_PARENT),572 hwndFrame, 544 573 HWND_TOP, 545 574 MAIN_LED, 546 575 NULL, 547 576 NULL); 548 hwndLEDHdr = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 577 if (!hwndLED) 578 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 579 580 hwndLEDHdr = WinCreateWindow(hwndFrame, 549 581 GetPString(IDS_WCLED), 550 582 "0", … … 555 587 12, 556 588 12, 557 WinQueryWindow(hwnd,QW_PARENT),589 hwndFrame, 558 590 HWND_TOP, 559 591 MAIN_LEDHDR, 560 592 NULL, 561 593 NULL); 562 hwndAutoview = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 594 if (!hwndLEDHdr) 595 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 596 597 hwndAutoview = WinCreateWindow(hwndFrame, 563 598 GetPString(IDS_WCAUTOVIEW), 564 599 NullStr, … … 575 610 SV_CXSIZEBORDER) * 2), 576 611 48, 577 WinQueryWindow(hwnd,QW_PARENT),612 hwndFrame, 578 613 HWND_TOP, 579 614 MAIN_AUTOVIEW, 580 615 NULL, 581 616 NULL); 582 hwndAutoMLE = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 583 // GetPString(IDS_WCAUTOVIEW), 617 if (!hwndAutoview) 618 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 619 620 hwndAutoMLE = WinCreateWindow(hwndFrame, 621 // GetPString(IDS_WCAUTOVIEW), 584 622 WC_MLE, 585 623 NullStr, … … 596 634 SV_CXSIZEBORDER) * 2), 597 635 48, 598 WinQueryWindow(hwnd,QW_PARENT),636 hwndFrame, 599 637 HWND_TOP, 600 638 MAIN_AUTOVIEWMLE, 601 639 NULL, 602 640 NULL); 603 { 604 PFNWP oldproc; 605 606 oldproc = WinSubclassWindow(hwndAutoMLE,(PFNWP)AutoViewProc); 607 WinSetWindowPtr(hwndAutoMLE,0,(PVOID)oldproc); 608 PostMsg(hwndAutoMLE, 609 UM_SETUP, 610 MPVOID, 611 MPVOID); 612 } 641 if (!hwndAutoMLE) 642 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 643 644 oldproc = WinSubclassWindow(hwndAutoMLE,AutoViewProc); 645 WinSetWindowPtr(hwndAutoMLE,0,(PVOID)oldproc); 646 PostMsg(hwndAutoMLE,UM_SETUP,MPVOID,MPVOID); 613 647 } 614 648 615 616 MRESULT EXPENTRY CommonMainWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) { 617 649 MRESULT EXPENTRY CommonMainWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) 650 { 618 651 switch(msg) { 619 652 case UM_THREADUSE: 620 if(hbmLEDon && 621 hbmLEDoff) { 622 623 static LONG threaduse = 0; 624 CHAR ts[33]; 653 if (hbmLEDon && hbmLEDoff) { 654 static LONG threaduse = 0; 655 CHAR ts[33]; 625 656 626 657 if(mp1) { 627 628 if(threaduse == 1)658 threaduse++; 659 if (threaduse == 1) 629 660 WinSendMsg(hwndLED, 630 661 SM_SETHANDLE, 631 662 MPFROMLONG(hbmLEDon), 632 663 MPVOID); 633 634 635 636 637 664 } 665 else { 666 threaduse--; 667 if(threaduse <= 0) { 668 threaduse = 0; 638 669 WinSendMsg(hwndLED, 639 670 SM_SETHANDLE, 640 671 MPFROMLONG(hbmLEDoff), 641 672 MPVOID); 642 643 673 } 674 } 644 675 ltoa(threaduse, 645 676 ts, … … 647 678 WinSetWindowText(hwndLEDHdr, 648 679 ts); 649 650 680 } 681 return 0; 651 682 652 683 case UM_LOADFILE: … … 692 723 693 724 694 MRESULT EXPENTRY CommonTextButton (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {695 725 MRESULT EXPENTRY CommonTextButton (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) 726 { 696 727 static HWND hwndLast = (HWND)0; 697 728 static ULONG lastclick = 0; … … 807 838 808 839 809 MRESULT EXPENTRY CommonCnrProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {810 840 MRESULT EXPENTRY CommonCnrProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) 841 { 811 842 DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd,0); 812 843 … … 894 925 895 926 HWND OpenDirCnr (HWND hwnd,HWND hwndParent,HWND hwndRestore, 896 BOOL noautotile,char *directory) {897 927 BOOL noautotile,char *directory) 928 { 898 929 SWP swp; 899 930 HWND hwndDir; -
trunk/dll/datamin.c
r346 r377 228 228 { 229 229 case WM_CREATE: 230 if (DataHwnd) 231 { 230 if (DataHwnd) { 232 231 WinSetWindowPos(DataHwnd, 233 232 HWND_TOP, … … 268 267 for (c = 0; ids[c]; c++) 269 268 { 270 WinCreateWindow(hwnd,269 if (!WinCreateWindow(hwnd, 271 270 GetPString(IDS_WCMINITIME), 272 271 NullStr, … … 280 279 ids[c], 281 280 NULL, 282 NULL); 281 NULL)) 282 { 283 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 284 } 283 285 x += (MINI_X + 4); 284 286 } … … 341 343 if ((ulDriveMap & (1L << c)) && !(driveflags[c] & drivestyle)) 342 344 { 343 WinCreateWindow(hwnd,345 if (!WinCreateWindow(hwnd, 344 346 GetPString(IDS_WCMINITIME), 345 347 NullStr, … … 353 355 MINI_DRIVEA + c, 354 356 NULL, 355 NULL); 357 NULL)) 358 { 359 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 360 } 356 361 numdrives++; 357 362 x += (MINI_X + 4); -
trunk/dll/dircnrs.c
r369 r377 3919 3919 NULL, 3920 3920 NULL); 3921 if(dcd->hwndCnr) { 3921 if (!dcd->hwndCnr) { 3922 Win_Error2(hwndClient,hwndClient,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 3923 PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID); 3924 free(dcd); 3925 hwndFrame = (HWND)0; 3926 } 3927 else { 3922 3928 WinSetWindowPtr(dcd->hwndCnr,QWL_USER,(PVOID)dcd); 3923 3929 dcd->oldproc = WinSubclassWindow(dcd->hwndCnr, … … 3972 3978 } 3973 3979 } 3974 else {3975 PostMsg(hwndClient,3976 WM_CLOSE,3977 MPVOID,3978 MPVOID);3979 free(dcd);3980 hwndFrame = (HWND)0;3981 }3982 3980 } 3983 3981 } -
trunk/dll/filter.c
r340 r377 371 371 swpD.cy,SWP_MOVE); 372 372 } 373 WinCreateWindow(hwnd,373 if (!WinCreateWindow(hwnd, 374 374 WC_STATIC, 375 375 GetPString(IDS_TEXTTITLETEXT), … … 384 384 65535, 385 385 NULL, 386 NULL); 387 WinCreateWindow(hwnd, 386 NULL)) 387 { 388 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 389 } 390 if (!WinCreateWindow(hwnd, 388 391 WC_ENTRYFIELD, 389 392 NULL, … … 398 401 MSK_TEXT, 399 402 NULL, 400 NULL); 403 NULL)) 404 { 405 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 406 } 401 407 WinSendDlgItemMsg(hwnd, 402 408 MSK_TEXT, -
trunk/dll/inis.c
r336 r377 394 394 Win_Error(HWND_DESKTOP,HWND_DESKTOP,pszSrcFile,__LINE__,"PrfQueryProfileSize"); 395 395 else if (!ulSize) 396 Runtime_Error (pszSrcFile, __LINE__, "no data");396 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 397 397 else { 398 398 pData = xmalloc(ulSize,pszSrcFile,__LINE__); … … 464 464 else { 465 465 if (!ulSize) 466 Runtime_Error (pszSrcFile, __LINE__, "no data");466 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 467 467 pData = xmalloc(ulSize + 1L,pszSrcFile,__LINE__); 468 468 if (pData) { … … 683 683 MPVOID); 684 684 if (sSelect < 0) 685 Runtime_Error (pszSrcFile, __LINE__, "no data");685 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 686 686 else { 687 687 *s = 0; … … 725 725 WinQueryWindowText(hwndMLE,8192,s); 726 726 if (!*s) 727 Runtime_Error (pszSrcFile, __LINE__, "no data");727 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 728 728 else { 729 729 fp = xfopen(filename,"w",pszSrcFile,__LINE__); … … 1465 1465 inidata = INSTDATA(hwnd); 1466 1466 if (!inidata) { 1467 Runtime_Error (pszSrcFile, __LINE__, "no data");1467 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 1468 1468 break; 1469 1469 } … … 1844 1844 INIDATA *inidata; 1845 1845 SHORT sSel; 1846 PFNWP oldproc; 1846 1847 1847 1848 switch(msg) { … … 1860 1861 WinSetWindowPtr(hwnd,0,(PVOID)inidata); 1861 1862 WinCheckMenuItem(inidata->hwndMenu,INI_CONFIRM,inidata->confirm); 1862 WinCreateWindow(hwnd,WC_LISTBOX,(PSZ)NULL,WS_VISIBLE | LS_HORZSCROLL | 1863 1864 if (!WinCreateWindow(hwnd,WC_LISTBOX,(PSZ)NULL,WS_VISIBLE | LS_HORZSCROLL | 1863 1865 LS_NOADJUSTPOS, 0,0,0,0,hwnd,HWND_TOP, 1864 INI_APPLIST,NULL,NULL); 1865 WinCreateWindow(hwnd,WC_LISTBOX,(PSZ)NULL,WS_VISIBLE | LS_HORZSCROLL | 1866 INI_APPLIST,NULL,NULL)) 1867 { 1868 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1869 } 1870 if (!WinCreateWindow(hwnd,WC_LISTBOX,(PSZ)NULL,WS_VISIBLE | LS_HORZSCROLL | 1866 1871 LS_NOADJUSTPOS, 0,0,0,0,hwnd,HWND_TOP, 1867 INI_KEYLIST,NULL,NULL); 1868 WinCreateWindow(hwnd,WC_LISTBOX,(PSZ)NULL,WS_VISIBLE | LS_HORZSCROLL | 1872 INI_KEYLIST,NULL,NULL)) 1873 { 1874 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1875 } 1876 if (!WinCreateWindow(hwnd,WC_LISTBOX,(PSZ)NULL,WS_VISIBLE | LS_HORZSCROLL | 1869 1877 LS_NOADJUSTPOS, 0,0,0,0,hwnd,HWND_TOP, 1870 INI_DATALIST,NULL,NULL); 1871 WinCreateWindow(hwnd,WC_STATIC,(PSZ)NULL,WS_VISIBLE | SS_TEXT | 1878 INI_DATALIST,NULL,NULL)) 1879 { 1880 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1881 } 1882 if (!WinCreateWindow(hwnd,WC_STATIC,(PSZ)NULL,WS_VISIBLE | SS_TEXT | 1872 1883 DT_CENTER | DT_VCENTER,0,0,0,0,hwnd,HWND_TOP, 1873 INI_NUMAPPS,NULL,NULL); 1874 WinCreateWindow(hwnd,WC_STATIC,(PSZ)NULL,WS_VISIBLE | SS_TEXT | 1884 INI_NUMAPPS,NULL,NULL)) 1885 { 1886 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1887 } 1888 if (!WinCreateWindow(hwnd,WC_STATIC,(PSZ)NULL,WS_VISIBLE | SS_TEXT | 1875 1889 DT_CENTER | DT_VCENTER,0,0,0,0,hwnd,HWND_TOP, 1876 INI_NUMKEYS,NULL,NULL); 1877 WinCreateWindow(hwnd,WC_STATIC,(PSZ)NULL,WS_VISIBLE | SS_TEXT | 1890 INI_NUMKEYS,NULL,NULL)) 1891 { 1892 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1893 } 1894 if (!WinCreateWindow(hwnd,WC_STATIC,(PSZ)NULL,WS_VISIBLE | SS_TEXT | 1878 1895 DT_CENTER | DT_VCENTER,0,0,0,0,hwnd,HWND_TOP, 1879 INI_NUMDATA,NULL,NULL); 1880 WinCreateWindow(hwnd, 1896 INI_NUMDATA,NULL,NULL)) 1897 { 1898 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1899 } 1900 if (!WinCreateWindow(hwnd, 1881 1901 WC_STATIC, 1882 1902 GetPString(IDS_APPLICATIONSTITLETEXT), … … 1891 1911 INI_APPHDR, 1892 1912 NULL, 1893 NULL); 1894 WinCreateWindow(hwnd, 1913 NULL)) 1914 { 1915 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1916 } 1917 if (!WinCreateWindow(hwnd, 1895 1918 WC_STATIC, 1896 1919 GetPString(IDS_KEYWORDSTITLETEXT), … … 1905 1928 INI_KEYHDR, 1906 1929 NULL, 1907 NULL); 1908 WinCreateWindow(hwnd, 1930 NULL)) 1931 { 1932 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1933 } 1934 if (!WinCreateWindow(hwnd, 1909 1935 WC_STATIC, 1910 1936 GetPString(IDS_DATABYTESTITLETEXT), … … 1919 1945 INI_DATAHDR, 1920 1946 NULL, 1921 NULL); 1947 NULL)) 1948 { 1949 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1950 } 1951 1922 1952 inidata->hwndApp = WinWindowFromID(hwnd,INI_APPLIST); 1923 1953 inidata->hwndKey = WinWindowFromID(hwnd,INI_KEYLIST); 1924 1954 inidata->hwndData = WinWindowFromID(hwnd,INI_DATALIST); 1925 { 1926 PFNWP oldproc; 1927 1928 oldproc = WinSubclassWindow(WinWindowFromID(hwnd,INI_APPLIST), 1929 (PFNWP)IniLBSubProc); 1930 if(oldproc) 1931 WinSetWindowPtr(WinWindowFromID(hwnd,INI_APPLIST), 1932 QWL_USER, 1933 (PVOID)oldproc); 1934 oldproc = WinSubclassWindow(WinWindowFromID(hwnd,INI_KEYLIST), 1935 (PFNWP)IniLBSubProc); 1936 if(oldproc) 1937 WinSetWindowPtr(WinWindowFromID(hwnd,INI_KEYLIST), 1938 QWL_USER, 1939 (PVOID)oldproc); 1940 oldproc = WinSubclassWindow(WinWindowFromID(hwnd,INI_DATALIST), 1941 (PFNWP)IniLBSubProc2); 1942 if(oldproc) 1943 WinSetWindowPtr(WinWindowFromID(hwnd,INI_DATALIST), 1944 QWL_USER, 1945 (PVOID)oldproc); 1946 } 1955 1956 oldproc = WinSubclassWindow(WinWindowFromID(hwnd,INI_APPLIST), 1957 IniLBSubProc); 1958 WinSetWindowPtr(WinWindowFromID(hwnd,INI_APPLIST), 1959 QWL_USER, 1960 (PVOID)oldproc); 1961 oldproc = WinSubclassWindow(WinWindowFromID(hwnd,INI_KEYLIST), 1962 IniLBSubProc); 1963 WinSetWindowPtr(WinWindowFromID(hwnd,INI_KEYLIST), 1964 QWL_USER, 1965 (PVOID)oldproc); 1966 oldproc = WinSubclassWindow(WinWindowFromID(hwnd,INI_DATALIST), 1967 IniLBSubProc2); 1968 WinSetWindowPtr(WinWindowFromID(hwnd,INI_DATALIST), 1969 QWL_USER, 1970 (PVOID)oldproc); 1947 1971 break; 1948 1972 -
trunk/dll/newview.c
r368 r377 1780 1780 { 1781 1781 HWND temphwnd; 1782 1783 temphwnd = WinCreateWindow(WinQueryWindow(hwnd, QW_PARENT), 1782 HWND hwndFrame = WinQueryWindow(hwnd, QW_PARENT); 1783 1784 temphwnd = WinCreateWindow(hwndFrame, 1784 1785 WC_BUTTON, 1785 1786 "<", … … 1790 1791 0, 1791 1792 0, 1792 WinQueryWindow(hwnd, QW_PARENT),1793 hwndFrame, 1793 1794 HWND_TOP, 1794 1795 IDM_PREVBLANKLINE, 1795 1796 NULL, 1796 1797 NULL); 1797 WinSetPresParam(temphwnd, 1798 PP_FONTNAMESIZE, 1799 strlen(GetPString(IDS_8HELVTEXT)) + 1, 1800 (PVOID) GetPString(IDS_8HELVTEXT)); 1801 temphwnd = WinCreateWindow(WinQueryWindow(hwnd, QW_PARENT), 1798 if (!temphwnd) 1799 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1800 else { 1801 WinSetPresParam(temphwnd, 1802 PP_FONTNAMESIZE, 1803 strlen(GetPString(IDS_8HELVTEXT)) + 1, 1804 (PVOID) GetPString(IDS_8HELVTEXT)); 1805 } 1806 temphwnd = WinCreateWindow(hwndFrame, 1802 1807 WC_BUTTON, 1803 1808 ">", … … 1808 1813 0, 1809 1814 0, 1810 WinQueryWindow(hwnd, QW_PARENT),1815 hwndFrame, 1811 1816 HWND_TOP, 1812 1817 IDM_NEXTBLANKLINE, 1813 1818 NULL, 1814 1819 NULL); 1815 WinSetPresParam(temphwnd, 1816 PP_FONTNAMESIZE, 1817 strlen(GetPString(IDS_8HELVTEXT)) + 1, 1818 (PVOID) GetPString(IDS_8HELVTEXT)); 1820 if (!temphwnd) 1821 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1822 else { 1823 WinSetPresParam(temphwnd, 1824 PP_FONTNAMESIZE, 1825 strlen(GetPString(IDS_8HELVTEXT)) + 1, 1826 (PVOID)GetPString(IDS_8HELVTEXT)); 1827 } 1819 1828 WinStartTimer(WinQueryAnchorBlock(hwnd), 1820 1829 hwnd, … … 1839 1848 1840 1849 case UM_SETUP: 1841 if (!ad) {1850 if (!ad) 1842 1851 Runtime_Error(pszSrcFile, __LINE__, "no data"); 1843 }1844 1852 else { 1845 1853 CHAR s[CCHMAXPATH + 8]; … … 1848 1856 ad -> hvscroll = WinWindowFromID(ad -> hwndFrame, FID_VERTSCROLL); 1849 1857 ad -> hhscroll = WinWindowFromID(ad -> hwndFrame, FID_HORZSCROLL); 1850 WinSendMsg(ad -> hhscroll, 1851 SBM_SETTHUMBSIZE, 1852 MPFROM2SHORT(1, 1), 1853 MPVOID); 1854 WinSendMsg(ad -> hvscroll, 1855 SBM_SETTHUMBSIZE, 1856 MPFROM2SHORT(1, 1), 1857 MPVOID); 1858 sprintf(s, 1859 "%s: %s", 1860 FM2Str, 1861 ad -> filename); 1862 WinSetWindowText(ad -> hwndFrame, 1863 s); 1858 WinSendMsg(ad -> hhscroll,SBM_SETTHUMBSIZE,MPFROM2SHORT(1, 1),MPVOID); 1859 WinSendMsg(ad -> hvscroll,SBM_SETTHUMBSIZE,MPFROM2SHORT(1, 1),MPVOID); 1860 sprintf(s,"%s: %s",FM2Str,ad -> filename); 1861 WinSetWindowText(ad -> hwndFrame,s); 1864 1862 rc = DosCreateMutexSem(NULL, &ad -> ScanSem, 0L, FALSE); 1865 1863 if (rc) … … 1867 1865 else { 1868 1866 PFNWP oldproc; 1867 HWND hwndFrame = ad -> hwndFrame; 1869 1868 WinSendMsg(ad -> hvscroll, 1870 1869 SBM_SETSCROLLBAR, … … 1873 1872 WinSendMsg(ad -> hhscroll, SBM_SETSCROLLBAR, MPFROMSHORT(1), 1874 1873 MPFROM2SHORT(1, 1)); 1875 ad -> hwndStatus1 = WinCreateWindow( ad ->hwndFrame,1874 ad -> hwndStatus1 = WinCreateWindow(hwndFrame, 1876 1875 GetPString(IDS_WCVIEWSTATUS), 1877 1876 GetPString(IDS_LOADINGTEXT), … … 1882 1881 0, 1883 1882 0, 1884 ad ->hwndFrame,1883 hwndFrame, 1885 1884 HWND_TOP, 1886 1885 NEWVIEW_STATUS1, 1887 1886 NULL, 1888 1887 NULL); 1889 ad -> hwndStatus2 = WinCreateWindow(ad -> hwndFrame, 1888 if (!ad -> hwndStatus1) 1889 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1890 1891 ad -> hwndStatus2 = WinCreateWindow(hwndFrame, 1890 1892 GetPString(IDS_WCVIEWSTATUS), 1891 1893 NULL, … … 1896 1898 0, 1897 1899 0, 1898 ad ->hwndFrame,1900 hwndFrame, 1899 1901 HWND_TOP, 1900 1902 NEWVIEW_STATUS2, 1901 1903 NULL, 1902 1904 NULL); 1903 ad -> hwndStatus3 = WinCreateWindow(ad -> hwndFrame, 1905 if (!ad -> hwndStatus2) 1906 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1907 1908 ad -> hwndStatus3 = WinCreateWindow(hwndFrame, 1904 1909 GetPString(IDS_WCVIEWSTATUS), 1905 1910 NULL, … … 1910 1915 0, 1911 1916 0, 1912 ad ->hwndFrame,1917 hwndFrame, 1913 1918 HWND_TOP, 1914 1919 NEWVIEW_STATUS3, 1915 1920 NULL, 1916 1921 NULL); 1917 ad -> hwndListbox = WinCreateWindow(ad -> hwndFrame, 1922 if (!ad -> hwndStatus3) 1923 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1924 1925 ad -> hwndListbox = WinCreateWindow(hwndFrame, 1918 1926 WC_LISTBOX, 1919 1927 NULL, … … 1923 1931 0, 1924 1932 0, 1925 ad ->hwndFrame,1933 hwndFrame, 1926 1934 HWND_TOP, 1927 1935 NEWVIEW_LISTBOX, 1928 1936 NULL, 1929 1937 NULL); 1930 ad -> hwndDrag = WinCreateWindow(ad -> hwndFrame, 1938 if (!ad -> hwndListbox) 1939 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1940 1941 ad -> hwndDrag = WinCreateWindow(hwndFrame, 1931 1942 GetPString(IDS_WCVIEWSTATUS), 1932 1943 "#100", … … 1936 1947 0, 1937 1948 0, 1938 ad ->hwndFrame,1949 hwndFrame, 1939 1950 HWND_TOP, 1940 1951 NEWVIEW_DRAG, 1941 1952 NULL, 1942 1953 NULL); 1943 oldproc = WinSubclassWindow(ad -> hwndFrame, (PFNWP) ViewFrameWndProc); 1944 if (oldproc) 1945 WinSetWindowPtr(ad -> hwndFrame, QWL_USER, (PVOID) oldproc); 1954 if (!ad -> hwndDrag) 1955 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1956 1957 oldproc = WinSubclassWindow(hwndFrame, ViewFrameWndProc); 1958 WinSetWindowPtr(hwndFrame, QWL_USER, (PVOID)oldproc); 1946 1959 ad -> hps = InitWindow(hwnd); 1947 1960 if (_beginthread(LoadFile, NULL, 524288, (PVOID) hwnd) == -1) -
trunk/dll/notify.c
r372 r377 199 199 NULL, 200 200 NULL); 201 if (!hwndP) 202 Win_Error2(hwndP,hwndP,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 203 201 204 if(p != str) 202 205 free(p); -
trunk/dll/objwin.c
r2 r377 1 2 /*********************************************************************** 3 4 $Id$ 5 6 Object windows 7 8 Copyright (c) 1993-98 M. Kimes 9 Copyright (c) 2006 Steven H.Levine 10 11 26 Jul 06 SHL Check more run time errors 12 13 ***********************************************************************/ 14 1 15 #define INCL_DOS 2 16 #define INCL_WIN 3 17 #define INCL_GPI 18 #include <os2.h> 4 19 5 #include <os2.h>6 20 #include <stdarg.h> 7 21 #include <stdio.h> … … 10 24 #include <ctype.h> 11 25 #include <stddef.h> 26 12 27 #include "fm3dll.h" 13 28 #include "fm3dlg.h" 14 29 #include "fm3str.h" 15 30 31 static PSZ pszSrcFile = __FILE__; 32 16 33 #pragma alloc_text(OBJWIN,ObjectWndProc,MakeObjWin) 17 18 34 19 35 MRESULT EXPENTRY ObjectWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) { … … 68 84 NULL, 69 85 NULL); 70 if(ObjectHwnd) { 86 if (!ObjectHwnd) 87 Win_Error2(HWND_OBJECT,HWND_DESKTOP,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 88 else { 71 89 WinSetWindowPtr(ObjectHwnd,0,args); 72 90 /* initially populate container */ -
trunk/dll/seeall.c
r335 r377 745 745 GetPString(IDS_TOTEXT), 746 746 newname); 747 WinSetWindowText(WinWindowFromID(hwndFrame, 748 SEEALL_STATUS), 747 WinSetWindowText(WinWindowFromID(hwndFrame,SEEALL_STATUS), 749 748 message); 750 749 if(fRealIdle) … … 1296 1295 NULL, 1297 1296 NULL); 1298 if(hwndObj) { 1297 if (!hwndObj) { 1298 Win_Error2(HWND_OBJECT,HWND_DESKTOP,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 1299 if (!PostMsg(ad->hwndClient,WM_CLOSE,MPVOID,MPVOID)) 1300 WinSendMsg(ad->hwndClient,WM_CLOSE,MPVOID,MPVOID); 1301 } 1302 else { 1299 1303 ad->hwndObj = hwndObj; 1300 1304 WinSetWindowULong(hwndObj,QWL_USER,ad->hwndFrame); … … 1303 1307 WinDispatchMsg(hab2,&qmsg2); 1304 1308 WinDestroyWindow(hwndObj); 1305 }1306 else {1307 if(!PostMsg(ad->hwndClient,WM_CLOSE,MPVOID,MPVOID))1308 WinSendMsg(ad->hwndClient,WM_CLOSE,MPVOID,MPVOID);1309 1309 } 1310 1310 WinDestroyMsgQueue(hmq2); … … 2544 2544 WinSetWindowPtr(hwnd,QWL_USER,NULL); 2545 2545 pAD = xmallocz(sizeof(ALLDATA),pszSrcFile,__LINE__); 2546 if(pAD) { 2546 if (pAD) { 2547 HWND hwndFrame; 2547 2548 pAD->size = sizeof(ALLDATA); 2548 pAD->hwndFrame = WinQueryWindow(hwnd,QW_PARENT); 2549 hwndFrame = WinQueryWindow(hwnd,QW_PARENT); 2550 pAD->hwndFrame = hwndFrame; 2549 2551 pAD->mask.attrFile = FILE_READONLY | FILE_HIDDEN | 2550 2552 FILE_SYSTEM | FILE_ARCHIVED; … … 2629 2631 pAD->fattrs.usCodePage = Codepage; 2630 2632 memcpy(pAD->aulColors,Colors,sizeof(LONG) * COLORS_MAX); 2631 pAD->hwndMenu = WinWindowFromID( WinQueryWindow(hwnd,QW_PARENT),2633 pAD->hwndMenu = WinWindowFromID(hwndFrame, 2632 2634 FID_MENU); 2633 2635 SetConditionalCascade(pAD->hwndMenu,IDM_DELETESUBMENU, … … 2646 2648 pAD->hwndClient = hwnd; 2647 2649 pAD->hps = InitWindow(hwnd); 2648 pAD->hvscroll = WinWindowFromID( WinQueryWindow(hwnd,QW_PARENT),2650 pAD->hvscroll = WinWindowFromID(hwndFrame, 2649 2651 FID_VERTSCROLL); 2650 pAD->hhscroll = WinWindowFromID( WinQueryWindow(hwnd,QW_PARENT),2652 pAD->hhscroll = WinWindowFromID(hwndFrame, 2651 2653 FID_HORZSCROLL); 2652 2654 pAD->multiplier = 1; … … 2655 2657 else { 2656 2658 if (!DosCreateMutexSem(NULL,&pAD->hmtxScan,0L,FALSE)) { 2657 pAD->hwndStatus = WinCreateWindow( WinQueryWindow(hwnd,QW_PARENT),2659 pAD->hwndStatus = WinCreateWindow(hwndFrame, 2658 2660 GetPString(IDS_WCSEESTATUS), 2659 2661 NullStr, … … 2664 2666 0, 2665 2667 0, 2666 WinQueryWindow(hwnd,QW_PARENT),2668 hwndFrame, 2667 2669 HWND_TOP, 2668 2670 SEEALL_STATUS, 2669 2671 NULL, 2670 2672 NULL); 2673 if (!pAD->hwndStatus) 2674 Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 2675 else 2671 2676 { 2672 2677 PFNWP oldproc; 2673 2674 oldproc = WinSubclassWindow(WinQueryWindow(hwnd,QW_PARENT), 2675 (PFNWP)SeeFrameWndProc); 2676 if(oldproc) 2677 WinSetWindowPtr(WinQueryWindow(hwnd,QW_PARENT), 2678 QWL_USER, 2679 (PVOID)oldproc); 2678 oldproc = WinSubclassWindow(hwndFrame,SeeFrameWndProc); 2679 WinSetWindowPtr(hwndFrame,QWL_USER,(PVOID)oldproc); 2680 2680 } 2681 2681 break; -
trunk/dll/treecnr.c
r352 r377 636 636 dcd = WinQueryWindowPtr(hwnd,QWL_USER); 637 637 if (!dcd) 638 Runtime_Error (pszSrcFile, __LINE__, "no data");638 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 639 639 else { 640 640 BOOL tempsusp = dcd->suspendview; … … 655 655 dcd = WinQueryWindowPtr(hwnd,QWL_USER); 656 656 if (!dcd || !mp1) 657 Runtime_Error (pszSrcFile, __LINE__, "no data");657 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 658 658 else { 659 659 INT numentries = 0; … … 674 674 dcd = WinQueryWindowPtr(hwnd,QWL_USER); 675 675 if (!dcd) 676 Runtime_Error (pszSrcFile, __LINE__, "no data");676 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 677 677 else { 678 678 dcd->hwndObject = hwnd; … … 685 685 dcd = WinQueryWindowPtr(hwnd,QWL_USER); 686 686 if (!dcd) 687 Runtime_Error (pszSrcFile, __LINE__, "no data");687 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 688 688 else if (!hwndStatus) 689 Runtime_Error (pszSrcFile, __LINE__, "no window");689 Runtime_Error2(pszSrcFile, __LINE__, IDS_NOWINDOWTEXT); 690 690 else if (dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) { 691 691 CHAR s[CCHMAXPATH * 2]; … … 788 788 dcd = WinQueryWindowPtr(hwnd,QWL_USER); 789 789 if (!dcd) 790 Runtime_Error (pszSrcFile, __LINE__, "no data");790 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 791 791 else { 792 792 WinSendMsg(dcd->hwndCnr, … … 861 861 dcd = WinQueryWindowPtr(hwnd,QWL_USER); 862 862 if (!dcd) 863 Runtime_Error (pszSrcFile, __LINE__, "no data");863 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 864 864 else { 865 865 WORKER *wk; … … 891 891 dcd = WinQueryWindowPtr(hwnd,QWL_USER); 892 892 if (!dcd) 893 Runtime_Error (pszSrcFile, __LINE__, "no data");893 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 894 894 else { 895 895 WORKER *wk; … … 1309 1309 case UM_SETUP: 1310 1310 if (!dcd) { 1311 Runtime_Error (pszSrcFile, __LINE__, "no data");1311 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 1312 1312 PostMsg(hwnd,WM_CLOSE,MPVOID,MPVOID); 1313 1313 return 0; … … 1423 1423 MPFROMP(&pqr)); 1424 1424 if(!pci || (INT)pci == -1) 1425 Runtime_Error (pszSrcFile, __LINE__, "no data");1425 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 1426 1426 else { 1427 1427 memset(&nr,0,sizeof(nr)); … … 1565 1565 1566 1566 if (!pcd) { 1567 Runtime_Error (pszSrcFile, __LINE__, "no data");1567 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 1568 1568 break; 1569 1569 } … … 1571 1571 pci = (PCNRITEM)pcd->pRecord; 1572 1572 if (!pci || (INT)pci == -1) { 1573 Runtime_Error (pszSrcFile, __LINE__, "no data");1573 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 1574 1574 break; 1575 1575 } … … 2420 2420 case UM_COMMAND: 2421 2421 if (!mp1) 2422 Runtime_Error (pszSrcFile, __LINE__, "no data");2422 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 2423 2423 else { 2424 2424 if (!dcd) { 2425 Runtime_Error (pszSrcFile, __LINE__, "no data");2425 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 2426 2426 FreeListInfo((LISTINFO *)mp1); 2427 2427 } … … 3297 3297 SWP swp; 3298 3298 WinQueryWindowPos(hwndFrame,&swp); 3299 if (*(ULONG *)realappname == FM3UL)3300 WinCreateWindow(hwndFrame,3299 if (*(ULONG *)realappname == FM3UL) { 3300 if (!WinCreateWindow(hwndFrame, 3301 3301 GetPString(IDS_WCTREEOPENBUTTON), 3302 3302 "O", … … 3313 3313 IDM_OPENWINDOW, 3314 3314 NULL, 3315 NULL); 3316 else 3317 WinCreateWindow(hwndFrame, 3315 NULL)) 3316 { 3317 Win_Error2(hwndFrame,hwndParent,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 3318 } 3319 } 3320 else { 3321 if (!WinCreateWindow(hwndFrame, 3318 3322 GetPString(IDS_WCTREESTATUS), 3319 3323 GetPString(IDS_YOUAREHERETEXT), … … 3330 3334 MAIN_STATUS, 3331 3335 NULL, 3332 NULL); 3336 NULL)) 3337 { 3338 Win_Error2(hwndFrame,hwndParent,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 3339 } 3340 } 3333 3341 memset(dcd,0,sizeof(DIRCNRDATA)); 3334 3342 dcd->size = sizeof(DIRCNRDATA); … … 3341 3349 PFNWP oldproc; 3342 3350 3343 oldproc = WinSubclassWindow(hwndFrame, (PFNWP)TreeFrameWndProc);3351 oldproc = WinSubclassWindow(hwndFrame,TreeFrameWndProc); 3344 3352 WinSetWindowPtr(hwndFrame,QWL_USER,(PVOID)oldproc); 3345 3353 oldproc = WinSubclassWindow(WinWindowFromID(hwndFrame,FID_TITLEBAR), … … 3363 3371 NULL, 3364 3372 NULL); 3365 if(dcd->hwndCnr) { 3373 if (!dcd->hwndCnr) { 3374 Win_Error2(hwndClient,hwndClient,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 3375 PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID); 3376 free(dcd); 3377 hwndFrame = (HWND)0; 3378 } 3379 else { 3366 3380 WinSetWindowPtr(dcd->hwndCnr,QWL_USER,(PVOID)dcd); 3367 3381 if(ParentIsDesktop(hwndFrame,hwndParent)) { … … 3374 3388 GetPString(IDS_TREETEXT)); 3375 3389 } 3376 dcd->oldproc = WinSubclassWindow(dcd->hwndCnr, (PFNWP)TreeCnrWndProc);3390 dcd->oldproc = WinSubclassWindow(dcd->hwndCnr,TreeCnrWndProc); 3377 3391 if(!PostMsg(dcd->hwndCnr,UM_SETUP,MPVOID,MPVOID)) 3378 3392 WinSendMsg(dcd->hwndCnr,UM_SETUP,MPVOID,MPVOID); 3379 }3380 else {3381 PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);3382 free(dcd);3383 hwndFrame = (HWND)0;3384 3393 } 3385 3394 } -
trunk/dll/viewer.c
r328 r377 318 318 case WM_CREATE: 319 319 /* create MLE window */ 320 WinCreateWindow(hwnd,320 if (!WinCreateWindow(hwnd, 321 321 WC_MLE, 322 322 (PSZ)NULL, … … 331 331 MLE_MLE, 332 332 MPVOID, 333 MPVOID) ;333 MPVOID)) 334 334 { 335 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 336 } 337 else { 335 338 PFNWP oldproc; 336 337 339 oldproc = WinSubclassWindow(WinWindowFromID(hwnd,MLE_MLE), 338 (PFNWP)MLESubProc); 339 if(oldproc) 340 WinSetWindowPtr(WinWindowFromID(hwnd,MLE_MLE), 341 QWL_USER, 342 (PVOID)oldproc); 340 MLESubProc); 341 WinSetWindowPtr(WinWindowFromID(hwnd,MLE_MLE), 342 QWL_USER, 343 (PVOID)oldproc); 343 344 } 344 345 break; -
trunk/dll/viewinf.c
r328 r377 222 222 WinDestroyWindow(WinWindowFromID(hwnd, 223 223 VINF_LISTBOX)); 224 WinCreateWindow(hwnd,224 if (!WinCreateWindow(hwnd, 225 225 WC_LISTBOX, 226 226 (PSZ)NULL, … … 234 234 VINF_LISTBOX, 235 235 NULL, 236 NULL); 237 WinSetPresParam(WinWindowFromID(hwnd, 238 VINF_LISTBOX), 239 PP_FONTNAMESIZE, 240 strlen(GetPString(IDS_10SYSTEMMONOTEXT)) + 1, 241 (PVOID)GetPString(IDS_10SYSTEMMONOTEXT)); 236 NULL)) 237 { 238 Win_Error2(hwnd,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW); 239 } 240 else { 241 WinSetPresParam(WinWindowFromID(hwnd,VINF_LISTBOX), 242 PP_FONTNAMESIZE, 243 strlen(GetPString(IDS_10SYSTEMMONOTEXT)) + 1, 244 (PVOID)GetPString(IDS_10SYSTEMMONOTEXT)); 245 } 242 246 WinSetWindowText(hwnd, 243 247 GetPString(IDS_VIEWHELPFILESTEXT)); 244 WinShowWindow(WinWindowFromID(hwnd, 245 VINF_SRCH), 248 WinShowWindow(WinWindowFromID(hwnd,VINF_SRCH), 246 249 FALSE); 247 WinShowWindow(WinWindowFromID(hwnd, 248 VINF_FILTER), 250 WinShowWindow(WinWindowFromID(hwnd,VINF_FILTER), 249 251 FALSE); 250 WinShowWindow(WinWindowFromID(hwnd, 251 VINF_TOPIC), 252 WinShowWindow(WinWindowFromID(hwnd,VINF_TOPIC), 252 253 FALSE); 253 WinShowWindow(WinWindowFromID(hwnd, 254 VINF_TOPICHDR), 254 WinShowWindow(WinWindowFromID(hwnd,VINF_TOPICHDR), 255 255 FALSE); 256 256 } 257 hptrIcon = WinLoadPointer(HWND_DESKTOP, 258 FM3ModHandle, 259 VINF_FRAME); 260 WinDefDlgProc(hwnd, 261 WM_SETICON, 262 MPFROMLONG(hptrIcon), 263 MPVOID); 257 hptrIcon = WinLoadPointer(HWND_DESKTOP,FM3ModHandle,VINF_FRAME); 258 WinDefDlgProc(hwnd,WM_SETICON,MPFROMLONG(hptrIcon),MPVOID); 264 259 hwndMe = hwnd; 265 PostMsg(hwnd, 266 UM_STRETCH, 267 MPVOID, 268 MPVOID); 269 PostMsg(hwnd, 270 UM_RESCAN, 271 MPVOID, 272 MPVOID); 260 PostMsg(hwnd,UM_STRETCH,MPVOID,MPVOID); 261 PostMsg(hwnd,UM_RESCAN,MPVOID,MPVOID); 273 262 break; 274 263
Note:
See TracChangeset
for help on using the changeset viewer.