[PATCH v2 0/1] MR3669: comctl32: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes (＠alesliehughes)]

--
  v2: comctl32: Remove DECLSPEC_HIDDEN usage.

https://gitlab.winehq.org/wine/wine/-/merge_requests/3669

[PATCH v2 1/1] comctl32: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/comctl32/comctl32.h | 142 +++++++++++++++++++--------------------
 dlls/comctl32/toolbar.c  |   2 +-
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
index faff3f30717..713e0690a46 100644
--- a/dlls/comctl32/comctl32.h
+++ b/dlls/comctl32/comctl32.h
@@ -35,8 +35,8 @@
 #include "winnls.h"
 #include "commctrl.h"

-extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN;
-extern HBRUSH  COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN;
+extern HMODULE COMCTL32_hModule;
+extern HBRUSH  COMCTL32_hPattern55AABrush;

/* Property sheet / Wizard */
 #define IDD_PROPSHEET 1006
@@ -155,7 +155,7 @@ typedef struct
    INT            visibleItems;
 } HEADCOMBO, *LPHEADCOMBO;

-extern BOOL COMBO_FlipListbox(HEADCOMBO *lphc, BOOL ok, BOOL bRedrawButton) DECLSPEC_HIDDEN;
+extern BOOL COMBO_FlipListbox(HEADCOMBO *lphc, BOOL ok, BOOL bRedrawButton);

typedef struct
 {
@@ -178,21 +178,21 @@ typedef struct
     COLORREF clrInfoText;           /* COLOR_INFOTEXT                      */
 } COMCTL32_SysColor;

-extern COMCTL32_SysColor  comctl32_color DECLSPEC_HIDDEN;
+extern COMCTL32_SysColor  comctl32_color;

/* Internal function */
-HWND COMCTL32_CreateToolTip (HWND) DECLSPEC_HIDDEN;
-void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background) DECLSPEC_HIDDEN;
-VOID COMCTL32_RefreshSysColors(void) DECLSPEC_HIDDEN;
-void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal) DECLSPEC_HIDDEN;
-void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground) DECLSPEC_HIDDEN;
-void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm) DECLSPEC_HIDDEN;
-BOOL COMCTL32_IsReflectedMessage(UINT uMsg) DECLSPEC_HIDDEN;
-INT  Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN;
-INT  Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN;
-BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
-BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
-BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN;
+HWND COMCTL32_CreateToolTip (HWND);
+void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background);
+VOID COMCTL32_RefreshSysColors(void);
+void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal);
+void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground);
+void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm);
+BOOL COMCTL32_IsReflectedMessage(UINT uMsg);
+INT  Str_GetPtrWtoA(LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen);
+INT  Str_GetPtrAtoW(LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen);
+BOOL Str_SetPtrAtoW(LPWSTR *lppDest, LPCSTR lpSrc);
+BOOL Str_SetPtrWtoA(LPSTR *lppDest, LPCWSTR lpSrc);
+BOOL imagelist_has_alpha(HIMAGELIST, UINT);

#define COMCTL32_VERSION_MINOR 81

@@ -226,60 +226,60 @@ INT  WINAPI Str_GetPtrW (LPCWSTR, LPWSTR, INT);
 LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet);
 BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2);

