Changeset 21840 for branches/gcc-kmk/src

Timestamp:

Dec 1, 2011, 3:01:01 PM (14 years ago)

Author:

dmik

Message:

Port COMCTL32 to GCC/kBuild.

Location:

branches/gcc-kmk/src

Files:

• Makefile.kmk (modified) (1 diff)
• comctl32/Makefile.kmk (added)
• comctl32/comctl32.def (modified) (2 diffs)
• comctl32/comctl32dbg.def (modified) (2 diffs)
• comctl32/initterm.cpp (moved) (moved from branches/gcc-kmk/src/comctl32/initcomctl32.cpp ) (4 diffs)
• comctl32/listview.c (modified) (1 diff)
• comctl32/propsheet.c (modified) (2 diffs)
• comctl32/toolbar.c (modified) (1 diff)

branches/gcc-kmk/src/Makefile.kmk

@@ -20 +20 @@
 include $(PATH_SUB_CURRENT)/gdi32/Makefile.kmk
 include $(PATH_SUB_CURRENT)/imm32/Makefile.kmk
+include $(PATH_SUB_CURRENT)/comctl32/Makefile.kmk
 
 include $(FILE_KBUILD_SUB_FOOTER)

branches/gcc-kmk/src/comctl32/comctl32.def

@@ -9 +9 @@
 
 EXPORTS
-  MenuHelp                     = _MenuHelp@28                        @2
-  ShowHideMenuCtl              = _ShowHideMenuCtl@12                 @3
-  GetEffectiveClientRect       = _GetEffectiveClientRect@12          @4
-  DrawStatusTextA              = _DrawStatusTextA@16                 @5
-  CreateStatusWindowA          = _CreateStatusWindowA@16             @6
-  CreateToolbar                = _CreateToolbar@32                   @7
-  CreateMappedBitmap           = _CreateMappedBitmap@20              @8
-  DPA_LoadStream               = _DPA_LoadStream@16                  @9
-  DPA_SaveStream               = _DPA_SaveStream@16                  @10
-  DPA_Merge                    = _DPA_Merge@24                       @11
+  MenuHelp                     = "_MenuHelp@28"                      @2
+  ShowHideMenuCtl              = "_ShowHideMenuCtl@12"               @3
+  GetEffectiveClientRect       = "_GetEffectiveClientRect@12"        @4
+  DrawStatusTextA              = "_DrawStatusTextA@16"               @5
+  CreateStatusWindowA          = "_CreateStatusWindowA@16"           @6
+  CreateToolbar                = "_CreateToolbar@32"                 @7
+  CreateMappedBitmap           = "_CreateMappedBitmap@20"            @8
+  DPA_LoadStream               = "_DPA_LoadStream@16"                @9
+  DPA_SaveStream               = "_DPA_SaveStream@16"                @10
+  DPA_Merge                    = "_DPA_Merge@24"                     @11
 ;;12 stub Cctl1632_ThunkData32
