Changeset 265
- Timestamp:
- Jul 4, 1999, 9:03:36 PM (26 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
changelog (modified) (1 diff)
-
include/win/tab.h (modified) (4 diffs)
-
include/win/winuser.h (modified) (51 diffs)
-
src/pe2lx/dialog.cpp (modified) (7 diffs)
-
src/user32/USER32.DEF (modified) (2 diffs)
-
src/user32/dialog.cpp (modified) (18 diffs)
-
src/user32/dlgconvert.cpp (modified) (5 diffs)
-
src/user32/user32exp.def (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/changelog
r258 r265 1 /* $Id: changelog,v 1.38 1999-07-02 12:42:14 sandervl Exp $ */ 1 /* $Id: changelog,v 1.39 1999-07-04 19:02:36 sandervl Exp $ */ 2 99-07-04: Christoph Bratschi <cbratschi@datacomm.ch> 3 - PE2LX/USER32: Dialog default font set to WarpSans + fixes 4 2 5 99-07-02: Christoph Bratschi <cbratschi@datacomm.ch> 3 6 - PE2LX/USER32: Dialog bugfix for entryfield strings -
trunk/include/win/tab.h
r4 r265 1 /* $Id: tab.h,v 1. 1 1999-05-24 20:19:19 ktkExp $ */1 /* $Id: tab.h,v 1.2 1999-07-04 19:03:36 sandervl Exp $ */ 2 2 3 3 /* … … 5 5 * 6 6 * Copyright 1998 Anders Carlsson 7 * Copyright 1999 Christoph Bratschi 7 8 */ 8 9 9 #ifndef __WINE_TAB_H 10 #ifndef __WINE_TAB_H 10 11 #define __WINE_TAB_H 11 12 … … 14 15 UINT mask; 15 16 DWORD dwState; 16 LP STRpszText;17 LPWSTR pszText; 17 18 INT cchTextMax; 18 19 INT iImage; 19 20 LPARAM lParam; 20 21 RECT rect; /* bounding rectangle of the item relative to the 21 * leftmost item (the leftmost item, 0, would have a 22 22 * leftmost item (the leftmost item, 0, would have a 23 * "left" member of 0 in this rectangle) */ 23 24 } TAB_ITEM; 24 25 … … 34 35 UINT cchTextMax; 35 36 INT leftmostVisible; /* Used for scrolling, this member contains 36 37 * the index of the first visible item */ 37 38 INT iSelected; /* the currently selected item */ 38 39 INT uFocus; /* item which has the focus */ 39 40 TAB_ITEM* items; /* pointer to an array of TAB_ITEM's */ 40 41 BOOL DoRedraw; /* flag for redrawing when tab contents is changed*/ 41 BOOL needsScrolling; /* TRUE if the size of the tabs is greater than 42 42 BOOL needsScrolling; /* TRUE if the size of the tabs is greater than 43 * the size of the control */ 43 44 HWND hwndUpDown; /* Updown control used for scrolling */ 44 45 } TAB_INFO; -
trunk/include/win/winuser.h
r264 r265 1 /* $Id: winuser.h,v 1. 2 1999-07-04 15:34:18sandervl Exp $ */1 /* $Id: winuser.h,v 1.3 1999-07-04 19:02:37 sandervl Exp $ */ 2 2 3 3 #ifndef __INCLUDE_WINUSER_H … … 106 106 #endif 107 107 108 #define FVIRTKEYTRUE /* Assumed to be == TRUE */109 #define FNOINVERT0x02110 #define FSHIFT0x04111 #define FCONTROL0x08112 #define FALT0x10108 #define FVIRTKEY TRUE /* Assumed to be == TRUE */ 109 #define FNOINVERT 0x02 110 #define FSHIFT 0x04 111 #define FCONTROL 0x08 112 #define FALT 0x10 113 113 114 114 … … 128 128 typedef struct 129 129 { 130 UINTcbSize;131 INTiTabLength;132 INTiLeftMargin;133 INTiRightMargin;134 UINTuiLengthDrawn;130 UINT cbSize; 131 INT iTabLength; 132 INT iLeftMargin; 133 INT iRightMargin; 134 UINT uiLengthDrawn; 135 135 } DRAWTEXTPARAMS,*LPDRAWTEXTPARAMS; 136 136 … … 239 239 240 240 /* Dialog styles */ 241 #define DS_ABSALIGN 242 #define DS_SYSMODAL 243 #define DS_3DLOOK 0x0004/* win95 */244 #define DS_FIXEDSYS 0x0008/* win95 */245 #define DS_NOFAILCREATE 0x0010/* win95 */246 #define DS_LOCALEDIT 247 #define DS_SETFONT 248 #define DS_MODALFRAME 249 #define DS_NOIDLEMSG 250 #define DS_SETFOREGROUND 0x0200/* win95 */251 #define DS_CONTROL 0x0400/* win95 */252 #define DS_CENTER 0x0800/* win95 */253 #define DS_CENTERMOUSE 0x1000/* win95 */254 #define DS_CONTEXTHELP 0x2000/* win95 */241 #define DS_ABSALIGN 0x0001 242 #define DS_SYSMODAL 0x0002 243 #define DS_3DLOOK 0x0004 /* win95 */ 244 #define DS_FIXEDSYS 0x0008 /* win95 */ 245 #define DS_NOFAILCREATE 0x0010 /* win95 */ 246 #define DS_LOCALEDIT 0x0020 247 #define DS_SETFONT 0x0040 248 #define DS_MODALFRAME 0x0080 249 #define DS_NOIDLEMSG 0x0100 250 #define DS_SETFOREGROUND 0x0200 /* win95 */ 251 #define DS_CONTROL 0x0400 /* win95 */ 252 #define DS_CENTER 0x0800 /* win95 */ 253 #define DS_CENTERMOUSE 0x1000 /* win95 */ 254 #define DS_CONTEXTHELP 0x2000 /* win95 */ 255 255 256 256 … … 338 338 #define OBM_OLD_CLOSE 32767 339 339 340 #define OCR_BUMMER 341 #define OCR_DRAGOBJECT 340 #define OCR_BUMMER 100 341 #define OCR_DRAGOBJECT 101 342 342 343 343 #define OCR_NORMAL 32512 … … 432 432 433 433 /* New since win95 : EM_SETMARGIN parameters */ 434 #define EC_LEFTMARGIN 435 #define EC_RIGHTMARGIN 436 #define EC_USEFONTINFO 434 #define EC_LEFTMARGIN 0x0001 435 #define EC_RIGHTMARGIN 0x0002 436 #define EC_USEFONTINFO 0xffff 437 437 438 438 … … 503 503 #define WM_TESTING 0x003a 504 504 505 #define WM_OTHERWINDOWCREATED 506 #define WM_OTHERWINDOWDESTROYED 507 #define WM_ACTIVATESHELLWINDOW 508 509 #define WM_COMPACTING 510 511 #define WM_COMMNOTIFY 512 #define WM_WINDOWPOSCHANGING 513 #define WM_WINDOWPOSCHANGED 514 #define WM_POWER 505 #define WM_OTHERWINDOWCREATED 0x003c 506 #define WM_OTHERWINDOWDESTROYED 0x003d 507 #define WM_ACTIVATESHELLWINDOW 0x003e 508 509 #define WM_COMPACTING 0x0041 510 511 #define WM_COMMNOTIFY 0x0044 512 #define WM_WINDOWPOSCHANGING 0x0046 513 #define WM_WINDOWPOSCHANGED 0x0047 514 #define WM_POWER 0x0048 515 515 516 516 /* Win32 4.0 messages */ 517 #define WM_COPYDATA 518 #define WM_CANCELJOURNAL 519 #define WM_NOTIFY 517 #define WM_COPYDATA 0x004a 518 #define WM_CANCELJOURNAL 0x004b 519 #define WM_NOTIFY 0x004e 520 520 #define WM_INPUTLANGCHANGEREQUEST 0x0050 521 521 #define WM_INPUTLANGCHANGE 0x0051 … … 523 523 #define WM_HELP 0x0053 524 524 #define WM_USERCHANGED 0x0054 525 #define WM_HELP 526 #define WM_NOTIFYFORMAT 527 528 #define WM_CONTEXTMENU 529 #define WM_STYLECHANGING 530 #define WM_STYLECHANGED 525 #define WM_HELP 0x0053 526 #define WM_NOTIFYFORMAT 0x0055 527 528 #define WM_CONTEXTMENU 0x007b 529 #define WM_STYLECHANGING 0x007c 530 #define WM_STYLECHANGED 0x007d 531 531 #define WM_DISPLAYCHANGE 0x007e 532 #define WM_GETICON 533 #define WM_SETICON 532 #define WM_GETICON 0x007f 533 #define WM_SETICON 0x0080 534 534 535 535 /* Non-client system messages */ … … 541 541 #define WM_NCACTIVATE 0x0086 542 542 543 #define WM_GETDLGCODE 544 #define WM_SYNCPAINT 545 #define WM_SYNCTASK 543 #define WM_GETDLGCODE 0x0087 544 #define WM_SYNCPAINT 0x0088 545 #define WM_SYNCTASK 0x0089 546 546 547 547 /* Non-client mouse messages */ … … 574 574 #define WM_IME_KEYLAST 0x010F 575 575 576 #define WM_INITDIALOG 0x0110 576 #define WM_INITDIALOG 0x0110 577 577 #define WM_COMMAND 0x0111 578 578 #define WM_SYSCOMMAND 0x0112 579 #define WM_TIMER 580 #define WM_SYSTIMER 579 #define WM_TIMER 0x0113 580 #define WM_SYSTIMER 0x0118 581 581 582 582 /* scroll messages */ … … 604 604 605 605 /* Mouse messages */ 606 #define WM_MOUSEMOVE 607 #define WM_LBUTTONDOWN 608 #define WM_LBUTTONUP 606 #define WM_MOUSEMOVE 0x0200 607 #define WM_LBUTTONDOWN 0x0201 608 #define WM_LBUTTONUP 0x0202 609 609 #define WM_LBUTTONDBLCLK 0x0203 610 #define WM_RBUTTONDOWN 611 #define WM_RBUTTONUP 610 #define WM_RBUTTONDOWN 0x0204 611 #define WM_RBUTTONUP 0x0205 612 612 #define WM_RBUTTONDBLCLK 0x0206 613 #define WM_MBUTTONDOWN 614 #define WM_MBUTTONUP 613 #define WM_MBUTTONDOWN 0x0207 614 #define WM_MBUTTONUP 0x0208 615 615 #define WM_MBUTTONDBLCLK 0x0209 616 #define WM_MOUSEFIRST 617 #define WM_MOUSELAST 616 #define WM_MOUSEFIRST WM_MOUSEMOVE 617 #define WM_MOUSELAST WM_MBUTTONDBLCLK 618 618 619 619 #define WM_PARENTNOTIFY 0x0210 620 620 #define WM_ENTERMENULOOP 0x0211 621 621 #define WM_EXITMENULOOP 0x0212 622 #define WM_NEXTMENU 622 #define WM_NEXTMENU 0x0213 623 623 624 624 /* Win32 4.0 messages */ 625 #define WM_SIZING 625 #define WM_SIZING 0x0214 626 626 #define WM_CAPTURECHANGED 0x0215 627 #define WM_MOVING 627 #define WM_MOVING 0x0216 628 628 629 629 /* MDI messages */ 630 #define WM_MDICREATE 631 #define WM_MDIDESTROY 632 #define WM_MDIACTIVATE 633 #define WM_MDIRESTORE 634 #define WM_MDINEXT 635 #define WM_MDIMAXIMIZE 636 #define WM_MDITILE 637 #define WM_MDICASCADE 630 #define WM_MDICREATE 0x0220 631 #define WM_MDIDESTROY 0x0221 632 #define WM_MDIACTIVATE 0x0222 633 #define WM_MDIRESTORE 0x0223 634 #define WM_MDINEXT 0x0224 635 #define WM_MDIMAXIMIZE 0x0225 636 #define WM_MDITILE 0x0226 637 #define WM_MDICASCADE 0x0227 638 638 #define WM_MDIICONARRANGE 0x0228 639 639 #define WM_MDIGETACTIVE 0x0229 … … 641 641 642 642 /* D&D messages */ 643 #define WM_DROPOBJECT 643 #define WM_DROPOBJECT 0x022A 644 644 #define WM_QUERYDROPOBJECT 0x022B 645 #define WM_BEGINDRAG 646 #define WM_DRAGLOOP 647 #define WM_DRAGSELECT 648 #define WM_DRAGMOVE 649 #define WM_MDISETMENU 645 #define WM_BEGINDRAG 0x022C 646 #define WM_DRAGLOOP 0x022D 647 #define WM_DRAGSELECT 0x022E 648 #define WM_DRAGMOVE 0x022F 649 #define WM_MDISETMENU 0x0230 650 650 651 651 #define WM_ENTERSIZEMOVE 0x0231 652 652 #define WM_EXITSIZEMOVE 0x0232 653 #define WM_DROPFILES 653 #define WM_DROPFILES 0x0233 654 654 655 655 #define WM_IME_SETCONTEXT 0x0281 … … 680 680 #define WM_PALETTEISCHANGING 0x0310 681 681 #define WM_PALETTECHANGED 0x0311 682 #define WM_HOTKEY 682 #define WM_HOTKEY 0x0312 683 683 684 684 #define WM_PRINT 0x0317 … … 691 691 #define WM_SIZEPARENT 0x0361 692 692 #define WM_SETMESSAGESTRING 0x0362 693 #define WM_IDLEUPDATECMDUI 0x0363 693 #define WM_IDLEUPDATECMDUI 0x0363 694 694 #define WM_INITIALUPDATE 0x0364 695 695 #define WM_COMMANDHELP 0x0365 … … 698 698 #define WM_RECALCPARENT 0x0368 699 699 #define WM_SIZECHILD 0x0369 700 #define WM_KICKIDLE 0x036A 700 #define WM_KICKIDLE 0x036A 701 701 #define WM_QUERYCENTERWND 0x036B 702 702 #define WM_DISABLEMODAL 0x036C 703 #define WM_FLOATSTATUS 0x036D 704 #define WM_ACTIVATETOPLEVEL 0x036E 705 #define WM_QUERY3DCONTROLS 0x036F 703 #define WM_FLOATSTATUS 0x036D 704 #define WM_ACTIVATETOPLEVEL 0x036E 705 #define WM_QUERY3DCONTROLS 0x036F 706 706 #define WM_SOCKET_NOTIFY 0x0373 707 707 #define WM_SOCKET_DEAD 0x0374 … … 746 746 #define IDNO 7 747 747 #define IDCLOSE 8 748 #define IDHELP 9 748 #define IDHELP 9 749 749 750 750 /****** Window classes ******/ … … 785 785 DECL_WINELIB_TYPE_AW(LPCREATESTRUCT) 786 786 787 typedef struct 787 typedef struct 788 788 { 789 789 HMENU hWindowMenu; … … 821 821 DECL_WINELIB_TYPE_AW(LPMDICREATESTRUCT) 822 822 823 #define MDITILE_VERTICAL 0x0000 823 #define MDITILE_VERTICAL 0x0000 824 824 #define MDITILE_HORIZONTAL 0x0001 825 825 #define MDITILE_SKIPDISABLED 0x0002 … … 843 843 #define GWL_HINSTANCE GWW_HINSTANCE 844 844 #define GWL_WNDPROC (-4) 845 #define DWL_MSGRESULT 846 #define DWL_DLGPROC 847 #define DWL_USER 845 #define DWL_MSGRESULT 0 846 #define DWL_DLGPROC 4 847 #define DWL_USER 8 848 848 849 849 /* GetWindow() constants */ 850 #define GW_HWNDFIRST 851 #define GW_HWNDLAST 852 #define GW_HWNDNEXT 853 #define GW_HWNDPREV 854 #define GW_OWNER 855 #define GW_CHILD 850 #define GW_HWNDFIRST 0 851 #define GW_HWNDLAST 1 852 #define GW_HWNDNEXT 2 853 #define GW_HWNDPREV 3 854 #define GW_OWNER 4 855 #define GW_CHILD 5 856 856 857 857 /* WM_GETMINMAXINFO struct */ … … 1000 1000 #define PRF_CHILDREN 0x00000010L 1001 1001 #define PRF_OWNED 0x00000020L 1002 1002 1003 1003 /* Offsets for GetClassLong() and GetClassWord() */ 1004 1004 #define GCL_MENUNAME (-8) … … 1030 1030 1031 1031 /* Hook values */ 1032 #define WH_MIN 1033 #define WH_MSGFILTER 1032 #define WH_MIN (-1) 1033 #define WH_MSGFILTER (-1) 1034 1034 #define WH_JOURNALRECORD 0 1035 1035 #define WH_JOURNALPLAYBACK 1 1036 #define WH_KEYBOARD 1037 #define WH_GETMESSAGE 1038 #define WH_CALLWNDPROC 1039 #define WH_CBT 1040 #define WH_SYSMSGFILTER 1041 #define WH_MOUSE 1042 #define WH_HARDWARE 1043 #define WH_DEBUG 1036 #define WH_KEYBOARD 2 1037 #define WH_GETMESSAGE 3 1038 #define WH_CALLWNDPROC 4 1039 #define WH_CBT 5 1040 #define WH_SYSMSGFILTER 6 1041 #define WH_MOUSE 7 1042 #define WH_HARDWARE 8 1043 #define WH_DEBUG 9 1044 1044 #define WH_SHELL 10 1045 1045 #define WH_FOREGROUNDIDLE 11 … … 1116 1116 /* WinHelp internal structure */ 1117 1117 typedef struct { 1118 1119 1120 1121 1122 1123 1118 WORD size; 1119 WORD command; 1120 LONG data; 1121 LONG reserved; 1122 WORD ofsFilename; 1123 WORD ofsData; 1124 1124 } WINHELP,*LPWINHELP; 1125 1125 … … 1132 1132 1133 1133 typedef struct { 1134 1135 1136 1137 1138 1139 1140 1134 WORD wStructSize; 1135 WORD x; 1136 WORD y; 1137 WORD dx; 1138 WORD dy; 1139 WORD wMax; 1140 char rgchMember[2]; 1141 1141 } HELPWININFO, *LPHELPWININFO; 1142 1142 … … 1156 1156 #define HELP_SETWINPOS 0x0203 1157 1157 #define HELP_CONTEXTMENU 0x000a 1158 #define HELP_FINDER 1159 #define HELP_WM_HELP 1158 #define HELP_FINDER 0x000b 1159 #define HELP_WM_HELP 0x000c 1160 1160 #define HELP_SETPOPUP_POS 0x000d 1161 1161 1162 #define HELP_TCARD 1163 #define HELP_TCARD_DATA 1162 #define HELP_TCARD 0x8000 1163 #define HELP_TCARD_DATA 0x0010 1164 1164 #define HELP_TCARD_OTHER_CALLER 0x0011 1165 1165 … … 1175 1175 1176 1176 /* flags to FormatMessage */ 1177 #define FORMAT_MESSAGE_ALLOCATE_BUFFER0x000001001178 #define FORMAT_MESSAGE_IGNORE_INSERTS0x000002001179 #define FORMAT_MESSAGE_FROM_STRING0x000004001180 #define FORMAT_MESSAGE_FROM_HMODULE0x000008001181 #define FORMAT_MESSAGE_FROM_SYSTEM0x000010001182 #define FORMAT_MESSAGE_ARGUMENT_ARRAY0x000020001183 #define FORMAT_MESSAGE_MAX_WIDTH_MASK0x000000FF1177 #define FORMAT_MESSAGE_ALLOCATE_BUFFER 0x00000100 1178 #define FORMAT_MESSAGE_IGNORE_INSERTS 0x00000200 1179 #define FORMAT_MESSAGE_FROM_STRING 0x00000400 1180 #define FORMAT_MESSAGE_FROM_HMODULE 0x00000800 1181 #define FORMAT_MESSAGE_FROM_SYSTEM 0x00001000 1182 #define FORMAT_MESSAGE_ARGUMENT_ARRAY 0x00002000 1183 #define FORMAT_MESSAGE_MAX_WIDTH_MASK 0x000000FF 1184 1184 1185 1185 typedef struct … … 1228 1228 } MSG, *LPMSG; 1229 1229 1230 1230 1231 1231 /* Cursors / Icons */ 1232 1232 1233 1233 typedef struct { 1234 BOOLfIcon;1235 DWORDxHotspot;1236 DWORDyHotspot;1237 HBITMAPhbmMask;1238 HBITMAPhbmColor;1234 BOOL fIcon; 1235 DWORD xHotspot; 1236 DWORD yHotspot; 1237 HBITMAP hbmMask; 1238 HBITMAP hbmColor; 1239 1239 } ICONINFO,*LPICONINFO; 1240 1240 … … 1274 1274 #define TPM_RETURNCMD 0x0100 1275 1275 1276 typedef struct 1276 typedef struct 1277 1277 { 1278 1278 UINT cbSize; … … 1329 1329 typedef MENUINFO const * LPCMENUINFO; 1330 1330 1331 #define MIM_MAXHEIGHT 1332 #define MIM_BACKGROUND 1333 #define MIM_HELPID 1334 #define MIM_MENUDATA 1335 #define MIM_STYLE 1336 #define MIM_APPLYTOSUBMENUS 1331 #define MIM_MAXHEIGHT 0x00000001 1332 #define MIM_BACKGROUND 0x00000002 1333 #define MIM_HELPID 0x00000004 1334 #define MIM_MENUDATA 0x00000008 1335 #define MIM_STYLE 0x00000010 1336 #define MIM_APPLYTOSUBMENUS 0x80000000 1337 1337 1338 1338 typedef struct { … … 1363 1363 #define MIIM_FTYPE 0x00000100 1364 1364 1365 #define HBMMENU_CALLBACK 1366 #define HBMMENU_SYSTEM 1367 #define HBMMENU_MBAR_RESTORE 1368 #define HBMMENU_MBAR_MINIMIZE 1369 #define HBMMENU_MBAR_CLOSE 1370 #define HBMMENU_MBAR_CLOSE_D 1371 #define HBMMENU_MBAR_MINIMIZE_D 1372 #define HBMMENU_POPUP_CLOSE 1373 #define HBMMENU_POPUP_RESTORE 1374 #define HBMMENU_POPUP_MAXIMIZE 1375 #define HBMMENU_POPUP_MINIMIZE 1365 #define HBMMENU_CALLBACK ((HBITMAP) -1) 1366 #define HBMMENU_SYSTEM ((HBITMAP) 1) 1367 #define HBMMENU_MBAR_RESTORE ((HBITMAP) 2) 1368 #define HBMMENU_MBAR_MINIMIZE ((HBITMAP) 3) 1369 #define HBMMENU_MBAR_CLOSE ((HBITMAP) 5) 1370 #define HBMMENU_MBAR_CLOSE_D ((HBITMAP) 6) 1371 #define HBMMENU_MBAR_MINIMIZE_D ((HBITMAP) 7) 1372 #define HBMMENU_POPUP_CLOSE ((HBITMAP) 8) 1373 #define HBMMENU_POPUP_RESTORE ((HBITMAP) 9) 1374 #define HBMMENU_POPUP_MAXIMIZE ((HBITMAP) 10) 1375 #define HBMMENU_POPUP_MINIMIZE ((HBITMAP) 11) 1376 1376 1377 1377 /* DrawState defines ... */ … … 1450 1450 #define BST_INDETERMINATE 0x0002 1451 1451 #define BST_PUSHED 0x0004 1452 #define BST_FOCUS 0x0008 1452 #define BST_FOCUS 0x0008 1453 1453 1454 1454 /* Static Control Styles */ … … 1510 1510 INT nTrackPos; 1511 1511 } SCROLLINFO, *LPSCROLLINFO; 1512 1513 /* GetScrollInfo() flags */ 1512 1513 /* GetScrollInfo() flags */ 1514 1514 #define SIF_RANGE 0x0001 1515 1515 #define SIF_PAGE 0x0002 … … 1609 1609 #define CBS_DISABLENOSCROLL 0x0800L 1610 1610 1611 #define CBS_UPPERCASE 1612 #define CBS_LOWERCASE 1611 #define CBS_UPPERCASE 0x2000L 1612 #define CBS_LOWERCASE 0x4000L 1613 1613 1614 1614 … … 1667 1667 #define CB_ERRSPACE (-2) 1668 1668 1669 #define MB_OK 1670 #define MB_OKCANCEL 1671 #define MB_ABORTRETRYIGNORE 1672 #define MB_YESNOCANCEL 1673 #define MB_YESNO 1674 #define MB_RETRYCANCEL 1675 #define MB_TYPEMASK 1676 1677 #define MB_ICONHAND 1678 #define MB_ICONQUESTION 1679 #define MB_ICONEXCLAMATION 1680 #define MB_ICONASTERISK 1681 #define MB_USERICON0x000000801682 #define MB_ICONMASK 1683 1684 #define MB_ICONINFORMATION 1685 #define MB_ICONSTOP 1686 #define MB_ICONWARNING 1687 #define MB_ICONERROR 1688 1689 #define MB_DEFBUTTON1 1690 #define MB_DEFBUTTON2 1691 #define MB_DEFBUTTON3 1692 #define MB_DEFBUTTON4 1693 #define MB_DEFMASK 1694 1695 #define MB_APPLMODAL 1696 #define MB_SYSTEMMODAL 1697 #define MB_TASKMODAL 1698 #define MB_MODEMASK 1699 1700 #define MB_HELP 1701 #define MB_NOFOCUS 1702 #define MB_MISCMASK 1703 1704 #define MB_SETFOREGROUND 1705 #define MB_DEFAULT_DESKTOP_ONLY 1706 #define MB_SERVICE_NOTIFICATION 1707 #define MB_TOPMOST 1708 #define MB_RIGHT 1709 #define MB_RTLREADING 1710 1711 #define HELPINFO_WINDOW0x00011712 #define HELPINFO_MENUITEM0x00021669 #define MB_OK 0x00000000 1670 #define MB_OKCANCEL 0x00000001 1671 #define MB_ABORTRETRYIGNORE 0x00000002 1672 #define MB_YESNOCANCEL 0x00000003 1673 #define MB_YESNO 0x00000004 1674 #define MB_RETRYCANCEL 0x00000005 1675 #define MB_TYPEMASK 0x0000000F 1676 1677 #define MB_ICONHAND 0x00000010 1678 #define MB_ICONQUESTION 0x00000020 1679 #define MB_ICONEXCLAMATION 0x00000030 1680 #define MB_ICONASTERISK 0x00000040 1681 #define MB_USERICON 0x00000080 1682 #define MB_ICONMASK 0x000000F0 1683 1684 #define MB_ICONINFORMATION MB_ICONASTERISK 1685 #define MB_ICONSTOP MB_ICONHAND 1686 #define MB_ICONWARNING MB_ICONEXCLAMATION 1687 #define MB_ICONERROR MB_ICONHAND 1688 1689 #define MB_DEFBUTTON1 0x00000000 1690 #define MB_DEFBUTTON2 0x00000100 1691 #define MB_DEFBUTTON3 0x00000200 1692 #define MB_DEFBUTTON4 0x00000300 1693 #define MB_DEFMASK 0x00000F00 1694 1695 #define MB_APPLMODAL 0x00000000 1696 #define MB_SYSTEMMODAL 0x00001000 1697 #define MB_TASKMODAL 0x00002000 1698 #define MB_MODEMASK 0x00003000 1699 1700 #define MB_HELP 0x00004000 1701 #define MB_NOFOCUS 0x00008000 1702 #define MB_MISCMASK 0x0000C000 1703 1704 #define MB_SETFOREGROUND 0x00010000 1705 #define MB_DEFAULT_DESKTOP_ONLY 0x00020000 1706 #define MB_SERVICE_NOTIFICATION 0x00040000 1707 #define MB_TOPMOST 0x00040000 1708 #define MB_RIGHT 0x00080000 1709 #define MB_RTLREADING 0x00100000 1710 1711 #define HELPINFO_WINDOW 0x0001 1712 #define HELPINFO_MENUITEM 0x0002 1713 1713 1714 1714 /* Structure pointed to by lParam of WM_HELP */ 1715 typedef struct 1716 { 1717 UINT cbSize;/* Size in bytes of this struct */1718 INT iContextType;/* Either HELPINFO_WINDOW or HELPINFO_MENUITEM */1719 INT iCtrlId;/* Control Id or a Menu item Id. */1720 HANDLE hItemHandle;/* hWnd of control or hMenu. */1721 DWORD dwContextId;/* Context Id associated with this item */1722 POINT MousePos;/* Mouse Position in screen co-ordinates */1715 typedef struct 1716 { 1717 UINT cbSize; /* Size in bytes of this struct */ 1718 INT iContextType; /* Either HELPINFO_WINDOW or HELPINFO_MENUITEM */ 1719 INT iCtrlId; /* Control Id or a Menu item Id. */ 1720 HANDLE hItemHandle; /* hWnd of control or hMenu. */ 1721 DWORD dwContextId; /* Context Id associated with this item */ 1722 POINT MousePos; /* Mouse Position in screen co-ordinates */ 1723 1723 } HELPINFO,*LPHELPINFO; 1724 1724 … … 1727 1727 typedef struct 1728 1728 { 1729 UINT 1730 HWND 1731 HINSTANCE 1732 LPCSTR 1733 LPCSTR 1734 DWORD 1735 LPCSTR 1736 DWORD 1737 MSGBOXCALLBACK 1738 DWORD 1729 UINT cbSize; 1730 HWND hwndOwner; 1731 HINSTANCE hInstance; 1732 LPCSTR lpszText; 1733 LPCSTR lpszCaption; 1734 DWORD dwStyle; 1735 LPCSTR lpszIcon; 1736 DWORD dwContextHelpId; 1737 MSGBOXCALLBACK lpfnMsgBoxCallback; 1738 DWORD dwLanguageId; 1739 1739 } MSGBOXPARAMSA,*LPMSGBOXPARAMSA; 1740 1740 1741 1741 typedef struct 1742 1742 { 1743 UINT 1744 HWND 1745 HINSTANCE 1746 LPCWSTR 1747 LPCWSTR 1748 DWORD 1749 LPCWSTR 1750 DWORD 1751 MSGBOXCALLBACK 1752 DWORD 1743 UINT cbSize; 1744 HWND hwndOwner; 1745 HINSTANCE hInstance; 1746 LPCWSTR lpszText; 1747 LPCWSTR lpszCaption; 1748 DWORD dwStyle; 1749 LPCWSTR lpszIcon; 1750 DWORD dwContextHelpId; 1751 MSGBOXCALLBACK lpfnMsgBoxCallback; 1752 DWORD dwLanguageId; 1753 1753 } MSGBOXPARAMSW,*LPMSGBOXPARAMSW; 1754 1754 … … 1845 1845 1846 1846 /* CBT hook values */ 1847 #define HCBT_MOVESIZE 1848 #define HCBT_MINMAX 1849 #define HCBT_QS 1850 #define HCBT_CREATEWND 1851 #define HCBT_DESTROYWND 1852 #define HCBT_ACTIVATE 1847 #define HCBT_MOVESIZE 0 1848 #define HCBT_MINMAX 1 1849 #define HCBT_QS 2 1850 #define HCBT_CREATEWND 3 1851 #define HCBT_DESTROYWND 4 1852 #define HCBT_ACTIVATE 5 1853 1853 #define HCBT_CLICKSKIPPED 6 1854 1854 #define HCBT_KEYSKIPPED 7 1855 #define HCBT_SYSCOMMAND 1856 #define HCBT_SETFOCUS 1855 #define HCBT_SYSCOMMAND 8 1856 #define HCBT_SETFOCUS 9 1857 1857 1858 1858 /* CBT hook structures */ … … 1881 1881 1882 1882 /* modifiers for RegisterHotKey */ 1883 #define MOD_ALT0x00011884 #define MOD_CONTROL0x00021885 #define MOD_SHIFT0x00041886 #define MOD_WIN0x00081883 #define MOD_ALT 0x0001 1884 #define MOD_CONTROL 0x0002 1885 #define MOD_SHIFT 0x0004 1886 #define MOD_WIN 0x0008 1887 1887 1888 1888 /* ids for RegisterHotKey */ 1889 #define IDHOT_SNAPWINDOW(-1) /* SHIFT-PRINTSCRN */1890 #define IDHOT_SNAPDESKTOP(-2) /* PRINTSCRN */1889 #define IDHOT_SNAPWINDOW (-1) /* SHIFT-PRINTSCRN */ 1890 #define IDHOT_SNAPDESKTOP (-2) /* PRINTSCRN */ 1891 1891 1892 1892 /* keybd_event flags */ … … 1918 1918 1919 1919 /* SetLastErrorEx types */ 1920 #define SLE_ERROR0x000000011921 #define SLE_MINORERROR0x000000021922 #define SLE_WARNING0x000000031920 #define SLE_ERROR 0x00000001 1921 #define SLE_MINORERROR 0x00000002 1922 #define SLE_WARNING 0x00000003 1923 1923 1924 1924 /* Predefined resources */ … … 2024 2024 #define SPI_SETFASTTASKSWITCH 36 2025 2025 #define SPI_SETDRAGFULLWINDOWS 37 2026 #define SPI_GETDRAGFULLWINDOWS 2026 #define SPI_GETDRAGFULLWINDOWS 38 2027 2027 2028 2028 #define SPI_GETFILTERKEYS 50 … … 2201 2201 #define CW_USEDEFAULT ((INT)0x80000000) 2202 2202 2203 /* CreateWindow() coordinates */2204 #define CW_USEDEFAULT16 ((INT16)0x8000)2205 2206 2203 /* ChildWindowFromPointEx Flags */ 2207 2204 #define CWP_ALL 0x0000 … … 2211 2208 2212 2209 /* PeekMessage() options */ 2213 #define PM_NOREMOVE 2214 #define PM_REMOVE 2215 #define PM_NOYIELD 2210 #define PM_NOREMOVE 0x0000 2211 #define PM_REMOVE 0x0001 2212 #define PM_NOYIELD 0x0002 2216 2213 2217 2214 #define WM_SHOWWINDOW 0x0018 … … 2236 2233 #define SW_SHOWNA 8 2237 2234 #define SW_RESTORE 9 2238 #define SW_SHOWDEFAULT 2239 #define SW_MAX 2240 #define SW_NORMALNA 0xCC/* undoc. flag in MinMaximize */2235 #define SW_SHOWDEFAULT 10 2236 #define SW_MAX 10 2237 #define SW_NORMALNA 0xCC /* undoc. flag in MinMaximize */ 2241 2238 2242 2239 /* WM_SIZE message wParam values */ … … 2353 2350 2354 2351 /* DrawCaption()/DrawCaptionTemp() flags */ 2355 #define DC_ACTIVE 2356 #define DC_SMALLCAP 2357 #define DC_ICON 2358 #define DC_TEXT 2359 #define DC_INBUTTON 2352 #define DC_ACTIVE 0x0001 2353 #define DC_SMALLCAP 0x0002 2354 #define DC_ICON 0x0004 2355 #define DC_TEXT 0x0008 2356 #define DC_INBUTTON 0x0010 2360 2357 2361 2358 /* DrawEdge() flags */ … … 2409 2406 #define DFCS_CAPTIONMAX 0x0002 2410 2407 #define DFCS_CAPTIONRESTORE 0x0003 2411 #define DFCS_CAPTIONHELP 0x0004 2408 #define DFCS_CAPTIONHELP 0x0004 /* Windows 95 only */ 2412 2409 2413 2410 #define DFCS_MENUARROW 0x0000 … … 2426 2423 #define DFCS_BUTTONCHECK 0x0000 2427 2424 #define DFCS_BUTTONRADIOIMAGE 0x0001 2428 #define DFCS_BUTTONRADIOMASK 0x0002 2425 #define DFCS_BUTTONRADIOMASK 0x0002 /* to draw nonsquare button */ 2429 2426 #define DFCS_BUTTONRADIO 0x0004 2430 2427 #define DFCS_BUTTON3STATE 0x0008 … … 2436 2433 #define DFCS_PUSHED 0x0200 2437 2434 #define DFCS_CHECKED 0x0400 2438 #define DFCS_ADJUSTRECT 0x2000 2435 #define DFCS_ADJUSTRECT 0x2000 /* exclude surrounding edge */ 2439 2436 #define DFCS_FLAT 0x4000 2440 2437 #define DFCS_MONO 0x8000 2441 2438 2442 2439 /* Image type */ 2443 #define DST_COMPLEX0x00002444 #define DST_TEXT0x00012445 #define DST_PREFIXTEXT0x00022446 #define DST_ICON0x00032447 #define DST_BITMAP0x00042440 #define DST_COMPLEX 0x0000 2441 #define DST_TEXT 0x0001 2442 #define DST_PREFIXTEXT 0x0002 2443 #define DST_ICON 0x0003 2444 #define DST_BITMAP 0x0004 2448 2445 2449 2446 /* State type */ 2450 #define DSS_NORMAL0x00002451 #define DSS_UNION0x0010 /* Gray string appearance */2452 #define DSS_DISABLED0x00202453 #define DSS_DEFAULT0x0040 /* Make it bold */2454 #define DSS_MONO0x00802455 #define DSS_RIGHT0x80002447 #define DSS_NORMAL 0x0000 2448 #define DSS_UNION 0x0010 /* Gray string appearance */ 2449 #define DSS_DISABLED 0x0020 2450 #define DSS_DEFAULT 0x0040 /* Make it bold */ 2451 #define DSS_MONO 0x0080 2452 #define DSS_RIGHT 0x8000 2456 2453 2457 2454 typedef struct … … 2674 2671 #define VK_PA1 0xFD 2675 2672 #define VK_OEM_CLEAR 0xFE 2676 2673 2677 2674 /* Key status flags for mouse events */ 2678 #define MK_LBUTTON 2679 #define MK_RBUTTON 2680 #define MK_SHIFT 2681 #define MK_CONTROL 2682 #define MK_MBUTTON 2675 #define MK_LBUTTON 0x0001 2676 #define MK_RBUTTON 0x0002 2677 #define MK_SHIFT 0x0004 2678 #define MK_CONTROL 0x0008 2679 #define MK_MBUTTON 0x0010 2683 2680 2684 2681 /* Queue status flags */ 2685 #define QS_KEY 2686 #define QS_MOUSEMOVE 2687 #define QS_MOUSEBUTTON 2688 #define QS_MOUSE 2689 #define QS_POSTMESSAGE 2690 #define QS_TIMER 2691 #define QS_PAINT 2692 #define QS_SENDMESSAGE 2693 #define QS_HOTKEY 2694 #define QS_INPUT 2695 #define QS_ALLEVENTS 2682 #define QS_KEY 0x0001 2683 #define QS_MOUSEMOVE 0x0002 2684 #define QS_MOUSEBUTTON 0x0004 2685 #define QS_MOUSE (QS_MOUSEMOVE | QS_MOUSEBUTTON) 2686 #define QS_POSTMESSAGE 0x0008 2687 #define QS_TIMER 0x0010 2688 #define QS_PAINT 0x0020 2689 #define QS_SENDMESSAGE 0x0040 2690 #define QS_HOTKEY 0x0080 2691 #define QS_INPUT (QS_MOUSE | QS_KEY) 2692 #define QS_ALLEVENTS (QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY) 2696 2693 #define QS_ALLINPUT (QS_ALLEVENTS | QS_SENDMESSAGE) 2697 2694 2698 #define DDL_READWRITE 2699 #define DDL_READONLY 2700 #define DDL_HIDDEN 2701 #define DDL_SYSTEM 2702 #define DDL_DIRECTORY 2703 #define DDL_ARCHIVE 2704 2705 #define DDL_POSTMSGS 2706 #define DDL_DRIVES 2707 #define DDL_EXCLUSIVE 2695 #define DDL_READWRITE 0x0000 2696 #define DDL_READONLY 0x0001 2697 #define DDL_HIDDEN 0x0002 2698 #define DDL_SYSTEM 0x0004 2699 #define DDL_DIRECTORY 0x0010 2700 #define DDL_ARCHIVE 0x0020 2701 2702 #define DDL_POSTMSGS 0x2000 2703 #define DDL_DRIVES 0x4000 2704 #define DDL_EXCLUSIVE 0x8000 2708 2705 2709 2706 /* Shell hook values */ … … 2779 2776 } DRAGINFO, *LPDRAGINFO; 2780 2777 2781 #define DRAGOBJ_PROGRAM 2782 #define DRAGOBJ_DATA 2783 #define DRAGOBJ_DIRECTORY 2784 #define DRAGOBJ_MULTIPLE 2785 #define DRAGOBJ_EXTERNAL 2786 2787 #define DRAG_PRINT 2788 #define DRAG_FILE 2778 #define DRAGOBJ_PROGRAM 0x0001 2779 #define DRAGOBJ_DATA 0x0002 2780 #define DRAGOBJ_DIRECTORY 0x0004 2781 #define DRAGOBJ_MULTIPLE 0x0008 2782 #define DRAGOBJ_EXTERNAL 0x8000 2783 2784 #define DRAG_PRINT 0x544E5250 2785 #define DRAG_FILE 0x454C4946 2789 2786 2790 2787 /* types of LoadImage */ 2791 #define IMAGE_BITMAP 2792 #define IMAGE_ICON 2793 #define IMAGE_CURSOR 2794 #define IMAGE_ENHMETAFILE 2788 #define IMAGE_BITMAP 0 2789 #define IMAGE_ICON 1 2790 #define IMAGE_CURSOR 2 2791 #define IMAGE_ENHMETAFILE 3 2795 2792 2796 2793 /* loadflags to LoadImage */ 2797 #define LR_DEFAULTCOLOR 2798 #define LR_MONOCHROME 2799 #define LR_COLOR 2800 #define LR_COPYRETURNORG 2801 #define LR_COPYDELETEORG 2802 #define LR_LOADFROMFILE 2803 #define LR_LOADTRANSPARENT 2804 #define LR_DEFAULTSIZE 2805 #define LR_VGA_COLOR 2806 #define LR_LOADMAP3DCOLORS 2807 #define LR_CREATEDIBSECTION0x20002808 #define LR_COPYFROMRESOURCE 2809 #define LR_SHARED 2794 #define LR_DEFAULTCOLOR 0x0000 2795 #define LR_MONOCHROME 0x0001 2796 #define LR_COLOR 0x0002 2797 #define LR_COPYRETURNORG 0x0004 2798 #define LR_COPYDELETEORG 0x0008 2799 #define LR_LOADFROMFILE 0x0010 2800 #define LR_LOADTRANSPARENT 0x0020 2801 #define LR_DEFAULTSIZE 0x0040 2802 #define LR_VGA_COLOR 0x0080 2803 #define LR_LOADMAP3DCOLORS 0x1000 2804 #define LR_CREATEDIBSECTION 0x2000 2805 #define LR_COPYFROMRESOURCE 0x4000 2806 #define LR_SHARED 0x8000 2810 2807 2811 2808 /* Flags for DrawIconEx. */ … … 2822 2819 2823 2820 /* WM_NOTIFYFORMAT commands and return values */ 2824 #define NFR_ANSI 2825 #define NFR_UNICODE 2826 #define NF_QUERY 2827 #define NF_REQUERY 2821 #define NFR_ANSI 1 2822 #define NFR_UNICODE 2 2823 #define NF_QUERY 3 2824 #define NF_REQUERY 4 2828 2825 2829 2826 //SM_ARRANGE return values: … … 3144 3141 BOOL WINAPI DrawIcon(HDC,INT,INT,HICON); 3145 3142 BOOL WINAPI DrawIconEx(HDC,INT,INT,HICON,INT,INT, 3146 3143 UINT,HBRUSH,UINT); 3147 3144 BOOL WINAPI DrawMenuBar(HWND); 3148 3145 BOOL WINAPI DrawStateA(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT); … … 3443 3440 #define SendMessage WINELIB_NAME_AW(SendMessage) 3444 3441 LRESULT WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT, 3445 3442 UINT,LPDWORD); 3446 3443 LRESULT WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT, 3447 3444 UINT,LPDWORD); 3448 3445 #define SendMessageTimeout WINELIB_NAME_AW(SendMessageTimeout) 3449 3446 HWND WINAPI SetActiveWindow(HWND); … … 3571 3568 VOID WINAPI ScreenSwitchEnable16(WORD); 3572 3569 3570 INT WINAPI NativeDlgBoxIP(HMODULE,HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM); 3571 INT WINAPI NativeCreateDlgIP(HMODULE,HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM); 3572 3573 3573 #define WC_DIALOG (LPSTR)((DWORD)((WORD)( 0x8002))) 3574 3574 -
trunk/src/pe2lx/dialog.cpp
r259 r265 1 /* $Id: dialog.cpp,v 1. 5 1999-07-02 12:43:30sandervl Exp $ */1 /* $Id: dialog.cpp,v 1.6 1999-07-04 19:02:37 sandervl Exp $ */ 2 2 3 3 /* … … 33 33 #endif 34 34 35 #define DEFAULT_DLGFONT "9.WarpSans" 36 35 37 static int ConvertClassAndStyle(int winclass, int style, USHORT *os2class, BOOL *fIconBmp); 36 38 static int ConvertDlgStyle(int style); … … 213 215 dlgitem->offPresParams = (USHORT)((int)dlgpparam - (int)dlgt); 214 216 dlgcurdata += dlgpparam->cb + sizeof(ULONG); 215 } 217 } else 218 { //CB: set default font 219 dlgpparam = (PRESPARAMS*)dlgcurdata; 220 dlgpparam->aparam[0].id = PP_FONTNAMESIZE; 221 dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1; 222 strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT); 223 dlgpparam->cb = dlgpparam->aparam[0].cb+2*sizeof(ULONG); 224 dlgitem->offPresParams = (USHORT)((int)dlgpparam-(int)dlgt); 225 dlgt->coffPresParams++; 226 dlgcurdata += dlgpparam->cb+sizeof(dlgpparam->cb); 227 } 228 } else 229 { //CB: set default font 230 dlgpparam = (PRESPARAMS*)dlgcurdata; 231 dlgpparam->aparam[0].id = PP_FONTNAMESIZE; 232 dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1; 233 strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT); 234 dlgpparam->cb = dlgpparam->aparam[0].cb+2*sizeof(ULONG); 235 dlgitem->offPresParams = (USHORT)((int)dlgpparam-(int)dlgt); 236 dlgt->coffPresParams++; 237 dlgcurdata += dlgpparam->cb+sizeof(dlgpparam->cb); 216 238 } 217 239 dlgitem++; … … 263 285 szCaption += 2; 264 286 dlgitem->cchText = 0; 265 dlgitem->offText = 0; 287 dlgitem->offText = (USHORT)((int)dlgcurdata-(int)dlgt); 288 dlgcurdata += 1; //CB: offText == empty string 266 289 } 267 290 else { //Handle Caption … … 459 482 dlgt->coffPresParams = (USHORT)((int)dlgpparam - (int)dlgt); 460 483 dlgcurdata += dlgpparam->cb; 461 } 484 } else 485 { //CB: set default font 486 dlgpparam = (PRESPARAMS*)dlgcurdata; 487 dlgpparam->aparam[0].id = PP_FONTNAMESIZE; 488 dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1; 489 strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT); 490 dlgpparam->cb = dlgpparam->aparam[0].cb+2*sizeof(ULONG); 491 dlgitem->offPresParams = (USHORT)((int)dlgpparam-(int)dlgt); 492 dlgt->coffPresParams++; 493 dlgcurdata += dlgpparam->cb+sizeof(dlgpparam->cb); 494 } 495 } else 496 { //CB: set default font 497 dlgpparam = (PRESPARAMS*)dlgcurdata; 498 dlgpparam->aparam[0].id = PP_FONTNAMESIZE; 499 dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1; 500 strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT); 501 dlgpparam->cb = dlgpparam->aparam[0].cb+2*sizeof(ULONG); 502 dlgitem->offPresParams = (USHORT)((int)dlgpparam-(int)dlgt); 503 dlgt->coffPresParams++; 504 dlgcurdata += dlgpparam->cb+sizeof(dlgpparam->cb); 462 505 } 463 506 ctrldata = (WINDLGITEMTEMPLATEEX *)(((int)ctrldata+3) & ~3); … … 560 603 #if 0 561 604 if(style & WINBS_LEFTTEXT) 562 os2style |= ; 605 os2style |= ; //not supported 563 606 #endif 564 607 style &= 0xF; … … 860 903 // } 861 904 // else TODO: More fonts!!! 905 // "MS Sans Serif" 862 906 // return(FALSE); //not found 863 907 #else -
trunk/src/user32/USER32.DEF
r173 r265 1 ; $Id: USER32.DEF,v 1. 7 1999-06-24 08:25:21 phallerExp $1 ; $Id: USER32.DEF,v 1.8 1999-07-04 19:02:38 sandervl Exp $ 2 2 3 3 ;Created by BLAST for IBM's compiler … … 599 599 EnumDisplayMonitors = _EnumDisplayMonitors@16 @1005 600 600 601 CreateWindowProc 601 CreateWindowProc @2000 602 602 GetOS2Callback__15Win32WindowProcFv @2001 603 603 ; Wine helper function 604 604 GetSysColorPen = _GetSysColorPen@4 @2002 605 ; COMCTL32 helper functions 606 NativeDlgBoxIP = _NativeDlgBoxIP@24 @2003 607 NativeCreateDlgIP = _NativeCreateDlgIP@24 @2004 -
trunk/src/user32/dialog.cpp
r217 r265 1 /* $Id: dialog.cpp,v 1. 5 1999-06-26 13:46:21sandervl Exp $ */1 /* $Id: dialog.cpp,v 1.6 1999-07-04 19:02:38 sandervl Exp $ */ 2 2 3 3 /* … … 20 20 //****************************************************************************** 21 21 //****************************************************************************** 22 HWND WIN32API CreateDialogParamA(HINSTANCE hinst, LPCSTR lpszTemplate, 23 HWND hwndOwner, DLGPROC dlgproc, 24 22 HWND WIN32API CreateDialogParamA(HINSTANCE hinst, LPCSTR lpszTemplate, 23 HWND hwndOwner, DLGPROC dlgproc, 24 LPARAM lParamInit) 25 25 { 26 26 HWND rc; … … 31 31 WriteLog("OS2CreateDialogParamA %s\n", lpszTemplate); 32 32 #endif 33 33 lpszTemplate = (LPCSTR)ConvertNameId(hinst, (char *)lpszTemplate); 34 34 } 35 35 #ifdef DEBUG … … 38 38 39 39 if(dlgproc) { 40 41 40 dialog = new Win32WindowProc((WNDPROC)dlgproc); 41 rc = O32_CreateDialogParam(hinst, lpszTemplate, hwndOwner, (DLGPROC_O32)dialog->GetOS2Callback(), lParamInit); 42 42 } 43 43 else rc = O32_CreateDialogParam(hinst, lpszTemplate, hwndOwner, (DLGPROC_O32)O32_DefDlgProc, lParamInit); 44 44 45 45 if(rc == 0 && dialog) { 46 46 delete(dialog); 47 47 } 48 48 … … 54 54 //****************************************************************************** 55 55 //****************************************************************************** 56 HWND WIN32API CreateDialogParamW(HINSTANCE hinst, LPCWSTR lpszTemplate, 57 HWND hwndOwner, DLGPROC dlgproc, 58 56 HWND WIN32API CreateDialogParamW(HINSTANCE hinst, LPCWSTR lpszTemplate, 57 HWND hwndOwner, DLGPROC dlgproc, 58 LPARAM lParamInit) 59 59 { 60 60 HWND rc; 61 61 62 62 if((int)lpszTemplate >> 16 != 0) {//convert string name identifier to numeric id 63 63 char *astring = UnicodeToAsciiString((LPWSTR)lpszTemplate); 64 64 #ifdef DEBUG 65 65 WriteLog("OS2CreateDialogParamW %s\n", astring); 66 66 #endif 67 68 67 lpszTemplate = (LPWSTR)ConvertNameId(hinst, astring); 68 FreeAsciiString(astring); 69 69 } 70 70 #ifdef DEBUG … … 73 73 74 74 Win32WindowProc *dialog = new Win32WindowProc((WNDPROC)dlgproc); 75 75 76 76 rc = O32_CreateDialogParam(hinst, (LPCSTR)lpszTemplate, hwndOwner, (DLGPROC_O32)dialog->GetOS2Callback(), lParamInit); 77 77 if(rc == 0) { 78 78 delete(dialog); 79 79 } 80 80 … … 86 86 //****************************************************************************** 87 87 //****************************************************************************** 88 HWND WIN32API CreateDialogIndirectParamA(HINSTANCE hinst, 89 DLGTEMPLATE *dlgtemplate, 90 HWND hwndParent, DLGPROC dlgproc, 91 92 { 93 HWND 88 HWND WIN32API CreateDialogIndirectParamA(HINSTANCE hinst, 89 DLGTEMPLATE *dlgtemplate, 90 HWND hwndParent, DLGPROC dlgproc, 91 LPARAM lParamInit) 92 { 93 HWND hwnd; 94 94 DLGTEMPLATE *os2dlg; 95 95 … … 99 99 hwnd = O32_CreateDialogIndirectParam(hinst, os2dlg, hwndParent, (DLGPROC_O32)dialog->GetOS2Callback(), lParamInit); 100 100 if(hwnd == 0) { 101 101 delete(dialog); 102 102 } 103 103 #ifdef DEBUG … … 108 108 //****************************************************************************** 109 109 //****************************************************************************** 110 HWND WIN32API CreateDialogIndirectParamW(HINSTANCE hinst, 111 DLGTEMPLATE *dlgtemplate, 112 HWND hwndParent, DLGPROC dlgproc, 113 114 { 115 HWND 110 HWND WIN32API CreateDialogIndirectParamW(HINSTANCE hinst, 111 DLGTEMPLATE *dlgtemplate, 112 HWND hwndParent, DLGPROC dlgproc, 113 LPARAM lParamInit) 114 { 115 HWND hwnd; 116 116 DLGTEMPLATE *os2dlg; 117 117 … … 121 121 hwnd = O32_CreateDialogIndirectParam(hinst, os2dlg, hwndParent, (DLGPROC_O32)dialog->GetOS2Callback(), lParamInit); 122 122 if(hwnd == 0) { 123 123 delete(dialog); 124 124 } 125 125 dprintf(("CreateDialogIndirectParamW returned %X\n", hwnd)); … … 128 128 //****************************************************************************** 129 129 //****************************************************************************** 130 BOOL WIN32API DialogBoxIndirectParamA(HINSTANCE hinst, 131 DLGTEMPLATE *dlgtemplate, 132 HWND hwndParent, DLGPROC dlgproc, 133 130 BOOL WIN32API DialogBoxIndirectParamA(HINSTANCE hinst, 131 DLGTEMPLATE *dlgtemplate, 132 HWND hwndParent, DLGPROC dlgproc, 133 LPARAM lParamInit) 134 134 { 135 135 BOOL rc; … … 137 137 138 138 os2dlg = ConvertWin32DlgTemplate(dlgtemplate); 139 139 140 Win32WindowProc *dialog = new Win32WindowProc((WNDPROC)dlgproc, os2dlg); 140 141 … … 146 147 //****************************************************************************** 147 148 //****************************************************************************** 148 BOOL WIN32API DialogBoxIndirectParamW(HINSTANCE hinst, 149 DLGTEMPLATE *dlgtemplate, 150 HWND hwndParent, DLGPROC dlgproc, 151 149 BOOL WIN32API DialogBoxIndirectParamW(HINSTANCE hinst, 150 DLGTEMPLATE *dlgtemplate, 151 HWND hwndParent, DLGPROC dlgproc, 152 LPARAM lParamInit) 152 153 { 153 154 BOOL rc; … … 165 166 //****************************************************************************** 166 167 int WIN32API DialogBoxParamA(HINSTANCE hinst, LPCSTR lpszTemplate, HWND hwndOwner, 167 168 DLGPROC dlgprc, LPARAM lParamInit) 168 169 { 169 170 int rc; 170 171 171 172 if((int)lpszTemplate >> 16 != 0) {//convert string name identifier to numeric id 172 173 174 } 175 else { 176 173 dprintf(("DialogBoxParam %s\n", lpszTemplate)); 174 lpszTemplate = (LPCSTR)ConvertNameId(hinst, (char *)lpszTemplate); 175 } 176 else { 177 dprintf(("DialogBoxParam %d\n", (int)lpszTemplate)); 177 178 } 178 179 … … 185 186 //****************************************************************************** 186 187 //****************************************************************************** 187 int WIN32API DialogBoxParamW(HINSTANCE arg1, LPCWSTR arg2, HWND arg3, 188 188 int WIN32API DialogBoxParamW(HINSTANCE arg1, LPCWSTR arg2, HWND arg3, 189 DLGPROC arg4, LPARAM arg5) 189 190 { 190 191 int rc; … … 193 194 194 195 if((int)arg2 >> 16 != 0) { 195 196 astring = UnicodeToAsciiString((LPWSTR)arg2); 196 197 } 197 198 else astring = (char *)arg2; … … 200 201 Win32WindowProc *dialog = new Win32WindowProc((WNDPROC)arg4); 201 202 rc = DialogBoxParamA(arg1, astring, arg3, arg4, arg5); 202 203 if((int)astring >> 16 != 0) 203 204 if((int)astring >> 16 != 0) FreeAsciiString(astring); 204 205 205 206 dprintf(("OS2DialogBoxIndirectParamA returned %d\n", rc)); … … 208 209 } 209 210 //****************************************************************************** 210 //****************************************************************************** 211 211 // CB: Loads and starts a native OS/2 dialog with Win32 DlgProc 212 // (used in COMCTL32) 213 // full name: NativeDialogBoxIndirectParam 214 //****************************************************************************** 215 INT WINAPI NativeDlgBoxIP(HMODULE hmodule, 216 HINSTANCE hinst, LPCSTR lpszName, 217 HWND hwndParent, DLGPROC dlgproc, 218 LPARAM lParamInit) 219 { 220 BOOL rc; 221 DLGTEMPLATE *os2dlg; 222 HRSRC hRes; 223 224 dprintf(("NativeDlgBoxIP")); 225 226 hRes = O32_FindResource(hmodule,lpszName,RT_DIALOGA); 227 if (hRes == 0) return (INT)-1; 228 229 dprintf((" hRes = %d",hRes)); 230 231 os2dlg = (DLGTEMPLATE*)O32_LoadResource(hmodule,hRes); 232 if (os2dlg == NULL) return (INT)-1; 233 234 dprintf((" os2dlg = %d",os2dlg)); 235 236 Win32WindowProc *dialog = new Win32WindowProc((WNDPROC)dlgproc,os2dlg); 237 rc = O32_DialogBoxIndirectParam(hinst,os2dlg,hwndParent,(DLGPROC_O32)dialog->GetOS2Callback(),lParamInit); 238 //dialog already destroyed when this returns 239 dprintf(("NativeDlgBoxIP returned %X\n", rc)); 240 241 return rc; 242 } 243 //****************************************************************************** 244 //****************************************************************************** 245 //****************************************************************************** 246 // CB: Loads and starts a native OS/2 dialog with Win32 DlgProc 247 // (used in COMCTL32) 248 // full name: NativeCreateDialogIndirectParam 249 //****************************************************************************** 250 INT WINAPI NativeCreateDlgIP(HMODULE hmodule, 251 HINSTANCE hinst, LPCSTR lpszName, 252 HWND hwndParent, DLGPROC dlgproc, 253 LPARAM lParamInit) 254 { 255 BOOL rc; 256 DLGTEMPLATE *os2dlg; 257 HRSRC hRes; 258 259 dprintf(("NativeCreateDlgBoxIP")); 260 261 hRes = O32_FindResource(hmodule,lpszName,RT_DIALOGA); 262 if (hRes == 0) return (INT)-1; 263 264 dprintf((" hRes = %d",hRes)); 265 266 os2dlg = (DLGTEMPLATE*)O32_LoadResource(hmodule,hRes); 267 if (os2dlg == NULL) return (INT)-1; 268 269 dprintf((" os2dlg = %d",os2dlg)); 270 271 Win32WindowProc *dialog = new Win32WindowProc((WNDPROC)dlgproc,os2dlg); 272 rc = O32_CreateDialogIndirectParam(hinst,os2dlg,hwndParent,(DLGPROC_O32)dialog->GetOS2Callback(),lParamInit); 273 //dialog already destroyed when this returns 274 dprintf(("NativeDlgBoxIP returned %X\n", rc)); 275 276 return rc; 277 } 278 //****************************************************************************** 279 //****************************************************************************** -
trunk/src/user32/dlgconvert.cpp
r259 r265 1 /* $Id: dlgconvert.cpp,v 1. 6 1999-07-02 12:42:57sandervl Exp $ */1 /* $Id: dlgconvert.cpp,v 1.7 1999-07-04 19:02:38 sandervl Exp $ */ 2 2 3 3 /* … … 41 41 #endif 42 42 43 #define DEFAULT_DLGFONT "9.WarpSans" 44 43 45 static int ConvertClassAndStyle(int winclass, int style, USHORT *os2class, BOOL *fIconBmp); 44 46 static int ConvertDlgStyle(int style); … … 244 246 dlgt->coffPresParams = (int)dlgpparam; 245 247 dlgcurdata += sizeof(PRESPARAMS) + dlgpparam->aparam[0].cb - 1; 248 } else 249 { //CB: set default font 250 dlgpparam = (PRESPARAMS*)dlgcurdata; 251 dlgpparam->aparam[0].id = PP_FONTNAMESIZE; 252 dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1; 253 strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT); 254 dlgpparam->cb = dlgpparam->aparam[0].cb+2*sizeof(ULONG); 255 dlgitem->offPresParams = (USHORT)((int)dlgpparam-(int)dlgt); 256 dlgt->coffPresParams++; 257 dlgcurdata += dlgpparam->cb+sizeof(dlgpparam->cb); 246 258 } 247 259 FreeAsciiString(font); 260 } else 261 { //CB: set default font 262 dlgpparam = (PRESPARAMS*)dlgcurdata; 263 dlgpparam->aparam[0].id = PP_FONTNAMESIZE; 264 dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1; 265 strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT); 266 dlgpparam->cb = dlgpparam->aparam[0].cb+2*sizeof(ULONG); 267 dlgitem->offPresParams = (USHORT)((int)dlgpparam-(int)dlgt); 268 dlgt->coffPresParams++; 269 dlgcurdata += dlgpparam->cb+sizeof(dlgpparam->cb); 248 270 } 249 271 ctrldata = (ControlData *)(((int)ctrldata+3) & ~3); … … 300 322 if(*(USHORT *)szCaption == 0xFFFF) { 301 323 szCaption += 2; 324 dlgitem->cchText = 0; 325 dlgitem->offText = (USHORT)((int)dlgcurdata-(int)dlgt); 326 dlgcurdata += 1; //CB: offText == empty string 302 327 } 303 328 else { //Handle Caption … … 521 546 dlgt->coffPresParams = (int)dlgpparam; 522 547 dlgcurdata += sizeof(PRESPARAMS) + dlgpparam->aparam[0].cb - 1; 548 } else 549 { //CB: set default font 550 dlgpparam = (PRESPARAMS*)dlgcurdata; 551 dlgpparam->aparam[0].id = PP_FONTNAMESIZE; 552 dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1; 553 strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT); 554 dlgpparam->cb = dlgpparam->aparam[0].cb+2*sizeof(ULONG); 555 dlgitem->offPresParams = (USHORT)((int)dlgpparam-(int)dlgt); 556 dlgt->coffPresParams++; 557 dlgcurdata += dlgpparam->cb+sizeof(dlgpparam->cb); 523 558 } 524 559 FreeAsciiString(font); 560 } else 561 { //CB: set default font 562 dlgpparam = (PRESPARAMS*)dlgcurdata; 563 dlgpparam->aparam[0].id = PP_FONTNAMESIZE; 564 dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1; 565 strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT); 566 dlgpparam->cb = dlgpparam->aparam[0].cb+2*sizeof(ULONG); 567 dlgitem->offPresParams = (USHORT)((int)dlgpparam-(int)dlgt); 568 dlgt->coffPresParams++; 569 dlgcurdata += dlgpparam->cb+sizeof(dlgpparam->cb); 525 570 } 526 571 ctrldata = (WINDLGITEMTEMPLATEEX *)(((int)ctrldata+3) & ~3); -
trunk/src/user32/user32exp.def
r96 r265 1 ; $Id: user32exp.def,v 1. 4 1999-06-10 16:50:36 phallerExp $1 ; $Id: user32exp.def,v 1.5 1999-07-04 19:02:38 sandervl Exp $ 2 2 3 3 ;Created by BLAST for IBM's compiler … … 596 596 597 597 598 CreateWindowProc 599 GetOS2Callback__15Win32WindowProcFv 598 CreateWindowProc @2000 599 GetOS2Callback__15Win32WindowProcFv @2001 600 600 _GetSysColorPen@4 @2002 601 _NativeDlgBoxIP@24 @2003 602 _NativeCreateDlgIP@24 @2004 601 603 602
Note:
See TracChangeset
for help on using the changeset viewer.
