Index: trunk/src/emx/src/lib/os2_386/ctls.imp
===================================================================
--- trunk/src/emx/src/lib/os2_386/ctls.imp	(revision 366)
+++ trunk/src/emx/src/lib/os2_386/ctls.imp	(revision 367)
@@ -8,2 +8,11 @@
 WinFreeFileDlgList              pmctls  6 1
 WinRegisterCircularSlider       pmctls 24 ?
+
+; Private API and globals.
+DaxOpenSave                     pmctls 295 ?
+WinDefColorDlgProc              pmctls 293 4
+WinDefFindDlgProc               pmctls 297 4
+WinDefPrintDlgProc              pmctls 301 4
+WinDefReplaceDlgProc            pmctls 299 4
+PaxChooseFont                   pmctls 292 ?
+
Index: trunk/src/emx/src/lib/os2_386/dos.imp
===================================================================
--- trunk/src/emx/src/lib/os2_386/dos.imp	(revision 366)
+++ trunk/src/emx/src/lib/os2_386/dos.imp	(revision 367)
@@ -3,5 +3,8 @@
 ;
 DosAcknowledgeSignalException   doscalls 418 1
+DosAcquireSpinLock              doscalls 558 ?
 DosAddMuxWaitSem                doscalls 341 2
+DosAliasMem                     doscalls 298 4
+DosAliasPerfCtrs                doscalls 364 4
 DosAllocMem                     doscalls 299 3
 DosAllocSharedMem               doscalls 300 4
@@ -11,4 +14,5 @@
 DosCallNPipe                    doscalls 240 7
 DosCancelLockRequest            doscalls 429 2
+DosCancelLockRequestL           doscalls 987 2
 DosClose                        doscalls 257 1
 DosCloseChangeNotify            doscalls 442 ?
@@ -17,4 +21,5 @@
 DosCloseMuxWaitSem              doscalls 339 1
 DosCloseVDD                     doscalls 310 1
+DosConfigurePerf                doscalls 365 6
 DosConnectNPipe                 doscalls 241 1
 DosCopy                         doscalls 258 3
@@ -25,6 +30,9 @@
 DosCreateNPipe                  doscalls 243 7
 DosCreatePipe                   doscalls 239 3
+DosCreateSpinLock               doscalls 557 ?
 DosCreateThread                 doscalls 311 5
+DosCreateThread2                doscalls 997 1
 DosDebug                        doscalls 317 1
+DosDeconPerf                    doscalls 366 1
 DosDelete                       doscalls 259 1
 DosDeleteDir                    doscalls 226 1
@@ -47,6 +55,4 @@
 DosExitList                     doscalls 296 2
 DosExitMustComplete             doscalls 381 1
-DosFlatToSel                    doscalls 425 R
-DosFreeThreadLocalMemory        doscalls 455 1
 DosFSAttach                     doscalls 269 5
 DosFSCtl                        doscalls 285 10
@@ -54,4 +60,5 @@
 DosFindFirst                    doscalls 264 7
 DosFindNext                     doscalls 265 4
+DosFlatToSel                    doscalls 425 R
 DosForceDelete                  doscalls 110 1
 DosForceSystemDump              doscalls 444 1
@@ -59,7 +66,10 @@
 DosFreeModule                   doscalls 322 1
 DosFreeResource                 doscalls 353 1
+DosFreeSpinLock                 doscalls 560 ?
+DosFreeThreadLocalMemory        doscalls 455 1
 DosGetDateTime                  doscalls 230 1
 DosGetInfoBlocks                doscalls 312 2
 DosGetNamedSharedMem            doscalls 301 3
+DosGetProcessorStatus           doscalls 447 2
 DosGetResource                  doscalls 352 4
 DosGetSharedMem                 doscalls 302 2
@@ -68,4 +78,6 @@
 DosKillProcess                  doscalls 235 2
 DosKillThread                   doscalls 111 1
+DosListIO                       doscalls 996 3
+DosListIOL                      doscalls 990 3
 DosLoadModule                   doscalls 318 4
 DosMove                         doscalls 271 2
@@ -73,4 +85,5 @@
 DosOpenChangeNotify             doscalls 440 ?
 DosOpenEventSem                 doscalls 325 2
+DosOpenL                        doscalls 981 9
 DosOpenMutexSem                 doscalls 332 2
 DosOpenMuxWaitSem               doscalls 338 2
@@ -79,8 +92,11 @@
 DosPM16SemRst                   doscalls 875 ?
 DosPMPostEventSem               doscalls 590 ?
+DosPMR3PostEventSem             doscalls 562 ?
+DosPMR3WaitEventSem             doscalls 561 ?
 DosPMRequestMutexSem            doscalls 593 ?
 DosPMWaitEventSem               doscalls 591 ?
 DosPMWaitMuxWaitSem             doscalls 595 ?
 DosPeekNPipe                    doscalls 244 6
+DosPerfSysCall                  doscalls 976 4
 DosPhysicalDisk                 doscalls 287 5
 DosPostEventSem                 doscalls 328 1
@@ -89,4 +105,5 @@
 DosProtectEnumAttribute         doscalls 636 8
 DosProtectOpen                  doscalls 637 9
+DosProtectOpenL                 doscalls 982 10
 DosProtectQueryFHState          doscalls 645 3
 DosProtectQueryFileInfo         doscalls 646 5
@@ -95,6 +112,9 @@
 DosProtectSetFileInfo           doscalls 643 5
 DosProtectSetFileLocks          doscalls 639 6
+DosProtectSetFileLocksL         doscalls 983 6
 DosProtectSetFilePtr            doscalls 621 5
+DosProtectSetFilePtrL           doscalls 984 6
 DosProtectSetFileSize           doscalls 640 3
+DosProtectSetFileSizeL          doscalls 985 4
 DosProtectWrite                 doscalls 642 5
 DosQueryABIOSSupport            doscalls 371 0
@@ -110,7 +130,8 @@
 DosQueryFSInfo                  doscalls 278 4
 DosQueryFileInfo                doscalls 279 4
+DosQueryHType                   doscalls 224 3
 DosQueryHeaderInfo              doscalls 582 ?
-DosQueryHType                   doscalls 224 3
 DosQueryMem                     doscalls 306 3
+DosQueryMemState                doscalls 307 3
 DosQueryModFromEIP              doscalls 360 6
 DosQueryModuleHandle            doscalls 319 2
@@ -121,4 +142,5 @@
 DosQueryNPipeInfo               doscalls 248 4
 DosQueryNPipeSemState           doscalls 249 3
+DosQueryPageUsage               doscalls 358 ?
 DosQueryPathInfo                doscalls 223 4
 DosQueryProcAddr                doscalls 321 4
@@ -128,4 +150,5 @@
 DosQuerySysInfo                 doscalls 348 4
 DosQuerySysState                doscalls 368 6
+DosQueryThreadAffinity          doscalls 563 2
 DosQueryThreadContext           doscalls 877 3
 DosQueryVerify                  doscalls 225 1
@@ -136,4 +159,5 @@
 DosRegisterPerfCtrs             doscalls 367 3
 DosReleaseMutexSem              doscalls 335 1
+DosReleaseSpinLock              doscalls 559 ?
 DosReplaceModule                doscalls 417 3
 DosRequestMutexSem              doscalls 334 2
@@ -158,6 +182,9 @@
 DosSetFileInfo                  doscalls 218 4
 DosSetFileLocks                 doscalls 428 5
+DosSetFileLocksL                doscalls 986 5
 DosSetFilePtr                   doscalls 256 4
+DosSetFilePtrL                  doscalls 988 5
 DosSetFileSize                  doscalls 272 2
+DosSetFileSizeL                 doscalls 989 3
 DosSetMaxFH                     doscalls 209 1
 DosSetMem                       doscalls 305 3
@@ -165,7 +192,10 @@
 DosSetNPipeSem                  doscalls 251 3
 DosSetPathInfo                  doscalls 219 5
+DosSetPriority                  doscalls 236 4
 DosSetProcessCp                 doscalls 289 1
+DosSetProcessorStatus           doscalls 448 2
 DosSetRelMaxFH                  doscalls 382 2
 DosSetSignalExceptionFocus      doscalls 378 2