-HRGN set_control_clipping(HDC hdc, const RECT *rect) DECLSPEC_HIDDEN;
-
-extern void ANIMATE_Register(void) DECLSPEC_HIDDEN;
-extern void ANIMATE_Unregister(void) DECLSPEC_HIDDEN;
-extern void BUTTON_Register(void) DECLSPEC_HIDDEN;
-extern void COMBO_Register(void) DECLSPEC_HIDDEN;
-extern void COMBOEX_Register(void) DECLSPEC_HIDDEN;
-extern void COMBOEX_Unregister(void) DECLSPEC_HIDDEN;
-extern void COMBOLBOX_Register(void) DECLSPEC_HIDDEN;
-extern void DATETIME_Register(void) DECLSPEC_HIDDEN;
-extern void DATETIME_Unregister(void) DECLSPEC_HIDDEN;
-extern void EDIT_Register(void) DECLSPEC_HIDDEN;
-extern void FLATSB_Register(void) DECLSPEC_HIDDEN;
-extern void FLATSB_Unregister(void) DECLSPEC_HIDDEN;
-extern void HEADER_Register(void) DECLSPEC_HIDDEN;
-extern void HEADER_Unregister(void) DECLSPEC_HIDDEN;
-extern void HOTKEY_Register(void) DECLSPEC_HIDDEN;
-extern void HOTKEY_Unregister(void) DECLSPEC_HIDDEN;
-extern void IPADDRESS_Register(void) DECLSPEC_HIDDEN;
-extern void IPADDRESS_Unregister(void) DECLSPEC_HIDDEN;
-extern void LISTBOX_Register(void) DECLSPEC_HIDDEN;
-extern void LISTVIEW_Register(void) DECLSPEC_HIDDEN;
-extern void LISTVIEW_Unregister(void) DECLSPEC_HIDDEN;
-extern void MONTHCAL_Register(void) DECLSPEC_HIDDEN;
-extern void MONTHCAL_Unregister(void) DECLSPEC_HIDDEN;
-extern void NATIVEFONT_Register(void) DECLSPEC_HIDDEN;
-extern void NATIVEFONT_Unregister(void) DECLSPEC_HIDDEN;
-extern void PAGER_Register(void) DECLSPEC_HIDDEN;
-extern void PAGER_Unregister(void) DECLSPEC_HIDDEN;
-extern void PROGRESS_Register(void) DECLSPEC_HIDDEN;
-extern void PROGRESS_Unregister(void) DECLSPEC_HIDDEN;
-extern void REBAR_Register(void) DECLSPEC_HIDDEN;
-extern void REBAR_Unregister(void) DECLSPEC_HIDDEN;
-extern void STATIC_Register(void) DECLSPEC_HIDDEN;
-extern void STATUS_Register(void) DECLSPEC_HIDDEN;
-extern void STATUS_Unregister(void) DECLSPEC_HIDDEN;
-extern void SYSLINK_Register(void) DECLSPEC_HIDDEN;
-extern void SYSLINK_Unregister(void) DECLSPEC_HIDDEN;
-extern void TAB_Register(void) DECLSPEC_HIDDEN;
-extern void TAB_Unregister(void) DECLSPEC_HIDDEN;
-extern void TOOLBAR_Register(void) DECLSPEC_HIDDEN;
-extern void TOOLBAR_Unregister(void) DECLSPEC_HIDDEN;
-extern void TOOLTIPS_Register(void) DECLSPEC_HIDDEN;
-extern void TOOLTIPS_Unregister(void) DECLSPEC_HIDDEN;
-extern void TRACKBAR_Register(void) DECLSPEC_HIDDEN;
-extern void TRACKBAR_Unregister(void) DECLSPEC_HIDDEN;
-extern void TREEVIEW_Register(void) DECLSPEC_HIDDEN;
-extern void TREEVIEW_Unregister(void) DECLSPEC_HIDDEN;
-extern void UPDOWN_Register(void) DECLSPEC_HIDDEN;
-extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN;
-
-
-int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN;
-int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN;
-LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) DECLSPEC_HIDDEN;
+HRGN set_control_clipping(HDC hdc, const RECT *rect);
+
+extern void ANIMATE_Register(void);
+extern void ANIMATE_Unregister(void);
+extern void BUTTON_Register(void);
+extern void COMBO_Register(void);
+extern void COMBOEX_Register(void);
+extern void COMBOEX_Unregister(void);
+extern void COMBOLBOX_Register(void);
+extern void DATETIME_Register(void);
+extern void DATETIME_Unregister(void);
+extern void EDIT_Register(void);
+extern void FLATSB_Register(void);
+extern void FLATSB_Unregister(void);
+extern void HEADER_Register(void);
+extern void HEADER_Unregister(void);
+extern void HOTKEY_Register(void);
+extern void HOTKEY_Unregister(void);
+extern void IPADDRESS_Register(void);
+extern void IPADDRESS_Unregister(void);
+extern void LISTBOX_Register(void);
+extern void LISTVIEW_Register(void);
+extern void LISTVIEW_Unregister(void);
+extern void MONTHCAL_Register(void);
+extern void MONTHCAL_Unregister(void);
+extern void NATIVEFONT_Register(void);
+extern void NATIVEFONT_Unregister(void);
+extern void PAGER_Register(void);
+extern void PAGER_Unregister(void);
+extern void PROGRESS_Register(void);
+extern void PROGRESS_Unregister(void);
+extern void REBAR_Register(void);
+extern void REBAR_Unregister(void);
+extern void STATIC_Register(void);
+extern void STATUS_Register(void);
+extern void STATUS_Unregister(void);
+extern void SYSLINK_Register(void);
+extern void SYSLINK_Unregister(void);
+extern void TAB_Register(void);
+extern void TAB_Unregister(void);
+extern void TOOLBAR_Register(void);
+extern void TOOLBAR_Unregister(void);
+extern void TOOLTIPS_Register(void);
+extern void TOOLTIPS_Unregister(void);
+extern void TRACKBAR_Register(void);
+extern void TRACKBAR_Unregister(void);
+extern void TREEVIEW_Register(void);
+extern void TREEVIEW_Unregister(void);
+extern void UPDOWN_Register(void);
+extern void UPDOWN_Unregister(void);
+
+
+int MONTHCAL_MonthLength(int month, int year);
+int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace);
+LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second);

#endif  /* __WINE_COMCTL32_H */
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 02538eeb649..690a02db6ee 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -2346,7 +2346,7 @@ static LRESULT TOOLBAR_Cust_AvailDragListNotification(const CUSTDLG_INFO *custIn
     return 0;
 }

-extern UINT uDragListMessage DECLSPEC_HIDDEN;
+extern UINT uDragListMessage;

/***********************************************************************
  * TOOLBAR_CustomizeDialogProc