Changeset 451
- Timestamp:
- Aug 24, 2006, 7:01:24 AM (19 years ago)
- Location:
- trunk/dll
- Files:
-
- 5 edited
-
droplist.c (modified) (3 diffs)
-
fm3dll2.h (modified) (6 diffs)
-
getnames.c (modified) (5 diffs)
-
killproc.c (modified) (1 diff)
-
misc.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/dll/droplist.c ¶
r346 r451 265 265 if(Operation == DO_MOVE && 266 266 !(pDItem->fsSupportedOps & DO_MOVEABLE)) { 267 saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"forcing DO_COPY"); // SHL 267 saymsg(MB_ENTER,HWND_DESKTOP,GetPString(IDS_WARNINGTEXT), 268 GetPString(IDS_FORCINGCOPYTEXT)); 268 269 Operation = DO_COPY; 269 270 } 270 271 numitems = DrgQueryDragitemCount(pDInfo); 271 272 while(curitem < numitems) { 272 pDItem = DrgQueryDragitemPtr(pDInfo, 273 curitem); 273 pDItem = DrgQueryDragitemPtr(pDInfo,curitem); 274 274 if(!pDItem) 275 275 break; … … 284 284 Operation = DO_LINK; 285 285 } 286 else { /* ignore object if selected command not allowed for it */ 287 switch(Operation) { 286 else { 287 /* ignore object if selected command not allowed for it */ 288 switch (Operation) { 288 289 case DO_MOVE: 289 290 if(pDItem->fsSupportedOps & DO_MOVEABLE) … … 299 300 break; 300 301 } 302 // Fail request 301 303 DrgSendTransferMsg(pDItem->hwndItem, 302 304 DM_ENDCONVERSATION, -
TabularUnified trunk/dll/fm3dll2.h ¶
r321 r451 13 13 01 Nov 04 SHL Rename SKULL? defines to avoid rc issues 14 14 06 Jul 06 SHL Add Select Same Content support 15 23 Aug 06 SHL Comments 15 16 16 17 ***********************************************************************/ … … 261 262 #define IDM_COLLECT 1011 262 263 #define IDM_OPENSUBMENU 1012 263 #define IDM_OPENSETTINGS1013264 #define IDM_OPENICON1014265 #define IDM_OPENDETAILS1015266 #define IDM_OPENTREE1016267 #define IDM_OPENDEFAULT1017268 #define IDM_OPENWINDOW1018269 #define IDM_OPENWALK1019264 #define IDM_OPENSETTINGS 1013 265 #define IDM_OPENICON 1014 266 #define IDM_OPENDETAILS 1015 267 #define IDM_OPENTREE 1016 268 #define IDM_OPENDEFAULT 1017 269 #define IDM_OPENWINDOW 1018 270 #define IDM_OPENWALK 1019 270 271 #define IDM_OBJECTSUBMENU 1020 271 #define IDM_SHADOW1021272 #define IDM_OBJECT1022272 #define IDM_SHADOW 1021 273 #define IDM_OBJECT 1022 273 274 #define IDM_VIEW 1023 274 275 #define IDM_EDIT 1024 … … 423 424 #define IDM_TOOLBAR 3002 424 425 #define IDM_SORTSUBMENU 3003 425 #define IDM_SORTNAME3004426 #define IDM_SORTFILENAME3005427 #define IDM_SORTSIZE3006428 #define IDM_SORTEASIZE3007429 #define IDM_SORTFIRST3008430 #define IDM_SORTLAST3009431 #define IDM_SORTLWDATE3010432 #define IDM_SORTLADATE3011433 #define IDM_SORTCRDATE3012434 #define IDM_SORTDIRSFIRST3013435 #define IDM_SORTDIRSLAST3014436 #define IDM_SORTREVERSE3015437 #define IDM_SORTSMARTNAME3016438 #define IDM_SORTNONE3017439 #define IDM_SORTSUBJECT3018426 #define IDM_SORTNAME 3004 427 #define IDM_SORTFILENAME 3005 428 #define IDM_SORTSIZE 3006 429 #define IDM_SORTEASIZE 3007 430 #define IDM_SORTFIRST 3008 431 #define IDM_SORTLAST 3009 432 #define IDM_SORTLWDATE 3010 433 #define IDM_SORTLADATE 3011 434 #define IDM_SORTCRDATE 3012 435 #define IDM_SORTDIRSFIRST 3013 436 #define IDM_SORTDIRSLAST 3014 437 #define IDM_SORTREVERSE 3015 438 #define IDM_SORTSMARTNAME 3016 439 #define IDM_SORTNONE 3017 440 #define IDM_SORTSUBJECT 3018 440 441 #define IDM_FONTPALETTE 3020 441 442 #define IDM_COLORPALETTE 3021 442 443 #define IDM_PROGSETUP 3022 443 444 #define IDM_TOGGLESSUBMENU 3033 444 #define IDM_FOLLOWTREE3034445 #define IDM_LOADSUBJECTS3035446 #define IDM_LOADLONGNAMES3036447 #define IDM_DONTMOVEMOUSE3037448 #define IDM_UNHILITE3038449 #define IDM_CONFIRMDELETE3039450 #define IDM_SYNCUPDATES3040451 #define IDM_FORCEUPPER3041452 #define IDM_FORCELOWER3042453 #define IDM_VERIFYWRITES3043454 #define IDM_NOICONSFILES3044455 #define IDM_NOICONSDIRS3045456 #define IDM_DCOPENS3046457 #define IDM_LINKSETSICON3047458 #define IDM_TEXTTOOLS3048459 #define IDM_TOOLTITLES3049445 #define IDM_FOLLOWTREE 3034 446 #define IDM_LOADSUBJECTS 3035 447 #define IDM_LOADLONGNAMES 3036 448 #define IDM_DONTMOVEMOUSE 3037 449 #define IDM_UNHILITE 3038 450 #define IDM_CONFIRMDELETE 3039 451 #define IDM_SYNCUPDATES 3040 452 #define IDM_FORCEUPPER 3041 453 #define IDM_FORCELOWER 3042 454 #define IDM_VERIFYWRITES 3043 455 #define IDM_NOICONSFILES 3044 456 #define IDM_NOICONSDIRS 3045 457 #define IDM_DCOPENS 3046 458 #define IDM_LINKSETSICON 3047 459 #define IDM_TEXTTOOLS 3048 460 #define IDM_TOOLTITLES 3049 460 461 #define IDM_PRINTER 3050 461 462 #define IDM_EDITANYARCHIVER 3051 … … 564 565 #define IDM_SWITCHLIST 9012 565 566 #define IDM_TILEMENU 9013 566 #define IDM_WINDOWSTART 9100 567 #define IDM_SWITCHSTART 9500 567 #define IDM_WINDOWSTART 9100 /* Allow for 499 windows */ 568 #define IDM_SWITCHSTART 9500 /* Allow for 499 switch entries */ 568 569 569 570 #define IDM_PARENT 10000 … … 573 574 #define IDM_COLLAPSE 10004 574 575 #define IDM_EXPAND 10005 576 575 577 #define IDM_SELECTALL 10006 576 578 #define IDM_DESELECTALL 10007 … … 610 612 611 613 #ifndef MM_PORTHOLEINIT 612 #define MM_PORTHOLEINIT 0x01fb614 # define MM_PORTHOLEINIT 0x01fb 613 615 #endif 614 616 #ifndef MS_POPUP 615 #define MS_POPUP 0x00000010L617 # define MS_POPUP 0x00000010L 616 618 #endif 617 619 #ifndef CCS_MINIICONS 618 #define CCS_MINIICONS 0x0800620 # define CCS_MINIICONS 0x0800 619 621 #endif 620 622 #ifndef CRA_SOURCE 621 #define CRA_SOURCE 0x00004000623 # define CRA_SOURCE 0x00004000 622 624 #endif 623 625 #ifndef CV_EXACTMATCH 624 #define CV_EXACTMATCH 0x10000000626 # define CV_EXACTMATCH 0x10000000 625 627 #endif 626 628 #ifndef CBN_SETFOCUS 627 #define CBN_SETFOCUS 20629 # define CBN_SETFOCUS 20 628 630 #endif 629 631 #ifndef CBN_KILLFOCUS 630 #define CBN_KILLFOCUS 21632 # define CBN_KILLFOCUS 21 631 633 #endif 632 634 #ifndef CN_VERIFYEDIT 633 #define CN_VERIFYEDIT 134635 # define CN_VERIFYEDIT 134 634 636 #endif 635 637 #ifndef CN_PICKUP 636 #define CN_PICKUP 135638 # define CN_PICKUP 135 637 639 #endif 638 640 #ifndef CN_DROPNOTIFY 639 #define CN_DROPNOTIFY 136641 # define CN_DROPNOTIFY 136 640 642 #endif 641 643 #ifndef CN_GRIDRESIZED 642 #define CN_GRIDRESIZED 137644 # define CN_GRIDRESIZED 137 643 645 #endif 644 646 #ifndef BKS_MERLINSTYLE 645 #define BKS_MERLINSTYLE 0x0800 646 #endif 647 647 # define BKS_MERLINSTYLE 0x0800 648 #endif -
TabularUnified trunk/dll/getnames.c ¶
r2 r451 1 2 /*********************************************************************** 3 4 $Id$ 5 6 Directory containers 7 8 Copyright (c) 1993-98 M. Kimes 9 Copyright (c) 2006 Steven H. Levine 10 11 23 Aug 06 SHL Comments 12 13 ***********************************************************************/ 14 1 15 #define INCL_DOS 2 16 #define INCL_WIN 3 4 17 #include <os2.h> 18 5 19 #include <stdlib.h> 6 20 #include <stdio.h> 7 21 #include <string.h> 8 22 #include <time.h> 23 9 24 #include <ctype.h> 10 25 #include "fm3dll.h" … … 16 31 17 32 18 MRESULT EXPENTRY CustomFileDlg (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {19 33 MRESULT EXPENTRY CustomFileDlg(HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) 34 { 20 35 switch(msg) { 21 36 case WM_INITDLG: … … 211 226 212 227 213 BOOL insert_filename (HWND hwnd,CHAR *filename,INT loadit, BOOL newok) {214 228 BOOL insert_filename(HWND hwnd,CHAR *filename,INT loadit, BOOL newok) 229 { 215 230 FILEDLG fdlg; 216 231 FILESTATUS3 fsa; … … 276 291 if(fdlg.lReturn != DID_CANCEL && !fdlg.lSRC) 277 292 strcpy(filename,fdlg.szFullFile); 293 else 294 return FALSE; 295 } 296 else 297 return FALSE; 298 MakeFullName(filename); 299 if(!DosQueryPathInfo(filename, 300 FIL_STANDARD, 301 &fsa, 302 sizeof(fsa))) { 303 if(fsa.attrFile & FILE_DIRECTORY) { 304 /* device or directory */ 305 saymsg(MB_CANCEL | MB_ICONEXCLAMATION, 306 hwnd, 307 filename, 308 GetPString(IDS_EXISTSBUTNOTFILETEXT), 309 filename); 310 return FALSE; 311 } 312 else if(fsa.cbFile == 0L) { 313 saymsg(MB_CANCEL, 314 hwnd, 315 filename, 316 GetPString(IDS_ISZEROLENGTHTEXT), 317 filename); 318 return FALSE; 319 } 320 } 321 else if(!newok) { 322 saymsg(MB_CANCEL, 323 hwnd, 324 filename, 325 GetPString(IDS_DOESNTEXISTTEXT), 326 filename); 327 return FALSE; 328 } 329 else { 330 rc = saymsg(MB_YESNOCANCEL, 331 hwnd, 332 filename, 333 GetPString(IDS_CREATENEWTEXT)); 334 if(rc != MBID_YES) 335 return FALSE; 336 } 337 p = filename; 338 while(*p) { 339 if(*p == '/') 340 *p = '\\'; 341 p++; 342 } 343 if(*filename) 344 strcpy(lastfilename,filename); 345 return TRUE; 346 } 347 348 349 BOOL export_filename(HWND hwnd,CHAR *filename,INT overwrite) 350 { 351 FILEDLG fdlg; 352 FILESTATUS3 fsa; 353 CHAR drive[3],*pdrive = drive,*p; 354 static CHAR lastfilename[CCHMAXPATH] = ""; 355 356 if(!filename) 357 return FALSE; 358 memset(&fdlg,0,sizeof(FILEDLG)); 359 fdlg.cbSize = sizeof(FILEDLG); 360 fdlg.fl = FDS_CENTER | FDS_OPEN_DIALOG; 361 fdlg.pszTitle = GetPString(IDS_EXPORTNAMETITLETEXT); 362 fdlg.pszOKButton = GetPString(IDS_OKAYTEXT); 363 if(IsFullName(filename)) { 364 *drive = *filename; 365 drive[1] = ':'; 366 drive[2] = 0; 367 fdlg.pszIDrive = pdrive; 368 } 369 else if(*lastfilename) { 370 *drive = *lastfilename; 371 drive[1] = ':'; 372 drive[2] = 0; 373 fdlg.pszIDrive = pdrive; 374 } 375 if(!*filename) { 376 if(*lastfilename) { 377 strcpy(fdlg.szFullFile,lastfilename); 378 p = strrchr(fdlg.szFullFile,'\\'); 379 if(p) { 380 p++; 381 *p = 0; 382 } 383 } 384 strcat(fdlg.szFullFile,"*.TXT"); 385 } 386 else 387 strcpy(fdlg.szFullFile,filename); 388 389 if(fCustomFileDlg) { 390 fdlg.fl |= FDS_HELPBUTTON | FDS_CUSTOM; 391 fdlg.pfnDlgProc = (PFNWP)CustomFileDlg; 392 fdlg.hMod = FM3ModHandle; 393 fdlg.usDlgId = FDLG_FRAME; 394 } 395 396 if(WinFileDlg(HWND_DESKTOP, 397 hwnd, 398 &fdlg)) { 399 if(fdlg.lReturn != DID_CANCEL && 400 !fdlg.lSRC) 401 strcpy(filename, 402 fdlg.szFullFile); 278 403 else 279 404 return FALSE; … … 294 419 return FALSE; 295 420 } 296 else if(fsa.cbFile == 0L) {297 saymsg(MB_CANCEL,298 hwnd,299 filename,300 GetPString(IDS_ISZEROLENGTHTEXT),301 filename);302 return FALSE;303 }304 }305 else if(!newok) {306 saymsg(MB_CANCEL,307 hwnd,308 filename,309 GetPString(IDS_DOESNTEXISTTEXT),310 filename);311 return FALSE;312 }313 else {314 rc = saymsg(MB_YESNOCANCEL,315 hwnd,316 filename,317 GetPString(IDS_CREATENEWTEXT));318 if(rc != MBID_YES)319 return FALSE;320 }321 p = filename;322 while(*p) {323 if(*p == '/')324 *p = '\\';325 p++;326 }327 if(*filename)328 strcpy(lastfilename,filename);329 return TRUE;330 }331 332 333 BOOL export_filename (HWND hwnd,CHAR *filename,INT overwrite) {334 335 FILEDLG fdlg;336 FILESTATUS3 fsa;337 CHAR drive[3],*pdrive = drive,*p;338 static CHAR lastfilename[CCHMAXPATH] = "";339 340 if(!filename)341 return FALSE;342 memset(&fdlg,0,sizeof(FILEDLG));343 fdlg.cbSize = sizeof(FILEDLG);344 fdlg.fl = FDS_CENTER | FDS_OPEN_DIALOG;345 fdlg.pszTitle = GetPString(IDS_EXPORTNAMETITLETEXT);346 fdlg.pszOKButton = GetPString(IDS_OKAYTEXT);347 if(IsFullName(filename)) {348 *drive = *filename;349 drive[1] = ':';350 drive[2] = 0;351 fdlg.pszIDrive = pdrive;352 }353 else if(*lastfilename) {354 *drive = *lastfilename;355 drive[1] = ':';356 drive[2] = 0;357 fdlg.pszIDrive = pdrive;358 }359 if(!*filename) {360 if(*lastfilename) {361 strcpy(fdlg.szFullFile,lastfilename);362 p = strrchr(fdlg.szFullFile,'\\');363 if(p) {364 p++;365 *p = 0;366 }367 }368 strcat(fdlg.szFullFile,"*.TXT");369 }370 else371 strcpy(fdlg.szFullFile,filename);372 373 if(fCustomFileDlg) {374 fdlg.fl |= FDS_HELPBUTTON | FDS_CUSTOM;375 fdlg.pfnDlgProc = (PFNWP)CustomFileDlg;376 fdlg.hMod = FM3ModHandle;377 fdlg.usDlgId = FDLG_FRAME;378 }379 380 if(WinFileDlg(HWND_DESKTOP,381 hwnd,382 &fdlg)) {383 if(fdlg.lReturn != DID_CANCEL &&384 !fdlg.lSRC)385 strcpy(filename,386 fdlg.szFullFile);387 else388 return FALSE;389 }390 else391 return FALSE;392 MakeFullName(filename);393 if(!DosQueryPathInfo(filename,394 FIL_STANDARD,395 &fsa,396 sizeof(fsa))) {397 if(fsa.attrFile & FILE_DIRECTORY) { /* device or directory */398 saymsg(MB_CANCEL | MB_ICONEXCLAMATION,399 hwnd,400 filename,401 GetPString(IDS_EXISTSBUTNOTFILETEXT),402 filename);403 return FALSE;404 }405 421 else if(overwrite && 406 422 fsa.cbFile != 0L) { -
TabularUnified trunk/dll/killproc.c ¶
r404 r451 180 180 DosClose(newstdout); 181 181 fclose(fp); 182 // fixme to be gone? 182 183 if(rc == -1) { 183 184 saymsg(MB_CANCEL, -
TabularUnified trunk/dll/misc.c ¶
r406 r451 19 19 27 Jul 06 SHL Comments, apply indent 20 20 29 Jul 06 SHL Use xfgets_bstripcr 21 16 Aug 06 SHL Comments 21 22 22 23 ***********************************************************************/ … … 816 817 } 817 818 819 //== ViewHelp() invoke view.exe, return TRUE if OK == 820 818 821 BOOL ViewHelp(CHAR * filename) 819 822 { … … 837 840 return (ret != -1); 838 841 } 842 843 //== ExecFile() run file, return 1 if OK 0 if skipped -1 if can't run == 839 844 840 845 INT ExecFile(HWND hwnd, CHAR * filename) … … 874 879 if (ret == 1) { 875 880 lastflags = ex.flags; 876 return (runemf2(ex.flags, hwnd, path, 877 (*ex.environment) ? ex.environment : NULL, 878 "%s", cl) != -1); 881 return runemf2(ex.flags, hwnd, path, 882 (*ex.environment) ? ex.environment : NULL, 883 "%s", 884 cl) != -1; 879 885 } 880 886 else if (ret != 0)
Note:
See TracChangeset
for help on using the changeset viewer.