+DosSetThreadAffinity            doscalls 564 1
 DosSetVerify                    doscalls 210 1
 DosShutdown                     doscalls 415 1
@@ -173,5 +203,4 @@
 DosStartTimer                   doscalls 351 3
 DosStopTimer                    doscalls 290 1
-DosSysCtl                       doscalls 876 ?
 DosSubAllocMem                  doscalls 345 3
 DosSubFreeMem                   doscalls 346 3
@@ -180,8 +209,9 @@
 DosSuppressPopUps               doscalls 114 2
 DosSuspendThread                doscalls 238 1
-DosTib                          doscalls 419 ?
+DosSysCtl                       doscalls 876 ?
+DosTIB                          doscalls 419 ?
+DosTestPSD                      doscalls 453 ?
 DosTmrQueryFreq                 doscalls 362 1
 DosTmrQueryTime                 doscalls 363 1
-DosSetPriority                  doscalls 236 4
 DosTransactNPipe                doscalls 252 6
 DosUnsetExceptionHandler        doscalls 355 1
@@ -194,2 +224,16 @@
 DosWaitThread                   doscalls 349 2
 DosWrite                        doscalls 282 4
+
+; Private API and globals.
+DosAllocProtectedMem            doscalls 297 ?
+DosFlatCS                       doscalls 369 ?
+DosFlatDS                       doscalls 370 ?
+DosICacheModule                 doscalls 416 ?
+DosIRaiseException              doscalls 594 ?
+DosLDTSel                       doscalls 599 ?
+SMArray                         doscalls 859 ?
+SMArraySize                     doscalls 862 ?
+SMInitialized                   doscalls 861 ?
+SMPIDArray                      doscalls 860 ?
+SMQueueRamSem                   doscalls 858 ?
+
Index: trunk/src/emx/src/lib/os2_386/drag.imp
===================================================================
--- trunk/src/emx/src/lib/os2_386/drag.imp	(revision 366)
+++ trunk/src/emx/src/lib/os2_386/drag.imp	(revision 367)
@@ -26,4 +26,5 @@
 DrgQueryDragitemCount           pmdrag 45 1
 DrgQueryDragitemPtr             pmdrag 46 2
+DrgQueryFormat                  pmdrag 75 5
 DrgQueryNativeRMF               pmdrag 47 3
 DrgQueryNativeRMFLen            pmdrag 48 1
Index: trunk/src/emx/src/lib/os2_386/gpi.imp
===================================================================
--- trunk/src/emx/src/lib/os2_386/gpi.imp	(revision 366)
+++ trunk/src/emx/src/lib/os2_386/gpi.imp	(revision 367)
@@ -6,8 +6,10 @@
 DevOpenDC                       pmgpi 610 6
 DevPostDeviceModes              pmgpi 609 6
+DevPostEscape                   pmgpi 729 9
 DevQueryCaps                    pmgpi 606 4
 DevQueryDeviceNames             pmgpi 607 7
 DevQueryHardcopyCaps            pmgpi 608 4
 DevStdOpen                      pmgpi 625 ?
+GpiAbortPath                    pmgpi 722 ?
 GpiAnimatePalette               pmgpi 595 5
 GpiAssociate                    pmgpi 351 2
@@ -34,9 +36,12 @@
 GpiCorrelateSegment             pmgpi 582 7
 GpiCreateBitmap                 pmgpi 598 5
+GpiCreateEllipticRegion         pmgpi 662 2
 GpiCreateLogColorTable          pmgpi 592 6
 GpiCreateLogFont                pmgpi 368 4
 GpiCreatePS                     pmgpi 369 4
 GpiCreatePalette                pmgpi 594 5
+GpiCreatePolygonRegion          pmgpi 663 4
 GpiCreateRegion                 pmgpi 370 3
+GpiCreateRoundRectRegion        pmgpi 661 4
 GpiDeleteBitmap                 pmgpi 371 1
 GpiDeleteElement                pmgpi 372 1
@@ -85,4 +90,5 @@
 GpiOpenSegment                  pmgpi 408 2
 GpiOutlinePath                  pmgpi 563 3
+GpiOval                         pmgpi 730 5
 GpiPaintRegion                  pmgpi 409 2
 GpiPartialArc                   pmgpi 612 5
@@ -146,4 +152,5 @@
 GpiQueryFontAction              pmgpi 576 2
 GpiQueryFontFileDescriptions    pmgpi 452 4
+GpiQueryFontMappingFlags        pmgpi 669 1
 GpiQueryFontMetrics             pmgpi 453 3
 GpiQueryFonts                   pmgpi 586 6
@@ -164,7 +171,9 @@
 GpiQueryMetaFileBits            pmgpi 465 4
 GpiQueryMetaFileLength          pmgpi 466 1
+GpiQueryMitreLimit              pmgpi 724 ?
 GpiQueryMix                     pmgpi 467 1
 GpiQueryModelTransformMatrix    pmgpi 468 3
 GpiQueryNearestColor            pmgpi 469 3
+GpiQueryNearestPaletteIndex     pmgpi 667 2
 GpiQueryNumberSetIds            pmgpi 470 1
 GpiQueryPS                      pmgpi 471 2
@@ -172,4 +181,5 @@
 GpiQueryPalette                 pmgpi 579 1
 GpiQueryPaletteInfo             pmgpi 597 5
+GpiQueryPath                    pmgpi 725 ?
 GpiQueryPattern                 pmgpi 473 1
 GpiQueryPatternRefPoint         pmgpi 474 2
@@ -179,4 +189,5 @@
 GpiQueryPickApertureSize        pmgpi 478 2
 GpiQueryRGBColor                pmgpi 479 3
+GpiQueryRasterizerCaps          pmgpi 660 1
 GpiQueryRealColors              pmgpi 480 5
 GpiQueryRegionBox               pmgpi 481 3
@@ -188,4 +199,5 @@
 GpiQuerySetIds                  pmgpi 486 5
 GpiQueryStopDraw                pmgpi 487 1
+GpiQueryTabbedTextExtent        pmgpi 658 5
 GpiQueryTag                     pmgpi 488 2
 GpiQueryTextAlignment           pmgpi 648 3
@@ -199,6 +211,7 @@
 GpiResetBoundaryData            pmgpi 497 1
 GpiResetPS                      pmgpi 498 2
+GpiResizePalette                pmgpi 666 2
 GpiRestorePS                    pmgpi 499 2
-GpiResumePlay                   pmgpi 562 ?
+GpiResumePlay                   pmgpi 562 1
 GpiRotate                       pmgpi 566 5
 GpiSaveMetaFile                 pmgpi 500 2
@@ -238,4 +251,5 @@
 GpiSetElementPointer            pmgpi 524 2
 GpiSetElementPointerAtLabel     pmgpi 525 2
+GpiSetFontMappingFlags          pmgpi 668 2
 GpiSetGraphicsField             pmgpi 526 2
 GpiSetInitialSegmentAttrs       pmgpi 527 3
@@ -249,4 +263,5 @@
 GpiSetMarkerSet                 pmgpi 535 2
 GpiSetMetaFileBits              pmgpi 536 4
+GpiSetMitreLimit                pmgpi 727 ?
 GpiSetMix                       pmgpi 537 2
 GpiSetModelTransformMatrix      pmgpi 538 4
@@ -271,7 +286,47 @@
 GpiStrokeInkPath                pmgpi 672 5
 GpiStrokePath                   pmgpi 554 3
-GpiSuspendPlay                  pmgpi 561 ?
+GpiSuspendPlay                  pmgpi 561 1
+GpiTabbedCharStringAt           pmgpi 659 9
 GpiTranslate                    pmgpi 564 4
 GpiUnloadFonts                  pmgpi 555 2
 GpiUnloadPublicFonts            pmgpi 623 2
 GpiWCBitBlt                     pmgpi 557 6
