Index: trunk/src/user32/Makefile
===================================================================
--- trunk/src/user32/Makefile	(revision 1076)
+++ trunk/src/user32/Makefile	(revision 1077)
@@ -1,3 +1,3 @@
-# $Id: Makefile,v 1.24 1999-09-27 12:32:27 bird Exp $
+# $Id: Makefile,v 1.25 1999-09-28 08:00:57 dengert Exp $
 
 #
@@ -35,4 +35,5 @@
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj \
         nativerc.obj oslibres.obj dummy.obj oslibmenu.obj dc.obj timer.obj \
+        caret.obj \
         windlgmsg.obj windlg.obj win32wdesktop.obj
 
@@ -118,6 +119,7 @@
 oslibres.obj:   oslibres.cpp oslibwin.h oslibres.h $(PDWIN32_INCLUDE)\winconst.h
 oslibdos.obj:   oslibdos.cpp oslibdos.h
-dc.obj:         dc.cpp win32wbase.h dc.h
+dc.obj:         dc.cpp win32wbase.h dc.h dcdata.h
 timer.obj:      timer.cpp win32wbase.h timer.h
+caret.obj:      caret.cpp win32wbase.h caret.h dcdata.h
 
 clipboard.obj:  clipboard.cpp
Index: trunk/src/user32/USER32.DEF
===================================================================
--- trunk/src/user32/USER32.DEF	(revision 1076)
+++ trunk/src/user32/USER32.DEF	(revision 1077)
@@ -1,3 +1,3 @@
-; $Id: USER32.DEF,v 1.13 1999-09-23 16:44:32 sandervl Exp $
+; $Id: USER32.DEF,v 1.14 1999-09-28 08:00:57 dengert Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -10,597 +10,602 @@
 
 IMPORTS
-    WinSetDAXData	       = PMMERGE.5448
-    GpiQueryDCData	       = PMGPI.665
+    WinSetDAXData              = PMMERGE.5448
+    GpiQueryDCData             = PMGPI.665
     GpiEnableYInversion        = PMGPI.723
-    HPSToHDC		       = PMWINX.1022
-    DeleteHDC		       = PMWINX.1023
+    HPSToHDC                   = PMWINX.1022
+    DeleteHDC                  = PMWINX.1023
+    _DestroyCaret              = PMMERGE.10001
+    _GetCaretBlinkTime         = PMMERGE.10002
+    _HideCaret                 = PMMERGE.10004
+    _SetCaretBlinkTime         = PMMERGE.10005
+    _ShowCaret                 = PMMERGE.10007
 
 EXPORTS
     ActivateKeyboardLayout     = _ActivateKeyboardLayout@8    @1
-    AdjustWindowRect	       = _AdjustWindowRect@12	      @2
-    AdjustWindowRectEx	       = _AdjustWindowRectEx@16       @3
-    AnyPopup		       = _AnyPopup@0		      @4
-    AppendMenuA 	       = _AppendMenuA@16	      @5
-    AppendMenuW 	       = _AppendMenuW@16	      @6
+    AdjustWindowRect           = _AdjustWindowRect@12         @2
+    AdjustWindowRectEx         = _AdjustWindowRectEx@16       @3
+    AnyPopup                   = _AnyPopup@0                  @4
+    AppendMenuA                = _AppendMenuA@16              @5
+    AppendMenuW                = _AppendMenuW@16              @6
     ArrangeIconicWindows       = _ArrangeIconicWindows@4      @7
-    AttachThreadInput	       = _AttachThreadInput@12	      @8
+    AttachThreadInput          = _AttachThreadInput@12        @8
     BeginDeferWindowPos        = _BeginDeferWindowPos@4       @9
-    BeginPaint		       = _BeginPaint@8		      @10
-    BringWindowToTop	       = _BringWindowToTop@4	      @11
+    BeginPaint                 = _BeginPaint@8                @10
+    BringWindowToTop           = _BringWindowToTop@4          @11
     BroadcastSystemMessage     = _BroadcastSystemMessage@20   @12
-;    CalcChildScroll		= _CalcChildScroll@??	      @13
-    CallMsgFilter	       = _CallMsgFilterA@8	     @14
-    CallMsgFilterA	       = _CallMsgFilterA@8	     @15
-    CallMsgFilterW	       = _CallMsgFilterW@8	     @16
-    CallNextHookEx	       = _CallNextHookEx@16	     @17
-    CallWindowProcA	       = _CallWindowProcA@20	     @18
-    CallWindowProcW	       = _CallWindowProcW@20	     @19
+;    CalcChildScroll            = _CalcChildScroll@??         @13
+    CallMsgFilter              = _CallMsgFilterA@8           @14
+    CallMsgFilterA             = _CallMsgFilterA@8           @15
+    CallMsgFilterW             = _CallMsgFilterW@8           @16
+    CallNextHookEx             = _CallNextHookEx@16          @17
+    CallWindowProcA            = _CallWindowProcA@20         @18
+    CallWindowProcW            = _CallWindowProcW@20         @19
     CascadeChildWindows        = _CascadeChildWindows@8      @20
-    CascadeWindows	       = _CascadeWindows@20	     @21
+    CascadeWindows             = _CascadeWindows@20          @21
     ChangeClipboardChain       = _ChangeClipboardChain@8     @22
     ChangeDisplaySettingsA     = _ChangeDisplaySettingsA@8   @23
     ChangeDisplaySettingsW     = _ChangeDisplaySettingsW@8   @24
-    ChangeMenuA 	       = _ChangeMenuA@20	     @25
-    ChangeMenuW 	       = _ChangeMenuW@20	     @26
-    CharLowerA		       = _CharLowerA@4		     @27
-    CharLowerBuffA	       = _CharLowerBuffA@8	     @28
-    CharLowerBuffW	       = _CharLowerBuffW@8	     @29
-    CharLowerW		       = _CharLowerW@4		     @30
-    CharNextA		       = _CharNextA@4		     @31
-    CharNextExA 	       = _CharNextExA@12	     @32
-    CharNextExW 	       = _CharNextExW@12	     @33
-    CharNextW		       = _CharNextW@4		     @34
-    CharPrevA		       = _CharPrevA@8		     @35
-    CharPrevExA 	       = _CharPrevExA@16	     @36
-    CharPrevExW 	       = _CharPrevExW@16	     @37
-    CharPrevW		       = _CharPrevW@8		     @38
-    CharToOemA		       = _CharToOemA@8		     @39
-    CharToOemBuffA	       = _CharToOemBuffA@12	     @40
-    CharToOemBuffW	       = _CharToOemBuffW@12	     @41
-    CharToOemW		       = _CharToOemW@8		    @42
-    CharUpperA		       = _CharUpperA@4		    @43
-    CharUpperBuffA	       = _CharUpperBuffA@8	    @44
-    CharUpperBuffW	       = _CharUpperBuffW@8	    @45
-    CharUpperW		       = _CharUpperW@4		    @46
-    CheckDlgButton	       = _CheckDlgButton@12	     @47
-    CheckMenuItem	       = _CheckMenuItem@12	     @48
-    CheckMenuRadioItem	       = _CheckMenuRadioItem@20      @49
-    CheckRadioButton	       = _CheckRadioButton@16	     @50
+    ChangeMenuA                = _ChangeMenuA@20             @25
+    ChangeMenuW                = _ChangeMenuW@20             @26
+    CharLowerA                 = _CharLowerA@4               @27
+    CharLowerBuffA             = _CharLowerBuffA@8           @28
+    CharLowerBuffW             = _CharLowerBuffW@8           @29
+    CharLowerW                 = _CharLowerW@4               @30
+    CharNextA                  = _CharNextA@4                @31
+    CharNextExA                = _CharNextExA@12             @32
+    CharNextExW                = _CharNextExW@12             @33
+    CharNextW                  = _CharNextW@4                @34
+    CharPrevA                  = _CharPrevA@8                @35
+    CharPrevExA                = _CharPrevExA@16             @36
+    CharPrevExW                = _CharPrevExW@16             @37
+    CharPrevW                  = _CharPrevW@8                @38
+    CharToOemA                 = _CharToOemA@8               @39
+    CharToOemBuffA             = _CharToOemBuffA@12          @40
+    CharToOemBuffW             = _CharToOemBuffW@12          @41
+    CharToOemW                 = _CharToOemW@8              @42
+    CharUpperA                 = _CharUpperA@4              @43
+    CharUpperBuffA             = _CharUpperBuffA@8          @44
+    CharUpperBuffW             = _CharUpperBuffW@8          @45
+    CharUpperW                 = _CharUpperW@4              @46
+    CheckDlgButton             = _CheckDlgButton@12          @47
+    CheckMenuItem              = _CheckMenuItem@12           @48
+    CheckMenuRadioItem         = _CheckMenuRadioItem@20      @49
+    CheckRadioButton           = _CheckRadioButton@16        @50
     ChildWindowFromPoint       = _ChildWindowFromPoint@12    @51
     ChildWindowFromPointEx     = _ChildWindowFromPointEx@16  @52
-;    ClientThreadConnect	= _ClientThreadConnect@??     @53
-    ClientToScreen	       = _ClientToScreen@8	     @54
-    ClipCursor		       = _ClipCursor@4		    @55
-    CloseClipboard	       = _CloseClipboard@0	     @56
-    CloseDesktop	       = _CloseDesktop@4	     @57
-    CloseWindow 	       = _CloseWindow@4 	     @58
-    CloseWindowStation	       = _CloseWindowStation@4	     @59
+;    ClientThreadConnect        = _ClientThreadConnect@??     @53
+    ClientToScreen             = _ClientToScreen@8           @54
+    ClipCursor                 = _ClipCursor@4              @55
+    CloseClipboard             = _CloseClipboard@0           @56
+    CloseDesktop               = _CloseDesktop@4             @57
+    CloseWindow                = _CloseWindow@4              @58
+    CloseWindowStation         = _CloseWindowStation@4       @59
     CopyAcceleratorTableA      = _CopyAcceleratorTableA@12   @60
     CopyAcceleratorTableW      = _CopyAcceleratorTableW@12   @61
-    CopyIcon		       = _CopyIcon@4		     @62
-    CopyImage		       = _CopyImage@20		     @63
-    CopyRect		       = _CopyRect@8		     @64
+    CopyIcon                   = _CopyIcon@4                 @62
+    CopyImage                  = _CopyImage@20               @63
+    CopyRect                   = _CopyRect@8                 @64
     CountClipboardFormats      = _CountClipboardFormats@0    @65
     CreateAcceleratorTableA    = _CreateAcceleratorTableA@8  @66
     CreateAcceleratorTableW    = _CreateAcceleratorTableW@8  @67
-    CreateCaret 	       = _CreateCaret@16	     @68
-    CreateCursor	       = _CreateCursor@28	     @69
-    CreateDesktopA	       = _CreateDesktopA@24	     @70
-    CreateDesktopW	       = _CreateDesktopW@24	     @71
-    CreateDialogIndirectParamA	= _CreateDialogIndirectParamA@20 @72
-    CreateDialogIndirectParamW	= _CreateDialogIndirectParamW@20 @73
-    CreateDialogParamA	       = _CreateDialogParamA@20      @74
-    CreateDialogParamW	       = _CreateDialogParamW@20      @75
-    CreateIcon		       = _CreateIcon@28 	     @76
+    CreateCaret                = _CreateCaret@16             @68
+    CreateCursor               = _CreateCursor@28            @69
+    CreateDesktopA             = _CreateDesktopA@24          @70
+    CreateDesktopW             = _CreateDesktopW@24          @71
+    CreateDialogIndirectParamA  = _CreateDialogIndirectParamA@20 @72
+    CreateDialogIndirectParamW  = _CreateDialogIndirectParamW@20 @73
+    CreateDialogParamA         = _CreateDialogParamA@20      @74
+    CreateDialogParamW         = _CreateDialogParamW@20      @75
+    CreateIcon                 = _CreateIcon@28              @76
     CreateIconFromResource     = _CreateIconFromResource@16  @77
     CreateIconFromResourceEx   = _CreateIconFromResourceEx@28 @78
