Import comctl32 functions from shell32 by ordinal.

Removed some unnecessary ordinals in comctl32.spec.
oldstable
Alexandre Julliard 2002-07-29 00:24:58 +00:00
parent d97432ac94
commit fb2eca812d
7 changed files with 206 additions and 245 deletions

View File

@ -12,177 +12,97 @@ init COMCTL32_LibMain
6 stdcall CreateStatusWindowA(long str long long) CreateStatusWindowA
7 stdcall CreateToolbar(long long long long long long ptr long) CreateToolbar
8 stdcall CreateMappedBitmap(long long long ptr long) CreateMappedBitmap
9 stdcall DPA_LoadStream(ptr ptr ptr long) DPA_LoadStream
10 stdcall DPA_SaveStream(ptr ptr ptr long) DPA_SaveStream
11 stdcall DPA_Merge(ptr ptr long ptr ptr long) DPA_Merge
9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) DPA_LoadStream
10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) DPA_SaveStream
11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) DPA_Merge
#12 stub Cctl1632_ThunkData32
13 stdcall MakeDragList(long) MakeDragList
14 stdcall LBItemFromPt(long long long long) LBItemFromPt
15 stdcall DrawInsert(long long long) DrawInsert
16 stdcall CreateUpDownControl(long long long long long long long long long long long long) CreateUpDownControl
17 stdcall InitCommonControls() InitCommonControls
18 stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA
19 stdcall CreatePropertySheetPageA(ptr) CreatePropertySheetPageA
20 stdcall CreatePropertySheetPageW(ptr) CreatePropertySheetPageW
21 stdcall CreateStatusWindow(long str long long) CreateStatusWindowA
22 stdcall CreateStatusWindowW(long wstr long long) CreateStatusWindowW
23 stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) CreateToolbarEx
24 stdcall DestroyPropertySheetPage(long) DestroyPropertySheetPage
25 stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion
26 stdcall DllInstall(long ptr) COMCTL32_DllInstall
27 stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA
28 stdcall DrawStatusTextW(long ptr wstr long) DrawStatusTextW
29 stdcall FlatSB_EnableScrollBar (long long long) FlatSB_EnableScrollBar
30 stdcall FlatSB_GetScrollInfo (long long ptr) FlatSB_GetScrollInfo
31 stdcall FlatSB_GetScrollPos (long long) FlatSB_GetScrollPos
32 stdcall FlatSB_GetScrollProp (long long ptr) FlatSB_GetScrollProp
33 stdcall FlatSB_GetScrollRange (long long ptr ptr) FlatSB_GetScrollRange
34 stdcall FlatSB_SetScrollInfo (long long ptr long) FlatSB_SetScrollInfo
35 stdcall FlatSB_SetScrollPos (long long long long) FlatSB_SetScrollPos
36 stdcall FlatSB_SetScrollProp (long long long long) FlatSB_SetScrollProp
37 stdcall FlatSB_SetScrollRange (long long long long long) FlatSB_SetScrollRange
38 stdcall FlatSB_ShowScrollBar (long long long) FlatSB_ShowScrollBar
39 stdcall GetMUILanguage() GetMUILanguage
40 stdcall ImageList_Add(ptr long long) ImageList_Add
41 stdcall ImageList_AddIcon(ptr long) ImageList_AddIcon
42 stdcall ImageList_AddMasked(ptr long long) ImageList_AddMasked
43 stdcall ImageList_BeginDrag(ptr long long long) ImageList_BeginDrag
44 stdcall ImageList_Copy(ptr long ptr long long) ImageList_Copy
45 stdcall ImageList_Create(long long long long long) ImageList_Create
46 stdcall ImageList_Destroy(ptr) ImageList_Destroy
47 stdcall ImageList_DragEnter(long long long) ImageList_DragEnter
48 stdcall ImageList_DragLeave(long) ImageList_DragLeave
49 stdcall ImageList_DragMove(long long) ImageList_DragMove
50 stdcall ImageList_DragShowNolock(long) ImageList_DragShowNolock
51 stdcall ImageList_Draw(ptr long long long long long) ImageList_Draw
52 stdcall ImageList_DrawEx(ptr long long long long long long long long long) ImageList_DrawEx
53 stdcall ImageList_DrawIndirect(ptr) ImageList_DrawIndirect
54 stdcall ImageList_Duplicate(ptr) ImageList_Duplicate
55 stdcall ImageList_EndDrag() ImageList_EndDrag
56 stdcall ImageList_GetBkColor(ptr) ImageList_GetBkColor
57 stdcall ImageList_GetDragImage(ptr ptr) ImageList_GetDragImage
58 stdcall ImageList_GetFlags(ptr) ImageList_GetFlags
59 stdcall ImageList_GetIcon(ptr long long) ImageList_GetIcon
60 stdcall ImageList_GetIconSize(ptr ptr ptr) ImageList_GetIconSize
61 stdcall ImageList_GetImageCount(ptr) ImageList_GetImageCount
62 stdcall ImageList_GetImageInfo(ptr long ptr) ImageList_GetImageInfo
63 stdcall ImageList_GetImageRect(ptr long ptr) ImageList_GetImageRect
64 stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImageA
65 stdcall ImageList_LoadImageA(long str long long long long long) ImageList_LoadImageA
66 stdcall ImageList_LoadImageW(long wstr long long long long long) ImageList_LoadImageW
67 stdcall ImageList_Merge(ptr long ptr long long long) ImageList_Merge
68 stdcall ImageList_Read(ptr) ImageList_Read
69 stdcall ImageList_Remove(ptr long) ImageList_Remove
70 stdcall ImageList_Replace(ptr long long long) ImageList_Replace
71 stdcall Alloc(long) COMCTL32_Alloc
72 stdcall ReAlloc(ptr long) COMCTL32_ReAlloc
73 stdcall Free(ptr) COMCTL32_Free
74 stdcall GetSize(ptr) COMCTL32_GetSize
75 stdcall ImageList_ReplaceIcon(ptr long long) ImageList_ReplaceIcon
76 stdcall ImageList_SetBkColor(ptr long) ImageList_SetBkColor
77 stdcall ImageList_SetDragCursorImage(ptr long long long) ImageList_SetDragCursorImage
78 stdcall ImageList_SetFilter(ptr long long) ImageList_SetFilter
79 stdcall ImageList_SetFlags(ptr long) ImageList_SetFlags
80 stdcall ImageList_SetIconSize(ptr long long) ImageList_SetIconSize
81 stdcall ImageList_SetImageCount(ptr long) ImageList_SetImageCount
82 stdcall ImageList_SetOverlayImage(ptr long long) ImageList_SetOverlayImage
83 stdcall ImageList_Write(ptr ptr) ImageList_Write
84 stdcall InitCommonControlsEx(ptr) InitCommonControlsEx
85 stdcall InitMUILanguage(long) InitMUILanguage
86 stdcall InitializeFlatSB(long) InitializeFlatSB
87 stdcall PropertySheet(ptr) PropertySheetA
88 stdcall PropertySheetA(ptr) PropertySheetA
89 stdcall PropertySheetW(ptr) PropertySheetW
90 stdcall UninitializeFlatSB(long) UninitializeFlatSB
91 stdcall _TrackMouseEvent(ptr) _TrackMouseEvent
151 stdcall CreateMRUListA(ptr) CreateMRUListA
152 stdcall FreeMRUList(long) FreeMRUList
153 stdcall AddMRUStringA(long str) AddMRUStringA
154 stdcall EnumMRUListA(long long ptr long) EnumMRUListA
155 stdcall FindMRUStringA(long str ptr) FindMRUStringA
156 stdcall DelMRUString(long long) DelMRUString
157 stdcall CreateMRUListLazyA(ptr long long long) CreateMRUListLazyA
163 stub CreatePage
164 stub CreateProxyPage
167 stdcall AddMRUData(long ptr long) AddMRUData
169 stdcall FindMRUData(long ptr long ptr) FindMRUData
233 stdcall Str_GetPtrA(str str long) Str_GetPtrA
234 stdcall Str_SetPtrA(str str) Str_SetPtrA
235 stdcall Str_GetPtrW(wstr wstr long) Str_GetPtrW
236 stdcall Str_SetPtrW(wstr wstr) Str_SetPtrW
320 stdcall DSA_Create(long long) DSA_Create
321 stdcall DSA_Destroy(ptr) DSA_Destroy
322 stdcall DSA_GetItem(ptr long long) DSA_GetItem
323 stdcall DSA_GetItemPtr(ptr long) DSA_GetItemPtr
324 stdcall DSA_InsertItem(ptr long long) DSA_InsertItem
325 stdcall DSA_SetItem (ptr long long) DSA_SetItem
326 stdcall DSA_DeleteItem(ptr long) DSA_DeleteItem
327 stdcall DSA_DeleteAllItems(ptr) DSA_DeleteAllItems
328 stdcall DPA_Create(long) DPA_Create
329 stdcall DPA_Destroy(ptr) DPA_Destroy
330 stdcall DPA_Grow(ptr long) DPA_Grow
331 stdcall DPA_Clone(ptr ptr) DPA_Clone
332 stdcall DPA_GetPtr(ptr long) DPA_GetPtr
333 stdcall DPA_GetPtrIndex(ptr ptr) DPA_GetPtrIndex
334 stdcall DPA_InsertPtr(ptr long ptr) DPA_InsertPtr
335 stdcall DPA_SetPtr(ptr long ptr) DPA_SetPtr
336 stdcall DPA_DeletePtr(ptr long) DPA_DeletePtr
337 stdcall DPA_DeleteAllPtrs(ptr) DPA_DeleteAllPtrs
338 stdcall DPA_Sort(ptr ptr long) DPA_Sort
339 stdcall DPA_Search(ptr ptr long ptr long long) DPA_Search
340 stdcall DPA_CreateEx(long long) DPA_CreateEx
341 stdcall SendNotify(long long long ptr) COMCTL32_SendNotify
342 stdcall SendNotifyEx(long long long ptr long) COMCTL32_SendNotifyEx
350 stdcall StrChrA(str str) COMCTL32_StrChrA
351 stdcall StrRChrA(str str long) COMCTL32_StrRChrA
352 stdcall StrCmpNA(str str long) COMCTL32_StrCmpNA
353 stdcall StrCmpNIA(str str long) COMCTL32_StrCmpNIA
354 stdcall StrStrA(str str) COMCTL32_StrStrA
355 stdcall StrStrIA(str str) COMCTL32_StrStrIA
356 stdcall StrCSpnA(str str) COMCTL32_StrCSpnA
357 stdcall StrToIntA(str) COMCTL32_StrToIntA
358 stdcall StrChrW(wstr long) COMCTL32_StrChrW
359 stdcall StrRChrW(wstr wstr long) COMCTL32_StrRChrW
360 stdcall StrCmpNW(wstr wstr long) COMCTL32_StrCmpNW
361 stdcall StrCmpNIW(wstr wstr long) COMCTL32_StrCmpNIW
362 stdcall StrStrW(wstr wstr) COMCTL32_StrStrW
363 stub StrStrIW
364 stdcall StrSpnW(wstr wstr) COMCTL32_StrSpnW
365 stdcall StrToIntW(wstr) COMCTL32_StrToIntW
366 stub StrChrIA
367 stub StrChrIW
368 stub StrRChrIA
369 stub StrRChrIW
372 stub StrRStrIA
373 stub StrRStrIW
374 stub StrCSpnIA
375 stub StrCSpnIW
376 stub IntlStrEqWorkerA@16
377 stub IntlStrEqWorkerW@16
382 stdcall SmoothScrollWindow(ptr) SmoothScrollWindow
383 stub DoReaderMode@4
384 stub SetPathWordBreakProc@8
385 stdcall DPA_EnumCallback(long long long) DPA_EnumCallback
386 stdcall DPA_DestroyCallback(ptr ptr long) DPA_DestroyCallback
387 stdcall DSA_EnumCallback(ptr ptr long) DSA_EnumCallback
388 stdcall DSA_DestroyCallback(ptr ptr long) DSA_DestroyCallback
71 stdcall -noname Alloc(long) COMCTL32_Alloc
72 stdcall -noname ReAlloc(ptr long) COMCTL32_ReAlloc
73 stdcall -noname Free(ptr) COMCTL32_Free
74 stdcall -noname GetSize(ptr) COMCTL32_GetSize
151 stdcall -noname CreateMRUListA(ptr) CreateMRUListA
152 stdcall -noname FreeMRUList(long) FreeMRUList
153 stdcall -noname AddMRUStringA(long str) AddMRUStringA
154 stdcall -noname EnumMRUListA(long long ptr long) EnumMRUListA
155 stdcall -noname FindMRUStringA(long str ptr) FindMRUStringA
156 stdcall -noname DelMRUString(long long) DelMRUString
157 stdcall -noname CreateMRUListLazyA(ptr long long long) CreateMRUListLazyA
163 stub -noname CreatePage
164 stub -noname CreateProxyPage
167 stdcall -noname AddMRUData(long ptr long) AddMRUData
169 stdcall -noname FindMRUData(long ptr long ptr) FindMRUData
233 stdcall -noname Str_GetPtrA(str str long) Str_GetPtrA
234 stdcall -noname Str_SetPtrA(str str) Str_SetPtrA
235 stdcall -noname Str_GetPtrW(wstr wstr long) Str_GetPtrW
236 stdcall -noname Str_SetPtrW(wstr wstr) Str_SetPtrW
320 stdcall -noname DSA_Create(long long) DSA_Create
321 stdcall -noname DSA_Destroy(ptr) DSA_Destroy
322 stdcall -noname DSA_GetItem(ptr long long) DSA_GetItem
323 stdcall -noname DSA_GetItemPtr(ptr long) DSA_GetItemPtr
324 stdcall -noname DSA_InsertItem(ptr long long) DSA_InsertItem
325 stdcall -noname DSA_SetItem (ptr long long) DSA_SetItem
326 stdcall -noname DSA_DeleteItem(ptr long) DSA_DeleteItem
327 stdcall -noname DSA_DeleteAllItems(ptr) DSA_DeleteAllItems
328 stdcall -noname DPA_Create(long) DPA_Create
329 stdcall -noname DPA_Destroy(ptr) DPA_Destroy
330 stdcall -noname DPA_Grow(ptr long) DPA_Grow
331 stdcall -noname DPA_Clone(ptr ptr) DPA_Clone
332 stdcall -noname DPA_GetPtr(ptr long) DPA_GetPtr
333 stdcall -noname DPA_GetPtrIndex(ptr ptr) DPA_GetPtrIndex
334 stdcall -noname DPA_InsertPtr(ptr long ptr) DPA_InsertPtr
335 stdcall -noname DPA_SetPtr(ptr long ptr) DPA_SetPtr
336 stdcall -noname DPA_DeletePtr(ptr long) DPA_DeletePtr
337 stdcall -noname DPA_DeleteAllPtrs(ptr) DPA_DeleteAllPtrs
338 stdcall -noname DPA_Sort(ptr ptr long) DPA_Sort
339 stdcall -noname DPA_Search(ptr ptr long ptr long long) DPA_Search
340 stdcall -noname DPA_CreateEx(long long) DPA_CreateEx
341 stdcall -noname SendNotify(long long long ptr) COMCTL32_SendNotify
342 stdcall -noname SendNotifyEx(long long long ptr long) COMCTL32_SendNotifyEx
350 stdcall -noname StrChrA(str str) COMCTL32_StrChrA
351 stdcall -noname StrRChrA(str str long) COMCTL32_StrRChrA
352 stdcall -noname StrCmpNA(str str long) COMCTL32_StrCmpNA
353 stdcall -noname StrCmpNIA(str str long) COMCTL32_StrCmpNIA
354 stdcall -noname StrStrA(str str) COMCTL32_StrStrA
355 stdcall -noname StrStrIA(str str) COMCTL32_StrStrIA
356 stdcall -noname StrCSpnA(str str) COMCTL32_StrCSpnA
357 stdcall -noname StrToIntA(str) COMCTL32_StrToIntA
358 stdcall -noname StrChrW(wstr long) COMCTL32_StrChrW
359 stdcall -noname StrRChrW(wstr wstr long) COMCTL32_StrRChrW
360 stdcall -noname StrCmpNW(wstr wstr long) COMCTL32_StrCmpNW
361 stdcall -noname StrCmpNIW(wstr wstr long) COMCTL32_StrCmpNIW
362 stdcall -noname StrStrW(wstr wstr) COMCTL32_StrStrW
363 stub -noname StrStrIW
364 stdcall -noname StrSpnW(wstr wstr) COMCTL32_StrSpnW
365 stdcall -noname StrToIntW(wstr) COMCTL32_StrToIntW
366 stub -noname StrChrIA
367 stub -noname StrChrIW
368 stub -noname StrRChrIA
369 stub -noname StrRChrIW
372 stub -noname StrRStrIA
373 stub -noname StrRStrIW
374 stub -noname StrCSpnIA
375 stub -noname StrCSpnIW
376 stub -noname IntlStrEqWorkerA
377 stub -noname IntlStrEqWorkerW
382 stdcall -noname SmoothScrollWindow(ptr) SmoothScrollWindow
383 stub -noname DoReaderMode
384 stub -noname SetPathWordBreakProc
385 stdcall -noname DPA_EnumCallback(long long long) DPA_EnumCallback
386 stdcall -noname DPA_DestroyCallback(ptr ptr long) DPA_DestroyCallback
387 stdcall -noname DSA_EnumCallback(ptr ptr long) DSA_EnumCallback
388 stdcall -noname DSA_DestroyCallback(ptr ptr long) DSA_DestroyCallback
389 stub @
390 stub @
400 stdcall CreateMRUListW(ptr) CreateMRUListW
401 stdcall AddMRUStringW(long wstr) AddMRUStringW
402 stdcall FindMRUStringW(long wstr ptr) FindMRUStringW
403 stdcall EnumMRUListW(long long ptr long) EnumMRUListW
404 stdcall CreateMRUListLazyW(ptr long long long) CreateMRUListLazyW
400 stdcall -noname CreateMRUListW(ptr) CreateMRUListW
401 stdcall -noname AddMRUStringW(long wstr) AddMRUStringW
402 stdcall -noname FindMRUStringW(long wstr ptr) FindMRUStringW
403 stdcall -noname EnumMRUListW(long long ptr long) EnumMRUListW
404 stdcall -noname CreateMRUListLazyW(ptr long long long) CreateMRUListLazyW
410 stdcall @(long long long long) COMCTL32_410
411 stdcall @(long long long) COMCTL32_411
412 stdcall @(long long long) COMCTL32_412
@ -195,3 +115,76 @@ init COMCTL32_LibMain
419 stdcall @(long long long long) COMCTL32_419
420 stub @
421 stub @
# Functions imported by name
@ stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA
@ stdcall CreatePropertySheetPageA(ptr) CreatePropertySheetPageA
@ stdcall CreatePropertySheetPageW(ptr) CreatePropertySheetPageW
@ stdcall CreateStatusWindow(long str long long) CreateStatusWindowA
@ stdcall CreateStatusWindowW(long wstr long long) CreateStatusWindowW
@ stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) CreateToolbarEx
@ stdcall DestroyPropertySheetPage(long) DestroyPropertySheetPage
@ stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion
@ stdcall DllInstall(long ptr) COMCTL32_DllInstall
@ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA
@ stdcall DrawStatusTextW(long ptr wstr long) DrawStatusTextW
@ stdcall FlatSB_EnableScrollBar (long long long) FlatSB_EnableScrollBar
@ stdcall FlatSB_GetScrollInfo (long long ptr) FlatSB_GetScrollInfo
@ stdcall FlatSB_GetScrollPos (long long) FlatSB_GetScrollPos
@ stdcall FlatSB_GetScrollProp (long long ptr) FlatSB_GetScrollProp
@ stdcall FlatSB_GetScrollRange (long long ptr ptr) FlatSB_GetScrollRange
@ stdcall FlatSB_SetScrollInfo (long long ptr long) FlatSB_SetScrollInfo
@ stdcall FlatSB_SetScrollPos (long long long long) FlatSB_SetScrollPos
@ stdcall FlatSB_SetScrollProp (long long long long) FlatSB_SetScrollProp
@ stdcall FlatSB_SetScrollRange (long long long long long) FlatSB_SetScrollRange
@ stdcall FlatSB_ShowScrollBar (long long long) FlatSB_ShowScrollBar
@ stdcall GetMUILanguage() GetMUILanguage
@ stdcall ImageList_Add(ptr long long) ImageList_Add
@ stdcall ImageList_AddIcon(ptr long) ImageList_AddIcon
@ stdcall ImageList_AddMasked(ptr long long) ImageList_AddMasked
@ stdcall ImageList_BeginDrag(ptr long long long) ImageList_BeginDrag
@ stdcall ImageList_Copy(ptr long ptr long long) ImageList_Copy
@ stdcall ImageList_Create(long long long long long) ImageList_Create
@ stdcall ImageList_Destroy(ptr) ImageList_Destroy
@ stdcall ImageList_DragEnter(long long long) ImageList_DragEnter
@ stdcall ImageList_DragLeave(long) ImageList_DragLeave
@ stdcall ImageList_DragMove(long long) ImageList_DragMove
@ stdcall ImageList_DragShowNolock(long) ImageList_DragShowNolock
@ stdcall ImageList_Draw(ptr long long long long long) ImageList_Draw
@ stdcall ImageList_DrawEx(ptr long long long long long long long long long) ImageList_DrawEx
@ stdcall ImageList_DrawIndirect(ptr) ImageList_DrawIndirect
@ stdcall ImageList_Duplicate(ptr) ImageList_Duplicate
@ stdcall ImageList_EndDrag() ImageList_EndDrag
@ stdcall ImageList_GetBkColor(ptr) ImageList_GetBkColor
@ stdcall ImageList_GetDragImage(ptr ptr) ImageList_GetDragImage
@ stdcall ImageList_GetFlags(ptr) ImageList_GetFlags
@ stdcall ImageList_GetIcon(ptr long long) ImageList_GetIcon
@ stdcall ImageList_GetIconSize(ptr ptr ptr) ImageList_GetIconSize
@ stdcall ImageList_GetImageCount(ptr) ImageList_GetImageCount
@ stdcall ImageList_GetImageInfo(ptr long ptr) ImageList_GetImageInfo
@ stdcall ImageList_GetImageRect(ptr long ptr) ImageList_GetImageRect
@ stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImageA
@ stdcall ImageList_LoadImageA(long str long long long long long) ImageList_LoadImageA
@ stdcall ImageList_LoadImageW(long wstr long long long long long) ImageList_LoadImageW
@ stdcall ImageList_Merge(ptr long ptr long long long) ImageList_Merge
@ stdcall ImageList_Read(ptr) ImageList_Read
@ stdcall ImageList_Remove(ptr long) ImageList_Remove
@ stdcall ImageList_Replace(ptr long long long) ImageList_Replace
@ stdcall ImageList_ReplaceIcon(ptr long long) ImageList_ReplaceIcon
@ stdcall ImageList_SetBkColor(ptr long) ImageList_SetBkColor
@ stdcall ImageList_SetDragCursorImage(ptr long long long) ImageList_SetDragCursorImage
@ stdcall ImageList_SetFilter(ptr long long) ImageList_SetFilter
@ stdcall ImageList_SetFlags(ptr long) ImageList_SetFlags
@ stdcall ImageList_SetIconSize(ptr long long) ImageList_SetIconSize
@ stdcall ImageList_SetImageCount(ptr long) ImageList_SetImageCount
@ stdcall ImageList_SetOverlayImage(ptr long long) ImageList_SetOverlayImage
@ stdcall ImageList_Write(ptr ptr) ImageList_Write
@ stdcall InitCommonControlsEx(ptr) InitCommonControlsEx
@ stdcall InitMUILanguage(long) InitMUILanguage
@ stdcall InitializeFlatSB(long) InitializeFlatSB
@ stdcall PropertySheet(ptr) PropertySheetA
@ stdcall PropertySheetA(ptr) PropertySheetA
@ stdcall PropertySheetW(ptr) PropertySheetW
@ stdcall UninitializeFlatSB(long) UninitializeFlatSB
@ stdcall _TrackMouseEvent(ptr) _TrackMouseEvent