+
+
+; Private API and globals.
+DevQueryDisplayResolutions      pmgpi 655 ?
+DspDefaultResolution            pmgpi 654 ?
+DspInitSystemDriverName         pmgpi 656 ?
+GpiAllocateDCData               pmgpi 664 ?
+GpiCloseMetafile                pmgpi 628 ?
+GpiConvPSH                      pmgpi 629 ?
+GpiEnableYInversion             pmgpi 723 ?
+GpiInstallIFIFont               pmgpi 624 ?
+GpiMtAssociate                  pmgpi 644 ?
+GpiMtDisassociate               pmgpi 645 ?
+GpiOpenMetafile                 pmgpi 627 ?
+GpiQueryDCData                  pmgpi 665 ?
+GpiQueryYInversion              pmgpi 726 ?
+GpiSaveMetaFile2                pmgpi 728 ?
+GpiSetBitmapOwner               pmgpi 620 ?
+GpiSetDCOwner                   pmgpi 619 ?
+GpiSetRegionOwner               pmgpi 621 ?
+PaxArc                          pmgpi 715 ?
+PaxBeginPath                    pmgpi 703 ?
+PaxChord                        pmgpi 716 ?
+PaxCloseFigure                  pmgpi 704 ?
+PaxEllipse                      pmgpi 717 ?
+PaxEndPath                      pmgpi 705 ?
+PaxFillPath                     pmgpi 706 ?
+PaxFlattenPath                  pmgpi 707 ?
+PaxGetPolyFillMode              pmgpi 700 ?
+PaxLineDDA                      pmgpi 718 ?
+PaxPathToRegion                 pmgpi 710 ?
+PaxPie                          pmgpi 719 ?
+PaxPolyBezier                   pmgpi 720 ?
+PaxPolyBezierAt                 pmgpi 721 ?
+PaxSetPolyFillMode              pmgpi 701 ?
+PaxStrokeAndFillPath            pmgpi 712 ?
+PaxStrokePath                   pmgpi 713 ?
+PaxWidenPath                    pmgpi 714 ?
+
Index: trunk/src/emx/src/lib/os2_386/pmmerge.imp
===================================================================
--- trunk/src/emx/src/lib/os2_386/pmmerge.imp	(revision 366)
+++ trunk/src/emx/src/lib/os2_386/pmmerge.imp	(revision 367)
@@ -3,3 +3,165 @@
 ;
 WinQueryControlColors           pmmerge 5470 5
+; WinMessageBox2                  pmmerge 5417 1
+WinQueryCpType                  pmmerge 5480 1
+WinQueryKbdLayer                pmmerge 3503 2
+Win32QueryKbdLayer              pmmerge 3503 2
+WinQueryKbdLayout               pmmerge 5479 1
+Win32QueryKbdLayout             pmmerge 5479 1
+WinQueryLangInfo                pmmerge 3501 4
+Win32QueryLangInfo              pmmerge 3501 4
+WinQueryLangViewer              pmmerge 3505 2
+Win32QueryLangViewer            pmmerge 3505 2
 WinSetControlColors             pmmerge 5471 5
+WinSetKbdLayer                  pmmerge 3502 3
+Win32SetKbdLayer                pmmerge 3502 3
+WinSetKbdLayout                 pmmerge 5458 2
+Win32SetKbdLayout               pmmerge 5458 2
+WinSetLangInfo                  pmmerge 3500 6
+Win32SetLangInfo                pmmerge 3500 6
+WinSetLangViewer                pmmerge 3504 3
+Win32SetLangViewer              pmmerge 3504 3
+
+; Private API and globals. (not complete)
+CCHSetHailing                   pmmerge 6196 ?
+EditAllocSpace                  pmmerge 5008 ?
+EditAutoSize                    pmmerge 5009 ?
+EditBackspace                   pmmerge 5010 ?
+EditChangeFocus                 pmmerge 5011 ?
+EditChangeSelection             pmmerge 5012 ?
+EditChar                        pmmerge 5013 ?
+EditCheckScroll                 pmmerge 5014 ?
+EditClear                       pmmerge 5015 ?
+EditCopy                        pmmerge 5016 ?
+EditCreate                      pmmerge 5017 ?
+EditCreateCursor                pmmerge 5018 ?
+EditCreatePassword              pmmerge 5019 ?
+EditCut                         pmmerge 5020 ?
+EditCxFromIch                   pmmerge 5021 ?
+EditDrawSubstring               pmmerge 5022 ?
+EditGetFlags                    pmmerge 5023 ?
+EditGetWindowRect               pmmerge 5024 ?
+EditIchFromPt                   pmmerge 5025 ?
+EditNotify                      pmmerge 5026 ?
+EditPaint                       pmmerge 5027 ?
+EditPaste                       pmmerge 5028 ?
+EditPtFromIch                   pmmerge 5029 ?
+EditQueryPresParams             pmmerge 5030 ?
+EditReplace                     pmmerge 5031 ?
+EditSetCursorPos                pmmerge 5032 ?
+EditSetFirstIndex               pmmerge 5033 ?
+EditSetInsertMode               pmmerge 5034 ?
+EditSetSelection                pmmerge 5035 ?
+EditSetText                     pmmerge 5036 ?
+EditSetWindowParams             pmmerge 5037 ?
+EditShowChange                  pmmerge 5038 ?
+EditStopMouseTracking           pmmerge 5039 ?
+EditTimerScroll                 pmmerge 5040 ?
+EditTrackMouse                  pmmerge 5041 ?
+EditVirtualKey                  pmmerge 5042 ?
+EditWMChar                      pmmerge 5043 ?
+GetDriverInfo                   pmmerge 5046 ?
+GetDriverInfo32                 pmmerge 5046 ?
+GetIconWindowsExe               pmmerge 5057 ?
+GetIconWindowsIco               pmmerge 5058 ?
+GreEntry10                      pmmerge 5048 ?
+GreEntry2                       pmmerge 5049 ?
+GreEntry3                       pmmerge 5050 ?
+GreEntry4                       pmmerge 5051 ?
+GreEntry5                       pmmerge 5052 ?
+GreEntry6                       pmmerge 5053 ?
+GreEntry7                       pmmerge 5054 ?
+GreEntry8                       pmmerge 5055 ?
+GreEntry9                       pmmerge 5056 ?
+GreMemPtrs                      pmmerge 6200 ?
+GreNls                          pmmerge 6100 ?
+HwndShell                       pmmerge 6202 ?
+InnerGre32Entry10               pmmerge 5059 ?
+InnerGre32Entry2                pmmerge 5060 ?
+InnerGre32Entry3                pmmerge 5061 ?
+InnerGre32Entry4                pmmerge 5062 ?
+InnerGre32Entry5                pmmerge 5063 ?
+InnerGre32Entry6                pmmerge 5064 ?
+InnerGre32Entry7                pmmerge 5065 ?
+InnerGre32Entry8                pmmerge 5066 ?
+InnerGre32Entry9                pmmerge 5067 ?
+InnerGreEntry10                 pmmerge 5059 ?
+InnerGreEntry2                  pmmerge 5060 ?
+InnerGreEntry3                  pmmerge 5061 ?
+InnerGreEntry4                  pmmerge 5062 ?
+InnerGreEntry5                  pmmerge 5063 ?
+InnerGreEntry6                  pmmerge 5064 ?
+InnerGreEntry7                  pmmerge 5065 ?
+InnerGreEntry8                  pmmerge 5066 ?
+InnerGreEntry9                  pmmerge 5067 ?
+PM32ExecRegister                pmmerge 5069 ?
+PMExecRegister                  pmmerge 5069 ?
+PMHeapIsMemInChain              pmmerge 5430 ?
+PrfChangeWriteThru              pmmerge 5076 ?
+PrfSuspendWriteToDisk           pmmerge 5094 ?
+; RamSemClear                     pmmerge 5096 ?
+; RamSemClear32                   pmmerge 5096 ?
+; RamSemRequest                   pmmerge 5097 ?
+; RamSemRequest32                 pmmerge 5097 ?
+SHPPI32LockINIFile              pmmerge 5101 ?
+SHPPI32ShutDown                 pmmerge 5102 ?
+SHPPILockINIFile                pmmerge 5101 ?
+SHPPIShutDown                   pmmerge 5102 ?
+SLEC_InitPen                    pmmerge 5103 ?
+SSAllocMem                      pmmerge 5104 ?
+SSAllocMem32                    pmmerge 5104 ?
+SSFreeMem                       pmmerge 5105 ?
+SSFreeMem32                     pmmerge 5105 ?
+SetDeviceSurface                pmmerge 5108 ?
+SetDriverInfo                   pmmerge 5098 ?
+SetDriverInfo32                 pmmerge 5098 ?
+ShePIInitIniFiles               pmmerge 5099 ?
+SheSystemShutdown               pmmerge 5100 ?
+WinAugmentPointer               pmmerge 5416 ?
+WinDrawTabbedText               pmmerge 5432 ?
+WinExplodeWindow                pmmerge 5175 ?
+WinGetFrameTreePPSize           pmmerge 5187 ?
+WinGetFrameTreePPs              pmmerge 5186 ?
+WinHAPPfromPID                  pmmerge 5198 ?
+WinHSWITCHfromHAPP              pmmerge 5199 ?
+WinIsWindowOfClass              pmmerge 5437 ?
+WinJiggleMouse                  pmmerge 5215 ?
+WinLoadVkeyGlyphXlatetbl        pmmerge 5463 ?
+WinMoveCursor                   pmmerge 5234 ?
+WinMspAlloc                     pmmerge 5418 ?
+WinMspFree                      pmmerge 5419 ?
+WinMspInit                      pmmerge 5420 ?
+WinNoShutdown                   pmmerge 5431 ?
+WinProcessHotKey                pmmerge 5421 ?
+WinQueryVKeyGlyphXlatetbl       pmmerge 5465 ?
+WinRegisterPen                  pmmerge 5316 ?
+WinRegisterSeamlessProc         pmmerge 5317 ?
+WinSeamlessBox                  pmmerge 5329 ?
+WinSemEnter                     pmmerge 5330 ?
+WinSemEnterTimeout              pmmerge 5467 ?
+WinSemLeave                     pmmerge 5331 ?
+WinSemQuery                     pmmerge 5332 ?
+WinSetAtomTableOwner            pmmerge 5438 ?
+WinSetCharXlateTbl              pmmerge 5339 ?
+WinSetErrorInfo32               pmmerge 5349 ?
+WinSetFrameTreePPs              pmmerge 5351 ?
+WinSetVKeyGlyphXlatetbl         pmmerge 5464 ?
+WinXxAllocFill                  pmmerge 5423 ?
+WinXxAllocMem                   pmmerge 5424 ?
+WinXxCreateHeap                 pmmerge 5425 ?
+WinXxDestroyHeap                pmmerge 5426 ?
+WinXxFreeMem                    pmmerge 5427 ?
+WinXxIsMemInHeap                pmmerge 5428 ?
+WinXxQueryMemSize               pmmerge 5439 ?
+WinXxReallocMem                 pmmerge 5429 ?
+enableCoachMsgHook              pmmerge 6197 ?
+;fCallGreCoach                   pmmerge 6198 ?
+;fPenAvail                       pmmerge 6201 ?
+;
+AAB32GetReg                     pmmerge 5000 ?
+AAB32SetReg                     pmmerge 5001 ?
+;
+WinQueryProperty                pmmerge  5450 2
+WinRemoveProperty               pmmerge  5451 2
+WinSetProperty                  pmmerge  5452 4
+
Index: trunk/src/emx/src/lib/os2_386/shl.imp
===================================================================
--- trunk/src/emx/src/lib/os2_386/shl.imp	(revision 366)
+++ trunk/src/emx/src/lib/os2_386/shl.imp	(revision 367)
@@ -29,4 +29,5 @@
 WinRemoveSwitchEntry            pmshapi 129 1
 WinStartApp                     pmshapi 119 5
