From 9d8e864b343d0fea43515ca6fd12f344a439ad6f Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 24 Oct 1998 10:49:27 +0000 Subject: [PATCH] Added xxx_Unregister() functions to all common controls. --- dlls/comctl32/animate.c | 13 ++- dlls/comctl32/comboex.c | 12 ++- dlls/comctl32/commctrl.c | 22 +++-- dlls/comctl32/header.c | 11 ++- dlls/comctl32/hotkey.c | 13 ++- dlls/comctl32/imagelist.c | 22 ++--- dlls/comctl32/listview.c | 12 ++- dlls/comctl32/progress.c | 29 +++++-- dlls/comctl32/status.c | 22 ++++- dlls/comctl32/tab.c | 12 ++- dlls/comctl32/trackbar.c | 15 +++- dlls/comctl32/treeview.c | 12 ++- dlls/comctl32/updown.c | 23 +++++- include/animate.h | 3 +- include/comboex.h | 3 +- include/commctrl.h | 163 ++++++++++++++++++++++++++++---------- include/header.h | 4 +- include/hotkey.h | 4 +- include/ipaddress.h | 2 +- include/listview.h | 3 +- include/pager.h | 3 +- include/progress.h | 4 +- include/status.h | 6 +- include/tab.h | 3 +- include/toolbar.h | 4 +- include/trackbar.h | 3 +- include/treeview.h | 3 +- include/updown.h | 3 +- 28 files changed, 327 insertions(+), 102 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 9c2fc196159..9efc0c63f45 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -310,8 +310,8 @@ ANIMATE_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) } -void -ANIMATE_Register (void) +VOID +ANIMATE_Register (VOID) { WNDCLASS32A wndClass; @@ -328,3 +328,12 @@ ANIMATE_Register (void) RegisterClass32A (&wndClass); } + + +VOID +ANIMATE_Unregister (VOID) +{ + if (GlobalFindAtom32A (ANIMATE_CLASS32A)) + UnregisterClass32A (ANIMATE_CLASS32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 7c7dc900b02..8bdf0f3c2e0 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -262,8 +262,8 @@ COMBOEX_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) } -void -COMBOEX_Register (void) +VOID +COMBOEX_Register (VOID) { WNDCLASS32A wndClass; @@ -281,3 +281,11 @@ COMBOEX_Register (void) RegisterClass32A (&wndClass); } + +VOID +COMBOEX_Unregister (VOID) +{ + if (GlobalFindAtom32A (WC_COMBOBOXEX32A)) + UnregisterClass32A (WC_COMBOBOXEX32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index ca68314892a..6f0d2d547c0 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -80,11 +80,23 @@ ComCtl32LibMain (HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) COMCTL32_dwProcessesAttached--; if (COMCTL32_dwProcessesAttached == 0) { /* unregister all common control classes */ + ANIMATE_Unregister (); + COMBOEX_Unregister (); + HEADER_Unregister (); + HOTKEY_Unregister (); IPADDRESS_Unregister (); - + LISTVIEW_Unregister (); NATIVEFONT_Unregister (); - + PAGER_Unregister (); + PROGRESS_Unregister (); + REBAR_Unregister (); + STATUS_Unregister (); + TAB_Unregister (); + TOOLBAR_Unregister (); TOOLTIPS_Unregister (); + TRACKBAR_Unregister (); + TREEVIEW_Unregister (); + UPDOWN_Unregister (); /* destroy private heap */ HeapDestroy (COMCTL32_hHeap); @@ -158,7 +170,7 @@ MenuHelp (UINT32 uMsg, WPARAM32 wParam, LPARAM lParam, HMENU32 hMainMenu, break; default: - FIXME (commctrl, "Invalid Message!\n"); + FIXME (commctrl, "Invalid Message 0x%x!\n", uMsg); break; } } @@ -282,7 +294,7 @@ GetEffectiveClientRect (HWND32 hwnd, LPRECT32 lpRect, LPINT32 lpInfo) * hdc [I] handle to the window's display context * lprc [I] pointer to a rectangle * text [I] pointer to the text - * style [I] + * style [I] * * RETURNS * No return value. @@ -344,7 +356,7 @@ DrawStatusText32W (HDC32 hdc, LPRECT32 lprc, LPCWSTR text, UINT32 style) * style [I] * text [I] * parent [I] handle to the parent window - * wid [I] + * wid [I] control id of the status bar * * RETURNS * Success: handle to the control diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index dd318cb65a6..0abbed8a41a 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1296,7 +1296,8 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam) } -void HEADER_Register( void ) +VOID +HEADER_Register (VOID) { WNDCLASS32A wndClass; @@ -1313,3 +1314,11 @@ void HEADER_Register( void ) RegisterClass32A (&wndClass); } + +VOID +HEADER_Unregister (VOID) +{ + if (GlobalFindAtom32A (WC_HEADER32A)) + UnregisterClass32A (WC_HEADER32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index a0c24d63199..902374d5099 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -340,8 +340,8 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) } -void -HOTKEY_Register (void) +VOID +HOTKEY_Register (VOID) { WNDCLASS32A wndClass; @@ -358,3 +358,12 @@ HOTKEY_Register (void) RegisterClass32A (&wndClass); } + + +VOID +HOTKEY_Unregister (VOID) +{ + if (GlobalFindAtom32A (HOTKEY_CLASS32A)) + UnregisterClass32A (HOTKEY_CLASS32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 867c326a1f4..8bb132db3cd 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -673,7 +673,7 @@ ImageList_DragLeave (HWND32 hwndLock) DeleteDC32 (hdcBackBuffer); DeleteObject32 (hbmBackBuffer); - return (TRUE); + return TRUE; } @@ -705,7 +705,7 @@ ImageList_DragMove (INT32 x, INT32 y) ImageList_DragShowNolock (TRUE); - return (FALSE); + return FALSE; } @@ -753,7 +753,7 @@ ImageList_DragShowNolock (BOOL32 bShow) ReleaseDC32 (hwndInternalDrag, hdcDrag); - return (FALSE); + return FALSE; } @@ -800,7 +800,7 @@ ImageList_Draw (HIMAGELIST himl, INT32 i, HDC32 hdc, imldp.fStyle = fStyle; imldp.dwRop = 0; - return (ImageList_DrawIndirect (&imldp)); + return ImageList_DrawIndirect (&imldp); } @@ -854,7 +854,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT32 i, HDC32 hdc, INT32 x, INT32 y, imldp.fStyle = fStyle; imldp.dwRop = 0; - return (ImageList_DrawIndirect (&imldp)); + return ImageList_DrawIndirect (&imldp); } @@ -891,7 +891,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (pimldp == NULL) return FALSE; if (pimldp->cbSize < sizeof(IMAGELISTDRAWPARAMS)) - return (FALSE); + return FALSE; if (pimldp->himl == NULL) return FALSE; if ((pimldp->i < 0) || (pimldp->i >= pimldp->himl->cCurImage)) @@ -1210,7 +1210,7 @@ ImageList_GetIcon (HIMAGELIST himl, INT32 i, UINT32 fStyle) HDC32 hdcSrc, hdcDst; INT32 nWidth, nHeight; - if ((himl == NULL) ||(i < 0) || (i >= himl->cCurImage)) + if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage)) return 0; nWidth = GetSystemMetrics32 (SM_CXICON); @@ -2129,14 +2129,14 @@ ImageList_SetImageCount (HIMAGELIST himl, INT32 iImageCount) /* delete 'empty' image space */ SetBkColor32 (hdcBitmap, RGB(255, 255, 255)); SetTextColor32 (hdcBitmap, RGB(0, 0, 0)); - PatBlt32 (hdcBitmap, nCopyCount * himl->cx, 0, + PatBlt32 (hdcBitmap, nCopyCount * himl->cx, 0, (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS); - DeleteObject32 (himl->hbmImage); - himl->hbmImage = hbmNewBitmap; + DeleteObject32 (himl->hbmImage); + himl->hbmImage = hbmNewBitmap; } else - ERR (imagelist, "Could not create new image bitmap !\n"); + ERR (imagelist, "Could not create new image bitmap !\n"); if (himl->hbmMask) { diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ead9eefc5ab..aacbae19c61 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1515,8 +1515,8 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) } -void -LISTVIEW_Register (void) +VOID +LISTVIEW_Register (VOID) { WNDCLASS32A wndClass; @@ -1534,3 +1534,11 @@ LISTVIEW_Register (void) RegisterClass32A (&wndClass); } + +VOID +LISTVIEW_Unregister (VOID) +{ + if (GlobalFindAtom32A (WC_LISTVIEW32A)) + UnregisterClass32A (WC_LISTVIEW32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index ad088723c3e..c7049680521 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -329,24 +329,37 @@ LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message, * PROGRESS_Register [Internal] * * Registers the progress bar window class. - * */ -void -PROGRESS_Register(void) +VOID +PROGRESS_Register (VOID) { WNDCLASS32A wndClass; - if( GlobalFindAtom32A( PROGRESS_CLASS32A ) ) return; + if (GlobalFindAtom32A (PROGRESS_CLASS32A)) return; - ZeroMemory( &wndClass, sizeof( WNDCLASS32A ) ); + ZeroMemory (&wndClass, sizeof( WNDCLASS32A)); wndClass.style = CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; wndClass.lpfnWndProc = (WNDPROC32)ProgressWindowProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = sizeof(PROGRESS_INFO *); - wndClass.hCursor = LoadCursor32A( 0, IDC_ARROW32A ); + wndClass.cbWndExtra = sizeof (PROGRESS_INFO *); + wndClass.hCursor = LoadCursor32A (0, IDC_ARROW32A); wndClass.lpszClassName = PROGRESS_CLASS32A; - RegisterClass32A( &wndClass ); + RegisterClass32A (&wndClass); +} + + +/*********************************************************************** + * PROGRESS_Unregister [Internal] + * + * Unregisters the progress bar window class. + */ + +VOID +PROGRESS_Unregister (VOID) +{ + if (GlobalFindAtom32A (PROGRESS_CLASS32A)) + UnregisterClass32A (PROGRESS_CLASS32A, (HINSTANCE32)NULL); } diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index a2c710ea798..489b817fa55 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -875,7 +875,7 @@ STATUSBAR_WMNCHitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) static __inline__ LRESULT STATUSBAR_WMNCLButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) { - PostMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NCLBUTTONDOWN, + PostMessage32A (wndPtr->parent->hwndSelf, WM_NCLBUTTONDOWN, wParam, lParam); return 0; } @@ -884,7 +884,7 @@ STATUSBAR_WMNCLButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) static __inline__ LRESULT STATUSBAR_WMNCLButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) { - PostMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NCLBUTTONUP, + PostMessage32A (wndPtr->parent->hwndSelf, WM_NCLBUTTONUP, wParam, lParam); return 0; } @@ -1126,7 +1126,9 @@ StatusWindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam) * * Registers the status window class. */ -void STATUS_Register (void) + +VOID +STATUS_Register (VOID) { WNDCLASS32A wndClass; @@ -1144,3 +1146,17 @@ void STATUS_Register (void) RegisterClass32A (&wndClass); } + +/*********************************************************************** + * STATUS_Unregister [Internal] + * + * Unregisters the status window class. + */ + +VOID +STATUS_Unregister (VOID) +{ + if (GlobalFindAtom32A (STATUSCLASSNAME32A)) + UnregisterClass32A (STATUSCLASSNAME32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 50a3afd1755..9ca0bba2fb8 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -371,8 +371,8 @@ TAB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) } -void -TAB_Register (void) +VOID +TAB_Register (VOID) { WNDCLASS32A wndClass; @@ -390,3 +390,11 @@ TAB_Register (void) RegisterClass32A (&wndClass); } + +VOID +TAB_Unregister (VOID) +{ + if (GlobalFindAtom32A (WC_TABCONTROL32A)) + UnregisterClass32A (WC_TABCONTROL32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 4a8ddf203ab..ef10af7b209 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1,7 +1,7 @@ /* * Trackbar control * - * Copyright 1998 Eric Kohli + * Copyright 1998 Eric Kohl * Copyright 1998 Alex Priem * * NOTES @@ -1440,8 +1440,8 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) } -void -TRACKBAR_Register (void) +VOID +TRACKBAR_Register (VOID) { WNDCLASS32A wndClass; @@ -1458,3 +1458,12 @@ TRACKBAR_Register (void) RegisterClass32A (&wndClass); } + + +VOID +TRACKBAR_Unregister (VOID) +{ + if (GlobalFindAtom32A (TRACKBAR_CLASS32A)) + UnregisterClass32A (TRACKBAR_CLASS32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8db65bf51a6..52e02dd02b0 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1794,8 +1794,8 @@ TREEVIEW_HScroll (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) } -void -TREEVIEW_Register (void) +VOID +TREEVIEW_Register (VOID) { WNDCLASS32A wndClass; @@ -1815,3 +1815,11 @@ TREEVIEW_Register (void) RegisterClass32A (&wndClass); } + +VOID +TREEVIEW_Unregister (VOID) +{ + if (GlobalFindAtom32A (WC_TREEVIEW32A)) + UnregisterClass32A (WC_TREEVIEW32A, (HINSTANCE32)NULL); +} + diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 8ccc64a9751..c5ef912c6cd 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -361,7 +361,7 @@ static BOOL32 UPDOWN_SetBuddy(WND *wndPtr, HWND32 hwndBud) GetWindowRect32(infoPtr->Buddy, &budRect); MapWindowPoints32(HWND_DESKTOP, GetParent32(infoPtr->Buddy), (POINT32 *)(&budRect.left), 2); - + /* now do the positioning */ if(wndPtr->dwStyle & UDS_ALIGNRIGHT){ budRect.right -= DEFAULT_WIDTH+DEFAULT_XSEP; @@ -820,12 +820,15 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam, return 0; } + /*********************************************************************** - * UPDOWN_Register [Internal] + * UPDOWN_Register [Internal] * * Registers the updown window class. */ -void UPDOWN_Register(void) + +VOID +UPDOWN_Register(void) { WNDCLASS32A wndClass; @@ -843,3 +846,17 @@ void UPDOWN_Register(void) RegisterClass32A( &wndClass ); } + +/*********************************************************************** + * UPDOWN_Unregister [Internal] + * + * Unregisters the updown window class. + */ + +VOID +UPDOWN_Unregister (VOID) +{ + if (GlobalFindAtom32A (UPDOWN_CLASS32A)) + UnregisterClass32A (UPDOWN_CLASS32A, (HINSTANCE32)NULL); +} + diff --git a/include/animate.h b/include/animate.h index 665fc627d3c..e988dd8fec5 100644 --- a/include/animate.h +++ b/include/animate.h @@ -15,6 +15,7 @@ typedef struct tagANIMATE_INFO } ANIMATE_INFO; -extern void ANIMATE_Register (void); +extern VOID ANIMATE_Register (VOID); +extern VOID ANIMATE_Unregister (VOID); #endif /* __WINE_ANIMATE_H */ diff --git a/include/comboex.h b/include/comboex.h index b2fb082f419..26fb6257cf6 100644 --- a/include/comboex.h +++ b/include/comboex.h @@ -18,6 +18,7 @@ typedef struct tagCOMBOEX_INFO } COMBOEX_INFO; -extern void COMBOEX_Register (void); +extern VOID COMBOEX_Register (VOID); +extern VOID COMBOEX_Unregister (VOID); #endif /* __WINE_COMBOEX_H */ diff --git a/include/commctrl.h b/include/commctrl.h index aab34bec2e4..182992d55ac 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1039,7 +1039,16 @@ typedef struct tagNMTTDISPINFOW #define REBARCLASSNAME16 "ReBarWindow" #define REBARCLASSNAME32A "ReBarWindow32" #define REBARCLASSNAME32W L"ReBarWindow32" -#define REBARCLASSNAME WINELIB_NAME_AW(REBARCLASSNAME) +#define REBARCLASSNAME WINELIB_NAME_AW(REBARCLASSNAME) + +#define RBS_TOOLTIPS 0x0100 +#define RBS_VARHEIGHT 0x0200 +#define RBS_BANDBORDERS 0x0400 +#define RBS_FIXEDORDER 0x0800 +#define RBS_REGISTERDROP 0x1000 +#define RBS_AUTOSIZE 0x2000 +#define RBS_VERTICALGRIPPER 0x4000 +#define RBS_DBLCLKTOGGLE 0x8000 #define RBIM_IMAGELIST 0x00000001 @@ -1056,17 +1065,35 @@ typedef struct tagNMTTDISPINFOW #define RBBIM_LPARAM 0x00000400 #define RBBIM_HEADERSIZE 0x00000800 +#define RBBS_BREAK 0x00000001 +#define RBBS_FIXEDSIZE 0x00000002 +#define RBBS_CHILDEDGE 0x00000004 +#define RBBS_HIDDEN 0x00000008 +#define RBBS_NOVERT 0x00000010 +#define RBBS_FIXEDBMP 0x00000020 +#define RBBS_VARIABLEHEIGHT 0x00000040 +#define RBBS_GRIPPERALWAYS 0x00000080 +#define RBBS_NOGRIPPER 0x00000100 + +#define RBNM_ID 0x00000001 +#define RBNM_STYLE 0x00000002 +#define RBNM_LPARAM 0x00000004 + +#define RBHT_NOWHERE 0x0001 +#define RBHT_CAPTION 0x0002 +#define RBHT_CLIENT 0x0003 +#define RBHT_GRABBER 0x0004 #define RB_INSERTBAND32A (WM_USER+1) #define RB_INSERTBAND32W (WM_USER+10) -#define RB_INSERTBANND WINELIB_NAME_AW(RB_INSERTBAND) +#define RB_INSERTBAND WINELIB_NAME_AW(RB_INSERTBAND) #define RB_DELETEBAND (WM_USER+2) #define RB_GETBARINFO (WM_USER+3) #define RB_SETBARINFO (WM_USER+4) #define RB_GETBANDINFO32 (WM_USER+5) /* just for compatibility */ #define RB_SETBANDINFO32A (WM_USER+6) #define RB_SETBANDINFO32W (WM_USER+11) -#define RB_SETBANDINFO WINELIB_NAME_AW(RB_SETBANDINFO) +#define RB_SETBANDINFO WINELIB_NAME_AW(RB_SETBANDINFO) #define RB_SETPARENT (WM_USER+7) #define RB_HITTEST (WM_USER+8) #define RB_GETRECT (WM_USER+9) @@ -1087,7 +1114,7 @@ typedef struct tagNMTTDISPINFOW #define RB_GETBARHEIGHT (WM_USER+27) #define RB_GETBANDINFO32W (WM_USER+28) #define RB_GETBANDINFO32A (WM_USER+29) -#define RB_GETBANDINFO WINELIB_NAME_AW(RB_GETBANDINFO) +#define RB_GETBANDINFO WINELIB_NAME_AW(RB_GETBANDINFO) #define RB_MINIMIZEBAND (WM_USER+30) #define RB_MAXIMIZEBAND (WM_USER+31) #define RB_GETBANDORDERS (WM_USER+34) @@ -1103,7 +1130,15 @@ typedef struct tagNMTTDISPINFOW #define RBN_FIRST (0U-831U) #define RBN_LAST (0U-859U) - +#define RBN_HEIGHTCHANGE (RBN_FIRST-0) +#define RBN_GETOBJECT (RBN_FIRST-1) +#define RBN_LAYOUTCHANGED (RBN_FIRST-2) +#define RBN_AUTOSIZE (RBN_FIRST-3) +#define RBN_BEGINDRAG (RBN_FIRST-4) +#define RBN_ENDDRAG (RBN_FIRST-5) +#define RBN_DELETINGBAND (RBN_FIRST-6) +#define RBN_DELETEDBAND (RBN_FIRST-7) +#define RBN_CHILDSIZE (RBN_FIRST-8) typedef struct tagREBARINFO { @@ -1172,6 +1207,40 @@ typedef REBARBANDINFO32W const *LPCREBARBANDINFO32W; #define REBARBANDINFO_V3_SIZE32W CCSIZEOF_STRUCT(REBARBANDINFO32W, wID) #define REBARBANDINFO_V3_SIZE WINELIB_NAME_AW(REBARBANDINFO_V3_SIZE) +typedef struct tagNMREBARCHILDSIZE +{ + NMHDR hdr; + UINT32 iBand; + UINT32 wID; + RECT32 rcChild; + RECT32 rcBand; +} NMREBARCHILDSIZE, *LPNMREBARCHILDSIZE; + +typedef struct tagNMREBAR +{ + NMHDR hdr; + DWORD dwMask; + UINT32 uBand; + UINT32 fStyle; + UINT32 wID; + LPARAM lParam; +} NMREBAR, *LPNMREBAR; + +typedef struct tagNMRBAUTOSIZE +{ + NMHDR hdr; + BOOL32 fChanged; + RECT32 rcTarget; + RECT32 rcActual; +} NMRBAUTOSIZE, *LPNMRBAUTOSIZE; + +typedef struct _RB_HITTESTINFO +{ + POINT32 pt; + UINT32 flags; + INT32 iBand; +} RBHITTESTINFO, *LPRBHITTESTINFO; + /* Trackbar control */ @@ -1775,6 +1844,17 @@ typedef struct tagTVHITTESTINFO { #define LVIS_OVERLAYMASK 0x0F00 #define LVIS_STATEIMAGEMASK 0xF000 +#define LVNI_ALL 0x0000 +#define LVNI_FOCUSED 0x0001 +#define LVNI_SELECTED 0x0002 +#define LVNI_CUT 0x0004 +#define LVNI_DROPHILITED 0x0008 + +#define LVNI_ABOVE 0x0100 +#define LVNI_BELOW 0x0200 +#define LVNI_TOLEFT 0x0400 +#define LVNI_TORIGHT 0x0800 + #define LVM_FIRST 0x1000 #define LVM_GETBKCOLOR (LVM_FIRST+0) #define LVM_SETBKCOLOR (LVM_FIRST+1) @@ -1950,40 +2030,6 @@ typedef struct tagLVITEMW #define LV_ITEM LVITEM -/* Tab Control */ - -#define WC_TABCONTROL16 "SysTabControl" -#define WC_TABCONTROL32A "SysTabControl32" -#define WC_TABCONTROL32W L"SysTabControl32" - -#define WC_TABCONTROL WINELIB_NAME_AW(WC_TABCONTROL) - -#define TCM_FIRST 0x1300 - -#define TCM_INSERTITEM (TCM_FIRST + 7) -#define TCM_GETCURSEL (TCM_FIRST + 11) - -#define TCIF_TEXT 0x0001 -#define TCIF_IMAGE 0x0002 -#define TCIF_RTLREADING 0x0004 -#define TCIF_PARAM 0x0008 - -typedef struct tagTCITEM { - UINT32 mask; - UINT32 lpReserved1; - UINT32 lpReserved2; - LPSTR pszText; - int cchTextMax; - int iImage; - LPARAM lParam; -} TCITEM, *LPTCITEM; - -#define TCN_FIRST (0U-550U) -#define TCN_LAST (0U-580U) -#define TCN_KEYDOWN (TCN_FIRST - 0) -#define TCN_SELCHANGE (TCN_FIRST - 1) -#define TCN_SELCHANGING (TCN_FIRST - 2) - typedef struct tagLVCOLUMNA { UINT32 mask; @@ -2087,6 +2133,43 @@ typedef INT32 (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM); (UINT32)SendMessage32A((hwndLV),LVM_GETSELECTEDCOUNT,0,0L) +/* Tab Control */ + +#define WC_TABCONTROL16 "SysTabControl" +#define WC_TABCONTROL32A "SysTabControl32" +#define WC_TABCONTROL32W L"SysTabControl32" + +#define WC_TABCONTROL WINELIB_NAME_AW(WC_TABCONTROL) + +#define TCM_FIRST 0x1300 + +#define TCM_GETITEMCOUNT (TCM_FIRST + 4) +#define TCM_INSERTITEM (TCM_FIRST + 7) +#define TCM_GETCURSEL (TCM_FIRST + 11) +#define TCM_SETITEMEXTRA (TCM_FIRST + 14) + +#define TCIF_TEXT 0x0001 +#define TCIF_IMAGE 0x0002 +#define TCIF_RTLREADING 0x0004 +#define TCIF_PARAM 0x0008 + +typedef struct tagTCITEM { + UINT32 mask; + UINT32 lpReserved1; + UINT32 lpReserved2; + LPSTR pszText; + int cchTextMax; + int iImage; + LPARAM lParam; +} TCITEM, *LPTCITEM; + +#define TCN_FIRST (0U-550U) +#define TCN_LAST (0U-580U) +#define TCN_KEYDOWN (TCN_FIRST - 0) +#define TCN_SELCHANGE (TCN_FIRST - 1) +#define TCN_SELCHANGING (TCN_FIRST - 2) + + /* ComboBoxEx control */ #define WC_COMBOBOXEX32A "ComboBoxEx32" @@ -2243,7 +2326,7 @@ typedef struct tagNMIPADDRESS * UNDOCUMENTED functions */ -/* local heap memory functions */ +/* private heap memory functions */ LPVOID WINAPI COMCTL32_Alloc (DWORD); LPVOID WINAPI COMCTL32_ReAlloc (LPVOID, DWORD); diff --git a/include/header.h b/include/header.h index 0ab962af203..9194fa757b5 100644 --- a/include/header.h +++ b/include/header.h @@ -42,9 +42,11 @@ typedef struct HIMAGELIST himl; /* handle to a image list (may be 0) */ HEADER_ITEM *items; /* pointer to array of HEADER_ITEM's */ + LPINT32 pOrder; /* pointer to order array */ } HEADER_INFO; -extern void HEADER_Register (void); +extern VOID HEADER_Register (VOID); +extern VOID HEADER_Unregister (VOID); #endif /* __WINE_HEADER_H_ */ diff --git a/include/hotkey.h b/include/hotkey.h index f583a2e78c1..c8dc19dcb9c 100644 --- a/include/hotkey.h +++ b/include/hotkey.h @@ -7,7 +7,6 @@ #ifndef __WINE_HOTKEY_H #define __WINE_HOTKEY_H - typedef struct tagHOTKEY_INFO { HFONT32 hFont; @@ -17,6 +16,7 @@ typedef struct tagHOTKEY_INFO } HOTKEY_INFO; -extern void HOTKEY_Register (void); +extern VOID HOTKEY_Register (VOID); +extern VOID HOTKEY_Unregister (VOID); #endif /* __WINE_HOTKEY_H */ diff --git a/include/ipaddress.h b/include/ipaddress.h index 9c90ce4ecba..c8ad898b71d 100644 --- a/include/ipaddress.h +++ b/include/ipaddress.h @@ -16,6 +16,6 @@ typedef struct tagIPADDRESS_INFO extern VOID IPADDRESS_Register (VOID); -extern VOID IPADDRESS_Register (VOID); +extern VOID IPADDRESS_Unregister (VOID); #endif /* __WINE_IPADDRESS_H */ diff --git a/include/listview.h b/include/listview.h index 869c798c114..ea5ff90f586 100644 --- a/include/listview.h +++ b/include/listview.h @@ -40,6 +40,7 @@ typedef struct tagLISTVIEW_INFO } LISTVIEW_INFO; -extern void LISTVIEW_Register (void); +extern VOID LISTVIEW_Register (VOID); +extern VOID LISTVIEW_Unregister (VOID); #endif /* __WINE_LISTVIEW_H */ diff --git a/include/pager.h b/include/pager.h index 73421474918..c02538e419f 100644 --- a/include/pager.h +++ b/include/pager.h @@ -22,6 +22,7 @@ typedef struct tagPAGER_INFO } PAGER_INFO; -extern void PAGER_Register (void); +extern VOID PAGER_Register (VOID); +extern VOID PAGER_Unregister (VOID); #endif /* __WINE_PAGER_H */ diff --git a/include/progress.h b/include/progress.h index 319367ecce1..b7fe1534a69 100644 --- a/include/progress.h +++ b/include/progress.h @@ -20,6 +20,8 @@ typedef struct COLORREF ColorBk; /* Background color */ } PROGRESS_INFO; -extern void PROGRESS_Register (void); + +extern VOID PROGRESS_Register (VOID); +extern VOID PROGRESS_Unregister (VOID); #endif /* __WINE_PROGRESS_H */ diff --git a/include/status.h b/include/status.h index 45323f4880f..6f4718df380 100644 --- a/include/status.h +++ b/include/status.h @@ -7,8 +7,6 @@ #ifndef __WINE_STATUS_H #define __WINE_STATUS_H -extern void STATUS_Register(void); - typedef struct { INT32 x; @@ -32,4 +30,8 @@ typedef struct STATUSWINDOWPART *parts; } STATUSWINDOWINFO; + +extern VOID STATUS_Register (VOID); +extern VOID STATUS_Unregister (VOID); + #endif /* __WINE_STATUS_H */ diff --git a/include/tab.h b/include/tab.h index 6b0b6311dbe..81b72485120 100644 --- a/include/tab.h +++ b/include/tab.h @@ -31,6 +31,7 @@ typedef struct tagTAB_INFO } TAB_INFO; -extern void TAB_Register (void); +extern VOID TAB_Register (VOID); +extern VOID TAB_Unregister (VOID); #endif /* __WINE_TAB_H */ diff --git a/include/toolbar.h b/include/toolbar.h index 51d4663b82f..55686d75468 100644 --- a/include/toolbar.h +++ b/include/toolbar.h @@ -45,6 +45,7 @@ typedef struct tagTOOLBAR_INFO INT32 nOldHit; INT32 nHotItem; /* index of the "hot" item */ HFONT32 hFont; /* text font */ + HIMAGELIST himlStd; /* standard image list */ HIMAGELIST himlDef; /* default image list */ HIMAGELIST himlHot; /* hot image list */ HIMAGELIST himlDis; /* disabled image list */ @@ -63,6 +64,7 @@ typedef struct tagTOOLBAR_INFO } TOOLBAR_INFO; -extern void TOOLBAR_Register (void); +extern VOID TOOLBAR_Register (VOID); +extern VOID TOOLBAR_Unregister (VOID); #endif /* __WINE_TOOLBAR_H */ diff --git a/include/trackbar.h b/include/trackbar.h index ae3cf8b4825..9962d12b24e 100644 --- a/include/trackbar.h +++ b/include/trackbar.h @@ -40,6 +40,7 @@ typedef struct tagTRACKBAR_INFO -extern void TRACKBAR_Register (void); +extern VOID TRACKBAR_Register (VOID); +extern VOID TRACKBAR_Unregister (VOID); #endif /* __WINE_TRACKBAR_H */ diff --git a/include/treeview.h b/include/treeview.h index d48c5d4f882..756c16a4416 100644 --- a/include/treeview.h +++ b/include/treeview.h @@ -80,6 +80,7 @@ typedef struct tagTREEVIEW_INFO } TREEVIEW_INFO; -extern void TREEVIEW_Register (void); +extern VOID TREEVIEW_Register (VOID); +extern VOID TREEVIEW_Unregister (VOID); #endif /* __WINE_TREEVIEW_H */ diff --git a/include/updown.h b/include/updown.h index 22a1e3dedcc..6256f19148c 100644 --- a/include/updown.h +++ b/include/updown.h @@ -29,6 +29,7 @@ typedef struct tagNM_UPDOWN int iDelta; } NM_UPDOWN; -extern void UPDOWN_Register (void); +extern VOID UPDOWN_Register (VOID); +extern VOID UPDOWN_Unregister (VOID); #endif /* __WINE_UPDOWN_H */