-  MakeDragList                 = _MakeDragList@4                     @13
-  LBItemFromPt                 = _LBItemFromPt@16                    @14
-  DrawInsert                   = _DrawInsert@12                      @15
-  CreateUpDownControl          = _CreateUpDownControl@48             @16
-  InitCommonControls           = _InitCommonControls@0               @17
-  CreatePropertySheetPage      = _CreatePropertySheetPageA@4         @18
-  CreatePropertySheetPageA     = _CreatePropertySheetPageA@4         @19
-  CreatePropertySheetPageW     = _CreatePropertySheetPageW@4         @20
-  CreateStatusWindow           = _CreateStatusWindowA@16             @21
-  CreateStatusWindowW          = _CreateStatusWindowW@16             @22
-  CreateToolbarEx              = _CreateToolbarEx@52                 @23
-  DestroyPropertySheetPage     = _DestroyPropertySheetPage@4         @24
-  DllGetVersion                = _COMCTL32_DllGetVersion@4           @25
-  DllInstall                   = _COMCTL32_DllInstall@8              @26
-  DrawStatusText               = _DrawStatusTextA@16                 @27
-  DrawStatusTextW              = _DrawStatusTextW@16                 @28
-  FlatSB_EnableScrollBar       = _FlatSB_EnableScrollBar@12          @29
-  FlatSB_GetScrollInfo         = _FlatSB_GetScrollInfo@12            @30
-  FlatSB_GetScrollPos          = _FlatSB_GetScrollPos@8              @31
-  FlatSB_GetScrollProp         = _FlatSB_GetScrollProp@12            @32
-  FlatSB_GetScrollRange        = _FlatSB_GetScrollRange@16           @33
-  FlatSB_SetScrollInfo         = _FlatSB_SetScrollInfo@16            @34
-  FlatSB_SetScrollPos          = _FlatSB_SetScrollPos@16             @35
-  FlatSB_SetScrollProp         = _FlatSB_SetScrollProp@16            @36
-  FlatSB_SetScrollRange        = _FlatSB_SetScrollRange@20           @37
-  FlatSB_ShowScrollBar         = _FlatSB_ShowScrollBar@12            @38
-  GetMUILanguage               = _GetMUILanguage@0                   @39
-  ImageList_Add                = _ImageList_Add@12                   @40
-  ImageList_AddIcon            = _ImageList_AddIcon@8                @41
-  ImageList_AddMasked          = _ImageList_AddMasked@12             @42
-  ImageList_BeginDrag          = _ImageList_BeginDrag@16             @43
-  ImageList_Copy               = _ImageList_Copy@20                  @44
-  ImageList_Create             = _ImageList_Create@20                @45
-  ImageList_Destroy            = _ImageList_Destroy@4                @46
-  ImageList_DragEnter          = _ImageList_DragEnter@12             @47
-  ImageList_DragLeave          = _ImageList_DragLeave@4              @48
-  ImageList_DragMove           = _ImageList_DragMove@8               @49
-  ImageList_DragShowNolock     = _ImageList_DragShowNolock@4         @50
-  ImageList_Draw               = _ImageList_Draw@24                  @51
-  ImageList_DrawEx             = _ImageList_DrawEx@40                @52
-  ImageList_DrawIndirect       = _ImageList_DrawIndirect@4           @53
-  ImageList_Duplicate          = _ImageList_Duplicate@4              @54
-  ImageList_EndDrag            = _ImageList_EndDrag@0                @55
-  ImageList_GetBkColor         = _ImageList_GetBkColor@4             @56
-  ImageList_GetDragImage       = _ImageList_GetDragImage@8           @57
-  ImageList_GetFlags           = _ImageList_GetFlags@4               @58
-  ImageList_GetIcon            = _ImageList_GetIcon@12               @59
-  ImageList_GetIconSize        = _ImageList_GetIconSize@12           @60
-  ImageList_GetImageCount      = _ImageList_GetImageCount@4          @61
-  ImageList_GetImageInfo       = _ImageList_GetImageInfo@12          @62
-  ImageList_GetImageRect       = _ImageList_GetImageRect@12          @63
-  ImageList_LoadImage          = _ImageList_LoadImageA@28            @64
-  ImageList_LoadImageA         = _ImageList_LoadImageA@28            @65
-  ImageList_LoadImageW         = _ImageList_LoadImageW@28            @66
-  ImageList_Merge              = _ImageList_Merge@24                 @67
-  ImageList_Read               = _ImageList_Read@4                   @68
-  ImageList_Remove             = _ImageList_Remove@8                 @69
-  ImageList_Replace            = _ImageList_Replace@16               @70
-  Alloc                        = _COMCTL32_Alloc@4                   @71
-  ReAlloc                      = _COMCTL32_ReAlloc@8                 @72
-  Free                         = _COMCTL32_Free@4                    @73
-  GetSize                      = _COMCTL32_GetSize@4                 @74
-  ImageList_ReplaceIcon        = _ImageList_ReplaceIcon@12           @75
-  ImageList_SetBkColor         = _ImageList_SetBkColor@8             @76
-  ImageList_SetDragCursorImage = _ImageList_SetDragCursorImage@16    @77
-  ImageList_SetFilter          = _ImageList_SetFilter@12             @78
-  ImageList_SetFlags           = _ImageList_SetFlags@8               @79
-  ImageList_SetIconSize        = _ImageList_SetIconSize@12           @80
-  ImageList_SetImageCount      = _ImageList_SetImageCount@8          @81
-  ImageList_SetOverlayImage    = _ImageList_SetOverlayImage@12       @82
-  ImageList_Write              = _ImageList_Write@8                  @83
-  InitCommonControlsEx         = _InitCommonControlsEx@4             @84
-  InitMUILanguage              = _InitMUILanguage@4                  @85
-  InitializeFlatSB             = _InitializeFlatSB@4                 @86
-  PropertySheet                = _PropertySheetA@4                   @87
-  PropertySheetA               = _PropertySheetA@4                   @88
-  PropertySheetW               = _PropertySheetW@4                   @89
-  UninitializeFlatSB           = _UninitializeFlatSB@4               @90
-  _TrackMouseEvent             = __TrackMouseEvent@4                 @91
-
-
-
-  CreateMRUListA      = _CreateMRUListA@4          @151
-  FreeMRUList         = _FreeMRUList@4             @152
-  AddMRUStringA       = _AddMRUStringA@8           @153
-  EnumMRUListA        = _EnumMRUListA@16           @154
-  FindMRUStringA      = _FindMRUStringA@12         @155
-  DelMRUString        = _DelMRUString@8            @156
-  CreateMRUListLazyA  = _CreateMRUListLazyA@16     @157
+  MakeDragList                 = "_MakeDragList@4"                   @13
+  LBItemFromPt                 = "_LBItemFromPt@16"                  @14
+  DrawInsert                   = "_DrawInsert@12"                    @15
+  CreateUpDownControl          = "_CreateUpDownControl@48"           @16
+  InitCommonControls           = "_InitCommonControls@0"             @17
+  CreatePropertySheetPage      = "_CreatePropertySheetPageA@4"       @18
+  CreatePropertySheetPageA     = "_CreatePropertySheetPageA@4"       @19
+  CreatePropertySheetPageW     = "_CreatePropertySheetPageW@4"       @20
+  CreateStatusWindow           = "_CreateStatusWindowA@16"           @21
+  CreateStatusWindowW          = "_CreateStatusWindowW@16"           @22
+  CreateToolbarEx              = "_CreateToolbarEx@52"               @23
+  DestroyPropertySheetPage     = "_DestroyPropertySheetPage@4"       @24
+  DllGetVersion                = "_COMCTL32_DllGetVersion@4"         @25
+  DllInstall                   = "_COMCTL32_DllInstall@8"            @26
+  DrawStatusText               = "_DrawStatusTextA@16"               @27
+  DrawStatusTextW              = "_DrawStatusTextW@16"               @28
+  FlatSB_EnableScrollBar       = "_FlatSB_EnableScrollBar@12"        @29
+  FlatSB_GetScrollInfo         = "_FlatSB_GetScrollInfo@12"          @30
+  FlatSB_GetScrollPos          = "_FlatSB_GetScrollPos@8"            @31
+  FlatSB_GetScrollProp         = "_FlatSB_GetScrollProp@12"          @32
+  FlatSB_GetScrollRange        = "_FlatSB_GetScrollRange@16"         @33
+  FlatSB_SetScrollInfo         = "_FlatSB_SetScrollInfo@16"          @34
+  FlatSB_SetScrollPos          = "_FlatSB_SetScrollPos@16"           @35
+  FlatSB_SetScrollProp         = "_FlatSB_SetScrollProp@16"          @36
+  FlatSB_SetScrollRange        = "_FlatSB_SetScrollRange@20"         @37
+  FlatSB_ShowScrollBar         = "_FlatSB_ShowScrollBar@12"          @38
+  GetMUILanguage               = "_GetMUILanguage@0"                 @39
+  ImageList_Add                = "_ImageList_Add@12"                 @40
+  ImageList_AddIcon            = "_ImageList_AddIcon@8"              @41
+  ImageList_AddMasked          = "_ImageList_AddMasked@12"           @42
+  ImageList_BeginDrag          = "_ImageList_BeginDrag@16"           @43
+  ImageList_Copy               = "_ImageList_Copy@20"                @44
+  ImageList_Create             = "_ImageList_Create@20"              @45
+  ImageList_Destroy            = "_ImageList_Destroy@4"              @46
+  ImageList_DragEnter          = "_ImageList_DragEnter@12"           @47
+  ImageList_DragLeave          = "_ImageList_DragLeave@4"            @48
+  ImageList_DragMove           = "_ImageList_DragMove@8"             @49
+  ImageList_DragShowNolock     = "_ImageList_DragShowNolock@4"       @50
+  ImageList_Draw               = "_ImageList_Draw@24"                @51
+  ImageList_DrawEx             = "_ImageList_DrawEx@40"              @52
+  ImageList_DrawIndirect       = "_ImageList_DrawIndirect@4"         @53
+  ImageList_Duplicate          = "_ImageList_Duplicate@4"            @54
+  ImageList_EndDrag            = "_ImageList_EndDrag@0"              @55
+  ImageList_GetBkColor         = "_ImageList_GetBkColor@4"           @56
+  ImageList_GetDragImage       = "_ImageList_GetDragImage@8"         @57
+  ImageList_GetFlags           = "_ImageList_GetFlags@4"             @58
+  ImageList_GetIcon            = "_ImageList_GetIcon@12"             @59
+  ImageList_GetIconSize        = "_ImageList_GetIconSize@12"         @60
+  ImageList_GetImageCount      = "_ImageList_GetImageCount@4"        @61
+  ImageList_GetImageInfo       = "_ImageList_GetImageInfo@12"        @62
+  ImageList_GetImageRect       = "_ImageList_GetImageRect@12"        @63
+  ImageList_LoadImage          = "_ImageList_LoadImageA@28"          @64
+  ImageList_LoadImageA         = "_ImageList_LoadImageA@28"          @65
+  ImageList_LoadImageW         = "_ImageList_LoadImageW@28"          @66
+  ImageList_Merge              = "_ImageList_Merge@24"               @67
+  ImageList_Read               = "_ImageList_Read@4"                 @68
+  ImageList_Remove             = "_ImageList_Remove@8"               @69
+  ImageList_Replace            = "_ImageList_Replace@16"             @70
+  Alloc                        = "_COMCTL32_Alloc@4"                 @71
+  ReAlloc                      = "_COMCTL32_ReAlloc@8"               @72
+  Free                         = "_COMCTL32_Free@4"                  @73
+  GetSize                      = "_COMCTL32_GetSize@4"               @74
+  ImageList_ReplaceIcon        = "_ImageList_ReplaceIcon@12"         @75
+  ImageList_SetBkColor         = "_ImageList_SetBkColor@8"           @76
+  ImageList_SetDragCursorImage = "_ImageList_SetDragCursorImage@16"  @77
+  ImageList_SetFilter          = "_ImageList_SetFilter@12"           @78
+  ImageList_SetFlags           = "_ImageList_SetFlags@8"             @79
+  ImageList_SetIconSize        = "_ImageList_SetIconSize@12"         @80
+  ImageList_SetImageCount      = "_ImageList_SetImageCount@8"        @81
+  ImageList_SetOverlayImage    = "_ImageList_SetOverlayImage@12"     @82
+  ImageList_Write              = "_ImageList_Write@8"                @83
+  InitCommonControlsEx         = "_InitCommonControlsEx@4"           @84
+  InitMUILanguage              = "_InitMUILanguage@4"                @85
+  InitializeFlatSB             = "_InitializeFlatSB@4"               @86
+  PropertySheet                = "_PropertySheetA@4"                 @87
+  PropertySheetA               = "_PropertySheetA@4"                 @88
+  PropertySheetW               = "_PropertySheetW@4"                 @89
+  UninitializeFlatSB           = "_UninitializeFlatSB@4"             @90
+  _TrackMouseEvent             = "__TrackMouseEvent@4"               @91
+
+
+
+  CreateMRUListA      = "_CreateMRUListA@4"        @151
+  FreeMRUList         = "_FreeMRUList@4"           @152
+  AddMRUStringA       = "_AddMRUStringA@8"         @153
+  EnumMRUListA        = "_EnumMRUListA@16"         @154
+  FindMRUStringA      = "_FindMRUStringA@12"       @155
+  DelMRUString        = "_DelMRUString@8"          @156
+  CreateMRUListLazyA  = "_CreateMRUListLazyA@16"   @157
 
 ;;163 stub CreatePage
 ;;164 stub CreateProxyPage
 