-    CreateIconIndirect	       = _CreateIconIndirect@4	     @79
-    CreateMDIWindowA	       = _CreateMDIWindowA@40	     @80
-    CreateMDIWindowW	       = _CreateMDIWindowW@40	     @81
-    CreateMenu		       = _CreateMenu@0		     @82
-    CreatePopupMenu	       = _CreatePopupMenu@0	     @83
-    CreateWindowExA	       = _CreateWindowExA@48	     @84
-    CreateWindowExW	       = _CreateWindowExW@48	     @85
+    CreateIconIndirect         = _CreateIconIndirect@4       @79
+    CreateMDIWindowA           = _CreateMDIWindowA@40        @80
+    CreateMDIWindowW           = _CreateMDIWindowW@40        @81
+    CreateMenu                 = _CreateMenu@0               @82
+    CreatePopupMenu            = _CreatePopupMenu@0          @83
+    CreateWindowExA            = _CreateWindowExA@48         @84
+    CreateWindowExW            = _CreateWindowExW@48         @85
     CreateWindowStationA       = _CreateWindowStationA@16    @86
     CreateWindowStationW       = _CreateWindowStationW@16    @87
     DdeAbandonTransaction      = _DdeAbandonTransaction@12   @88
-    DdeAccessData	       = _DdeAccessData@8	     @89
-    DdeAddData		       = _DdeAddData@16 	     @90
+    DdeAccessData              = _DdeAccessData@8            @89
+    DdeAddData                 = _DdeAddData@16              @90
     DdeClientTransaction       = _DdeClientTransaction@32    @91
     DdeCmpStringHandles        = _DdeCmpStringHandles@8      @92
-    DdeConnect		       = _DdeConnect@16 	     @93
-    DdeConnectList	       = _DdeConnectList@20	     @94
+    DdeConnect                 = _DdeConnect@16              @93
+    DdeConnectList             = _DdeConnectList@20          @94
     DdeCreateDataHandle        = _DdeCreateDataHandle@28     @95
     DdeCreateStringHandleA     = _DdeCreateStringHandleA@12  @96
     DdeCreateStringHandleW     = _DdeCreateStringHandleW@12  @97
-    DdeDisconnect	       = _DdeDisconnect@4	     @98
-    DdeDisconnectList	       = _DdeDisconnectList@4	     @99
-    DdeEnableCallback	       = _DdeEnableCallback@12	     @100
-    DdeFreeDataHandle	       = _DdeFreeDataHandle@4	     @101
+    DdeDisconnect              = _DdeDisconnect@4            @98
+    DdeDisconnectList          = _DdeDisconnectList@4        @99
+    DdeEnableCallback          = _DdeEnableCallback@12       @100
+    DdeFreeDataHandle          = _DdeFreeDataHandle@4        @101
     DdeFreeStringHandle        = _DdeFreeStringHandle@8      @102
-    DdeGetData		       = _DdeGetData@16 	     @103
-    DdeGetLastError	       = _DdeGetLastError@4	     @104
+    DdeGetData                 = _DdeGetData@16              @103
+    DdeGetLastError            = _DdeGetLastError@4          @104
     DdeImpersonateClient       = _DdeImpersonateClient@4     @105
-    DdeInitializeA	       = _DdeInitializeA@16	     @106
-    DdeInitializeW	       = _DdeInitializeW@16	     @107
+    DdeInitializeA             = _DdeInitializeA@16          @106
+    DdeInitializeW             = _DdeInitializeW@16          @107
     DdeKeepStringHandle        = _DdeKeepStringHandle@8      @108
-    DdeNameService	       = _DdeNameService@16	     @109
-    DdePostAdvise	       = _DdePostAdvise@12	     @110
-    DdeQueryConvInfo	       = _DdeQueryConvInfo@12	     @111
-    DdeQueryNextServer	       = _DdeQueryNextServer@8	     @112
-    DdeQueryStringA	       = _DdeQueryStringA@20	     @113
-    DdeQueryStringW	       = _DdeQueryStringW@20	     @114
-    DdeReconnect	       = _DdeReconnect@4	     @115
+    DdeNameService             = _DdeNameService@16          @109
+    DdePostAdvise              = _DdePostAdvise@12           @110
+    DdeQueryConvInfo           = _DdeQueryConvInfo@12        @111
+    DdeQueryNextServer         = _DdeQueryNextServer@8       @112
+    DdeQueryStringA            = _DdeQueryStringA@20         @113
+    DdeQueryStringW            = _DdeQueryStringW@20         @114
+    DdeReconnect               = _DdeReconnect@4             @115
     DdeSetQualityOfService     = _DdeSetQualityOfService@12  @116
-    DdeSetUserHandle	       = _DdeSetUserHandle@12	     @117
-    DdeUnaccessData	       = _DdeUnaccessData@4	     @118
-    DdeUninitialize	       = _DdeUninitialize@4	     @119
-    DefDlgProcA 	       = _DefDlgProcA@16	     @120
-    DefDlgProcW 	       = _DefDlgProcW@16	     @121
-    DefFrameProcA	       = _DefFrameProcA@20	     @122
-    DefFrameProcW	       = _DefFrameProcW@20	     @123
-    DefMDIChildProcA	       = _DefMDIChildProcA@16	     @124
-    DefMDIChildProcW	       = _DefMDIChildProcW@16	     @125
-    DefWindowProcA	       = _DefWindowProcA@16	     @126
-    DefWindowProcW	       = _DefWindowProcW@16	     @127
-    DeferWindowPos	       = _DeferWindowPos@32	     @128
-    DeleteMenu		       = _DeleteMenu@12 	     @129
+    DdeSetUserHandle           = _DdeSetUserHandle@12        @117
+    DdeUnaccessData            = _DdeUnaccessData@4          @118
+    DdeUninitialize            = _DdeUninitialize@4          @119
+    DefDlgProcA                = _DefDlgProcA@16             @120
+    DefDlgProcW                = _DefDlgProcW@16             @121
+    DefFrameProcA              = _DefFrameProcA@20           @122
+    DefFrameProcW              = _DefFrameProcW@20           @123
+    DefMDIChildProcA           = _DefMDIChildProcA@16        @124
+    DefMDIChildProcW           = _DefMDIChildProcW@16        @125
+    DefWindowProcA             = _DefWindowProcA@16          @126
+    DefWindowProcW             = _DefWindowProcW@16          @127
+    DeferWindowPos             = _DeferWindowPos@32          @128
+    DeleteMenu                 = _DeleteMenu@12              @129
     DestroyAcceleratorTable    = _DestroyAcceleratorTable@4  @130
-    DestroyCaret	       = _DestroyCaret@0	     @131
-    DestroyCursor	       = _DestroyCursor@4	     @132
-    DestroyIcon 	       = _DestroyIcon@4 	     @133
-    DestroyMenu 	       = _DestroyMenu@4 	     @134
-    DestroyWindow	       = _DestroyWindow@4	     @135
+    DestroyCaret               = _DestroyCaret@0             @131
+    DestroyCursor              = _DestroyCursor@4            @132
+    DestroyIcon                = _DestroyIcon@4              @133
+    DestroyMenu                = _DestroyMenu@4              @134
+    DestroyWindow              = _DestroyWindow@4            @135
     DialogBoxIndirectParamA    = _DialogBoxIndirectParamA@20 @136
     DialogBoxIndirectParamW    = _DialogBoxIndirectParamW@20 @137
-    DialogBoxParamA	       = _DialogBoxParamA@20	     @138
-    DialogBoxParamW	       = _DialogBoxParamW@20	     @139
-    DispatchMessageA	       = _DispatchMessageA@4	     @140
-    DispatchMessageW	       = _DispatchMessageW@4	     @141
-    DlgDirListA 	       = _DlgDirListA@20	     @142
+    DialogBoxParamA            = _DialogBoxParamA@20         @138
+    DialogBoxParamW            = _DialogBoxParamW@20         @139
+    DispatchMessageA           = _DispatchMessageA@4         @140
+    DispatchMessageW           = _DispatchMessageW@4         @141
+    DlgDirListA                = _DlgDirListA@20             @142
     DlgDirListComboBoxA        = _DlgDirListComboBoxA@20     @143
     DlgDirListComboBoxW        = _DlgDirListComboBoxW@20     @144
-    DlgDirListW 	       = _DlgDirListW@20	     @145
+    DlgDirListW                = _DlgDirListW@20             @145
     DlgDirSelectComboBoxExA    = _DlgDirSelectComboBoxExA@16 @146
     DlgDirSelectComboBoxExW    = _DlgDirSelectComboBoxExW@16 @147
-    DlgDirSelectExA	       = _DlgDirSelectExA@16	     @148
-    DlgDirSelectExW	       = _DlgDirSelectExW@16	     @149
-    DragDetect		       = _DragDetect@12 	     @150
-    DragObject		       = _DragObject@20 	     @151
-    DrawAnimatedRects	       = _DrawAnimatedRects@16	     @152
-    DrawCaption 	       = _DrawCaption@16	     @153
-    DrawCaptionTempA	       = _DrawCaptionTempA@28	     @154
-    DrawCaptionTempW	       = _DrawCaptionTempW@28	     @155
-    DrawEdge		       = _DrawEdge@16		     @156
-    DrawFocusRect	       = _DrawFocusRect@8	     @157
-;    DrawFrame			= _DrawFrame@?? 	      @158
-    DrawFrameControl	       = _DrawFrameControl@16	     @159
-    DrawIcon		       = _DrawIcon@16		     @160
-    DrawIconEx		       = _DrawIconEx@36 	     @161
-    DrawMenuBar 	       = _DrawMenuBar@4 	     @162
-    DrawStateA		       = _DrawStateA@40 	     @163
-    DrawStateW		       = _DrawStateW@40 	     @164
-    DrawTextA		       = _DrawTextA@20		     @165
-    DrawTextExA 	       = _DrawTextExA@24	     @166
-    DrawTextExW 	       = _DrawTextExW@24	     @167
-    DrawTextW		       = _DrawTextW@20		     @168
-;    EditWndProc		= _EditWndProc@??	      @169
-    EmptyClipboard	       = _EmptyClipboard@0	     @170
-    EnableMenuItem	       = _EnableMenuItem@12	     @171
-    EnableScrollBar	       = _EnableScrollBar@12	     @172
-    EnableWindow	       = _EnableWindow@8	     @173
-    EndDeferWindowPos	       = _EndDeferWindowPos@4	     @174
-    EndDialog		       = _EndDialog@8		     @175
-    EndPaint		       = _EndPaint@8		     @176
-    EndTask		       = _EndTask@12		     @177
-    EnumChildWindows	       = _EnumChildWindows@12	     @178
+    DlgDirSelectExA            = _DlgDirSelectExA@16         @148
+    DlgDirSelectExW            = _DlgDirSelectExW@16         @149
+    DragDetect                 = _DragDetect@12              @150
+    DragObject                 = _DragObject@20              @151
+    DrawAnimatedRects          = _DrawAnimatedRects@16       @152
+    DrawCaption                = _DrawCaption@16             @153
+    DrawCaptionTempA           = _DrawCaptionTempA@28        @154
+    DrawCaptionTempW           = _DrawCaptionTempW@28        @155
+    DrawEdge                   = _DrawEdge@16                @156
+    DrawFocusRect              = _DrawFocusRect@8            @157
+;    DrawFrame                  = _DrawFrame@??               @158
+    DrawFrameControl           = _DrawFrameControl@16        @159
+    DrawIcon                   = _DrawIcon@16                @160
+    DrawIconEx                 = _DrawIconEx@36              @161
+    DrawMenuBar                = _DrawMenuBar@4              @162
+    DrawStateA                 = _DrawStateA@40              @163
+    DrawStateW                 = _DrawStateW@40              @164
+    DrawTextA                  = _DrawTextA@20               @165
+    DrawTextExA                = _DrawTextExA@24             @166
+    DrawTextExW                = _DrawTextExW@24             @167
+    DrawTextW                  = _DrawTextW@20               @168
+;    EditWndProc                = _EditWndProc@??             @169
+    EmptyClipboard             = _EmptyClipboard@0           @170
+    EnableMenuItem             = _EnableMenuItem@12          @171
+    EnableScrollBar            = _EnableScrollBar@12         @172
+    EnableWindow               = _EnableWindow@8             @173
+    EndDeferWindowPos          = _EndDeferWindowPos@4        @174
+    EndDialog                  = _EndDialog@8                @175
+    EndPaint                   = _EndPaint@8                 @176
+    EndTask                    = _EndTask@12                 @177
+    EnumChildWindows           = _EnumChildWindows@12        @178
     EnumClipboardFormats       = _EnumClipboardFormats@4     @179