+WinSwitchProgramRegister        pmshapi 156 ?
 WinSwitchToProgram              pmshapi 131 1
 WinTerminateApp                 pmshapi 130 1
Index: trunk/src/emx/src/lib/os2_386/spl.imp
===================================================================
--- trunk/src/emx/src/lib/os2_386/spl.imp	(revision 366)
+++ trunk/src/emx/src/lib/os2_386/spl.imp	(revision 367)
@@ -3,7 +3,12 @@
 ;
 PrtAbort                        pmspl 375 1
+PrtAbortDoc                     pmspl 601 4
 PrtClose                        pmspl 373 1
 PrtDevIOCtl                     pmspl 372 5
+PrtNewPage                      pmspl 602 2
 PrtOpen                         pmspl 370 8
+PrtQuery                        pmspl 603 ?
+PrtResetAbort                   pmspl 600 1
+PrtSet                          pmspl 604 ?
 PrtWrite                        pmspl 371 4
 SplControlDevice                pmspl 380 3
@@ -16,4 +21,7 @@
 SplDeletePort                   pmspl 414 2
 SplDeleteQueue                  pmspl 396 2
+SplDisable                      pmspl 610 ?
+SplDisplayControlPanel          pmspl 616 ?
+SplEnable                       pmspl 611 ?
 SplEnumDevice                   pmspl 382 8
 SplEnumDriver                   pmspl 406 8
@@ -23,8 +31,12 @@
 SplEnumQueue                    pmspl 399 8
 SplEnumQueueProcessor           pmspl 407 8
+SplGetControlPanelList          pmspl 618 ?
+SplGetPortFromQ                 pmspl 617 ?
 SplHoldJob                      pmspl 385 3
 SplHoldQueue                    pmspl 394 2
 SplInit                         pmspl 320 ?
 SplMessageBox                   pmspl 307 7
+SplProtSendCmd                  pmspl 605 ?
+SplProtXlateCmd                 pmspl 606 ?
 SplPurgeQueue                   pmspl 404 2
 SplQmAbort                      pmspl 305 1
@@ -38,4 +50,5 @@
 SplQmStartDoc                   pmspl 302 2
 SplQmWrite                      pmspl 304 3
+SplQueryControlPanel            pmspl 615 ?
 SplQueryDevice                  pmspl 381 6
 SplQueryDriver                  pmspl 446 7
@@ -45,4 +58,6 @@
 SplQueryPort                    pmspl 410 6
 SplQueryQueue                   pmspl 397 6
+SplRegister                     pmspl 612 ?
+SplRegisterControlPanel         pmspl 614 ?
 SplReleaseJob                   pmspl 384 3
 SplReleaseQueue                 pmspl 395 2
@@ -59,2 +74,16 @@
 SplStdStart                     pmspl 352 1
 SplStdStop                      pmspl 353 1
+SplUnRegister                   pmspl 613 ?
+
+; Private API and globals. (not complete)
+SplPrmSpool                     pmspl 315 ?
+SplQmCancelPrintingJob          pmspl 317 ?
+SplQmCancelWaitingJobs          pmspl 316 ?
+SplQmChooseLogAddr              pmspl 311 ?
+SplQmInitialize                 pmspl 312 ?
+SplQmQueryPrintRes              pmspl 440 ?
+SplQmSpoolerPresent             pmspl 310 ?
+SplQmTerminate                  pmspl 313 ?
+SplQueryJobFile                 pmspl 444 ?
+SplVqIfInit                     pmspl 319 ?
+
Index: trunk/src/emx/src/lib/os2_386/win.imp
===================================================================
--- trunk/src/emx/src/lib/os2_386/win.imp	(revision 366)
+++ trunk/src/emx/src/lib/os2_386/win.imp	(revision 367)
@@ -2,4 +2,5 @@
 ; win.imp
 ;
+KbdPacket                       pmwin  174 ?
 WinAddAtom                      pmwin  700 2
 WinAlarm                        pmwin  701 2
@@ -102,6 +103,6 @@
 WinLoadProcedure                pmwin  986 3
 WinLoadString                   pmwin  781 5
+WinLockInput                    pmwin  995 2
 WinLockPointerUpdate            pmwin  997 3
-WinLockInput                    pmwin  995 2
 WinLockVisRegions               pmwin  782 2
 WinLockWindowUpdate             pmwin  784 2
@@ -137,4 +138,5 @@
 WinQueryClassName               pmwin  805 3
 WinQueryClassThunkProc          pmwin  931 1
+WinQueryClipRegion              pmwin  1044 2
 WinQueryClipbrdData             pmwin  806 2
 WinQueryClipbrdFmtInfo          pmwin  807 3
@@ -201,4 +203,5 @@
 WinSetClassMsgInterest          pmwin  853 4
 WinSetClassThunkProc            pmwin  930 2