-  AddMRUData          = _AddMRUData@12             @167
-  FindMRUData         = _FindMRUData@16            @169
-
-  Str_GetPtrA         = _Str_GetPtrA@12            @233
-  Str_SetPtrA         = _Str_SetPtrA@8             @234
-  Str_GetPtrW         = _Str_GetPtrW@12            @235
-  Str_SetPtrW         = _Str_SetPtrW@8             @236
-
-  DSA_Create          = _DSA_Create@8              @320
-  DSA_Destroy         = _DSA_Destroy@4             @321
-  DSA_GetItem         = _DSA_GetItem@12            @322
-  DSA_GetItemPtr      = _DSA_GetItemPtr@8          @323
-  DSA_SetItem         = _DSA_SetItem@12            @324
-  DSA_InsertItem      = _DSA_InsertItem@12         @325
-  DSA_DeleteItem      = _DSA_DeleteItem@8          @326
-  DSA_DeleteAllItems  = _DSA_DeleteAllItems@4      @327
-  DPA_Create          = _DPA_Create@4              @328
-  DPA_Destroy         = _DPA_Destroy@4             @329
-  DPA_Grow            = _DPA_Grow@8                @330
-  DPA_Clone           = _DPA_Clone@8               @331
-  DPA_GetPtr          = _DPA_GetPtr@8              @332
-  DPA_GetPtrIndex     = _DPA_GetPtrIndex@8         @333
-  DPA_InsertPtr       = _DPA_InsertPtr@12          @334
-  DPA_SetPtr          = _DPA_SetPtr@12             @335
-  DPA_DeletePtr       = _DPA_DeletePtr@8           @336
-  DPA_DeleteAllPtrs   = _DPA_DeleteAllPtrs@4       @337
-  DPA_Sort            = _DPA_Sort@12               @338
-  DPA_Search          = _DPA_Search@24             @339
-  DPA_CreateEx        = _DPA_CreateEx@8            @340
-
-  SendNotify          = _COMCTL32_SendNotify@16    @341
-  SendNotifyEx        = _COMCTL32_SendNotifyEx@20  @342
-
-  StrChrA             = _COMCTL32_StrChrA@8        @350
-  StrRChrA            = _COMCTL32_StrRChrA@12      @351
-  StrCmpNA            = _COMCTL32_StrCmpNA@12      @352
-  StrCmpNIA           = _COMCTL32_StrCmpNIA@12     @353
-  StrStrA             = _COMCTL32_StrStrA@8        @354
-  StrStrIA            = _COMCTL32_StrStrIA@8       @355
-  StrCSpnA            = _COMCTL32_StrCSpnA@8       @356
-  StrChrW             = _COMCTL32_StrChrW@8        @358
-  StrToIntA           = _COMCTL32_StrToIntA@4      @357
-  StrRChrW            = _COMCTL32_StrRChrW@12      @359
-  StrCmpNW            = _COMCTL32_StrCmpNW@12      @360
-  StrCmpNIW           = _COMCTL32_StrCmpNIW@12     @361
-  StrStrW             = _COMCTL32_StrStrW@8        @362
-  StrStrIW            = _COMCTL32_StrStrIW@8       @363
-  StrSpnW             = _COMCTL32_StrSpnW@8        @364
-  StrToIntW           = _COMCTL32_StrToIntW@4      @365
+  AddMRUData          = "_AddMRUData@12"           @167
+  FindMRUData         = "_FindMRUData@16"          @169
+
+  Str_GetPtrA         = "_Str_GetPtrA@12"          @233
+  Str_SetPtrA         = "_Str_SetPtrA@8"           @234
+  Str_GetPtrW         = "_Str_GetPtrW@12"          @235
+  Str_SetPtrW         = "_Str_SetPtrW@8"           @236
+
+  DSA_Create          = "_DSA_Create@8"            @320
+  DSA_Destroy         = "_DSA_Destroy@4"           @321
+  DSA_GetItem         = "_DSA_GetItem@12"          @322
+  DSA_GetItemPtr      = "_DSA_GetItemPtr@8"        @323
+  DSA_SetItem         = "_DSA_SetItem@12"          @324
+  DSA_InsertItem      = "_DSA_InsertItem@12"       @325
+  DSA_DeleteItem      = "_DSA_DeleteItem@8"        @326
+  DSA_DeleteAllItems  = "_DSA_DeleteAllItems@4"    @327
+  DPA_Create          = "_DPA_Create@4"            @328
+  DPA_Destroy         = "_DPA_Destroy@4"           @329
+  DPA_Grow            = "_DPA_Grow@8"              @330
+  DPA_Clone           = "_DPA_Clone@8"             @331
+  DPA_GetPtr          = "_DPA_GetPtr@8"            @332
+  DPA_GetPtrIndex     = "_DPA_GetPtrIndex@8"       @333
+  DPA_InsertPtr       = "_DPA_InsertPtr@12"        @334
+  DPA_SetPtr          = "_DPA_SetPtr@12"           @335
+  DPA_DeletePtr       = "_DPA_DeletePtr@8"         @336
+  DPA_DeleteAllPtrs   = "_DPA_DeleteAllPtrs@4"     @337
+  DPA_Sort            = "_DPA_Sort@12"             @338
+  DPA_Search          = "_DPA_Search@24"           @339
+  DPA_CreateEx        = "_DPA_CreateEx@8"          @340
+
+  SendNotify          = "_COMCTL32_SendNotify@16"  @341
+  SendNotifyEx        = "_COMCTL32_SendNotifyEx@20"  @342
+
+  StrChrA             = "_COMCTL32_StrChrA@8"      @350
+  StrRChrA            = "_COMCTL32_StrRChrA@12"    @351
+  StrCmpNA            = "_COMCTL32_StrCmpNA@12"    @352
+  StrCmpNIA           = "_COMCTL32_StrCmpNIA@12"   @353
+  StrStrA             = "_COMCTL32_StrStrA@8"      @354
+  StrStrIA            = "_COMCTL32_StrStrIA@8"     @355
+  StrCSpnA            = "_COMCTL32_StrCSpnA@8"     @356
+  StrChrW             = "_COMCTL32_StrChrW@8"      @358
+  StrToIntA           = "_COMCTL32_StrToIntA@4"    @357
+  StrRChrW            = "_COMCTL32_StrRChrW@12"    @359
+  StrCmpNW            = "_COMCTL32_StrCmpNW@12"    @360
+  StrCmpNIW           = "_COMCTL32_StrCmpNIW@12"   @361
+  StrStrW             = "_COMCTL32_StrStrW@8"      @362
+  StrStrIW            = "_COMCTL32_StrStrIW@8"     @363
+  StrSpnW             = "_COMCTL32_StrSpnW@8"      @364
+  StrToIntW           = "_COMCTL32_StrToIntW@4"    @365
 ;366 stub StrChrIA
 ;367 stub StrChrIW