-    EnumDesktopWindows	       = _EnumDesktopWindows@12      @180
-    EnumDesktopsA	       = _EnumDesktopsA@12	     @181
-    EnumDesktopsW	       = _EnumDesktopsW@12	     @182
+    EnumDesktopWindows         = _EnumDesktopWindows@12      @180
+    EnumDesktopsA              = _EnumDesktopsA@12           @181
+    EnumDesktopsW              = _EnumDesktopsW@12           @182
     EnumDisplaySettingsA       = _EnumDisplaySettingsA@12    @183
     EnumDisplaySettingsW       = _EnumDisplaySettingsW@12    @184
-    EnumPropsA		       = _EnumPropsA@8		     @185
-    EnumPropsExA	       = _EnumPropsExA@12	     @186
-    EnumPropsExW	       = _EnumPropsExW@12	     @187
-    EnumPropsW		       = _EnumPropsW@8		     @188
-    EnumThreadWindows	       = _EnumThreadWindows@12	     @189
+    EnumPropsA                 = _EnumPropsA@8               @185
+    EnumPropsExA               = _EnumPropsExA@12            @186
+    EnumPropsExW               = _EnumPropsExW@12            @187
+    EnumPropsW                 = _EnumPropsW@8               @188
+    EnumThreadWindows          = _EnumThreadWindows@12       @189
     EnumWindowStationsA        = _EnumWindowStationsA@8      @190
     EnumWindowStationsW        = _EnumWindowStationsW@8      @191
-    EnumWindows 	       = _EnumWindows@8 	     @192
-    EqualRect		       = _EqualRect@8		     @193
-    ExcludeUpdateRgn	       = _ExcludeUpdateRgn@8	     @194
-    ExitWindowsEx	       = _ExitWindowsEx@8	     @195
-    FillRect		       = _FillRect@12		     @196
-    FindWindowA 	       = _FindWindowA@8 	     @197
-    FindWindowExA	       = _FindWindowExA@16	     @198
-    FindWindowExW	       = _FindWindowExW@16	     @199
-    FindWindowW 	       = _FindWindowW@8 	     @200
-    FlashWindow 	       = _FlashWindow@8 	     @201
-    FrameRect		       = _FrameRect@12		     @202
-    FreeDDElParam	       = _FreeDDElParam@8	     @203
-    GetActiveWindow	       = _GetActiveWindow@0	     @204
-    GetAsyncKeyState	       = _GetAsyncKeyState@4	     @205
-    GetCapture		       = _GetCapture@0		     @206
-    GetCaretBlinkTime	       = _GetCaretBlinkTime@0	     @207
-    GetCaretPos 	       = _GetCaretPos@4 	     @208
-    GetClassInfoA	       = _GetClassInfoA@12	     @209
-    GetClassInfoExA	       = _GetClassInfoExA@12	     @210
-    GetClassInfoExW	       = _GetClassInfoExW@12	     @211
-    GetClassInfoW	       = _GetClassInfoW@12	     @212
-    GetClassLongA	       = _GetClassLongA@8	     @213
-    GetClassLongW	       = _GetClassLongW@8	     @214
-    GetClassNameA	       = _GetClassNameA@12	     @215
-    GetClassNameW	       = _GetClassNameW@12	     @216
-    GetClassWord	       = _GetClassWord@8	     @217
-    GetClientRect	       = _GetClientRect@8	     @218
-    GetClipCursor	       = _GetClipCursor@4	     @219
-    GetClipboardData	       = _GetClipboardData@4	     @220
+    EnumWindows                = _EnumWindows@8              @192
+    EqualRect                  = _EqualRect@8                @193
+    ExcludeUpdateRgn           = _ExcludeUpdateRgn@8         @194
+    ExitWindowsEx              = _ExitWindowsEx@8            @195
+    FillRect                   = _FillRect@12                @196
+    FindWindowA                = _FindWindowA@8              @197
+    FindWindowExA              = _FindWindowExA@16           @198
+    FindWindowExW              = _FindWindowExW@16           @199
+    FindWindowW                = _FindWindowW@8              @200
+    FlashWindow                = _FlashWindow@8              @201
+    FrameRect                  = _FrameRect@12               @202
+    FreeDDElParam              = _FreeDDElParam@8            @203
+    GetActiveWindow            = _GetActiveWindow@0          @204
+    GetAsyncKeyState           = _GetAsyncKeyState@4         @205
+    GetCapture                 = _GetCapture@0               @206
+    GetCaretBlinkTime          = _GetCaretBlinkTime@0        @207
+    GetCaretPos                = _GetCaretPos@4              @208
+    GetClassInfoA              = _GetClassInfoA@12           @209
+    GetClassInfoExA            = _GetClassInfoExA@12         @210
+    GetClassInfoExW            = _GetClassInfoExW@12         @211
+    GetClassInfoW              = _GetClassInfoW@12           @212
+    GetClassLongA              = _GetClassLongA@8            @213
+    GetClassLongW              = _GetClassLongW@8            @214
+    GetClassNameA              = _GetClassNameA@12           @215
+    GetClassNameW              = _GetClassNameW@12           @216
+    GetClassWord               = _GetClassWord@8             @217
+    GetClientRect              = _GetClientRect@8            @218
+    GetClipCursor              = _GetClipCursor@4            @219
+    GetClipboardData           = _GetClipboardData@4         @220
     GetClipboardFormatNameA    = _GetClipboardFormatNameA@12 @221
     GetClipboardFormatNameW    = _GetClipboardFormatNameW@12 @222
-    GetClipboardOwner	       = _GetClipboardOwner@0	     @223
-    GetClipboardViewer	       = _GetClipboardViewer@0	     @224
-    GetCursor		       = _GetCursor@0		    @225
-    GetCursorPos	       = _GetCursorPos@4	    @226
-    GetDC		       = _GetDC@4		     @227
-    GetDCEx		       = _GetDCEx@12		     @228
-    GetDesktopWindow	       = _GetDesktopWindow@0	     @229
-    GetDialogBaseUnits	       = _GetDialogBaseUnits@0	     @230
-    GetDlgCtrlID	       = _GetDlgCtrlID@4	     @231
-    GetDlgItem		       = _GetDlgItem@8		     @232
-    GetDlgItemInt	       = _GetDlgItemInt@16	     @233
-    GetDlgItemTextA	       = _GetDlgItemTextA@16	     @234
-    GetDlgItemTextW	       = _GetDlgItemTextW@16	     @235
-    GetDoubleClickTime	       = _GetDoubleClickTime@0	     @236
-    GetFocus		       = _GetFocus@0		     @237
+    GetClipboardOwner          = _GetClipboardOwner@0        @223
+    GetClipboardViewer         = _GetClipboardViewer@0       @224
+    GetCursor                  = _GetCursor@0               @225
+    GetCursorPos               = _GetCursorPos@4            @226
+    GetDC                      = _GetDC@4                    @227
+    GetDCEx                    = _GetDCEx@12                 @228
+    GetDesktopWindow           = _GetDesktopWindow@0         @229
+    GetDialogBaseUnits         = _GetDialogBaseUnits@0       @230
+    GetDlgCtrlID               = _GetDlgCtrlID@4             @231
+    GetDlgItem                 = _GetDlgItem@8               @232
+    GetDlgItemInt              = _GetDlgItemInt@16           @233
+    GetDlgItemTextA            = _GetDlgItemTextA@16         @234
+    GetDlgItemTextW            = _GetDlgItemTextW@16         @235
+    GetDoubleClickTime         = _GetDoubleClickTime@0       @236
+    GetFocus                   = _GetFocus@0                 @237
     GetForegroundWindow        = _GetForegroundWindow@0      @238
-    GetIconInfo 	       = _GetIconInfo@8 	     @239
-;    GetInputDesktop		= _GetInputDesktop@??	      @240
-    GetInputState	       = _GetInputState@0	     @241
+    GetIconInfo                = _GetIconInfo@8              @239
+;    GetInputDesktop            = _GetInputDesktop@??         @240
+    GetInputState              = _GetInputState@0            @241
     GetInternalWindowPos       = _GetInternalWindowPos@12    @242
-    GetKBCodePage	       = _GetKBCodePage@0	     @243
-    GetKeyNameTextA	       = _GetKeyNameTextA@12	     @244
-    GetKeyNameTextW	       = _GetKeyNameTextW@12	     @245
-    GetKeyState 	       = _GetKeyState@4 	    @246
-    GetKeyboardLayout	       = _GetKeyboardLayout@4	     @247
+    GetKBCodePage              = _GetKBCodePage@0            @243
+    GetKeyNameTextA            = _GetKeyNameTextA@12         @244
+    GetKeyNameTextW            = _GetKeyNameTextW@12         @245
+    GetKeyState                = _GetKeyState@4             @246
+    GetKeyboardLayout          = _GetKeyboardLayout@4        @247
     GetKeyboardLayoutList      = _GetKeyboardLayoutList@8    @248
     GetKeyboardLayoutNameA     = _GetKeyboardLayoutNameA@4   @249
     GetKeyboardLayoutNameW     = _GetKeyboardLayoutNameW@4   @250
-    GetKeyboardState	       = _GetKeyboardState@4	     @251
-    GetKeyboardType	       = _GetKeyboardType@4	      @252
-    GetLastActivePopup	       = _GetLastActivePopup@4	     @253
-    GetMenu		       = _GetMenu@4		     @254
-    GetMenuCheckMarkDimensions	= _GetMenuCheckMarkDimensions@0 @255
+    GetKeyboardState           = _GetKeyboardState@4         @251
+    GetKeyboardType            = _GetKeyboardType@4           @252
+    GetLastActivePopup         = _GetLastActivePopup@4       @253
+    GetMenu                    = _GetMenu@4                  @254
+    GetMenuCheckMarkDimensions  = _GetMenuCheckMarkDimensions@0 @255
     GetMenuContextHelpId       = _GetMenuContextHelpId@4     @256