+WinSetClipRegion                pmwin  1043 2
 WinSetClipbrdData               pmwin  854 4
 WinSetClipbrdOwner              pmwin  855 2
Index: trunk/src/emx/src/libos2/ctls.imp
===================================================================
--- trunk/src/emx/src/libos2/ctls.imp	(revision 366)
+++ trunk/src/emx/src/libos2/ctls.imp	(revision 367)
@@ -8,2 +8,11 @@
 WinFreeFileDlgList              pmctls  6 1
 WinRegisterCircularSlider       pmctls 24 ?
+
+; Private API and globals.
+DaxOpenSave                     pmctls 295 ?
+WinDefColorDlgProc              pmctls 293 4
+WinDefFindDlgProc               pmctls 297 4
+WinDefPrintDlgProc              pmctls 301 4
+WinDefReplaceDlgProc            pmctls 299 4
+PaxChooseFont                   pmctls 292 ?
+
Index: trunk/src/emx/src/libos2/dos.imp
===================================================================
--- trunk/src/emx/src/libos2/dos.imp	(revision 366)
+++ trunk/src/emx/src/libos2/dos.imp	(revision 367)
@@ -3,5 +3,8 @@
 ;
 DosAcknowledgeSignalException   doscalls 418 1
+DosAcquireSpinLock              doscalls 558 ?
 DosAddMuxWaitSem                doscalls 341 2
+DosAliasMem                     doscalls 298 4
+DosAliasPerfCtrs                doscalls 364 4
 DosAllocMem                     doscalls 299 3
 DosAllocSharedMem               doscalls 300 4
@@ -11,4 +14,5 @@
 DosCallNPipe                    doscalls 240 7
 DosCancelLockRequest            doscalls 429 2
+DosCancelLockRequestL           doscalls 987 2
 DosClose                        doscalls 257 1
 DosCloseChangeNotify            doscalls 442 ?
@@ -17,4 +21,5 @@
 DosCloseMuxWaitSem              doscalls 339 1
 DosCloseVDD                     doscalls 310 1
+DosConfigurePerf                doscalls 365 6
 DosConnectNPipe                 doscalls 241 1
 DosCopy                         doscalls 258 3
@@ -25,6 +30,9 @@
 DosCreateNPipe                  doscalls 243 7
 DosCreatePipe                   doscalls 239 3
+DosCreateSpinLock               doscalls 557 ?
 DosCreateThread                 doscalls 311 5
+DosCreateThread2                doscalls 997 1
 DosDebug                        doscalls 317 1
+DosDeconPerf                    doscalls 366 1
 DosDelete                       doscalls 259 1
 DosDeleteDir                    doscalls 226 1
@@ -47,6 +55,4 @@
 DosExitList                     doscalls 296 2
 DosExitMustComplete             doscalls 381 1
-DosFlatToSel                    doscalls 425 R
-DosFreeThreadLocalMemory        doscalls 455 1
 DosFSAttach                     doscalls 269 5
 DosFSCtl                        doscalls 285 10
@@ -54,4 +60,5 @@
 DosFindFirst                    doscalls 264 7
 DosFindNext                     doscalls 265 4
+DosFlatToSel                    doscalls 425 R
 DosForceDelete                  doscalls 110 1
 DosForceSystemDump              doscalls 444 1
@@ -59,7 +66,10 @@
 DosFreeModule                   doscalls 322 1
 DosFreeResource                 doscalls 353 1
+DosFreeSpinLock                 doscalls 560 ?
+DosFreeThreadLocalMemory        doscalls 455 1
 DosGetDateTime                  doscalls 230 1
 DosGetInfoBlocks                doscalls 312 2
 DosGetNamedSharedMem            doscalls 301 3
+DosGetProcessorStatus           doscalls 447 2
 DosGetResource                  doscalls 352 4
 DosGetSharedMem                 doscalls 302 2
@@ -68,4 +78,6 @@
 DosKillProcess                  doscalls 235 2
 DosKillThread                   doscalls 111 1
+DosListIO                       doscalls 996 3
+DosListIOL                      doscalls 990 3
 DosLoadModule                   doscalls 318 4
 DosMove                         doscalls 271 2
@@ -73,4 +85,5 @@
 DosOpenChangeNotify             doscalls 440 ?
 DosOpenEventSem                 doscalls 325 2
+DosOpenL                        doscalls 981 9
 DosOpenMutexSem                 doscalls 332 2
 DosOpenMuxWaitSem               doscalls 338 2
@@ -79,8 +92,11 @@
 DosPM16SemRst                   doscalls 875 ?
 DosPMPostEventSem               doscalls 590 ?
+DosPMR3PostEventSem             doscalls 562 ?
+DosPMR3WaitEventSem             doscalls 561 ?
 DosPMRequestMutexSem            doscalls 593 ?
 DosPMWaitEventSem               doscalls 591 ?
 DosPMWaitMuxWaitSem             doscalls 595 ?
 DosPeekNPipe                    doscalls 244 6
+DosPerfSysCall                  doscalls 976 4
 DosPhysicalDisk                 doscalls 287 5
 DosPostEventSem                 doscalls 328 1
@@ -89,4 +105,5 @@
 DosProtectEnumAttribute         doscalls 636 8
 DosProtectOpen                  doscalls 637 9
+DosProtectOpenL                 doscalls 982 10
 DosProtectQueryFHState          doscalls 645 3
 DosProtectQueryFileInfo         doscalls 646 5
@@ -95,6 +112,9 @@
 DosProtectSetFileInfo           doscalls 643 5
 DosProtectSetFileLocks          doscalls 639 6
+DosProtectSetFileLocksL         doscalls 983 6
 DosProtectSetFilePtr            doscalls 621 5
+DosProtectSetFilePtrL           doscalls 984 6
 DosProtectSetFileSize           doscalls 640 3
+DosProtectSetFileSizeL          doscalls 985 4
 DosProtectWrite                 doscalls 642 5
 DosQueryABIOSSupport            doscalls 371 0
@@ -110,7 +130,8 @@
 DosQueryFSInfo                  doscalls 278 4
 DosQueryFileInfo                doscalls 279 4
+DosQueryHType                   doscalls 224 3
 DosQueryHeaderInfo              doscalls 582 ?
-DosQueryHType                   doscalls 224 3
 DosQueryMem                     doscalls 306 3
+DosQueryMemState                doscalls 307 3
 DosQueryModFromEIP              doscalls 360 6
 DosQueryModuleHandle            doscalls 319 2
@@ -121,4 +142,5 @@
 DosQueryNPipeInfo               doscalls 248 4
 DosQueryNPipeSemState           doscalls 249 3
+DosQueryPageUsage               doscalls 358 ?
 DosQueryPathInfo                doscalls 223 4
 DosQueryProcAddr                doscalls 321 4
@@ -128,4 +150,5 @@
 DosQuerySysInfo                 doscalls 348 4
 DosQuerySysState                doscalls 368 6
+DosQueryThreadAffinity          doscalls 563 2
 DosQueryThreadContext           doscalls 877 3
 DosQueryVerify                  doscalls 225 1
@@ -136,4 +159,5 @@
 DosRegisterPerfCtrs             doscalls 367 3
 DosReleaseMutexSem              doscalls 335 1
+DosReleaseSpinLock              doscalls 559 ?
 DosReplaceModule                doscalls 417 3
 DosRequestMutexSem              doscalls 334 2
@@ -158,6 +182,9 @@
 DosSetFileInfo                  doscalls 218 4
 DosSetFileLocks                 doscalls 428 5
+DosSetFileLocksL                doscalls 986 5
 DosSetFilePtr                   doscalls 256 4
+DosSetFilePtrL                  doscalls 988 5
 DosSetFileSize                  doscalls 272 2
+DosSetFileSizeL                 doscalls 989 3
 DosSetMaxFH                     doscalls 209 1
 DosSetMem                       doscalls 305 3
@@ -165,7 +192,10 @@
 DosSetNPipeSem                  doscalls 251 3
 DosSetPathInfo                  doscalls 219 5
+DosSetPriority                  doscalls 236 4
 DosSetProcessCp                 doscalls 289 1
+DosSetProcessorStatus           doscalls 448 2
 DosSetRelMaxFH                  doscalls 382 2
 DosSetSignalExceptionFocus      doscalls 378 2