@@ -173 +173 @@
 ;377 stub IntlStrEqWorkerW@16
 
-  SmoothScrollWindow  = _SmoothScrollWindow@4      @382
+  SmoothScrollWindow  = "_SmoothScrollWindow@4"    @382
 ;383 stub DoReaderMode@4
 ;384 stub SetPathWordBreakProc@8
 
-  DPA_EnumCallback    = _DPA_EnumCallback@12       @385
-  DPA_DestroyCallback = _DPA_DestroyCallback@12    @386
-  DSA_EnumCallback    = _DSA_EnumCallback@12       @387
-  DSA_DestroyCallback = _DSA_DestroyCallback@12    @388
-                        _COMCTL32_389@8            @389 NONAME
-                        _COMCTL32_390@16           @390 NONAME
-
-  CreateMRUListW      = _CreateMRUListW@4          @400
-  AddMRUStringW       = _AddMRUStringW@8           @401
-  FindMRUStringW      = _FindMRUStringW@12         @402
-  EnumMRUListW        = _EnumMRUListW@16           @403
-  CreateMRUListLazyW  = _CreateMRUListLazyW@16     @404
+  DPA_EnumCallback    = "_DPA_EnumCallback@12"     @385
+  DPA_DestroyCallback = "_DPA_DestroyCallback@12"  @386
+  DSA_EnumCallback    = "_DSA_EnumCallback@12"     @387
+  DSA_DestroyCallback = "_DSA_DestroyCallback@12"  @388
+                        "_COMCTL32_389@8"          @389 NONAME
+                        "_COMCTL32_390@16"         @390 NONAME
+
+  CreateMRUListW      = "_CreateMRUListW@4"        @400
+  AddMRUStringW       = "_AddMRUStringW@8"         @401
+  FindMRUStringW      = "_FindMRUStringW@12"       @402
+  EnumMRUListW        = "_EnumMRUListW@16"         @403
+  CreateMRUListLazyW  = "_CreateMRUListLazyW@16"   @404
 
 ; These are only available in comctrl 6
-  DefSubclassProc      = _DefSubclassProc@16       @410
-  GetWindowSubclass    = _GetWindowSubclass@16     @411
-  RemoveWindowSubclass = _RemoveWindowSubclass@12  @412
-  SetWindowSubclass    = _SetWindowSubclass@16     @413
-                        _COMCTL32_415@20           @415 NONAME
-
-                        _COMCTL32_417@32           @417 NONAME
-                        _COMCTL32_419@16           @419 NONAME
-
-
+  DefSubclassProc      = "_DefSubclassProc@16"     @410
+  GetWindowSubclass    = "_GetWindowSubclass@16"   @411
+  RemoveWindowSubclass = "_RemoveWindowSubclass@12"  @412
+  SetWindowSubclass    = "_SetWindowSubclass@16"   @413
+                        "_COMCTL32_415@20"         @415 NONAME
+
+                        "_COMCTL32_417@32"         @417 NONAME
+                        "_COMCTL32_419@16"         @419 NONAME
+
+

branches/gcc-kmk/src/comctl32/comctl32dbg.def

@@ -9 +9 @@
 
 EXPORTS
-  MenuHelp                     = _DbgMenuHelp@28                        @2
-  ShowHideMenuCtl              = _DbgShowHideMenuCtl@12                 @3
-  GetEffectiveClientRect       = _DbgGetEffectiveClientRect@12          @4
-  DrawStatusTextA              = _DbgDrawStatusTextA@16                 @5
-  CreateStatusWindowA          = _DbgCreateStatusWindowA@16             @6
-  CreateToolbar                = _DbgCreateToolbar@32                   @7
-  CreateMappedBitmap           = _DbgCreateMappedBitmap@20              @8
-  DPA_LoadStream               = _DbgDPA_LoadStream@16                  @9
-  DPA_SaveStream               = _DbgDPA_SaveStream@16                  @10
-  DPA_Merge                    = _DbgDPA_Merge@24                       @11
+  MenuHelp                     = "_DbgMenuHelp@28"                      @2
+  ShowHideMenuCtl              = "_DbgShowHideMenuCtl@12"               @3
+  GetEffectiveClientRect       = "_DbgGetEffectiveClientRect@12"        @4
+  DrawStatusTextA              = "_DbgDrawStatusTextA@16"               @5
+  CreateStatusWindowA          = "_DbgCreateStatusWindowA@16"           @6
+  CreateToolbar                = "_DbgCreateToolbar@32"                 @7
+  CreateMappedBitmap           = "_DbgCreateMappedBitmap@20"            @8
+  DPA_LoadStream               = "_DbgDPA_LoadStream@16"                @9
+  DPA_SaveStream               = "_DbgDPA_SaveStream@16"                @10
+  DPA_Merge                    = "_DbgDPA_Merge@24"                     @11
 ;;12 stub Cctl1632_ThunkData32