-    GetMenuDefaultItem	       = _GetMenuDefaultItem@12      @257
-    GetMenuItemCount	       = _GetMenuItemCount@4	     @258
-    GetMenuItemID	       = _GetMenuItemID@8	     @259
-    GetMenuItemInfoA	       = _GetMenuItemInfoA@16	     @260
-    GetMenuItemInfoW	       = _GetMenuItemInfoW@16	     @261
-    GetMenuItemRect	       = _GetMenuItemRect@16	     @262
-    GetMenuState	       = _GetMenuState@12	     @263
-    GetMenuStringA	       = _GetMenuStringA@20	     @264
-    GetMenuStringW	       = _GetMenuStringW@20	     @265
-    GetMessageA 	       = _GetMessageA@16	     @266
+    GetMenuDefaultItem         = _GetMenuDefaultItem@12      @257
+    GetMenuItemCount           = _GetMenuItemCount@4         @258
+    GetMenuItemID              = _GetMenuItemID@8            @259
+    GetMenuItemInfoA           = _GetMenuItemInfoA@16        @260
+    GetMenuItemInfoW           = _GetMenuItemInfoW@16        @261
+    GetMenuItemRect            = _GetMenuItemRect@16         @262
+    GetMenuState               = _GetMenuState@12            @263
+    GetMenuStringA             = _GetMenuStringA@20          @264
+    GetMenuStringW             = _GetMenuStringW@20          @265
+    GetMessageA                = _GetMessageA@16             @266
     GetMessageExtraInfo        = _GetMessageExtraInfo@0      @267
-    GetMessagePos	       = _GetMessagePos@0	     @268
-    GetMessageTime	       = _GetMessageTime@0	     @269
-    GetMessageW 	       = _GetMessageW@16	     @270
+    GetMessagePos              = _GetMessagePos@0            @268
+    GetMessageTime             = _GetMessageTime@0           @269
+    GetMessageW                = _GetMessageW@16             @270
     GetNextDlgGroupItem        = _GetNextDlgGroupItem@12     @271
-    GetNextDlgTabItem	       = _GetNextDlgTabItem@12	     @272
-    GetNextQueueWindow	       = _GetNextQueueWindow@8	     @273
+    GetNextDlgTabItem          = _GetNextDlgTabItem@12       @272
+    GetNextQueueWindow         = _GetNextQueueWindow@8       @273
     GetOpenClipboardWindow     = _GetOpenClipboardWindow@0   @274
-    GetParent		       = _GetParent@4		     @275
-    GetPriorityClipboardFormat	= _GetPriorityClipboardFormat@8 @276
+    GetParent                  = _GetParent@4                @275
+    GetPriorityClipboardFormat  = _GetPriorityClipboardFormat@8 @276
     GetProcessWindowStation    = _GetProcessWindowStation@0  @277
-    GetProgmanWindow	       = _GetProgmanWindow@0		     ;@289
-    GetPropA		       = _GetPropA@8		     @278
-    GetPropW		       = _GetPropW@8		     @279
-    GetQueueStatus	       = _GetQueueStatus@4	     @280
-    GetScrollInfo	       = _GetScrollInfo@12	     @281
-    GetScrollPos	       = _GetScrollPos@8	     @282
-    GetScrollRange	       = _GetScrollRange@16	     @283
-    GetShellWindow	       = _GetShellWindow@0	     @284
-    GetSubMenu		       = _GetSubMenu@8		     @285
-    GetSysColor 	       = _GetSysColor@4 	     @286
-    GetSysColorBrush	       = _GetSysColorBrush@4	     @287
-    GetSystemMenu	       = _GetSystemMenu@8	     @288
-    GetSystemMetrics	       = _GetSystemMetrics@4	     @289
+    GetProgmanWindow           = _GetProgmanWindow@0                 ;@289
+    GetPropA                   = _GetPropA@8                 @278
+    GetPropW                   = _GetPropW@8                 @279
+    GetQueueStatus             = _GetQueueStatus@4           @280
+    GetScrollInfo              = _GetScrollInfo@12           @281
+    GetScrollPos               = _GetScrollPos@8             @282
+    GetScrollRange             = _GetScrollRange@16          @283
+    GetShellWindow             = _GetShellWindow@0           @284
+    GetSubMenu                 = _GetSubMenu@8               @285
+    GetSysColor                = _GetSysColor@4              @286
+    GetSysColorBrush           = _GetSysColorBrush@4         @287
+    GetSystemMenu              = _GetSystemMenu@8            @288
+    GetSystemMetrics           = _GetSystemMetrics@4         @289
     GetTabbedTextExtentA       = _GetTabbedTextExtentA@20    @290
     GetTabbedTextExtentW       = _GetTabbedTextExtentW@20    @291
-    GetTaskmanWindow	       = _GetTaskmanWindow@0		      ;@304
-    GetThreadDesktop	       = _GetThreadDesktop@4	     @292
-    GetTopWindow	       = _GetTopWindow@4	     @293
-    GetUpdateRect	       = _GetUpdateRect@12	     @294
-    GetUpdateRgn	       = _GetUpdateRgn@12	     @295
+    GetTaskmanWindow           = _GetTaskmanWindow@0                  ;@304
+    GetThreadDesktop           = _GetThreadDesktop@4         @292
+    GetTopWindow               = _GetTopWindow@4             @293
+    GetUpdateRect              = _GetUpdateRect@12           @294
+    GetUpdateRgn               = _GetUpdateRgn@12            @295
     GetUserObjectInformationA  = _GetUserObjectInformationA@20 @296
     GetUserObjectInformationW  = _GetUserObjectInformationW@20 @297
     GetUserObjectSecurity      = _GetUserObjectSecurity@20   @298
-    GetWindow		       = _GetWindow@8		     @299
+    GetWindow                  = _GetWindow@8                @299
     GetWindowContextHelpId     = _GetWindowContextHelpId@4   @300
-    GetWindowDC 	       = _GetWindowDC@4 	     @301
-    GetWindowLongA	       = _GetWindowLongA@8	     @302
-    GetWindowLongW	       = _GetWindowLongW@8	     @303
-    GetWindowPlacement	       = _GetWindowPlacement@8	     @304
-    GetWindowRect	       = _GetWindowRect@8	     @305
-    GetWindowRgn	       = _GetWindowRgn@8	     @306
-    GetWindowTextA	       = _GetWindowTextA@12	     @307
+    GetWindowDC                = _GetWindowDC@4              @301
+    GetWindowLongA             = _GetWindowLongA@8           @302
+    GetWindowLongW             = _GetWindowLongW@8           @303
+    GetWindowPlacement         = _GetWindowPlacement@8       @304
+    GetWindowRect              = _GetWindowRect@8            @305
+    GetWindowRgn               = _GetWindowRgn@8             @306
+    GetWindowTextA             = _GetWindowTextA@12          @307
     GetWindowTextLengthA       = _GetWindowTextLengthA@4     @308
     GetWindowTextLengthW       = _GetWindowTextLengthW@4     @309
-    GetWindowTextW	       = _GetWindowTextW@12	     @310
+    GetWindowTextW             = _GetWindowTextW@12          @310
     GetWindowThreadProcessId   = _GetWindowThreadProcessId@8 @311
-    GetWindowWord	       = _GetWindowWord@8	     @312
-    GrayStringA 	       = _GrayStringA@36	     @313
-    GrayStringW 	       = _GrayStringW@36	     @314
-    HideCaret		       = _HideCaret@4		     @315
-    HiliteMenuItem	       = _HiliteMenuItem@16	     @316
-    ImpersonateDdeClientWindow	= _ImpersonateDdeClientWindow@8 @317
-    InSendMessage	       = _InSendMessage@0	     @318
-    InflateRect 	       = _InflateRect@12	     @319
-;    InitSharedTable		= _InitSharedTable@??	      @320
-;    InitTask			= _InitTask@??		      @321
-    InsertMenuA 	       = _InsertMenuA@20	     @322
-    InsertMenuItemA	       = _InsertMenuItemA@16	     @323
-    InsertMenuItemW	       = _InsertMenuItemW@16	     @324
-    InsertMenuW 	       = _InsertMenuW@20	     @325
+    GetWindowWord              = _GetWindowWord@8            @312
+    GrayStringA                = _GrayStringA@36             @313
+    GrayStringW                = _GrayStringW@36             @314
+    HideCaret                  = _HideCaret@4                @315
+    HiliteMenuItem             = _HiliteMenuItem@16          @316
+    ImpersonateDdeClientWindow  = _ImpersonateDdeClientWindow@8 @317
+    InSendMessage              = _InSendMessage@0            @318
+    InflateRect                = _InflateRect@12             @319
+;    InitSharedTable            = _InitSharedTable@??         @320
+;    InitTask                   = _InitTask@??                @321
+    InsertMenuA                = _InsertMenuA@20             @322
+    InsertMenuItemA            = _InsertMenuItemA@16         @323
+    InsertMenuItemW            = _InsertMenuItemW@16         @324
+    InsertMenuW                = _InsertMenuW@20             @325
     InternalGetWindowText      = _InternalGetWindowText@12   @326
-    IntersectRect	       = _IntersectRect@12	     @327
-    InvalidateRect	       = _InvalidateRect@12	     @328
-    InvalidateRgn	       = _InvalidateRgn@12	     @329
-    InvertRect		       = _InvertRect@8		     @330
-    IsCharAlphaA	       = _IsCharAlphaA@4	     @331
+    IntersectRect              = _IntersectRect@12           @327
+    InvalidateRect             = _InvalidateRect@12          @328
+    InvalidateRgn              = _InvalidateRgn@12           @329
+    InvertRect                 = _InvertRect@8               @330
+    IsCharAlphaA               = _IsCharAlphaA@4             @331
     IsCharAlphaNumericA        = _IsCharAlphaNumericA@4      @332
     IsCharAlphaNumericW        = _IsCharAlphaNumericW@4      @333