+DosSetThreadAffinity            doscalls 564 1
 DosSetVerify                    doscalls 210 1
 DosShutdown                     doscalls 415 1
@@ -173,5 +203,4 @@
 DosStartTimer                   doscalls 351 3
 DosStopTimer                    doscalls 290 1
-DosSysCtl                       doscalls 876 ?
 DosSubAllocMem                  doscalls 345 3
 DosSubFreeMem                   doscalls 346 3
@@ -180,8 +209,9 @@
 DosSuppressPopUps               doscalls 114 2
 DosSuspendThread                doscalls 238 1
-DosTib                          doscalls 419 ?
+DosSysCtl                       doscalls 876 ?
+DosTIB                          doscalls 419 ?
+DosTestPSD                      doscalls 453 ?
 DosTmrQueryFreq                 doscalls 362 1
 DosTmrQueryTime                 doscalls 363 1
-DosSetPriority                  doscalls 236 4
 DosTransactNPipe                doscalls 252 6
 DosUnsetExceptionHandler        doscalls 355 1
@@ -194,2 +224,16 @@
 DosWaitThread                   doscalls 349 2
 DosWrite                        doscalls 282 4
+
+; Private API and globals.
+DosAllocProtectedMem            doscalls 297 ?
+DosFlatCS                       doscalls 369 ?
+DosFlatDS                       doscalls 370 ?
+DosICacheModule                 doscalls 416 ?
+DosIRaiseException              doscalls 594 ?
+DosLDTSel                       doscalls 599 ?
+SMArray                         doscalls 859 ?
+SMArraySize                     doscalls 862 ?
+SMInitialized                   doscalls 861 ?
+SMPIDArray                      doscalls 860 ?
+SMQueueRamSem                   doscalls 858 ?
+
Index: trunk/src/emx/src/libos2/drag.imp
===================================================================
--- trunk/src/emx/src/libos2/drag.imp	(revision 366)
+++ trunk/src/emx/src/libos2/drag.imp	(revision 367)
@@ -26,4 +26,5 @@
 DrgQueryDragitemCount           pmdrag 45 1
 DrgQueryDragitemPtr             pmdrag 46 2
+DrgQueryFormat                  pmdrag 75 5
 DrgQueryNativeRMF               pmdrag 47 3
 DrgQueryNativeRMFLen            pmdrag 48 1
Index: trunk/src/emx/src/libos2/gpi.imp
===================================================================
--- trunk/src/emx/src/libos2/gpi.imp	(revision 366)
+++ trunk/src/emx/src/libos2/gpi.imp	(revision 367)
@@ -6,8 +6,10 @@
 DevOpenDC                       pmgpi 610 6
 DevPostDeviceModes              pmgpi 609 6
+DevPostEscape                   pmgpi 729 9
 DevQueryCaps                    pmgpi 606 4
 DevQueryDeviceNames             pmgpi 607 7
 DevQueryHardcopyCaps            pmgpi 608 4
 DevStdOpen                      pmgpi 625 ?
+GpiAbortPath                    pmgpi 722 ?
 GpiAnimatePalette               pmgpi 595 5
 GpiAssociate                    pmgpi 351 2
@@ -34,9 +36,12 @@
 GpiCorrelateSegment             pmgpi 582 7
 GpiCreateBitmap                 pmgpi 598 5
+GpiCreateEllipticRegion         pmgpi 662 2
 GpiCreateLogColorTable          pmgpi 592 6
 GpiCreateLogFont                pmgpi 368 4
 GpiCreatePS                     pmgpi 369 4
 GpiCreatePalette                pmgpi 594 5
+GpiCreatePolygonRegion          pmgpi 663 4
 GpiCreateRegion                 pmgpi 370 3
+GpiCreateRoundRectRegion        pmgpi 661 4
 GpiDeleteBitmap                 pmgpi 371 1
 GpiDeleteElement                pmgpi 372 1
@@ -85,4 +90,5 @@
 GpiOpenSegment                  pmgpi 408 2
 GpiOutlinePath                  pmgpi 563 3
+GpiOval                         pmgpi 730 5
 GpiPaintRegion                  pmgpi 409 2
 GpiPartialArc                   pmgpi 612 5
@@ -146,4 +152,5 @@
 GpiQueryFontAction              pmgpi 576 2
 GpiQueryFontFileDescriptions    pmgpi 452 4
+GpiQueryFontMappingFlags        pmgpi 669 1
 GpiQueryFontMetrics             pmgpi 453 3
 GpiQueryFonts                   pmgpi 586 6
@@ -164,7 +171,9 @@
 GpiQueryMetaFileBits            pmgpi 465 4
 GpiQueryMetaFileLength          pmgpi 466 1
+GpiQueryMitreLimit              pmgpi 724 ?
 GpiQueryMix                     pmgpi 467 1
 GpiQueryModelTransformMatrix    pmgpi 468 3
 GpiQueryNearestColor            pmgpi 469 3
+GpiQueryNearestPaletteIndex     pmgpi 667 2
 GpiQueryNumberSetIds            pmgpi 470 1
 GpiQueryPS                      pmgpi 471 2
@@ -172,4 +181,5 @@
 GpiQueryPalette                 pmgpi 579 1
 GpiQueryPaletteInfo             pmgpi 597 5
+GpiQueryPath                    pmgpi 725 ?
 GpiQueryPattern                 pmgpi 473 1
 GpiQueryPatternRefPoint         pmgpi 474 2
@@ -179,4 +189,5 @@
 GpiQueryPickApertureSize        pmgpi 478 2
 GpiQueryRGBColor                pmgpi 479 3
+GpiQueryRasterizerCaps          pmgpi 660 1
 GpiQueryRealColors              pmgpi 480 5
 GpiQueryRegionBox               pmgpi 481 3
@@ -188,4 +199,5 @@
 GpiQuerySetIds                  pmgpi 486 5
 GpiQueryStopDraw                pmgpi 487 1
+GpiQueryTabbedTextExtent        pmgpi 658 5
 GpiQueryTag                     pmgpi 488 2
 GpiQueryTextAlignment           pmgpi 648 3
@@ -199,6 +211,7 @@
 GpiResetBoundaryData            pmgpi 497 1
 GpiResetPS                      pmgpi 498 2
+GpiResizePalette                pmgpi 666 2
 GpiRestorePS                    pmgpi 499 2
-GpiResumePlay                   pmgpi 562 ?
+GpiResumePlay                   pmgpi 562 1
 GpiRotate                       pmgpi 566 5
 GpiSaveMetaFile                 pmgpi 500 2
@@ -238,4 +251,5 @@
 GpiSetElementPointer            pmgpi 524 2
 GpiSetElementPointerAtLabel     pmgpi 525 2
+GpiSetFontMappingFlags          pmgpi 668 2
 GpiSetGraphicsField             pmgpi 526 2
 GpiSetInitialSegmentAttrs       pmgpi 527 3
@@ -249,4 +263,5 @@
 GpiSetMarkerSet                 pmgpi 535 2
 GpiSetMetaFileBits              pmgpi 536 4
+GpiSetMitreLimit                pmgpi 727 ?
 GpiSetMix                       pmgpi 537 2
 GpiSetModelTransformMatrix      pmgpi 538 4
@@ -271,7 +286,47 @@
 GpiStrokeInkPath                pmgpi 672 5
 GpiStrokePath                   pmgpi 554 3
-GpiSuspendPlay                  pmgpi 561 ?
+GpiSuspendPlay                  pmgpi 561 1
+GpiTabbedCharStringAt           pmgpi 659 9
 GpiTranslate                    pmgpi 564 4
 GpiUnloadFonts                  pmgpi 555 2
 GpiUnloadPublicFonts            pmgpi 623 2
 GpiWCBitBlt                     pmgpi 557 6