-  MakeDragList                 = _DbgMakeDragList@4                     @13
-  LBItemFromPt                 = _DbgLBItemFromPt@16                    @14
-  DrawInsert                   = _DbgDrawInsert@12                      @15
-  CreateUpDownControl          = _DbgCreateUpDownControl@48             @16
-  InitCommonControls           = _DbgInitCommonControls@0               @17
-  CreatePropertySheetPage      = _DbgCreatePropertySheetPageA@4         @18
-  CreatePropertySheetPageA     = _DbgCreatePropertySheetPageA@4         @19
-  CreatePropertySheetPageW     = _DbgCreatePropertySheetPageW@4         @20
-  CreateStatusWindow           = _DbgCreateStatusWindowA@16             @21
-  CreateStatusWindowW          = _DbgCreateStatusWindowW@16             @22
-  CreateToolbarEx              = _DbgCreateToolbarEx@52                 @23
-  DestroyPropertySheetPage     = _DbgDestroyPropertySheetPage@4         @24
-  DllGetVersion                = _DbgCOMCTL32_DllGetVersion@4           @25
-  DllInstall                   = _DbgCOMCTL32_DllInstall@8              @26
-  DrawStatusText               = _DbgDrawStatusTextA@16                 @27
-  DrawStatusTextW              = _DbgDrawStatusTextW@16                 @28
-  FlatSB_EnableScrollBar       = _DbgFlatSB_EnableScrollBar@12          @29
-  FlatSB_GetScrollInfo         = _DbgFlatSB_GetScrollInfo@12            @30
-  FlatSB_GetScrollPos          = _DbgFlatSB_GetScrollPos@8              @31
-  FlatSB_GetScrollProp         = _DbgFlatSB_GetScrollProp@12            @32
-  FlatSB_GetScrollRange        = _DbgFlatSB_GetScrollRange@16           @33
-  FlatSB_SetScrollInfo         = _DbgFlatSB_SetScrollInfo@16            @34
-  FlatSB_SetScrollPos          = _DbgFlatSB_SetScrollPos@16             @35
-  FlatSB_SetScrollProp         = _DbgFlatSB_SetScrollProp@16            @36
-  FlatSB_SetScrollRange        = _DbgFlatSB_SetScrollRange@20           @37
-  FlatSB_ShowScrollBar         = _DbgFlatSB_ShowScrollBar@12            @38
-  GetMUILanguage               = _DbgGetMUILanguage@0                   @39
-  ImageList_Add                = _DbgImageList_Add@12                   @40
-  ImageList_AddIcon            = _DbgImageList_AddIcon@8                @41
-  ImageList_AddMasked          = _DbgImageList_AddMasked@12             @42
-  ImageList_BeginDrag          = _DbgImageList_BeginDrag@16             @43
-  ImageList_Copy               = _DbgImageList_Copy@20                  @44
-  ImageList_Create             = _DbgImageList_Create@20                @45
-  ImageList_Destroy            = _DbgImageList_Destroy@4                @46
-  ImageList_DragEnter          = _DbgImageList_DragEnter@12             @47
-  ImageList_DragLeave          = _DbgImageList_DragLeave@4              @48
-  ImageList_DragMove           = _DbgImageList_DragMove@8               @49
-  ImageList_DragShowNolock     = _DbgImageList_DragShowNolock@4         @50
-  ImageList_Draw               = _DbgImageList_Draw@24                  @51
-  ImageList_DrawEx             = _DbgImageList_DrawEx@40                @52
-  ImageList_DrawIndirect       = _DbgImageList_DrawIndirect@4           @53
-  ImageList_Duplicate          = _DbgImageList_Duplicate@4              @54
-  ImageList_EndDrag            = _DbgImageList_EndDrag@0                @55
-  ImageList_GetBkColor         = _DbgImageList_GetBkColor@4             @56
-  ImageList_GetDragImage       = _DbgImageList_GetDragImage@8           @57
-  ImageList_GetFlags           = _DbgImageList_GetFlags@4               @58
-  ImageList_GetIcon            = _DbgImageList_GetIcon@12               @59
-  ImageList_GetIconSize        = _DbgImageList_GetIconSize@12           @60
-  ImageList_GetImageCount      = _DbgImageList_GetImageCount@4          @61
-  ImageList_GetImageInfo       = _DbgImageList_GetImageInfo@12          @62
-  ImageList_GetImageRect       = _DbgImageList_GetImageRect@12          @63
-  ImageList_LoadImage          = _DbgImageList_LoadImageA@28            @64
-  ImageList_LoadImageA         = _DbgImageList_LoadImageA@28            @65
-  ImageList_LoadImageW         = _DbgImageList_LoadImageW@28            @66
-  ImageList_Merge              = _DbgImageList_Merge@24                 @67
-  ImageList_Read               = _DbgImageList_Read@4                   @68
-  ImageList_Remove             = _DbgImageList_Remove@8                 @69
-  ImageList_Replace            = _DbgImageList_Replace@16               @70
-  Alloc                        = _DbgCOMCTL32_Alloc@4                   @71
-  ReAlloc                      = _DbgCOMCTL32_ReAlloc@8                 @72
-  Free                         = _DbgCOMCTL32_Free@4                    @73
-  GetSize                      = _DbgCOMCTL32_GetSize@4                 @74
-  ImageList_ReplaceIcon        = _DbgImageList_ReplaceIcon@12           @75
-  ImageList_SetBkColor         = _DbgImageList_SetBkColor@8             @76
-  ImageList_SetDragCursorImage = _DbgImageList_SetDragCursorImage@16    @77
-  ImageList_SetFilter          = _DbgImageList_SetFilter@12             @78
-  ImageList_SetFlags           = _DbgImageList_SetFlags@8               @79
-  ImageList_SetIconSize        = _DbgImageList_SetIconSize@12           @80
-  ImageList_SetImageCount      = _DbgImageList_SetImageCount@8          @81
-  ImageList_SetOverlayImage    = _DbgImageList_SetOverlayImage@12       @82
-  ImageList_Write              = _DbgImageList_Write@8                  @83
-  InitCommonControlsEx         = _DbgInitCommonControlsEx@4             @84
-  InitMUILanguage              = _DbgInitMUILanguage@4                  @85
-  InitializeFlatSB             = _DbgInitializeFlatSB@4                 @86
-  PropertySheet                = _DbgPropertySheetA@4                   @87
-  PropertySheetA               = _DbgPropertySheetA@4                   @88
-  PropertySheetW               = _DbgPropertySheetW@4                   @89
-  UninitializeFlatSB           = _DbgUninitializeFlatSB@4               @90
-  _TrackMouseEvent             = _Dbg_TrackMouseEvent@4                 @91
+  MakeDragList                 = "_DbgMakeDragList@4"                   @13
+  LBItemFromPt                 = "_DbgLBItemFromPt@16"                  @14
+  DrawInsert                   = "_DbgDrawInsert@12"                    @15
+  CreateUpDownControl          = "_DbgCreateUpDownControl@48"           @16
+  InitCommonControls           = "_DbgInitCommonControls@0"             @17
+  CreatePropertySheetPage      = "_DbgCreatePropertySheetPageA@4"       @18
+  CreatePropertySheetPageA     = "_DbgCreatePropertySheetPageA@4"       @19
+  CreatePropertySheetPageW     = "_DbgCreatePropertySheetPageW@4"       @20
+  CreateStatusWindow           = "_DbgCreateStatusWindowA@16"           @21
+  CreateStatusWindowW          = "_DbgCreateStatusWindowW@16"           @22
+  CreateToolbarEx              = "_DbgCreateToolbarEx@52"               @23
+  DestroyPropertySheetPage     = "_DbgDestroyPropertySheetPage@4"       @24
+  DllGetVersion                = "_DbgCOMCTL32_DllGetVersion@4"         @25
+  DllInstall                   = "_DbgCOMCTL32_DllInstall@8"            @26
+  DrawStatusText               = "_DbgDrawStatusTextA@16"               @27
+  DrawStatusTextW              = "_DbgDrawStatusTextW@16"               @28
+  FlatSB_EnableScrollBar       = "_DbgFlatSB_EnableScrollBar@12"        @29
+  FlatSB_GetScrollInfo         = "_DbgFlatSB_GetScrollInfo@12"          @30
+  FlatSB_GetScrollPos          = "_DbgFlatSB_GetScrollPos@8"            @31
+  FlatSB_GetScrollProp         = "_DbgFlatSB_GetScrollProp@12"          @32
+  FlatSB_GetScrollRange        = "_DbgFlatSB_GetScrollRange@16"         @33
+  FlatSB_SetScrollInfo         = "_DbgFlatSB_SetScrollInfo@16"          @34
+  FlatSB_SetScrollPos          = "_DbgFlatSB_SetScrollPos@16"           @35
+  FlatSB_SetScrollProp         = "_DbgFlatSB_SetScrollProp@16"          @36
+  FlatSB_SetScrollRange        = "_DbgFlatSB_SetScrollRange@20"         @37
+  FlatSB_ShowScrollBar         = "_DbgFlatSB_ShowScrollBar@12"          @38
+  GetMUILanguage               = "_DbgGetMUILanguage@0"                 @39
+  ImageList_Add                = "_DbgImageList_Add@12"                 @40
+  ImageList_AddIcon            = "_DbgImageList_AddIcon@8"              @41
+  ImageList_AddMasked          = "_DbgImageList_AddMasked@12"           @42
+  ImageList_BeginDrag          = "_DbgImageList_BeginDrag@16"           @43
+  ImageList_Copy               = "_DbgImageList_Copy@20"                @44
+  ImageList_Create             = "_DbgImageList_Create@20"              @45
+  ImageList_Destroy            = "_DbgImageList_Destroy@4"              @46
+  ImageList_DragEnter          = "_DbgImageList_DragEnter@12"           @47
+  ImageList_DragLeave          = "_DbgImageList_DragLeave@4"            @48
+  ImageList_DragMove           = "_DbgImageList_DragMove@8"             @49
+  ImageList_DragShowNolock     = "_DbgImageList_DragShowNolock@4"       @50
+  ImageList_Draw               = "_DbgImageList_Draw@24"                @51
+  ImageList_DrawEx             = "_DbgImageList_DrawEx@40"              @52
+  ImageList_DrawIndirect       = "_DbgImageList_DrawIndirect@4"         @53
+  ImageList_Duplicate          = "_DbgImageList_Duplicate@4"            @54
+  ImageList_EndDrag            = "_DbgImageList_EndDrag@0"              @55
+  ImageList_GetBkColor         = "_DbgImageList_GetBkColor@4"           @56
+  ImageList_GetDragImage       = "_DbgImageList_GetDragImage@8"         @57
+  ImageList_GetFlags           = "_DbgImageList_GetFlags@4"             @58
+  ImageList_GetIcon            = "_DbgImageList_GetIcon@12"             @59
+  ImageList_GetIconSize        = "_DbgImageList_GetIconSize@12"         @60
+  ImageList_GetImageCount      = "_DbgImageList_GetImageCount@4"        @61
+  ImageList_GetImageInfo       = "_DbgImageList_GetImageInfo@12"        @62
+  ImageList_GetImageRect       = "_DbgImageList_GetImageRect@12"        @63
+  ImageList_LoadImage          = "_DbgImageList_LoadImageA@28"          @64
+  ImageList_LoadImageA         = "_DbgImageList_LoadImageA@28"          @65
+  ImageList_LoadImageW         = "_DbgImageList_LoadImageW@28"          @66
+  ImageList_Merge              = "_DbgImageList_Merge@24"               @67
+  ImageList_Read               = "_DbgImageList_Read@4"                 @68
+  ImageList_Remove             = "_DbgImageList_Remove@8"               @69
+  ImageList_Replace            = "_DbgImageList_Replace@16"             @70
+  Alloc                        = "_DbgCOMCTL32_Alloc@4"                 @71
+  ReAlloc                      = "_DbgCOMCTL32_ReAlloc@8"               @72
+  Free                         = "_DbgCOMCTL32_Free@4"                  @73
+  GetSize                      = "_DbgCOMCTL32_GetSize@4"               @74
+  ImageList_ReplaceIcon        = "_DbgImageList_ReplaceIcon@12"         @75
+  ImageList_SetBkColor         = "_DbgImageList_SetBkColor@8"           @76
+  ImageList_SetDragCursorImage = "_DbgImageList_SetDragCursorImage@16"  @77
+  ImageList_SetFilter          = "_DbgImageList_SetFilter@12"           @78
+  ImageList_SetFlags           = "_DbgImageList_SetFlags@8"             @79
+  ImageList_SetIconSize        = "_DbgImageList_SetIconSize@12"         @80
+  ImageList_SetImageCount      = "_DbgImageList_SetImageCount@8"        @81
+  ImageList_SetOverlayImage    = "_DbgImageList_SetOverlayImage@12"     @82
+  ImageList_Write              = "_DbgImageList_Write@8"                @83
+  InitCommonControlsEx         = "_DbgInitCommonControlsEx@4"           @84
+  InitMUILanguage              = "_DbgInitMUILanguage@4"                @85
+  InitializeFlatSB             = "_DbgInitializeFlatSB@4"               @86
+  PropertySheet                = "_DbgPropertySheetA@4"                 @87
+  PropertySheetA               = "_DbgPropertySheetA@4"                 @88
+  PropertySheetW               = "_DbgPropertySheetW@4"                 @89
+  UninitializeFlatSB           = "_DbgUninitializeFlatSB@4"             @90
+  _TrackMouseEvent             = "_Dbg_TrackMouseEvent@4"               @91
 
 
 