-    IsCharAlphaW	       = _IsCharAlphaW@4	     @334
-    IsCharLowerA	       = _IsCharLowerA@4	     @335
-    IsCharLowerW	       = _IsCharLowerW@4	     @336
-    IsCharUpperA	       = _IsCharUpperA@4	     @337
-    IsCharUpperW	       = _IsCharUpperW@4	     @338
-    IsChild		       = _IsChild@8		     @339
-    IsClipboardFormatAvailable	= _IsClipboardFormatAvailable@4 @340
-    IsDialogMessage	       = _IsDialogMessageA@8	     @341
-    IsDialogMessageA	       = _IsDialogMessageA@8	     @342
-    IsDialogMessageW	       = _IsDialogMessageW@8	     @343
-    IsDlgButtonChecked	       = _IsDlgButtonChecked@8	     @344
-    IsHungThread	       = _IsHungThread@4	     @345
-    IsHungAppWindow	       = _IsHungAppWindow@8
-    IsIconic		       = _IsIconic@4		     @346
-    IsMenu		       = _IsMenu@4		     @347
-    IsRectEmpty 	       = _IsRectEmpty@4 	     @348
-    IsWindow		       = _IsWindow@4		     @349
-    IsWindowEnabled	       = _IsWindowEnabled@4	     @350
-    IsWindowUnicode	       = _IsWindowUnicode@4	     @351
-    IsWindowVisible	       = _IsWindowVisible@4	     @352
-    IsZoomed		       = _IsZoomed@4		     @353
-    KillTimer		       = _KillTimer@8		     @354
-    LoadAcceleratorsA	       = _LoadAcceleratorsA@8	     @355
-    LoadAcceleratorsW	       = _LoadAcceleratorsW@8	     @356
-    LoadBitmapA 	       = _LoadBitmapA@8 	     @357
-    LoadBitmapW 	       = _LoadBitmapW@8 	     @358
-    LoadCursorA 	       = _LoadCursorA@8 	     @359
+    IsCharAlphaW               = _IsCharAlphaW@4             @334
+    IsCharLowerA               = _IsCharLowerA@4             @335
+    IsCharLowerW               = _IsCharLowerW@4             @336
+    IsCharUpperA               = _IsCharUpperA@4             @337
+    IsCharUpperW               = _IsCharUpperW@4             @338
+    IsChild                    = _IsChild@8                  @339
+    IsClipboardFormatAvailable  = _IsClipboardFormatAvailable@4 @340
+    IsDialogMessage            = _IsDialogMessageA@8         @341
+    IsDialogMessageA           = _IsDialogMessageA@8         @342
+    IsDialogMessageW           = _IsDialogMessageW@8         @343
+    IsDlgButtonChecked         = _IsDlgButtonChecked@8       @344
+    IsHungThread               = _IsHungThread@4             @345
+    IsHungAppWindow            = _IsHungAppWindow@8
+    IsIconic                   = _IsIconic@4                 @346
+    IsMenu                     = _IsMenu@4                   @347
+    IsRectEmpty                = _IsRectEmpty@4              @348
+    IsWindow                   = _IsWindow@4                 @349
+    IsWindowEnabled            = _IsWindowEnabled@4          @350
+    IsWindowUnicode            = _IsWindowUnicode@4          @351
+    IsWindowVisible            = _IsWindowVisible@4          @352
+    IsZoomed                   = _IsZoomed@4                 @353
+    KillTimer                  = _KillTimer@8                @354
+    LoadAcceleratorsA          = _LoadAcceleratorsA@8        @355
+    LoadAcceleratorsW          = _LoadAcceleratorsW@8        @356
+    LoadBitmapA                = _LoadBitmapA@8              @357
+    LoadBitmapW                = _LoadBitmapW@8              @358
+    LoadCursorA                = _LoadCursorA@8              @359
     LoadCursorFromFileA        = _LoadCursorFromFileA@4      @360
     LoadCursorFromFileW        = _LoadCursorFromFileW@4      @361
-    LoadCursorW 	       = _LoadCursorW@8 	     @362
-    LoadIconA		       = _LoadIconA@8		     @363
-    LoadIconW		       = _LoadIconW@8		     @364
-    LoadImageA		       = _LoadImageA@24 	     @365
-    LoadImageW		       = _LoadImageW@24 	     @366
+    LoadCursorW                = _LoadCursorW@8              @362
+    LoadIconA                  = _LoadIconA@8                @363
+    LoadIconW                  = _LoadIconW@8                @364
+    LoadImageA                 = _LoadImageA@24              @365
+    LoadImageW                 = _LoadImageW@24              @366
     LoadKeyboardLayoutA        = _LoadKeyboardLayoutA@8      @367
     LoadKeyboardLayoutW        = _LoadKeyboardLayoutW@8      @368
-    LoadMenuA		       = _LoadMenuA@8		     @369
-    LoadMenuIndirectA	       = _LoadMenuIndirectA@4	     @370
-    LoadMenuIndirectW	       = _LoadMenuIndirectW@4	     @371
-    LoadMenuW		       = _LoadMenuW@8		     @372
-    LoadStringA 	       = _LoadStringA@16	     @373
-    LoadStringW 	       = _LoadStringW@16	     @374
-;    LockWindowStation		= _LockWindowStation@??       @375
-    LockWindowUpdate	       = _LockWindowUpdate@4	     @376
+    LoadMenuA                  = _LoadMenuA@8                @369
+    LoadMenuIndirectA          = _LoadMenuIndirectA@4        @370
+    LoadMenuIndirectW          = _LoadMenuIndirectW@4        @371
+    LoadMenuW                  = _LoadMenuW@8                @372
+    LoadStringA                = _LoadStringA@16             @373
+    LoadStringW                = _LoadStringW@16             @374
+;    LockWindowStation          = _LockWindowStation@??       @375
+    LockWindowUpdate           = _LockWindowUpdate@4         @376
     LookupIconIdFromDirectory  = _LookupIconIdFromDirectory@8 @377
     LookupIconIdFromDirectoryEx  = _LookupIconIdFromDirectoryEx@20 @378
-    MapDialogRect	       = _MapDialogRect@8	     @379
-    MapVirtualKeyA	       = _MapVirtualKeyA@8	     @380
-    MapVirtualKeyExA	       = _MapVirtualKeyExA@12	     @381
-    MapVirtualKeyExW	       = _MapVirtualKeyExW@12	     @382
-    MapVirtualKeyW	       = _MapVirtualKeyW@8	     @383
-    MapWindowPoints	       = _MapWindowPoints@16	     @384
-    MenuItemFromPoint	       = _MenuItemFromPoint@16	     @385
-    MessageBeep 	       = _MessageBeep@4 	     @386
-    MessageBoxA 	       = _MessageBoxA@16	     @387
-    MessageBoxExA	       = _MessageBoxExA@20	     @388
-    MessageBoxExW	       = _MessageBoxExW@20	     @389
+    MapDialogRect              = _MapDialogRect@8            @379
+    MapVirtualKeyA             = _MapVirtualKeyA@8           @380
+    MapVirtualKeyExA           = _MapVirtualKeyExA@12        @381
+    MapVirtualKeyExW           = _MapVirtualKeyExW@12        @382
+    MapVirtualKeyW             = _MapVirtualKeyW@8           @383
+    MapWindowPoints            = _MapWindowPoints@16         @384
+    MenuItemFromPoint          = _MenuItemFromPoint@16       @385
+    MessageBeep                = _MessageBeep@4              @386
+    MessageBoxA                = _MessageBoxA@16             @387
+    MessageBoxExA              = _MessageBoxExA@20           @388
+    MessageBoxExW              = _MessageBoxExW@20           @389
     MessageBoxIndirectA        = _MessageBoxIndirectA@4     @390
     MessageBoxIndirectW        = _MessageBoxIndirectW@4     @391
-    MessageBoxW 	       = _MessageBoxW@16	     @392
-;    ModifyAccess		= _ModifyAccess@??	      @393
-    ModifyMenuA 	       = _ModifyMenuA@20	     @394
-    ModifyMenuW 	       = _ModifyMenuW@20	     @395
-    MoveWindow		       = _MoveWindow@24 	     @396
+    MessageBoxW                = _MessageBoxW@16             @392
+;    ModifyAccess               = _ModifyAccess@??            @393
+    ModifyMenuA                = _ModifyMenuA@20             @394
+    ModifyMenuW                = _ModifyMenuW@20             @395
+    MoveWindow                 = _MoveWindow@24              @396
     MsgWaitForMultipleObjects  = _MsgWaitForMultipleObjects@20 @397
-    OemKeyScan		       = _OemKeyScan@4		     @398
-    OemToCharA		       = _OemToCharA@8		     @399
-    OemToCharBuffA	       = _OemToCharBuffA@12	     @400
-    OemToCharBuffW	       = _OemToCharBuffW@12	     @401
-    OemToCharW		       = _OemToCharW@8		     @402
-    OffsetRect		       = _OffsetRect@12 	     @403
-    OpenClipboard	       = _OpenClipboard@4	     @404
-    OpenDesktopA	       = _OpenDesktopA@16	     @405
-    OpenDesktopW	       = _OpenDesktopW@16	     @406
-    OpenIcon		       = _OpenIcon@4		     @407
-    OpenInputDesktop	       = _OpenInputDesktop@12	     @408
-    OpenWindowStationA	       = _OpenWindowStationA@12      @409
-    OpenWindowStationW	       = _OpenWindowStationW@12      @410
-    PackDDElParam	       = _PackDDElParam@12	     @411
-    PaintDesktop	       = _PaintDesktop@4	     @412
-    PeekMessageA	       = _PeekMessageA@20	     @413
-    PeekMessageW	       = _PeekMessageW@20	     @414
-    PlaySoundEvent	       = _PlaySoundEvent@4	     @415
-    PostMessageA	       = _PostMessageA@16	     @416
-    PostMessageW	       = _PostMessageW@16	     @417
-    PostQuitMessage	       = _PostQuitMessage@4	     @418
-    PostThreadMessageA	       = _PostThreadMessageA@16      @419
-    PostThreadMessageW	       = _PostThreadMessageW@16      @420
-    PtInRect		       = _PtInRect@12		     @421
-    RedrawWindow	       = _RedrawWindow@16	     @422
-    RegisterClassA	       = _RegisterClassA@4	     @423
-    RegisterClassExA	       = _RegisterClassExA@4	     @424
-    RegisterClassExW	       = _RegisterClassExW@4	     @425
-    RegisterClassW	       = _RegisterClassW@4	     @426
+    OemKeyScan                 = _OemKeyScan@4               @398
+    OemToCharA                 = _OemToCharA@8               @399
+    OemToCharBuffA             = _OemToCharBuffA@12          @400
+    OemToCharBuffW             = _OemToCharBuffW@12          @401
+    OemToCharW                 = _OemToCharW@8               @402
+    OffsetRect                 = _OffsetRect@12              @403
+    OpenClipboard              = _OpenClipboard@4            @404
+    OpenDesktopA               = _OpenDesktopA@16            @405
+    OpenDesktopW               = _OpenDesktopW@16            @406
+    OpenIcon                   = _OpenIcon@4                 @407
+    OpenInputDesktop           = _OpenInputDesktop@12        @408
+    OpenWindowStationA         = _OpenWindowStationA@12      @409
+    OpenWindowStationW         = _OpenWindowStationW@12      @410
+    PackDDElParam              = _PackDDElParam@12           @411
+    PaintDesktop               = _PaintDesktop@4             @412
+    PeekMessageA               = _PeekMessageA@20            @413
+    PeekMessageW               = _PeekMessageW@20            @414
+    PlaySoundEvent             = _PlaySoundEvent@4           @415
+    PostMessageA               = _PostMessageA@16            @416
+    PostMessageW               = _PostMessageW@16            @417
+    PostQuitMessage            = _PostQuitMessage@4          @418
+    PostThreadMessageA         = _PostThreadMessageA@16      @419
+    PostThreadMessageW         = _PostThreadMessageW@16      @420
+    PtInRect                   = _PtInRect@12                @421
+    RedrawWindow               = _RedrawWindow@16            @422
+    RegisterClassA             = _RegisterClassA@4           @423
+    RegisterClassExA           = _RegisterClassExA@4         @424
+    RegisterClassExW           = _RegisterClassExW@4         @425
+    RegisterClassW             = _RegisterClassW@4           @426
     RegisterClipboardFormatA   = _RegisterClipboardFormatA@4 @427
     RegisterClipboardFormatW   = _RegisterClipboardFormatW@4 @428