+
+
+; Private API and globals.
+DevQueryDisplayResolutions      pmgpi 655 ?
+DspDefaultResolution            pmgpi 654 ?
+DspInitSystemDriverName         pmgpi 656 ?
+GpiAllocateDCData               pmgpi 664 ?
+GpiCloseMetafile                pmgpi 628 ?
+GpiConvPSH                      pmgpi 629 ?
+GpiEnableYInversion             pmgpi 723 ?
+GpiInstallIFIFont               pmgpi 624 ?
+GpiMtAssociate                  pmgpi 644 ?
+GpiMtDisassociate               pmgpi 645 ?
+GpiOpenMetafile                 pmgpi 627 ?
+GpiQueryDCData                  pmgpi 665 ?
+GpiQueryYInversion              pmgpi 726 ?
+GpiSaveMetaFile2                pmgpi 728 ?
+GpiSetBitmapOwner               pmgpi 620 ?
+GpiSetDCOwner                   pmgpi 619 ?
+GpiSetRegionOwner               pmgpi 621 ?
+PaxArc                          pmgpi 715 ?
+PaxBeginPath                    pmgpi 703 ?
+PaxChord                        pmgpi 716 ?
+PaxCloseFigure                  pmgpi 704 ?
+PaxEllipse                      pmgpi 717 ?
+PaxEndPath                      pmgpi 705 ?
+PaxFillPath                     pmgpi 706 ?
+PaxFlattenPath                  pmgpi 707 ?
+PaxGetPolyFillMode              pmgpi 700 ?
+PaxLineDDA                      pmgpi 718 ?
+PaxPathToRegion                 pmgpi 710 ?
+PaxPie                          pmgpi 719 ?
+PaxPolyBezier                   pmgpi 720 ?
+PaxPolyBezierAt                 pmgpi 721 ?
+PaxSetPolyFillMode              pmgpi 701 ?
+PaxStrokeAndFillPath            pmgpi 712 ?
+PaxStrokePath                   pmgpi 713 ?
+PaxWidenPath                    pmgpi 714 ?
+
Index: trunk/src/emx/src/libos2/pmmerge.imp
===================================================================
--- trunk/src/emx/src/libos2/pmmerge.imp	(revision 366)
+++ trunk/src/emx/src/libos2/pmmerge.imp	(revision 367)
@@ -3,3 +3,165 @@
 ;
 WinQueryControlColors           pmmerge 5470 5
+; WinMessageBox2                  pmmerge 5417 1
+WinQueryCpType                  pmmerge 5480 1
+WinQueryKbdLayer                pmmerge 3503 2
+Win32QueryKbdLayer              pmmerge 3503 2
+WinQueryKbdLayout               pmmerge 5479 1
+Win32QueryKbdLayout             pmmerge 5479 1
+WinQueryLangInfo                pmmerge 3501 4
+Win32QueryLangInfo              pmmerge 3501 4
+WinQueryLangViewer              pmmerge 3505 2
+Win32QueryLangViewer            pmmerge 3505 2
 WinSetControlColors             pmmerge 5471 5
+WinSetKbdLayer                  pmmerge 3502 3
+Win32SetKbdLayer                pmmerge 3502 3
+WinSetKbdLayout                 pmmerge 5458 2
+Win32SetKbdLayout               pmmerge 5458 2
+WinSetLangInfo                  pmmerge 3500 6
+Win32SetLangInfo                pmmerge 3500 6
+WinSetLangViewer                pmmerge 3504 3
+Win32SetLangViewer              pmmerge 3504 3
+
+; Private API and globals. (not complete)
+CCHSetHailing                   pmmerge 6196 ?
+EditAllocSpace                  pmmerge 5008 ?
+EditAutoSize                    pmmerge 5009 ?
+EditBackspace                   pmmerge 5010 ?
+EditChangeFocus                 pmmerge 5011 ?
+EditChangeSelection             pmmerge 5012 ?
+EditChar                        pmmerge 5013 ?
+EditCheckScroll                 pmmerge 5014 ?
+EditClear                       pmmerge 5015 ?
+EditCopy                        pmmerge 5016 ?
+EditCreate                      pmmerge 5017 ?
+EditCreateCursor                pmmerge 5018 ?
+EditCreatePassword              pmmerge 5019 ?
+EditCut                         pmmerge 5020 ?
+EditCxFromIch                   pmmerge 5021 ?
+EditDrawSubstring               pmmerge 5022 ?
+EditGetFlags                    pmmerge 5023 ?
+EditGetWindowRect               pmmerge 5024 ?
+EditIchFromPt                   pmmerge 5025 ?
+EditNotify                      pmmerge 5026 ?
+EditPaint                       pmmerge 5027 ?
+EditPaste                       pmmerge 5028 ?
+EditPtFromIch                   pmmerge 5029 ?
+EditQueryPresParams             pmmerge 5030 ?
+EditReplace                     pmmerge 5031 ?
+EditSetCursorPos                pmmerge 5032 ?
+EditSetFirstIndex               pmmerge 5033 ?
+EditSetInsertMode               pmmerge 5034 ?
+EditSetSelection                pmmerge 5035 ?
+EditSetText                     pmmerge 5036 ?
+EditSetWindowParams             pmmerge 5037 ?
+EditShowChange                  pmmerge 5038 ?
+EditStopMouseTracking           pmmerge 5039 ?
+EditTimerScroll                 pmmerge 5040 ?
+EditTrackMouse                  pmmerge 5041 ?
+EditVirtualKey                  pmmerge 5042 ?
+EditWMChar                      pmmerge 5043 ?
+GetDriverInfo                   pmmerge 5046 ?
+GetDriverInfo32                 pmmerge 5046 ?
+GetIconWindowsExe               pmmerge 5057 ?
+GetIconWindowsIco               pmmerge 5058 ?
+GreEntry10                      pmmerge 5048 ?
+GreEntry2                       pmmerge 5049 ?
+GreEntry3                       pmmerge 5050 ?
+GreEntry4                       pmmerge 5051 ?
+GreEntry5                       pmmerge 5052 ?
+GreEntry6                       pmmerge 5053 ?
+GreEntry7                       pmmerge 5054 ?
+GreEntry8                       pmmerge 5055 ?
+GreEntry9                       pmmerge 5056 ?
+GreMemPtrs                      pmmerge 6200 ?
+GreNls                          pmmerge 6100 ?
+HwndShell                       pmmerge 6202 ?
+InnerGre32Entry10               pmmerge 5059 ?
+InnerGre32Entry2                pmmerge 5060 ?
+InnerGre32Entry3                pmmerge 5061 ?
+InnerGre32Entry4                pmmerge 5062 ?
+InnerGre32Entry5                pmmerge 5063 ?
+InnerGre32Entry6                pmmerge 5064 ?
+InnerGre32Entry7                pmmerge 5065 ?
+InnerGre32Entry8                pmmerge 5066 ?
+InnerGre32Entry9                pmmerge 5067 ?
+InnerGreEntry10                 pmmerge 5059 ?
+InnerGreEntry2                  pmmerge 5060 ?
+InnerGreEntry3                  pmmerge 5061 ?
+InnerGreEntry4                  pmmerge 5062 ?
+InnerGreEntry5                  pmmerge 5063 ?
+InnerGreEntry6                  pmmerge 5064 ?
+InnerGreEntry7                  pmmerge 5065 ?
+InnerGreEntry8                  pmmerge 5066 ?
+InnerGreEntry9                  pmmerge 5067 ?
+PM32ExecRegister                pmmerge 5069 ?
+PMExecRegister                  pmmerge 5069 ?
+PMHeapIsMemInChain              pmmerge 5430 ?
+PrfChangeWriteThru              pmmerge 5076 ?
+PrfSuspendWriteToDisk           pmmerge 5094 ?
+; RamSemClear                     pmmerge 5096 ?
+; RamSemClear32                   pmmerge 5096 ?
+; RamSemRequest                   pmmerge 5097 ?
+; RamSemRequest32                 pmmerge 5097 ?
+SHPPI32LockINIFile              pmmerge 5101 ?
+SHPPI32ShutDown                 pmmerge 5102 ?
+SHPPILockINIFile                pmmerge 5101 ?
+SHPPIShutDown                   pmmerge 5102 ?
+SLEC_InitPen                    pmmerge 5103 ?
+SSAllocMem                      pmmerge 5104 ?
+SSAllocMem32                    pmmerge 5104 ?
+SSFreeMem                       pmmerge 5105 ?
+SSFreeMem32                     pmmerge 5105 ?
+SetDeviceSurface                pmmerge 5108 ?
+SetDriverInfo                   pmmerge 5098 ?
+SetDriverInfo32                 pmmerge 5098 ?
+ShePIInitIniFiles               pmmerge 5099 ?
+SheSystemShutdown               pmmerge 5100 ?
+WinAugmentPointer               pmmerge 5416 ?
+WinDrawTabbedText               pmmerge 5432 ?
+WinExplodeWindow                pmmerge 5175 ?
+WinGetFrameTreePPSize           pmmerge 5187 ?
+WinGetFrameTreePPs              pmmerge 5186 ?
+WinHAPPfromPID                  pmmerge 5198 ?
+WinHSWITCHfromHAPP              pmmerge 5199 ?
+WinIsWindowOfClass              pmmerge 5437 ?
+WinJiggleMouse                  pmmerge 5215 ?
+WinLoadVkeyGlyphXlatetbl        pmmerge 5463 ?
+WinMoveCursor                   pmmerge 5234 ?
+WinMspAlloc                     pmmerge 5418 ?
+WinMspFree                      pmmerge 5419 ?
+WinMspInit                      pmmerge 5420 ?
+WinNoShutdown                   pmmerge 5431 ?
+WinProcessHotKey                pmmerge 5421 ?
+WinQueryVKeyGlyphXlatetbl       pmmerge 5465 ?
+WinRegisterPen                  pmmerge 5316 ?
+WinRegisterSeamlessProc         pmmerge 5317 ?
+WinSeamlessBox                  pmmerge 5329 ?
+WinSemEnter                     pmmerge 5330 ?
+WinSemEnterTimeout              pmmerge 5467 ?
+WinSemLeave                     pmmerge 5331 ?
+WinSemQuery                     pmmerge 5332 ?
+WinSetAtomTableOwner            pmmerge 5438 ?
+WinSetCharXlateTbl              pmmerge 5339 ?
+WinSetErrorInfo32               pmmerge 5349 ?
+WinSetFrameTreePPs              pmmerge 5351 ?
+WinSetVKeyGlyphXlatetbl         pmmerge 5464 ?
+WinXxAllocFill                  pmmerge 5423 ?
+WinXxAllocMem                   pmmerge 5424 ?
+WinXxCreateHeap                 pmmerge 5425 ?
+WinXxDestroyHeap                pmmerge 5426 ?
+WinXxFreeMem                    pmmerge 5427 ?
+WinXxIsMemInHeap                pmmerge 5428 ?
+WinXxQueryMemSize               pmmerge 5439 ?
+WinXxReallocMem                 pmmerge 5429 ?
+enableCoachMsgHook              pmmerge 6197 ?
+;fCallGreCoach                   pmmerge 6198 ?
+;fPenAvail                       pmmerge 6201 ?
+;
+AAB32GetReg                     pmmerge 5000 ?
+AAB32SetReg                     pmmerge 5001 ?
+;
+WinQueryProperty                pmmerge  5450 2
+WinRemoveProperty               pmmerge  5451 2
+WinSetProperty                  pmmerge  5452 4
+
Index: trunk/src/emx/src/libos2/shl.imp
===================================================================
--- trunk/src/emx/src/libos2/shl.imp	(revision 366)
+++ trunk/src/emx/src/libos2/shl.imp	(revision 367)
@@ -29,4 +29,5 @@
 WinRemoveSwitchEntry            pmshapi 129 1
 WinStartApp                     pmshapi 119 5