-  CreateMRUListA      = _DbgCreateMRUListA@4          @151
-  FreeMRUList         = _DbgFreeMRUList@4             @152
-  AddMRUStringA       = _DbgAddMRUStringA@8           @153
-  EnumMRUListA        = _DbgEnumMRUListA@16           @154
-  FindMRUStringA      = _DbgFindMRUStringA@12         @155
-  DelMRUString        = _DbgDelMRUString@8            @156
-  CreateMRUListLazyA  = _DbgCreateMRUListLazyA@16     @157
+  CreateMRUListA      = "_DbgCreateMRUListA@4"        @151
+  FreeMRUList         = "_DbgFreeMRUList@4"           @152
+  AddMRUStringA       = "_DbgAddMRUStringA@8"         @153
+  EnumMRUListA        = "_DbgEnumMRUListA@16"         @154
+  FindMRUStringA      = "_DbgFindMRUStringA@12"       @155
+  DelMRUString        = "_DbgDelMRUString@8"          @156
+  CreateMRUListLazyA  = "_DbgCreateMRUListLazyA@16"   @157
 
-  AddMRUData          = _DbgAddMRUData@12             @167
-  FindMRUData         = _DbgFindMRUData@16            @169
+  AddMRUData          = "_DbgAddMRUData@12"           @167
+  FindMRUData         = "_DbgFindMRUData@16"          @169
 
-  Str_GetPtrA         = _DbgStr_GetPtrA@12            @233
-  Str_SetPtrA         = _DbgStr_SetPtrA@8             @234
-  Str_GetPtrW         = _DbgStr_GetPtrW@12            @235
-  Str_SetPtrW         = _DbgStr_SetPtrW@8             @236
+  Str_GetPtrA         = "_DbgStr_GetPtrA@12"          @233
+  Str_SetPtrA         = "_DbgStr_SetPtrA@8"           @234
+  Str_GetPtrW         = "_DbgStr_GetPtrW@12"          @235
+  Str_SetPtrW         = "_DbgStr_SetPtrW@8"           @236
 