-    RegisterHotKey	       = _RegisterHotKey@16	     @429
-;    RegisterLogonProcess	= _RegisterLogonProcess@??    @430
+    RegisterHotKey             = _RegisterHotKey@16          @429
+;    RegisterLogonProcess       = _RegisterLogonProcess@??    @430
     RegisterNetworkCapabilities  = _RegisterNetworkCapabilities@8 @431
     RegisterSystemThread       = _RegisterSystemThread@8     @432
-    RegisterTasklist	       = _RegisterTasklist@4	     @433
+    RegisterTasklist           = _RegisterTasklist@4         @433
     RegisterWindowMessageA     = _RegisterWindowMessageA@4   @434
     RegisterWindowMessageW     = _RegisterWindowMessageW@4   @435
-    ReleaseCapture	       = _ReleaseCapture@0	     @436
-    ReleaseDC		       = _ReleaseDC@8		     @437
-    RemoveMenu		       = _RemoveMenu@12 	     @438
-    RemovePropA 	       = _RemovePropA@8 	     @439
-    RemovePropW 	       = _RemovePropW@8 	     @440
-    ReplyMessage	       = _ReplyMessage@4	     @441
-    ReuseDDElParam	       = _ReuseDDElParam@20	     @442
-    ScreenToClient	       = _ScreenToClient@8	     @443
-    ScrollDC		       = _ScrollDC@28		     @444
-    ScrollWindow	       = _ScrollWindow@20	     @445
-    ScrollWindowEx	       = _ScrollWindowEx@32	     @446
+    ReleaseCapture             = _ReleaseCapture@0           @436
+    ReleaseDC                  = _ReleaseDC@8                @437
+    RemoveMenu                 = _RemoveMenu@12              @438
+    RemovePropA                = _RemovePropA@8              @439
+    RemovePropW                = _RemovePropW@8              @440
+    ReplyMessage               = _ReplyMessage@4             @441
+    ReuseDDElParam             = _ReuseDDElParam@20          @442
+    ScreenToClient             = _ScreenToClient@8           @443
+    ScrollDC                   = _ScrollDC@28                @444
+    ScrollWindow               = _ScrollWindow@20            @445
+    ScrollWindowEx             = _ScrollWindowEx@32          @446
     SendDlgItemMessageA        = _SendDlgItemMessageA@20     @447
     SendDlgItemMessageW        = _SendDlgItemMessageW@20     @448
-    SendMessageA	       = _SendMessageA@16	     @449
+    SendMessageA               = _SendMessageA@16            @449
     SendMessageCallbackA       = _SendMessageCallbackA@24    @450
     SendMessageCallbackW       = _SendMessageCallbackW@24    @451
     SendMessageTimeoutA        = _SendMessageTimeoutA@28     @452
     SendMessageTimeoutW        = _SendMessageTimeoutW@28     @453
-    SendMessageW	       = _SendMessageW@16	     @454
-    SendNotifyMessageA	       = _SendNotifyMessageA@16      @455
-    SendNotifyMessageW	       = _SendNotifyMessageW@16      @456
-    SetActiveWindow	       = _SetActiveWindow@4	     @457
-    SetCapture		       = _SetCapture@4		     @458
-    SetCaretBlinkTime	       = _SetCaretBlinkTime@4	     @459
-    SetCaretPos 	       = _SetCaretPos@8 	     @460
-    SetClassLongA	       = _SetClassLongA@12	     @461
-    SetClassLongW	       = _SetClassLongW@12	     @462
-    SetClassWord	       = _SetClassWord@12	     @463
-    SetClipboardData	       = _SetClipboardData@8	     @464
-    SetClipboardViewer	       = _SetClipboardViewer@4	    @465
-    SetCursor		       = _SetCursor@4		     @466
-    SetCursorPos	       = _SetCursorPos@8	     @467
-    SetDebugErrorLevel	       = _SetDebugErrorLevel@4	     @468
-;    SetDeskWallpaper		= _SetDeskWallpaper@??	      @469
-;    SetDesktopBitmap		= _SetDesktopBitmap@??	      @470
-    SetDlgItemInt	       = _SetDlgItemInt@16	     @471
-    SetDlgItemTextA	       = _SetDlgItemTextA@12	     @472
-    SetDlgItemTextW	       = _SetDlgItemTextW@12	     @473
-    SetDoubleClickTime	       = _SetDoubleClickTime@4	     @474
-    SetFocus		       = _SetFocus@4		     @475
+    SendMessageW               = _SendMessageW@16            @454
+    SendNotifyMessageA         = _SendNotifyMessageA@16      @455
+    SendNotifyMessageW         = _SendNotifyMessageW@16      @456
+    SetActiveWindow            = _SetActiveWindow@4          @457
+    SetCapture                 = _SetCapture@4               @458
+    SetCaretBlinkTime          = _SetCaretBlinkTime@4        @459
+    SetCaretPos                = _SetCaretPos@8              @460
+    SetClassLongA              = _SetClassLongA@12           @461
+    SetClassLongW              = _SetClassLongW@12           @462
+    SetClassWord               = _SetClassWord@12            @463
+    SetClipboardData           = _SetClipboardData@8         @464
+    SetClipboardViewer         = _SetClipboardViewer@4      @465
+    SetCursor                  = _SetCursor@4                @466
+    SetCursorPos               = _SetCursorPos@8             @467
+    SetDebugErrorLevel         = _SetDebugErrorLevel@4       @468
+;    SetDeskWallpaper           = _SetDeskWallpaper@??        @469
+;    SetDesktopBitmap           = _SetDesktopBitmap@??        @470
+    SetDlgItemInt              = _SetDlgItemInt@16           @471
+    SetDlgItemTextA            = _SetDlgItemTextA@12         @472
+    SetDlgItemTextW            = _SetDlgItemTextW@12         @473
+    SetDoubleClickTime         = _SetDoubleClickTime@4       @474
+    SetFocus                   = _SetFocus@4                 @475
     SetForegroundWindow        = _SetForegroundWindow@4      @476
     SetInternalWindowPos       = _SetInternalWindowPos@16    @477
-    SetKeyboardState	       = _SetKeyboardState@4	     @478
-    SetLastErrorEx	       = _SetLastErrorEx@8	     @479
-;    SetLogonNotifyWindow	= _SetLogonNotifyWindow@??    @480
-    SetMenu		       = _SetMenu@8		     @481
+    SetKeyboardState           = _SetKeyboardState@4         @478
+    SetLastErrorEx             = _SetLastErrorEx@8           @479
+;    SetLogonNotifyWindow       = _SetLogonNotifyWindow@??    @480
+    SetMenu                    = _SetMenu@8                  @481
     SetMenuContextHelpId       = _SetMenuContextHelpId@8     @482
-    SetMenuDefaultItem	       = _SetMenuDefaultItem@12      @483
-    SetMenuItemBitmaps	       = _SetMenuItemBitmaps@20      @484
-    SetMenuItemInfoA	       = _SetMenuItemInfoA@16	     @485
-    SetMenuItemInfoW	       = _SetMenuItemInfoW@16	     @486
+    SetMenuDefaultItem         = _SetMenuDefaultItem@12      @483
+    SetMenuItemBitmaps         = _SetMenuItemBitmaps@20      @484
+    SetMenuItemInfoA           = _SetMenuItemInfoA@16        @485
+    SetMenuItemInfoW           = _SetMenuItemInfoW@16        @486
     SetMessageExtraInfo        = _SetMessageExtraInfo@4      @487
-    SetMessageQueue	       = _SetMessageQueue@4	     @488
-    SetParent		       = _SetParent@8		     @489
+    SetMessageQueue            = _SetMessageQueue@4          @488
+    SetParent                  = _SetParent@8                @489
     SetProcessWindowStation    = _SetProcessWindowStation@4  @490
-    SetProgmanWindow	       = _SetProgmanWindow@4		     ;@522 ?
-    SetPropA		       = _SetPropA@12		     @491
-    SetPropW		       = _SetPropW@12		     @492
-    SetRect		       = _SetRect@20		     @493
-    SetRectEmpty	       = _SetRectEmpty@4	     @494
-    SetScrollInfo	       = _SetScrollInfo@16	     @495
-    SetScrollPos	       = _SetScrollPos@16	     @496
-    SetScrollRange	       = _SetScrollRange@20	     @497
-    SetShellWindow	       = _SetShellWindow@4	     @498
-    SetShellWindowEx	       = _SetShellWindowEx@8		     ;@531 ?
-    SetSysColors	       = _SetSysColors@12	     @499
-    SetSysColorsTemp	       = _SetSysColorsTemp@0	     @500
-    SetSystemCursor	       = _SetSystemCursor@8	     @501
-    SetTaskmanWindow	       = _SetTaskmanWindow@4		     ;@537
-    SetThreadDesktop	       = _SetThreadDesktop@4	     @502
-    SetTimer		       = _SetTimer@16		     @503
+    SetProgmanWindow           = _SetProgmanWindow@4                 ;@522 ?
+    SetPropA                   = _SetPropA@12                @491
+    SetPropW                   = _SetPropW@12                @492
+    SetRect                    = _SetRect@20                 @493
+    SetRectEmpty               = _SetRectEmpty@4             @494
+    SetScrollInfo              = _SetScrollInfo@16           @495
+    SetScrollPos               = _SetScrollPos@16            @496
+    SetScrollRange             = _SetScrollRange@20          @497
+    SetShellWindow             = _SetShellWindow@4           @498
+    SetShellWindowEx           = _SetShellWindowEx@8                 ;@531 ?
+    SetSysColors               = _SetSysColors@12            @499
+    SetSysColorsTemp           = _SetSysColorsTemp@0         @500
+    SetSystemCursor            = _SetSystemCursor@8          @501
+    SetTaskmanWindow           = _SetTaskmanWindow@4                 ;@537
+    SetThreadDesktop           = _SetThreadDesktop@4         @502
+    SetTimer                   = _SetTimer@16                @503
     SetUserObjectInformationA  = _SetUserObjectInformationA@16 @504
     SetUserObjectInformationW  = _SetUserObjectInformationW@16 @505
     SetUserObjectSecurity      = _SetUserObjectSecurity@12   @506
     SetWindowContextHelpId     = _SetWindowContextHelpId@8   @507
-;    SetWindowFullScreenState	= _SetWindowFullScreenState@?? @508
-    SetWindowLongA	       = _SetWindowLongA@12	     @509
-    SetWindowLongW	       = _SetWindowLongW@12	     @510
-    SetWindowPlacement	       = _SetWindowPlacement@8	     @511
-    SetWindowPos	       = _SetWindowPos@28	     @512
-    SetWindowRgn	       = _SetWindowRgn@12	     @513
-    SetWindowTextA	       = _SetWindowTextA@8	     @514
-    SetWindowTextW	       = _SetWindowTextW@8	     @515
-    SetWindowWord	       = _SetWindowWord@12	     @516
-    SetWindowsHookA	       = _SetWindowsHookA@8	     @517
-    SetWindowsHookExA	       = _SetWindowsHookExA@16	     @518
-    SetWindowsHookExW	       = _SetWindowsHookExW@16	     @519
-    SetWindowsHookW	       = _SetWindowsHookW@8	     @520
-    ShowCaret		       = _ShowCaret@4		     @521
-    ShowCursor		       = _ShowCursor@4		     @522
-    ShowOwnedPopups	       = _ShowOwnedPopups@8	     @523
-    ShowScrollBar	       = _ShowScrollBar@12	     @524
-    ShowWindow		       = _ShowWindow@8		     @525
-    ShowWindowAsync	       = _ShowWindowAsync@8	     @526
-    SubtractRect	       = _SubtractRect@12	     @527
-    SwapMouseButton	       = _SwapMouseButton@4	     @528
-    SwitchDesktop	       = _SwitchDesktop@4	     @529
-    SwitchToThisWindow	       = _SwitchToThisWindow@8	     @530
-    SysErrorBox 	       = _SysErrorBox@12	     @531
+;    SetWindowFullScreenState   = _SetWindowFullScreenState@?? @508
+    SetWindowLongA             = _SetWindowLongA@12          @509
+    SetWindowLongW             = _SetWindowLongW@12          @510
+    SetWindowPlacement         = _SetWindowPlacement@8       @511
+    SetWindowPos               = _SetWindowPos@28            @512
+    SetWindowRgn               = _SetWindowRgn@12            @513
+    SetWindowTextA             = _SetWindowTextA@8           @514
+    SetWindowTextW             = _SetWindowTextW@8           @515
+    SetWindowWord              = _SetWindowWord@12           @516
+    SetWindowsHookA            = _SetWindowsHookA@8          @517
+    SetWindowsHookExA          = _SetWindowsHookExA@16       @518
+    SetWindowsHookExW          = _SetWindowsHookExW@16       @519
+    SetWindowsHookW            = _SetWindowsHookW@8          @520
+    ShowCaret                  = _ShowCaret@4                @521
+    ShowCursor                 = _ShowCursor@4               @522
+    ShowOwnedPopups            = _ShowOwnedPopups@8          @523
+    ShowScrollBar              = _ShowScrollBar@12           @524
+    ShowWindow                 = _ShowWindow@8               @525
+    ShowWindowAsync            = _ShowWindowAsync@8          @526
+    SubtractRect               = _SubtractRect@12            @527
+    SwapMouseButton            = _SwapMouseButton@4          @528
+    SwitchDesktop              = _SwitchDesktop@4            @529
+    SwitchToThisWindow         = _SwitchToThisWindow@8       @530
+    SysErrorBox                = _SysErrorBox@12             @531
     SystemParametersInfoA      = _SystemParametersInfoA@16   @532
     SystemParametersInfoW      = _SystemParametersInfoW@16   @533
-    TabbedTextOutA	       = _TabbedTextOutA@32	     @534
-    TabbedTextOutW	       = _TabbedTextOutW@32	     @535
-    TileChildWindows	       = _TileChildWindows@8	     @536
-    TileWindows 	       = _TileWindows@20	     @537
-    ToAscii		       = _ToAscii@20		     @538
-    ToAsciiEx		       = _ToAsciiEx@24		     @539
-    ToUnicode		       = _ToUnicode@24		     @540
-    TrackPopupMenu	       = _TrackPopupMenu@28	     @541
-    TrackPopupMenuEx	       = _TrackPopupMenuEx@24	     @542
+    TabbedTextOutA             = _TabbedTextOutA@32          @534
+    TabbedTextOutW             = _TabbedTextOutW@32          @535
+    TileChildWindows           = _TileChildWindows@8         @536
+    TileWindows                = _TileWindows@20             @537
+    ToAscii                    = _ToAscii@20                 @538
+    ToAsciiEx                  = _ToAsciiEx@24               @539
+    ToUnicode                  = _ToUnicode@24               @540
+    TrackPopupMenu             = _TrackPopupMenu@28          @541
+    TrackPopupMenuEx           = _TrackPopupMenuEx@24        @542
     TranslateAccelerator       = _TranslateAcceleratorA@12   @543
     TranslateAcceleratorA      = _TranslateAcceleratorA@12   @544
     TranslateAcceleratorW      = _TranslateAcceleratorW@12   @545
     TranslateMDISysAccel       = _TranslateMDISysAccel@8     @546
-    TranslateMessage	       = _TranslateMessage@4	     @547
-    UnhookWindowsHook	       = _UnhookWindowsHook@8	     @548
+    TranslateMessage           = _TranslateMessage@4         @547
+    UnhookWindowsHook          = _UnhookWindowsHook@8        @548
     UnhookWindowsHookEx        = _UnhookWindowsHookEx@4      @549
-    UnionRect		       = _UnionRect@12		     @550
+    UnionRect                  = _UnionRect@12               @550
     UnloadKeyboardLayout       = _UnloadKeyboardLayout@4     @551
-;    UnlockWindowStation	= _UnlockWindowStation@??     @552
-    UnpackDDElParam	       = _UnpackDDElParam@16	     @553
-    UnregisterClassA	       = _UnregisterClassA@8	     @554
-    UnregisterClassW	       = _UnregisterClassW@8	     @555
-    UnregisterHotKey	       = _UnregisterHotKey@8	     @556
-    UpdateWindow	       = _UpdateWindow@4	     @557
-;    UserClientDllInitialize	= _UserClientDllInitialize@?? @558
-    UserSignalProc	       = _UserSignalProc@16	     @559
-    ValidateRect	       = _ValidateRect@8	     @560
-    ValidateRgn 	       = _ValidateRgn@8 	     @561
-    VkKeyScanA		       = _VkKeyScanA@4		    @562
-    VkKeyScanExA	       = _VkKeyScanExA@8	     @563
-    VkKeyScanExW	       = _VkKeyScanExW@8	     @564
-    VkKeyScanW		       = _VkKeyScanW@4		     @565
-;    WNDPROC_CALLBACK		= _WNDPROC_CALLBACK@??	      @566
-    WaitForInputIdle	       = _WaitForInputIdle@8	     @567
-    WaitMessage 	       = _WaitMessage@0 	     @568
-    WinHelpA		       = _WinHelpA@16		     @569
-    WinHelpW		       = _WinHelpW@16		     @570
+;    UnlockWindowStation        = _UnlockWindowStation@??     @552
+    UnpackDDElParam            = _UnpackDDElParam@16         @553
+    UnregisterClassA           = _UnregisterClassA@8         @554
+    UnregisterClassW           = _UnregisterClassW@8         @555
+    UnregisterHotKey           = _UnregisterHotKey@8         @556
+    UpdateWindow               = _UpdateWindow@4             @557
+;    UserClientDllInitialize    = _UserClientDllInitialize@?? @558
+    UserSignalProc             = _UserSignalProc@16          @559
+    ValidateRect               = _ValidateRect@8             @560
+    ValidateRgn                = _ValidateRgn@8              @561
+    VkKeyScanA                 = _VkKeyScanA@4              @562
+    VkKeyScanExA               = _VkKeyScanExA@8             @563
+    VkKeyScanExW               = _VkKeyScanExW@8             @564
+    VkKeyScanW                 = _VkKeyScanW@4               @565
+;    WNDPROC_CALLBACK           = _WNDPROC_CALLBACK@??        @566
+    WaitForInputIdle           = _WaitForInputIdle@8         @567
+    WaitMessage                = _WaitMessage@0              @568
+    WinHelpA                   = _WinHelpA@16                @569
+    WinHelpW                   = _WinHelpW@16                @570
     WinOldAppHackoMatic        = _WinOldAppHackoMatic@4      @571
-    WindowFromDC	       = _WindowFromDC@4	     @572
-    WindowFromPoint	       = _WindowFromPoint@8	     @573
-    YieldTask		       = _YieldTask@0		     @574
-    keybd_event 	       = _keybd_event@16	     @575
-    mouse_event 	       = _mouse_event@20	     @576
-    wsprintfA		       = _wsprintfA		      @577
-    wsprintfW		       = _wsprintfW		      @578
-    wvsprintfA		       = _wvsprintfA@12 	     @579
-    wvsprintfW		       = _wvsprintfW@12 	     @580
+    WindowFromDC               = _WindowFromDC@4             @572
+    WindowFromPoint            = _WindowFromPoint@8          @573
+    YieldTask                  = _YieldTask@0                @574
+    keybd_event                = _keybd_event@16             @575
+    mouse_event                = _mouse_event@20             @576
+    wsprintfA                  = _wsprintfA                   @577
+    wsprintfW                  = _wsprintfW                   @578
+    wvsprintfA                 = _wvsprintfA@12              @579
+    wvsprintfW                 = _wvsprintfW@12              @580
 
 ;------------
@@ -611,20 +616,20 @@
 
 
-    GetMonitorInfoW		  = _GetMonitorInfoW@8		@1000
-    GetMonitorInfoA		  = _GetMonitorInfoA@8		@1001
-    MonitorFromWindow	       = _MonitorFromWindow@8		@1002
-    MonitorFromRect	       = _MonitorFromRect@8		@1003
-    MonitorFromPoint		  = _MonitorFromPoint@12	@1004
-    EnumDisplayMonitors        = _EnumDisplayMonitors@16	@1005
-
-    CreateWindowProc			@2000
+    GetMonitorInfoW               = _GetMonitorInfoW@8          @1000
+    GetMonitorInfoA               = _GetMonitorInfoA@8          @1001
+    MonitorFromWindow          = _MonitorFromWindow@8           @1002
+    MonitorFromRect            = _MonitorFromRect@8             @1003
+    MonitorFromPoint              = _MonitorFromPoint@12        @1004
+    EnumDisplayMonitors        = _EnumDisplayMonitors@16        @1005
+
+    CreateWindowProc                    @2000
     GetOS2Callback__15Win32WindowProcFv = GetOS2Callback__Fv @2001
 
 ; Wine helper function
-    GetSysColorPen		= _GetSysColorPen@4		 @2002
+    GetSysColorPen              = _GetSysColorPen@4              @2002
 ; COMCTL32 helper functions
-    NativeDlgBoxIP	       = _NativeDlgBoxIP@24	     @2003
-    NativeCreateDlgIP	       = _NativeCreateDlgIP@24	     @2004
-    NativeLoadBitmap	       = _NativeLoadBitmap@8	     @2005
+    NativeDlgBoxIP             = _NativeDlgBoxIP@24          @2003
+    NativeCreateDlgIP          = _NativeCreateDlgIP@24       @2004
+    NativeLoadBitmap           = _NativeLoadBitmap@8         @2005
 
     Win32ToOS2Handle__FUl      = Win32ToOS2Handle__15Win32BaseWindowFUl @2006