+WinSwitchProgramRegister        pmshapi 156 ?
 WinSwitchToProgram              pmshapi 131 1
 WinTerminateApp                 pmshapi 130 1
Index: trunk/src/emx/src/libos2/spl.imp
===================================================================
--- trunk/src/emx/src/libos2/spl.imp	(revision 366)
+++ trunk/src/emx/src/libos2/spl.imp	(revision 367)
@@ -3,7 +3,12 @@
 ;
 PrtAbort                        pmspl 375 1
+PrtAbortDoc                     pmspl 601 4
 PrtClose                        pmspl 373 1
 PrtDevIOCtl                     pmspl 372 5
+PrtNewPage                      pmspl 602 2
 PrtOpen                         pmspl 370 8
+PrtQuery                        pmspl 603 ?
+PrtResetAbort                   pmspl 600 1
+PrtSet                          pmspl 604 ?
 PrtWrite                        pmspl 371 4
 SplControlDevice                pmspl 380 3
@@ -16,4 +21,7 @@
 SplDeletePort                   pmspl 414 2
 SplDeleteQueue                  pmspl 396 2
+SplDisable                      pmspl 610 ?
+SplDisplayControlPanel          pmspl 616 ?
+SplEnable                       pmspl 611 ?
 SplEnumDevice                   pmspl 382 8
 SplEnumDriver                   pmspl 406 8
@@ -23,8 +31,12 @@
 SplEnumQueue                    pmspl 399 8
 SplEnumQueueProcessor           pmspl 407 8
+SplGetControlPanelList          pmspl 618 ?
+SplGetPortFromQ                 pmspl 617 ?
 SplHoldJob                      pmspl 385 3
 SplHoldQueue                    pmspl 394 2
 SplInit                         pmspl 320 ?
 SplMessageBox                   pmspl 307 7
+SplProtSendCmd                  pmspl 605 ?
+SplProtXlateCmd                 pmspl 606 ?
 SplPurgeQueue                   pmspl 404 2
 SplQmAbort                      pmspl 305 1
@@ -38,4 +50,5 @@
 SplQmStartDoc                   pmspl 302 2
 SplQmWrite                      pmspl 304 3
+SplQueryControlPanel            pmspl 615 ?
 SplQueryDevice                  pmspl 381 6
 SplQueryDriver                  pmspl 446 7
@@ -45,4 +58,6 @@
 SplQueryPort                    pmspl 410 6
 SplQueryQueue                   pmspl 397 6
+SplRegister                     pmspl 612 ?
+SplRegisterControlPanel         pmspl 614 ?
 SplReleaseJob                   pmspl 384 3
 SplReleaseQueue                 pmspl 395 2
@@ -59,2 +74,16 @@
 SplStdStart                     pmspl 352 1
 SplStdStop                      pmspl 353 1
+SplUnRegister                   pmspl 613 ?
+
+; Private API and globals. (not complete)
+SplPrmSpool                     pmspl 315 ?
+SplQmCancelPrintingJob          pmspl 317 ?
+SplQmCancelWaitingJobs          pmspl 316 ?
+SplQmChooseLogAddr              pmspl 311 ?
+SplQmInitialize                 pmspl 312 ?
+SplQmQueryPrintRes              pmspl 440 ?
+SplQmSpoolerPresent             pmspl 310 ?
+SplQmTerminate                  pmspl 313 ?
+SplQueryJobFile                 pmspl 444 ?
+SplVqIfInit                     pmspl 319 ?
+
Index: trunk/src/emx/src/libos2/win.imp
===================================================================
--- trunk/src/emx/src/libos2/win.imp	(revision 366)
+++ trunk/src/emx/src/libos2/win.imp	(revision 367)
@@ -2,4 +2,5 @@
 ; win.imp
 ;
+KbdPacket                       pmwin  174 ?
 WinAddAtom                      pmwin  700 2
 WinAlarm                        pmwin  701 2
@@ -102,6 +103,6 @@
 WinLoadProcedure                pmwin  986 3
 WinLoadString                   pmwin  781 5
+WinLockInput                    pmwin  995 2
 WinLockPointerUpdate            pmwin  997 3
-WinLockInput                    pmwin  995 2
 WinLockVisRegions               pmwin  782 2
 WinLockWindowUpdate             pmwin  784 2
@@ -137,4 +138,5 @@
 WinQueryClassName               pmwin  805 3
 WinQueryClassThunkProc          pmwin  931 1
+WinQueryClipRegion              pmwin  1044 2
 WinQueryClipbrdData             pmwin  806 2
 WinQueryClipbrdFmtInfo          pmwin  807 3
@@ -201,4 +203,5 @@
 WinSetClassMsgInterest          pmwin  853 4
 WinSetClassThunkProc            pmwin  930 2
+WinSetClipRegion                pmwin  1043 2
 WinSetClipbrdData               pmwin  854 4
 WinSetClipbrdOwner              pmwin  855 2