-  DSA_Create          = _DbgDSA_Create@8              @320
-  DSA_Destroy         = _DbgDSA_Destroy@4             @321
-  DSA_GetItem         = _DbgDSA_GetItem@12            @322
-  DSA_GetItemPtr      = _DbgDSA_GetItemPtr@8          @323
-  DSA_SetItem         = _DbgDSA_SetItem@12            @324
-  DSA_InsertItem      = _DbgDSA_InsertItem@12         @325
-  DSA_DeleteItem      = _DbgDSA_DeleteItem@8          @326
-  DSA_DeleteAllItems  = _DbgDSA_DeleteAllItems@4      @327
-  DPA_Create          = _DbgDPA_Create@4              @328
-  DPA_Destroy         = _DbgDPA_Destroy@4             @329
-  DPA_Grow            = _DbgDPA_Grow@8                @330
-  DPA_Clone           = _DbgDPA_Clone@8               @331
-  DPA_GetPtr          = _DbgDPA_GetPtr@8              @332
-  DPA_GetPtrIndex     = _DbgDPA_GetPtrIndex@8         @333
-  DPA_InsertPtr       = _DbgDPA_InsertPtr@12          @334
-  DPA_SetPtr          = _DbgDPA_SetPtr@12             @335
-  DPA_DeletePtr       = _DbgDPA_DeletePtr@8           @336
-  DPA_DeleteAllPtrs   = _DbgDPA_DeleteAllPtrs@4       @337
-  DPA_Sort            = _DbgDPA_Sort@12               @338
-  DPA_Search          = _DbgDPA_Search@24             @339
-  DPA_CreateEx        = _DbgDPA_CreateEx@8            @340
+  DSA_Create          = "_DbgDSA_Create@8"            @320
+  DSA_Destroy         = "_DbgDSA_Destroy@4"           @321
+  DSA_GetItem         = "_DbgDSA_GetItem@12"          @322
+  DSA_GetItemPtr      = "_DbgDSA_GetItemPtr@8"        @323
+  DSA_SetItem         = "_DbgDSA_SetItem@12"          @324
+  DSA_InsertItem      = "_DbgDSA_InsertItem@12"       @325
+  DSA_DeleteItem      = "_DbgDSA_DeleteItem@8"        @326
+  DSA_DeleteAllItems  = "_DbgDSA_DeleteAllItems@4"    @327
+  DPA_Create          = "_DbgDPA_Create@4"            @328
+  DPA_Destroy         = "_DbgDPA_Destroy@4"           @329
+  DPA_Grow            = "_DbgDPA_Grow@8"              @330
+  DPA_Clone           = "_DbgDPA_Clone@8"             @331
+  DPA_GetPtr          = "_DbgDPA_GetPtr@8"            @332
+  DPA_GetPtrIndex     = "_DbgDPA_GetPtrIndex@8"       @333
+  DPA_InsertPtr       = "_DbgDPA_InsertPtr@12"        @334
+  DPA_SetPtr          = "_DbgDPA_SetPtr@12"           @335
+  DPA_DeletePtr       = "_DbgDPA_DeletePtr@8"         @336
+  DPA_DeleteAllPtrs   = "_DbgDPA_DeleteAllPtrs@4"     @337
+  DPA_Sort            = "_DbgDPA_Sort@12"             @338
+  DPA_Search          = "_DbgDPA_Search@24"           @339
+  DPA_CreateEx        = "_DbgDPA_CreateEx@8"          @340
 
-  SendNotify          = _DbgCOMCTL32_SendNotify@16    @341
-  SendNotifyEx        = _DbgCOMCTL32_SendNotifyEx@20  @342
+  SendNotify          = "_DbgCOMCTL32_SendNotify@16"  @341
+  SendNotifyEx        = "_DbgCOMCTL32_SendNotifyEx@20"  @342
 
-  StrChrA             = _DbgCOMCTL32_StrChrA@8        @350
-  StrRChrA            = _DbgCOMCTL32_StrRChrA@12      @351
-  StrCmpNA            = _DbgCOMCTL32_StrCmpNA@12      @352
-  StrCmpNIA           = _DbgCOMCTL32_StrCmpNIA@12     @353
-  StrStrA             = _DbgCOMCTL32_StrStrA@8        @354
-  StrStrIA            = _DbgCOMCTL32_StrStrIA@8       @355
-  StrCSpnA            = _DbgCOMCTL32_StrCSpnA@8       @356
-  StrChrW             = _DbgCOMCTL32_StrChrW@8        @358
-  StrToIntA           = _DbgCOMCTL32_StrToIntA@4      @357
-  StrRChrW            = _DbgCOMCTL32_StrRChrW@12      @359
-  StrCmpNW            = _DbgCOMCTL32_StrCmpNW@12      @360
-  StrCmpNIW           = _DbgCOMCTL32_StrCmpNIW@12     @361
-  StrStrW             = _DbgCOMCTL32_StrStrW@8        @362
-  StrStrIW            = _DbgCOMCTL32_StrStrIW@8       @363
-  StrSpnW             = _DbgCOMCTL32_StrSpnW@8        @364
-  StrToIntW           = _DbgCOMCTL32_StrToIntW@4      @365
+  StrChrA             = "_DbgCOMCTL32_StrChrA@8"      @350
+  StrRChrA            = "_DbgCOMCTL32_StrRChrA@12"    @351
+  StrCmpNA            = "_DbgCOMCTL32_StrCmpNA@12"    @352
+  StrCmpNIA           = "_DbgCOMCTL32_StrCmpNIA@12"   @353
+  StrStrA             = "_DbgCOMCTL32_StrStrA@8"      @354
+  StrStrIA            = "_DbgCOMCTL32_StrStrIA@8"     @355
+  StrCSpnA            = "_DbgCOMCTL32_StrCSpnA@8"     @356
+  StrChrW             = "_DbgCOMCTL32_StrChrW@8"      @358
+  StrToIntA           = "_DbgCOMCTL32_StrToIntA@4"    @357
+  StrRChrW            = "_DbgCOMCTL32_StrRChrW@12"    @359
+  StrCmpNW            = "_DbgCOMCTL32_StrCmpNW@12"    @360
+  StrCmpNIW           = "_DbgCOMCTL32_StrCmpNIW@12"   @361
+  StrStrW             = "_DbgCOMCTL32_StrStrW@8"      @362
+  StrStrIW            = "_DbgCOMCTL32_StrStrIW@8"     @363
+  StrSpnW             = "_DbgCOMCTL32_StrSpnW@8"      @364
+  StrToIntW           = "_DbgCOMCTL32_StrToIntW@4"    @365
 ;366 stub StrChrIA
 ;367 stub StrChrIW
@@ -170 +170 @@
 ;377 stub IntlStrEqWorkerW@16
 
-  SmoothScrollWindow  = _DbgSmoothScrollWindow@4      @382
+  SmoothScrollWindow  = "_DbgSmoothScrollWindow@4"    @382
 ;383 stub DoReaderMode@4
 ;384 stub SetPathWordBreakProc@8
 
-  DPA_EnumCallback    = _DbgDPA_EnumCallback@12       @385
-  DPA_DestroyCallback = _DbgDPA_DestroyCallback@12    @386
-  DSA_EnumCallback    = _DbgDSA_EnumCallback@12       @387
-  DSA_DestroyCallback = _DbgDSA_DestroyCallback@12    @388
-                        _COMCTL32_389@8            @389 NONAME
-                        _COMCTL32_390@16           @390 NONAME
+  DPA_EnumCallback    = "_DbgDPA_EnumCallback@12"     @385
+  DPA_DestroyCallback = "_DbgDPA_DestroyCallback@12"  @386
+  DSA_EnumCallback    = "_DbgDSA_EnumCallback@12"     @387
+  DSA_DestroyCallback = "_DbgDSA_DestroyCallback@12"  @388
+                        "_COMCTL32_389@8"          @389 NONAME
+                        "_COMCTL32_390@16"         @390 NONAME
 