Index: trunk/src/user32/caret.cpp
===================================================================
--- trunk/src/user32/caret.cpp	(revision 1076)
+++ trunk/src/user32/caret.cpp	(revision 1077)
@@ -1,3 +1,3 @@
-/* $Id: caret.cpp,v 1.1 1999-09-27 18:20:00 dengert Exp $ */
+/* $Id: caret.cpp,v 1.2 1999-09-28 08:00:56 dengert Exp $ */
 
 /*
@@ -9,4 +9,5 @@
 
 #define INCL_WIN
+#define INCL_GPI
 #include <os2.h>
 #include <os2sel.h>
@@ -19,4 +20,6 @@
 #include "oslibwin.h"
 #include "dcdata.h"
+#include "dc.h"
+#include "caret.h"
 
 #undef SEVERITY_ERROR
@@ -26,4 +29,6 @@
 #define OPEN32API _System
 #endif
+
+#pragma data_seg(_GLOBALDATA)
 
 static HWND hwndCaret;
@@ -33,6 +38,19 @@
 static BOOL CaretIsVisible;
 
+#pragma data_seg()
+
+PVOID   APIENTRY  GpiQueryDCData (HPS hps);
+VOID    OPEN32API _O32_SetLastError( DWORD );
+BOOL    OPEN32API _O32_CreateCaret (HWND hwnd, HBITMAP hbm, int width, int height);
+BOOL    APIENTRY  _DestroyCaret (void);
+UINT    APIENTRY  _GetCaretBlinkTime (void);
+BOOL    APIENTRY  _HideCaret (HWND hwnd);
+BOOL    APIENTRY  _SetCaretBlinkTime (UINT mSecs);
+BOOL    APIENTRY  _ShowCaret (HWND hwnd);
+
 BOOL WIN32API CreateCaret (HWND hwnd, HBITMAP hBmp, int width, int height)
 {
+   dprintf(("USER32:  CreateCaret"));
+
    if (hwnd == NULLHANDLE)
    {
@@ -69,4 +87,6 @@
    USHORT sel = RestoreOS2FS();
 
+   dprintf(("USER32:  DestroyCaret"));
+
    hwndCaret      = 0;
    hbmCaret       = 0;
@@ -81,4 +101,16 @@
 }
 
+BOOL WIN32API SetCaretBlinkTime (UINT mSecs)
+{
+   USHORT sel = RestoreOS2FS();
+   BOOL rc;
+
+   dprintf(("USER32:  SetCaretBlinkTime"));
+
+   rc = _SetCaretBlinkTime (mSecs);
+
+   SetFS(sel);
+   return (rc);
+}
 
 UINT WIN32API GetCaretBlinkTime()
@@ -87,4 +119,6 @@
    USHORT sel = RestoreOS2FS();
 
+   dprintf(("USER32:  GetCaretBlinkTime"));
+
    rc = _GetCaretBlinkTime();
 
@@ -93,8 +127,71 @@
 }
 
+BOOL WIN32API SetCaretPos (int x, int y)
+{
+   USHORT     sel = RestoreOS2FS();
+   LONG       xNew = 0, yNew = 0;
+   BOOL       result = TRUE;
+   BOOL       rc;
+   CURSORINFO cursorInfo;
+   POINTL     caretPos = { x, y };
+
+   dprintf(("USER32:  SetCaretPos"));
+
+   rc = WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo);
+   if (rc == TRUE)
+   {
+      HWND hwnd = cursorInfo.hwnd;
+      Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromOS2Handle (hwnd);
+      if (wnd)
+      {
+        if (wnd->isOwnDC())
+        {
+           HPS     hps  = wnd->getOwnDC();
+           pDCData pHps = (pDCData)GpiQueryDCData(hps);
+           if (!pHps)
+           {
+              _O32_SetLastError (ERROR_INTERNAL_ERROR);
+              SetFS(sel);
+              return FALSE;
+           }
+           GpiConvert (pHps->hps, CVTC_WORLD, CVTC_DEVICE, 1, &caretPos);
+           xNew = caretPos.x;
+
+           if (isYup (pHps))
+              yNew = caretPos.y;
+           else
+              yNew = caretPos.y - cursorInfo.cy;
+        }
+        else
+        {
+           long height = wnd->getWindowHeight();
+           caretPos.y = height - caretPos.y - 1;
+           xNew = caretPos.x;
+           yNew = caretPos.y - cursorInfo.cy;
+        }
+
+        hwndCaret = wnd->getWindowHandle();
+        CaretPosX = x;
+        CaretPosY = y;
+
+        rc = WinCreateCursor (cursorInfo.hwnd, xNew, yNew, 0, 0, CURSOR_SETPOS, NULL);
+      }
+   }
+   if (rc == FALSE)
+   {
+      _O32_SetLastError (ERROR_INVALID_PARAMETER);
+      result = FALSE;
+   }
+
+   SetFS(sel);
+   return (result);
+}
+
 BOOL WIN32API GetCaretPos (PPOINT pPoint)
 {
    USHORT sel = RestoreOS2FS();
    CURSORINFO cursorInfo;
+
+   dprintf(("USER32:  GetCaretPos"));
 
    if (WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
@@ -102,5 +199,5 @@
       if (cursorInfo.hwnd != HWND_DESKTOP)
       {
-         HPS hps = NULLHANDLE;
+         HPS hps   = NULLHANDLE;
          HWND hwnd = cursorInfo.hwnd;
          Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromOS2Handle (hwnd);
@@ -115,7 +212,7 @@
             cursorInfo.y = caretPos.y;
          } else {
-            caretPos.y += cursorInfo.cy;
-            convertDevicePoint( cursorInfo.hwnd, &caretPos, 1);
-            cursorInfo.y = caretPos.y;
+            long height  = wnd->getWindowHeight();
+            caretPos.y  += cursorInfo.cy;
+            cursorInfo.y = height - caretPos.y - 1;
          }
       }
@@ -133,110 +230,38 @@
 }
 
+BOOL WIN32API ShowCaret (HWND hwnd)
+{
+   USHORT sel = RestoreOS2FS();
+   BOOL   rc = FALSE;
+
+   dprintf(("USER32:  ShowCaret"));
+
+   CaretIsVisible = TRUE;
+   rc = _ShowCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
+
+   SetFS(sel);
+   return (rc);
+}
+
 BOOL WIN32API HideCaret (HWND hwnd)
 {
    USHORT sel = RestoreOS2FS();
    BOOL rc = FALSE;
-   Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+
+   dprintf(("USER32:  HideCaret"));
 
    CaretIsVisible = FALSE;
-
-   if (wnd)
-       rc = _HideCaret (wnd->getOS2WindowHandle());
-
-   SetFS(sel);
-   return (rc);
-}
-
-BOOL WIN32API SetCaretBlinkTime (UINT mSecs)
-{
-   USHORT sel = RestoreOS2FS();
-   BOOL rc;
-
-   rc = _SetCaretBlinkTime (mSecs);
-
-   SetFS(sel);
-   return (rc);
-}
-
-BOOL WIN32API SetCaretPos (int x, int y)
-{
-   USHORT     sel = RestoreOS2FS();
-   LONG       xNew = 0, yNew = 0;
-   BOOL       result = TRUE;
-   BOOL       rc;
+   rc = _HideCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
+
+   SetFS(sel);
+   return (rc);
+}
+
+void recreateCaret (HWND hwndFocus)
+{
    CURSORINFO cursorInfo;
-   POINTL     caretPos = { x, y };
-
-   rc = WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo);
-   if (rc == TRUE)
-   {
-      HWND hwnd = cursorInfo.hwnd;
-      Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromOS2Handle (hwnd);
-      if (wnd && wnd->isOwnDC())
-      {
-         HPS     hps  = wnd->getOwnDC();
-         pDCData pHps = (pDCData)GpiQueryDCData(hps);
-         if (!pHps)
-         {
-            _O32_SetLastError (ERROR_INTERNAL_ERROR);
-            SetFS(sel);
-            return FALSE;
-         }
-#if 0
-         convertWinWorldPointToPMDevicePoint (pHps, &caretPos, 1);
-
-         xNew = caretPos.x;
-
-         if (doesYAxisGrowNorth(pHps) == TRUE)
-         {
-            yNew = caretPos.y;
-         }
-         else
-         {
-            yNew = caretPos.y - cursorInfo.cy;
-         }
-#endif
-      }
-      else
-      {
-//         convertWinDevicePointToPMDevicePoint (cursorInfo.hwnd, &caretPos, 1);
-         xNew = caretPos.x;
-         yNew = caretPos.y - cursorInfo.cy;
-      }
-
-      hwndCaret = wnd->getWindowHandle();
-      CaretPosX = x;
-      CaretPosY = y;
-
-      rc = WinCreateCursor (cursorInfo.hwnd, xNew, yNew, 0, 0, CURSOR_SETPOS, NULL);
-   }
-   if (rc == FALSE)
-   {
-      _O32_SetLastError (ERROR_INVALID_PARAMETER);
-      result = FALSE;
-   }
-
-   SetFS(sel);
-   return (result);
-}
-
-BOOL WIN32API ShowCaret (HWND hwnd)
-{
-   USHORT sel = RestoreOS2FS();
-   BOOL   rc = FALSE;
-
-   CaretIsVisible = TRUE;
-   rc = _ShowCaret (Win32ToOS2Handle (hwnd));
-
-   SetFS(sel);
-   return (result);
-}
-
-void recreateCaret (HWND hwndFocus)
-{
-   CURSORINFO cursorInfo;
-
-   if ((hwndCaret == hwndFocus)
-       && !WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
+
+   if ((hwndCaret == hwndFocus) &&
+       !WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
    {
       CreateCaret (hwndCaret, hbmCaret, CaretWidth, CaretHeight);
Index: trunk/src/user32/caret.h
===================================================================
--- trunk/src/user32/caret.h	(revision 1077)
+++ trunk/src/user32/caret.h	(revision 1077)
@@ -0,0 +1,11 @@
+/* $Id: caret.h,v 1.1 1999-09-28 08:00:56 dengert Exp $ */
+
+/*
+ * Caret functions for USER32
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ */
+
+extern void recreateCaret (HWND hwndFocus);
+
Index: trunk/src/user32/dc.cpp
===================================================================
--- trunk/src/user32/dc.cpp	(revision 1076)
+++ trunk/src/user32/dc.cpp	(revision 1077)
@@ -1,3 +1,3 @@
-/* $Id: dc.cpp,v 1.8 1999-09-27 18:21:25 dengert Exp $ */
+/* $Id: dc.cpp,v 1.9 1999-09-28 08:00:56 dengert Exp $ */
 
 /*
@@ -453,4 +453,21 @@
       return MEM_HPS_MAX;
    }
+}
+
+BOOL isYup (pDCData pHps)
+{
+   if (((pHps->windowExt.cy < 0) && (pHps->viewportYExt > 0.0)) ||
+       ((pHps->windowExt.cy > 0) && (pHps->viewportYExt < 0.0)))
+   {
+      if ((pHps->graphicsMode == GM_COMPATIBLE_W) ||
+          ((pHps->graphicsMode == GM_ADVANCED_W) && (pHps->xform.eM22 >= 0.0)))
+         return TRUE;
+   }
+   else
+   {
+      if ((pHps->graphicsMode == GM_ADVANCED_W) && (pHps->xform.eM22 < 0.0))
+         return TRUE;
+   }
+   return FALSE;
 }
 
Index: trunk/src/user32/dc.h
===================================================================
--- trunk/src/user32/dc.h	(revision 1076)
+++ trunk/src/user32/dc.h	(revision 1077)
@@ -1,3 +1,3 @@
-/* $Id: dc.h,v 1.3 1999-09-27 18:21:25 dengert Exp $ */
+/* $Id: dc.h,v 1.4 1999-09-28 08:00:56 dengert Exp $ */
 /*
  * public dc functions
@@ -13,4 +13,5 @@
 #define __DC_H__
 
+extern BOOL isYup (struct _DCData *pHps);
 extern HDC sendEraseBkgnd (Win32BaseWindow *wnd);
 extern void releaseOwnDC (HDC hps);
Index: trunk/src/user32/user32.cpp
===================================================================
--- trunk/src/user32/user32.cpp	(revision 1076)
+++ trunk/src/user32/user32.cpp	(revision 1077)
@@ -1,3 +1,3 @@
-/* $Id: user32.cpp,v 1.33 1999-09-26 16:09:03 dengert Exp $ */
+/* $Id: user32.cpp,v 1.34 1999-09-28 08:00:56 dengert Exp $ */
 
 /*
@@ -476,4 +476,6 @@
 }
 //******************************************************************************
+
+#if 0
 //******************************************************************************
 /* Caret Functions */
@@ -548,4 +550,5 @@
     return O32_ShowCaret(hwnd);
 }
+#endif
 
 /* Cursor Functions */