View File

@ -95,7 +95,7 @@ static INT SIC_IconAppend (LPCSTR sSourceFile, INT dwSourceIndex, HICON hSmallIc
EnterCriticalSection(&SHELL32_SicCS);
index = pDPA_InsertPtr(sic_hdpa, 0x7fff, lpsice);
index = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice);
if ( INVALID_INDEX == index )
{
SHFree(lpsice);
@ -159,10 +159,10 @@ INT SIC_GetIconIndex (LPCSTR sSourceFile, INT dwSourceIndex )
EnterCriticalSection(&SHELL32_SicCS);
if (NULL != pDPA_GetPtr (sic_hdpa, 0))
if (NULL != DPA_GetPtr (sic_hdpa, 0))
{
/* search linear from position 0*/
index = pDPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0);
index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0);
}
if ( INVALID_INDEX == index )
@ -172,7 +172,7 @@ INT SIC_GetIconIndex (LPCSTR sSourceFile, INT dwSourceIndex )
else
{
TRACE("-- found\n");
ret = ((LPSIC_ENTRY)pDPA_GetPtr(sic_hdpa, index))->dwListIndex;
ret = ((LPSIC_ENTRY)DPA_GetPtr(sic_hdpa, index))->dwListIndex;
}
LeaveCriticalSection(&SHELL32_SicCS);
@ -218,7 +218,7 @@ BOOL SIC_Initialize(void)
if (sic_hdpa) /* already initialized?*/
return TRUE;
sic_hdpa = pDPA_Create(16);
sic_hdpa = DPA_Create(16);
if (!sic_hdpa)
{
@ -262,14 +262,14 @@ void SIC_Destroy(void)
EnterCriticalSection(&SHELL32_SicCS);
if (sic_hdpa && NULL != pDPA_GetPtr (sic_hdpa, 0))
if (sic_hdpa && NULL != DPA_GetPtr (sic_hdpa, 0))
{
for (i=0; i < pDPA_GetPtrCount(sic_hdpa); ++i)
for (i=0; i < DPA_GetPtrCount(sic_hdpa); ++i)
{
lpsice = pDPA_GetPtr(sic_hdpa, i);
lpsice = DPA_GetPtr(sic_hdpa, i);
SHFree(lpsice);
}
pDPA_Destroy(sic_hdpa);
DPA_Destroy(sic_hdpa);
}
sic_hdpa = NULL;

View File

@ -42,6 +42,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(pidl);
WINE_DECLARE_DEBUG_CHANNEL(shell);
/* from comctl32.dll */
extern LPVOID WINAPI Alloc(INT);
extern BOOL WINAPI Free(LPVOID);
/*************************************************************************
* ILGetDisplayName [SHELL32.15]
@ -297,7 +300,7 @@ LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl)
return NULL;
len = ILGetSize(pidl);
newpidl = (LPITEMIDLIST)pCOMCTL32_Alloc(len);
newpidl = (LPITEMIDLIST)Alloc(len);
if (newpidl)
memcpy(newpidl,pidl,len);
@ -640,7 +643,7 @@ void WINAPI ILGlobalFree( LPCITEMIDLIST pidl)
TRACE("%p\n",pidl);
if(!pidl) return;
pCOMCTL32_Free(pidl);
Free(pidl);
}
/*************************************************************************
* ILCreateFromPath [SHELL32.157]

View File

@ -908,13 +908,6 @@ void (WINAPI *pDLLInitComctl)(LPVOID);
LPVOID (WINAPI *pCOMCTL32_Alloc) (INT);
BOOL (WINAPI *pCOMCTL32_Free) (LPVOID);
HDPA (WINAPI *pDPA_Create) (INT);
INT (WINAPI *pDPA_InsertPtr) (const HDPA, INT, LPVOID);
BOOL (WINAPI *pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM);
LPVOID (WINAPI *pDPA_GetPtr) (const HDPA, INT);
BOOL (WINAPI *pDPA_Destroy) (const HDPA);
INT (WINAPI *pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
LPVOID (WINAPI *pDPA_DeletePtr) (const HDPA hdpa, INT i);
HANDLE (WINAPI *pCreateMRUListA) (LPVOID lpcml);
DWORD (WINAPI *pFreeMRUListA) (HANDLE hMRUList);
INT (WINAPI *pAddMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData);
@ -954,21 +947,6 @@ BOOL WINAPI Shell32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
/* comctl32 */
pDLLInitComctl=(void*)GetProcAddress(hComctl32,"InitCommonControlsEx");
pCOMCTL32_Alloc=(void*)GetProcAddress(hComctl32, (LPCSTR)71L);
pCOMCTL32_Free=(void*)GetProcAddress(hComctl32, (LPCSTR)73L);
pDPA_Create=(void*)GetProcAddress(hComctl32, (LPCSTR)328L);
pDPA_Destroy=(void*)GetProcAddress(hComctl32, (LPCSTR)329L);
pDPA_GetPtr=(void*)GetProcAddress(hComctl32, (LPCSTR)332L);
pDPA_InsertPtr=(void*)GetProcAddress(hComctl32, (LPCSTR)334L);
pDPA_DeletePtr=(void*)GetProcAddress(hComctl32, (LPCSTR)336L);
pDPA_Sort=(void*)GetProcAddress(hComctl32, (LPCSTR)338L);
pDPA_Search=(void*)GetProcAddress(hComctl32, (LPCSTR)339L);
pCreateMRUListA=(void*)GetProcAddress(hComctl32, (LPCSTR)151L /*"CreateMRUListA"*/);
pFreeMRUListA=(void*)GetProcAddress(hComctl32, (LPCSTR)152L /*"FreeMRUList"*/);
pAddMRUData=(void*)GetProcAddress(hComctl32, (LPCSTR)167L /*"AddMRUData"*/);
pFindMRUData=(void*)GetProcAddress(hComctl32, (LPCSTR)169L /*"FindMRUData"*/);
pEnumMRUListA=(void*)GetProcAddress(hComctl32, (LPCSTR)154L /*"EnumMRUListA"*/);
/* initialize the common controls */
if (pDLLInitComctl)
{

View File

@ -47,24 +47,6 @@ extern HDPA sic_hdpa;
*/
extern void (WINAPI *pDLLInitComctl)(LPVOID);
extern LPVOID (WINAPI *pCOMCTL32_Alloc) (INT);
extern BOOL (WINAPI *pCOMCTL32_Free) (LPVOID);
extern HDPA (WINAPI *pDPA_Create) (INT);
extern INT (WINAPI *pDPA_InsertPtr) (const HDPA, INT, LPVOID);
extern BOOL (WINAPI *pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM);
extern LPVOID (WINAPI *pDPA_GetPtr) (const HDPA, INT);
extern BOOL (WINAPI *pDPA_Destroy) (const HDPA);
extern INT (WINAPI *pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
extern LPVOID (WINAPI *pDPA_DeletePtr) (const HDPA hdpa, INT i);
extern HANDLE (WINAPI *pCreateMRUListA) (LPVOID lpcml);
extern DWORD (WINAPI *pFreeMRUListA) (HANDLE hMRUList);
extern INT (WINAPI *pAddMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData);
extern INT (WINAPI *pFindMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum);
extern INT (WINAPI *pEnumMRUListA) (HANDLE hList, INT nItemPos, LPVOID lpBuffer, DWORD nBufferSize);
#define pDPA_GetPtrCount(hdpa) (*(INT*)(hdpa))
BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
/* Iconcache */

View File

@ -40,6 +40,29 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
WINE_DECLARE_DEBUG_CHANNEL(pidl);
/* FIXME: !!! move CREATEMRULIST and flags to header file !!! */
/* !!! it is in both here and comctl32undoc.c !!! */
typedef struct tagCREATEMRULIST
{
DWORD cbSize; /* size of struct */
DWORD nMaxItems; /* max no. of items in list */
DWORD dwFlags; /* see below */
HKEY hKey; /* root reg. key under which list is saved */
LPCSTR lpszSubKey; /* reg. subkey */
PROC lpfnCompare; /* item compare proc */
} CREATEMRULISTA, *LPCREATEMRULISTA;
/* dwFlags */
#define MRUF_STRING_LIST 0 /* list will contain strings */
#define MRUF_BINARY_LIST 1 /* list will contain binary data */
#define MRUF_DELAYED_SAVE 2 /* only save list order to reg. is FreeMRUList */
extern HANDLE WINAPI CreateMRUListA(LPCREATEMRULISTA lpcml);
extern DWORD WINAPI FreeMRUList(HANDLE hMRUList);
extern INT WINAPI AddMRUData(HANDLE hList, LPCVOID lpData, DWORD cbData);
extern INT WINAPI FindMRUData(HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum);
extern INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer, DWORD nBufferSize);
/*************************************************************************
* ParseFieldA [internal]
*
@ -526,7 +549,7 @@ static INT SHADD_create_add_mru_data(HANDLE mruhandle, LPSTR doc_name, LPSTR new
/* Add the new entry into the MRU list
*/
return pAddMRUData(mruhandle, (LPCVOID)buffer, *len);
return AddMRUData(mruhandle, (LPCVOID)buffer, *len);
}
/*************************************************************************
@ -543,24 +566,6 @@ static INT SHADD_create_add_mru_data(HANDLE mruhandle, LPSTR doc_name, LPSTR new
*/
DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
{
/* FIXME: !!! move CREATEMRULIST and flags to header file !!! */
/* !!! it is in both here and comctl32undoc.c !!! */
typedef struct tagCREATEMRULIST
{
DWORD cbSize; /* size of struct */
DWORD nMaxItems; /* max no. of items in list */
DWORD dwFlags; /* see below */
HKEY hKey; /* root reg. key under which list is saved */
LPCSTR lpszSubKey; /* reg. subkey */
PROC lpfnCompare; /* item compare proc */
} CREATEMRULIST, *LPCREATEMRULIST;
/* dwFlags */
#define MRUF_STRING_LIST 0 /* list will contain strings */
#define MRUF_BINARY_LIST 1 /* list will contain binary data */
#define MRUF_DELAYED_SAVE 2 /* only save list order to reg. is FreeMRUList */
/* If list is a string list lpfnCompare has the following prototype
* int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2)
* for binary lists the prototype is
@ -709,7 +714,7 @@ typedef struct tagCREATEMRULIST
* new_lnk_filepath
* - path and file name of new .lnk file
*/
CREATEMRULIST mymru;
CREATEMRULISTA mymru;
HANDLE mruhandle;
INT len, pos, bufused, err;
INT i;
@ -719,13 +724,13 @@ typedef struct tagCREATEMRULIST
CHAR old_lnk_name[MAX_PATH];
short int slen;
mymru.cbSize = sizeof(CREATEMRULIST);
mymru.cbSize = sizeof(CREATEMRULISTA);
mymru.nMaxItems = 15;
mymru.dwFlags = MRUF_BINARY_LIST | MRUF_DELAYED_SAVE;
mymru.hKey = HCUbasekey;
mymru.lpszSubKey = "RecentDocs";
mymru.lpfnCompare = &SHADD_compare_mru;
mruhandle = pCreateMRUListA(&mymru);
mruhandle = CreateMRUListA(&mymru);
if (!mruhandle) {
/* MRU failed */
ERR("MRU processing failed, handle zero\n");
@ -733,13 +738,13 @@ typedef struct tagCREATEMRULIST
return 0;
}
len = lstrlenA(doc_name);
pos = pFindMRUData(mruhandle, doc_name, len, 0);
pos = FindMRUData(mruhandle, doc_name, len, 0);
/* Now get the MRU entry that will be replaced
* and delete the .lnk file for it
*/
if ((bufused = pEnumMRUListA(mruhandle, (pos == -1) ? 14 : pos,
buffer, 2048)) != -1) {
if ((bufused = EnumMRUListA(mruhandle, (pos == -1) ? 14 : pos,
buffer, 2048)) != -1) {
ptr = buffer;
ptr += (lstrlenA(buffer) + 1);
slen = *((short int*)ptr);
@ -795,7 +800,7 @@ typedef struct tagCREATEMRULIST
*/
pos = SHADD_create_add_mru_data(mruhandle, doc_name, new_lnk_name,
buffer, &len);
pFreeMRUListA(mruhandle);
FreeMRUList(mruhandle);
TRACE("Updated MRU list, new doc is position %d\n", pos);
}

View File

@ -577,7 +577,7 @@ static HRESULT ShellView_FillList(IShellViewImpl * This)
}
/* create a pointer array */
hdpa = pDPA_Create(16);
hdpa = DPA_Create(16);
if (!hdpa)
{
return(E_OUTOFMEMORY);
@ -586,21 +586,21 @@ static HRESULT ShellView_FillList(IShellViewImpl * This)
/* copy the items into the array*/
while((S_OK == IEnumIDList_Next(pEnumIDList,1, &pidl, &dwFetched)) && dwFetched)
{
if (pDPA_InsertPtr(hdpa, 0x7fff, pidl) == -1)
if (DPA_InsertPtr(hdpa, 0x7fff, pidl) == -1)
{
SHFree(pidl);
}
}
/* sort the array */
pDPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent);
DPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent);
/*turn the listview's redrawing off*/
SendMessageA(This->hWndList, WM_SETREDRAW, FALSE, 0);
for (i=0; i < DPA_GetPtrCount(hdpa); ++i) /* DPA_GetPtrCount is a macro*/
{
pidl = (LPITEMIDLIST)pDPA_GetPtr(hdpa, i);
pidl = (LPITEMIDLIST)DPA_GetPtr(hdpa, i);
/* in a commdlg This works as a filemask*/
if ( IncludeObject(This, pidl)==S_OK )
@ -612,7 +612,7 @@ static HRESULT ShellView_FillList(IShellViewImpl * This)
SendMessageA(This->hWndList, WM_SETREDRAW, TRUE, 0);
IEnumIDList_Release(pEnumIDList); /* destroy the list*/
pDPA_Destroy(hdpa);
DPA_Destroy(hdpa);
return S_OK;
}