-  CreateMRUListW      = _DbgCreateMRUListW@4          @400
-  AddMRUStringW       = _DbgAddMRUStringW@8           @401
-  FindMRUStringW      = _DbgFindMRUStringW@12         @402
-  EnumMRUListW        = _DbgEnumMRUListW@16           @403
-  CreateMRUListLazyW  = _DbgCreateMRUListLazyW@16     @404
+  CreateMRUListW      = "_DbgCreateMRUListW@4"        @400
+  AddMRUStringW       = "_DbgAddMRUStringW@8"         @401
+  FindMRUStringW      = "_DbgFindMRUStringW@12"       @402
+  EnumMRUListW        = "_DbgEnumMRUListW@16"         @403
+  CreateMRUListLazyW  = "_DbgCreateMRUListLazyW@16"   @404
 
 ; These are only available in comctrl 6
-  DefSubclassProc      = _DefSubclassProc@16       @410
-  GetWindowSubclass    = _GetWindowSubclass@16     @411
-  RemoveWindowSubclass = _RemoveWindowSubclass@12  @412
-  SetWindowSubclass    = _SetWindowSubclass@16     @413
-                        _COMCTL32_415@20           @415 NONAME
+  DefSubclassProc      = "_DefSubclassProc@16"     @410
+  GetWindowSubclass    = "_GetWindowSubclass@16"   @411
+  RemoveWindowSubclass = "_RemoveWindowSubclass@12"  @412
+  SetWindowSubclass    = "_SetWindowSubclass@16"   @413
+                        "_COMCTL32_415@20"         @415 NONAME
 
-                        _COMCTL32_417@32           @417 NONAME
-                        _COMCTL32_419@16           @419 NONAME
+                        "_COMCTL32_417@32"         @417 NONAME
+                        "_COMCTL32_419@16"         @419 NONAME
 

branches/gcc-kmk/src/comctl32/initterm.cpp

@@ -1 @@
-/* $Id: initcomctl32.cpp,v 1.6 2003-05-15 14:26:27 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.16 2001-09-05 12:04:59 bird Exp $ */
 /*
  * COMCTL32 DLL entry point
@@ -8 +8 @@
  *
  * Project Odin Software License can be found in LICENSE.TXT
- *
- *
  */
 
-/*-------------------------------------------------------------*/
-/* INITERM.C -- Source for a custom dynamic link library       */
-/*              initialization and termination (_DLL_InitTerm) */
-/*              function.                                      */
-/*                                                             */
-/* When called to perform initialization, this sample function */
-/* gets storage for an array of integers, and initializes its  */
-/* elements with random integers.  At termination time, it     */
-/* frees the array.  Substitute your own special processing.   */
-/*-------------------------------------------------------------*/
-
-
-/* Include files */
 #define  INCL_DOSMODULEMGR
 #define  INCL_DOSPROCESS
@@ -37 +22 @@
 #include <initdll.h>
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD comctl32_PEResTab;
-}
+// Win32 resource table (produced by wrc)
+extern DWORD comctl32_PEResTab;
 
 static HMODULE dllHandle = 0;
@@ -46 +29 @@
 BOOL WINAPI COMCTL32_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
 
-//******************************************************************************
-//******************************************************************************
 BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
-   switch (fdwReason)
-   {
-   case DLL_PROCESS_ATTACH:
-   case DLL_THREAD_ATTACH:
-   case DLL_THREAD_DETACH:
+    switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
         return COMCTL32_DllMain(hinstDLL, fdwReason, fImpLoad);
 
-   case DLL_PROCESS_DETACH:
+    case DLL_PROCESS_DETACH:
         return COMCTL32_DllMain(hinstDLL, fdwReason, fImpLoad);
-   }
-   return FALSE;
+    }
+    return FALSE;
 }
-/****************************************************************************/
-/* _DLL_InitTerm is the function that gets called by the operating system   */
-/* loader when it loads and frees this DLL for each process that accesses   */
-/* this DLL.  However, it only gets called the first time the DLL is loaded */
-/* and the last time it is freed for a particular process.  The system      */
-/* linkage convention MUST be used because the operating system loader is   */
-/* calling this function.                                                   */
-/****************************************************************************/
-ULONG APIENTRY inittermComctl32(unsigned long hModule, unsigned long ulFlag)
+
+ULONG SYSTEM DLL_InitComCtl32(ULONG hModule)
 {
-   size_t i;
-   APIRET rc;
+    CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-   /*-------------------------------------------------------------------------*/
-   /* If ulFlag is zero then the DLL is being loaded so initialization should */
-   /* be performed.  If ulFlag is 1 then the DLL is being freed so            */
-   /* termination should be performed.                                        */
-   /*-------------------------------------------------------------------------*/
+    dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&comctl32_PEResTab,
+                              COMCTL32_MAJORIMAGE_VERSION, COMCTL32_MINORIMAGE_VERSION,
+                              IMAGE_SUBSYSTEM_WINDOWS_GUI);
+    if (dllHandle == 0)
+        return -1;
 
-   switch (ulFlag) {
-      case 0 :
-     dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&comctl32_PEResTab,
-                                   COMCTL32_MAJORIMAGE_VERSION, COMCTL32_MINORIMAGE_VERSION,
-                                   IMAGE_SUBSYSTEM_WINDOWS_GUI);
-         if(dllHandle == 0)
-        return 0UL;
+    return 0;
+}
 
-         break;
-      case 1 :
-         if(dllHandle) {
+void SYSTEM DLL_TermComCtl32(ULONG hModule)
+{
+    if (dllHandle)
         UnregisterLxDll(dllHandle);
-         }
-         break;
-      default  :
-         return 0UL;
-   }
+}
 
-   /***********************************************************/
-   /* A non-zero value must be returned to indicate success.  */
-   /***********************************************************/
-   return 1UL;
+ULONG SYSTEM DLL_Init(ULONG hModule)
+{
+    if (DLL_InitDefault(hModule) == -1)
+        return -1;
+    return DLL_InitComCtl32(hModule);
 }
-//******************************************************************************
-//******************************************************************************
+
+void SYSTEM DLL_Term(ULONG hModule)
+{
+    DLL_TermComCtl32(hModule);
+    DLL_TermDefault(hModule);
+}

branches/gcc-kmk/src/comctl32/listview.c

@@ -497 +497 @@
 }
     
-static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n)
-{
-    int res;
-
-    n = min(min(n, strlenW(s1)), strlenW(s2));
-    res = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n);
-    return res ? res - sizeof(WCHAR) : res;
-}
-
 /******** Debugging functions *****************************************/
 #if defined(__WIN32OS2__) && !defined(DEBUG)

branches/gcc-kmk/src/comctl32/propsheet.c

@@ -171 +171 @@
 static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID);
 
-INT_PTR CALLBACK
+static BOOL CALLBACK
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
@@ -2690 +2690 @@
  *            PROPSHEET_DialogProc
  */
-INT_PTR CALLBACK
+static BOOL CALLBACK
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

branches/gcc-kmk/src/comctl32/toolbar.c

@@ -1662 +1662 @@
  * This function implements the toolbar customization dialog.
  */
-static INT_PTR CALLBACK
+static BOOL CALLBACK
 TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {