[PATCH 0/1] MR3255: win32u: Remove DECLSPEC_HIDDEN usage.

[PATCH 1/1] win32u: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/win32u/dibdrv/dibdrv.h  | 114 +++++------
 dlls/win32u/font.c           |   4 +-
 dlls/win32u/imm.c            |   4 +-
 dlls/win32u/main.c           |   2 +-
 dlls/win32u/ntgdi_private.h  | 230 +++++++++++-----------
 dlls/win32u/ntuser_private.h |  66 +++----
 dlls/win32u/win32u_private.h | 368 +++++++++++++++++------------------
 7 files changed, 394 insertions(+), 394 deletions(-)

diff --git a/dlls/win32u/dibdrv/dibdrv.h b/dlls/win32u/dibdrv/dibdrv.h
index c0a07cba95e..599d41c377e 100644
--- a/dlls/win32u/dibdrv/dibdrv.h
+++ b/dlls/win32u/dibdrv/dibdrv.h
@@ -113,50 +113,50 @@ typedef struct dibdrv_physdev
 } dibdrv_physdev;

extern BOOL     dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
-                                   PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN;
+                                   PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend );
 extern BOOL     dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-                            INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN;
+                            INT start_x, INT start_y, INT end_x, INT end_y );
 extern BOOL     dibdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-                              INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN;
+                              INT start_x, INT start_y, INT end_x, INT end_y );
 extern DWORD    dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits,
-                                   struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN;
+                                   struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func );
 extern BOOL     dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-                              INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) DECLSPEC_HIDDEN;
+                              INT start_x, INT start_y, INT end_x, INT end_y );
+extern BOOL     dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom );
+extern BOOL     dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type );
 extern BOOL     dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
-                                   const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
+                                   const RECT *rect, LPCWSTR str, UINT count, const INT *dx );
+extern BOOL     dibdrv_FillPath( PHYSDEV dev );
 extern DWORD    dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits,
-                                 struct bitblt_coords *src ) DECLSPEC_HIDDEN;
-extern COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
-extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN;
+                                 struct bitblt_coords *src );
+extern COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color );
+extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y );
 extern BOOL     dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
-                                     void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN;
+                                     void *grad_array, ULONG ngrad, ULONG mode );
+extern BOOL     dibdrv_LineTo( PHYSDEV dev, INT x, INT y );
+extern BOOL     dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop );
+extern BOOL     dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn );
 extern BOOL     dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-                            INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons ) DECLSPEC_HIDDEN;
+                            INT start_x, INT start_y, INT end_x, INT end_y );
+extern BOOL     dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons );
 extern BOOL     dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts,
-                                     DWORD polylines ) DECLSPEC_HIDDEN;
+                                     DWORD polylines );
 extern DWORD    dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
                                  const struct gdi_image_bits *bits, struct bitblt_coords *src,
-                                 struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN;
+                                 struct bitblt_coords *dst, DWORD rop );
+extern BOOL     dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom );
 extern BOOL     dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-                                  INT ellipse_width, INT ellipse_height ) DECLSPEC_HIDDEN;
-extern HBRUSH   dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN;
-extern HFONT    dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) DECLSPEC_HIDDEN;
-extern HPEN     dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN;
-extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
-extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
-extern COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
+                                  INT ellipse_width, INT ellipse_height );
+extern HBRUSH   dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern );
+extern HFONT    dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags );
+extern HPEN     dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern );
+extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color );
+extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color );
+extern COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color );
 extern BOOL     dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
-                                   PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
-extern BOOL     dibdrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN;
+                                   PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop );
+extern BOOL     dibdrv_StrokeAndFillPath( PHYSDEV dev );
+extern BOOL     dibdrv_StrokePath( PHYSDEV dev );

static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev )
 {
@@ -213,15 +213,15 @@ typedef struct primitive_funcs
                                     const dib_info *src_dib, const struct bitblt_coords *src);
 } primitive_funcs;

-extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN;
-extern const primitive_funcs funcs_32   DECLSPEC_HIDDEN;
-extern const primitive_funcs funcs_24   DECLSPEC_HIDDEN;
-extern const primitive_funcs funcs_555  DECLSPEC_HIDDEN;
-extern const primitive_funcs funcs_16   DECLSPEC_HIDDEN;
-extern const primitive_funcs funcs_8    DECLSPEC_HIDDEN;
-extern const primitive_funcs funcs_4    DECLSPEC_HIDDEN;
-extern const primitive_funcs funcs_1    DECLSPEC_HIDDEN;
-extern const primitive_funcs funcs_null DECLSPEC_HIDDEN;
+extern const primitive_funcs funcs_8888;
+extern const primitive_funcs funcs_32  ;
+extern const primitive_funcs funcs_24  ;
+extern const primitive_funcs funcs_555 ;
+extern const primitive_funcs funcs_16  ;
+extern const primitive_funcs funcs_8   ;
+extern const primitive_funcs funcs_4   ;
+extern const primitive_funcs funcs_1   ;
+extern const primitive_funcs funcs_null;

struct rop_codes
 {
@@ -247,23 +247,23 @@ struct clipped_rects
     RECT  buffer[32];
 };

-extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN;
-extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN;
-extern void init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits) DECLSPEC_HIDDEN;
-extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp) DECLSPEC_HIDDEN;
-extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN;
-extern void free_pattern_brush(dib_brush *brush) DECLSPEC_HIDDEN;
-extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN;
-extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN;
-extern DWORD get_pixel_color( DC *dc, const dib_info *dib, COLORREF color, BOOL mono_fixup ) DECLSPEC_HIDDEN;
-extern int get_dib_rect( const dib_info *dib, RECT *rc ) DECLSPEC_HIDDEN;
-extern int clip_rect_to_dib( const dib_info *dib, RECT *rc ) DECLSPEC_HIDDEN;
-extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN;
-extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN;
+extern void get_rop_codes(INT rop, struct rop_codes *codes);
+extern void reset_dash_origin(dibdrv_physdev *pdev);
+extern void init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits);
+extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp);
+extern void free_dib_info(dib_info *dib);
+extern void free_pattern_brush(dib_brush *brush);
+extern void copy_dib_color_info(dib_info *dst, const dib_info *src);
+extern BOOL convert_dib(dib_info *dst, const dib_info *src);
+extern DWORD get_pixel_color( DC *dc, const dib_info *dib, COLORREF color, BOOL mono_fixup );
+extern int get_dib_rect( const dib_info *dib, RECT *rc );
+extern int clip_rect_to_dib( const dib_info *dib, RECT *rc );
+extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects );
+extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip );
 extern int clip_line(const POINT *start, const POINT *end, const RECT *clip,
-                     const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN;
-extern void release_cached_font( struct cached_font *font ) DECLSPEC_HIDDEN;
-extern BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) DECLSPEC_HIDDEN;
+                     const bres_params *params, POINT *pt1, POINT *pt2);
+extern void release_cached_font( struct cached_font *font );
+extern BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop );

static inline void init_clipped_rects( struct clipped_rects *clip_rects )
 {
@@ -300,4 +300,4 @@ struct osmesa_funcs
                           int width, int height, int bpp, int stride );
 };

-extern const struct osmesa_funcs *init_opengl_lib(void) DECLSPEC_HIDDEN;
+extern const struct osmesa_funcs *init_opengl_lib(void);
diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index c5f62e76f3a..17cc6f3b855 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -3571,7 +3571,7 @@ static BOOL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, font_enum_proc proc, LPAR

static BOOL check_unicode_tategaki( WCHAR ch )
 {
-    extern const unsigned short vertical_orientation_table[] DECLSPEC_HIDDEN;
+    extern const unsigned short vertical_orientation_table[];
     unsigned short orientation = vertical_orientation_table[vertical_orientation_table[vertical_orientation_table[ch >> 8]+((ch >> 4) & 0x0f)]+ (ch & 0xf)];

/* We only reach this code if typographical substitution did not occur */
@@ -7085,7 +7085,7 @@ BOOL WINAPI NtGdiGetCharWidthInfo( HDC hdc, struct char_width_info *info )
 /***********************************************************************
  *           DrawTextW    (win32u.so)
  */
-INT WINAPI DECLSPEC_HIDDEN DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT *rect, UINT flags )
+INT WINAPI DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT *rect, UINT flags )
 {
     struct draw_text_params *params;
     ULONG ret_len, size;
diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c
index 287596e60ef..a14d199e253 100644
--- a/dlls/win32u/imm.c
+++ b/dlls/win32u/imm.c
@@ -444,7 +444,7 @@ void WINAPI NtUserNotifyIMEStatus( HWND hwnd, UINT status )
     user_driver->pNotifyIMEStatus( hwnd, status );
 }

-BOOL WINAPI DECLSPEC_HIDDEN ImmProcessKey( HWND hwnd, HKL hkl, UINT vkey, LPARAM key_data, DWORD unknown )
+BOOL WINAPI ImmProcessKey( HWND hwnd, HKL hkl, UINT vkey, LPARAM key_data, DWORD unknown )
 {
     struct imm_process_key_params params =
         { .hwnd = hwnd, .hkl = hkl, .vkey = vkey, .key_data = key_data };
@@ -453,7 +453,7 @@ BOOL WINAPI DECLSPEC_HIDDEN ImmProcessKey( HWND hwnd, HKL hkl, UINT vkey, LPARAM
     return KeUserModeCallback( NtUserImmProcessKey, &params, sizeof(params), &ret_ptr, &ret_len );
 }

-BOOL WINAPI DECLSPEC_HIDDEN ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM key_data )
+BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM key_data )
 {
     struct imm_translate_message_params params =
         { .hwnd = hwnd, .msg = msg, .wparam = wparam, .key_data = key_data };
diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c
index d2cd039b701..7d68149f776 100644
--- a/dlls/win32u/main.c
+++ b/dlls/win32u/main.c
@@ -27,7 +27,7 @@
 #include "ntgdi.h"
 #include "wine/unixlib.h"

-extern void *__wine_syscall_dispatcher DECLSPEC_HIDDEN;
+extern void *__wine_syscall_dispatcher;

static unixlib_handle_t win32u_handle;

diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h
index ad4c709b865..5c4f8279c87 100644
--- a/dlls/win32u/ntgdi_private.h
+++ b/dlls/win32u/ntgdi_private.h
@@ -147,24 +147,24 @@ static inline BOOL is_bitmapobj_dib( const BITMAPOBJ *bmp )

/* bitblt.c */
 extern DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src,
-                           BITMAPINFO *dst_info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN;
-extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src ) DECLSPEC_HIDDEN;
+                           BITMAPINFO *dst_info, struct gdi_image_bits *bits );
+extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src );
 extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src,
                            BITMAPINFO *dst_info, struct bitblt_coords *dst,
-                           struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN;
-extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN;
+                           struct gdi_image_bits *bits, int mode );
+extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count );

/* brush.c */
-extern HBRUSH create_brush( const LOGBRUSH *brush ) DECLSPEC_HIDDEN;
-extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN;
-extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN;
+extern HBRUSH create_brush( const LOGBRUSH *brush );
+extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern );
+extern void free_brush_pattern( struct brush_pattern *pattern );

/* clipping.c */
-extern BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN;
-extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN;
+extern BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src );
+extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src );
 extern void set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect,
-                                const RECT *device_rect, struct window_surface *surface ) DECLSPEC_HIDDEN;
-extern void update_dc_clipping( DC * dc ) DECLSPEC_HIDDEN;
+                                const RECT *device_rect, struct window_surface *surface );
+extern void update_dc_clipping( DC * dc );

/* Return the total DC region (if any) */
 static inline HRGN get_dc_region( DC *dc )
@@ -176,57 +176,57 @@ static inline HRGN get_dc_region( DC *dc )
 }

/* dc.c */
-extern DC *alloc_dc_ptr( DWORD magic ) DECLSPEC_HIDDEN;
-extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN;
-extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN;
-extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN;
-extern struct dce *get_dc_dce( HDC hdc ) DECLSPEC_HIDDEN;
-extern void set_dc_dce( HDC hdc, struct dce *dce ) DECLSPEC_HIDDEN;
-extern WORD set_dce_flags( HDC hdc, WORD flags ) DECLSPEC_HIDDEN;
-extern DWORD set_stretch_blt_mode( HDC hdc, DWORD mode ) DECLSPEC_HIDDEN;
-extern BOOL set_viewport_org( HDC hdc, INT x, INT y, POINT *point ) DECLSPEC_HIDDEN;
-extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN;
-extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN;
+extern DC *alloc_dc_ptr( DWORD magic );
+extern void free_dc_ptr( DC *dc );
+extern DC *get_dc_ptr( HDC hdc );
+extern void release_dc_ptr( DC *dc );
+extern struct dce *get_dc_dce( HDC hdc );
+extern void set_dc_dce( HDC hdc, struct dce *dce );
+extern WORD set_dce_flags( HDC hdc, WORD flags );
+extern DWORD set_stretch_blt_mode( HDC hdc, DWORD mode );
+extern BOOL set_viewport_org( HDC hdc, INT x, INT y, POINT *point );
+extern void DC_InitDC( DC * dc );
+extern void DC_UpdateXforms( DC * dc );

/* dib.c */
-extern BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) DECLSPEC_HIDDEN;
-extern const RGBQUAD *get_default_color_table( int bpp ) DECLSPEC_HIDDEN;
-extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN;
-extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN;
-extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN;
+extern BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc );
+extern const RGBQUAD *get_default_color_table( int bpp );
+extern void fill_default_color_table( BITMAPINFO *info );
+extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info );
+extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage );
 extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src,
-                                 const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN;
+                                 const BITMAPINFO *dst_info, void *dst_bits );

extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src,
                                  const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst,
-                                 INT mode ) DECLSPEC_HIDDEN;
+                                 INT mode );
 extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src,
                                const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst,
-                               BLENDFUNCTION blend ) DECLSPEC_HIDDEN;
+                               BLENDFUNCTION blend );
 extern DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_array, ULONG nvert,
-                                  void *grad_array, ULONG ngrad, ULONG mode, const POINT *dev_pts, HRGN rgn ) DECLSPEC_HIDDEN;
-extern COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN;
+                                  void *grad_array, ULONG ngrad, ULONG mode, const POINT *dev_pts, HRGN rgn );
+extern COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt_coords *src );
 extern BOOL render_aa_text_bitmapinfo( DC *dc, BITMAPINFO *info, struct gdi_image_bits *bits,
                                        struct bitblt_coords *src, INT x, INT y, UINT flags,
-                                       UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN;
+                                       UINT aa_flags, LPCWSTR str, UINT count, const INT *dx );
 extern DWORD get_image_from_bitmap( BITMAPOBJ *bmp, BITMAPINFO *info,
-                                    struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN;
+                                    struct gdi_image_bits *bits, struct bitblt_coords *src );
 extern DWORD put_image_into_bitmap( BITMAPOBJ *bmp, HRGN clip, BITMAPINFO *info,
                                     const struct gdi_image_bits *bits, struct bitblt_coords *src,
-                                    struct bitblt_coords *dst ) DECLSPEC_HIDDEN;
+                                    struct bitblt_coords *dst );
 extern UINT get_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries,
-                                    RGBQUAD *colors ) DECLSPEC_HIDDEN;
+                                    RGBQUAD *colors );
 extern UINT set_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries,
-                                    const RGBQUAD *colors ) DECLSPEC_HIDDEN;
-extern void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) DECLSPEC_HIDDEN;
-extern struct opengl_funcs *dibdrv_get_wgl_driver(void) DECLSPEC_HIDDEN;
+                                    const RGBQUAD *colors );
+extern void dibdrv_set_window_surface( DC *dc, struct window_surface *surface );
+extern struct opengl_funcs *dibdrv_get_wgl_driver(void);

/* driver.c */
-extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN;
-extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN;
-extern const struct gdi_dc_funcs path_driver DECLSPEC_HIDDEN;
-extern const struct gdi_dc_funcs font_driver DECLSPEC_HIDDEN;
-extern const struct gdi_dc_funcs *get_display_driver(void) DECLSPEC_HIDDEN;
+extern const struct gdi_dc_funcs null_driver;
+extern const struct gdi_dc_funcs dib_driver;
+extern const struct gdi_dc_funcs path_driver;
+extern const struct gdi_dc_funcs font_driver;
+extern const struct gdi_dc_funcs *get_display_driver(void);

/* font.c */

@@ -340,9 +340,9 @@ extern int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name,
                          const WCHAR *style, const WCHAR *fullname, const WCHAR *file,
                          void *data_ptr, SIZE_T data_size, UINT index, FONTSIGNATURE fs,
                          DWORD ntmflags, DWORD version, DWORD flags,
-                         const struct bitmap_font_size *size ) DECLSPEC_HIDDEN;
-extern UINT font_init(void) DECLSPEC_HIDDEN;
-extern const struct font_backend_funcs *init_freetype_lib(void) DECLSPEC_HIDDEN;
+                         const struct bitmap_font_size *size );
+extern UINT font_init(void);
+extern const struct font_backend_funcs *init_freetype_lib(void);

/* opentype.c */

@@ -357,75 +357,75 @@ struct opentype_name
 };

extern BOOL opentype_get_ttc_sfnt_v1( const void *data, size_t size, DWORD index, DWORD *count,
-                                      const struct ttc_sfnt_v1 **ttc_sfnt_v1 ) DECLSPEC_HIDDEN;
+                                      const struct ttc_sfnt_v1 **ttc_sfnt_v1 );
 extern BOOL opentype_get_tt_name_v0( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1,
-                                     const struct tt_name_v0 **tt_name_v0 ) DECLSPEC_HIDDEN;
+                                     const struct tt_name_v0 **tt_name_v0 );

typedef BOOL ( *opentype_enum_names_cb )( LANGID langid, struct opentype_name *name, void *user );
 extern BOOL opentype_enum_family_names( const struct tt_name_v0 *tt_name_v0,
-                                        opentype_enum_names_cb callback, void *user ) DECLSPEC_HIDDEN;
+                                        opentype_enum_names_cb callback, void *user );
 extern BOOL opentype_enum_style_names( const struct tt_name_v0 *tt_name_v0,
-                                       opentype_enum_names_cb callback, void *user ) DECLSPEC_HIDDEN;
+                                       opentype_enum_names_cb callback, void *user );
 extern BOOL opentype_enum_full_names( const struct tt_name_v0 *tt_name_v0,
-                                      opentype_enum_names_cb callback, void *user ) DECLSPEC_HIDDEN;
+                                      opentype_enum_names_cb callback, void *user );

extern BOOL opentype_get_properties( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1,
-                                     DWORD *version, FONTSIGNATURE *fs, DWORD *ntm_flags ) DECLSPEC_HIDDEN;
+                                     DWORD *version, FONTSIGNATURE *fs, DWORD *ntm_flags );

/* gdiobj.c */
 extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type,
-                                 const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN;
-extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN;
-extern void *GDI_GetObjPtr( HGDIOBJ, DWORD ) DECLSPEC_HIDDEN;
-extern void *get_any_obj_ptr( HGDIOBJ, DWORD * ) DECLSPEC_HIDDEN;
-extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN;
-extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN;
-extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN;
-extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN;
-extern DWORD get_gdi_object_type( HGDIOBJ obj ) DECLSPEC_HIDDEN;
-extern void make_gdi_object_system( HGDIOBJ handle, BOOL set ) DECLSPEC_HIDDEN;
+                                 const struct gdi_obj_funcs *funcs );
+extern void *free_gdi_handle( HGDIOBJ handle );
+extern void *GDI_GetObjPtr( HGDIOBJ, DWORD );
+extern void *get_any_obj_ptr( HGDIOBJ, DWORD * );
+extern void GDI_ReleaseObj( HGDIOBJ );
+extern UINT GDI_get_ref_count( HGDIOBJ handle );
+extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle );
+extern BOOL GDI_dec_ref_count( HGDIOBJ handle );
+extern DWORD get_gdi_object_type( HGDIOBJ obj );
+extern void make_gdi_object_system( HGDIOBJ handle, BOOL set );

/* mapping.c */
-extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN;
-extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN;
-extern BOOL set_map_mode( DC *dc, int mode ) DECLSPEC_HIDDEN;
+extern BOOL dp_to_lp( DC *dc, POINT *points, INT count );
+extern void lp_to_dp( DC *dc, POINT *points, INT count );
+extern BOOL set_map_mode( DC *dc, int mode );
 extern void combine_transform( XFORM *result, const XFORM *xform1,
-                               const XFORM *xform2 ) DECLSPEC_HIDDEN;
+                               const XFORM *xform2 );

/* driver.c */
-extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN;
+extern BOOL is_display_device( LPCWSTR name );

/* path.c */

-extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN;
-extern struct gdi_path *get_gdi_flat_path( DC *dc, HRGN *rgn ) DECLSPEC_HIDDEN;
-extern int get_gdi_path_data( struct gdi_path *path, POINT **points, BYTE **flags ) DECLSPEC_HIDDEN;
-extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN;
-extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN;
+extern void free_gdi_path( struct gdi_path *path );
+extern struct gdi_path *get_gdi_flat_path( DC *dc, HRGN *rgn );
+extern int get_gdi_path_data( struct gdi_path *path, POINT **points, BYTE **flags );
+extern BOOL PATH_SavePath( DC *dst, DC *src );
+extern BOOL PATH_RestorePath( DC *dst, DC *src );

/* painting.c */
-extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPEC_HIDDEN;
+extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut );

/* palette.c */
-extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN;
+extern HPALETTE PALETTE_Init(void);
 extern UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count,
-                                 PALETTEENTRY *entries ) DECLSPEC_HIDDEN;
-extern UINT realize_palette( HDC hdc ) DECLSPEC_HIDDEN;
+                                 PALETTEENTRY *entries );
+extern UINT realize_palette( HDC hdc );

/* pen.c */
-extern HPEN create_pen( INT style, INT width, COLORREF color ) DECLSPEC_HIDDEN;
+extern HPEN create_pen( INT style, INT width, COLORREF color );

/* region.c */
-extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN;
-extern INT mirror_region( HRGN dst, HRGN src, INT width ) DECLSPEC_HIDDEN;
-extern BOOL mirror_window_region( HWND hwnd, HRGN hrgn ) DECLSPEC_HIDDEN;
-extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN;
+extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect );
+extern INT mirror_region( HRGN dst, HRGN src, INT width );
+extern BOOL mirror_window_region( HWND hwnd, HRGN hrgn );
+extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y );
 extern HRGN create_polypolygon_region( const POINT *pts, const INT *count, INT nbpolygons,
-                                       INT mode, const RECT *clip_rect ) DECLSPEC_HIDDEN;
+                                       INT mode, const RECT *clip_rect );

/* dce.c */
-extern BOOL delete_dce( struct dce *dce ) DECLSPEC_HIDDEN;
-extern void update_dc( DC *dc ) DECLSPEC_HIDDEN;
+extern BOOL delete_dce( struct dce *dce );
+extern void update_dc( DC *dc );

#define RGN_DEFAULT_RECTS 4
 typedef struct
@@ -482,42 +482,42 @@ static inline int region_find_pt( const WINEREGION *rgn, int x, int y, BOOL *hit
 }

/* null driver entry points */
-extern BOOL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
+extern BOOL nulldrv_AbortPath( PHYSDEV dev );
 extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
-                                PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
+                                PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func);
+extern BOOL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep );
+extern BOOL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend );
+extern BOOL nulldrv_BeginPath( PHYSDEV dev );
 extern DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits,
-                                 struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
+                                 struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func );
+extern BOOL nulldrv_CloseFigure( PHYSDEV dev );
+extern BOOL nulldrv_EndPath( PHYSDEV dev );
 extern BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect,
-                                LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN;
-extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN;
-extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
-extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN;
-extern UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN;
+                                LPCWSTR str, UINT count, const INT *dx );
+extern BOOL nulldrv_FillPath( PHYSDEV dev );
+extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush );
+extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height );
+extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size );
+extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color );
+extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y );
+extern UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries );
 extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
-                                  void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN;
+                                  void * grad_array, ULONG ngrad, ULONG mode );
+extern BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn );
+extern BOOL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count );
+extern BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count );
+extern BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count );
+extern BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count );
 extern INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height,
                                       INT x_src, INT y_src, UINT start, UINT lines,
-                                      const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;
+                                      const void *bits, BITMAPINFO *info, UINT coloruse );
 extern BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
-                                PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN;
+                                PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop );
 extern INT  nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst,
                                    INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits,
-                                   BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
-extern BOOL nulldrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN;
+                                   BITMAPINFO *info, UINT coloruse, DWORD rop );
+extern BOOL nulldrv_StrokeAndFillPath( PHYSDEV dev );
+extern BOOL nulldrv_StrokePath( PHYSDEV dev );

static inline DC *get_nulldrv_dc( PHYSDEV dev )
 {
@@ -638,10 +638,10 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src )
     memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS ));
 }

-extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN;
+extern void free_heap_bits( struct gdi_image_bits *bits );

-void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN;
+void set_gdi_client_ptr( HGDIOBJ handle, void *ptr );

-extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN;
+extern SYSTEM_BASIC_INFORMATION system_info;

#endif /* __WINE_NTGDI_PRIVATE_H */
diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
index b39e38db5d6..33005da49b0 100644
--- a/dlls/win32u/ntuser_private.h
+++ b/dlls/win32u/ntuser_private.h
@@ -207,56 +207,56 @@ struct scroll_bar_win_data
 #define WINSWITCH_CLASS_ATOM MAKEINTATOM(32771)  /* WinSwitch */
 #define ICONTITLE_CLASS_ATOM MAKEINTATOM(32772)  /* IconTitle */

-extern const char *debugstr_msg_name( UINT msg, HWND hwnd ) DECLSPEC_HIDDEN;
-extern const char *debugstr_vkey_name( WPARAM wParam ) DECLSPEC_HIDDEN;
-extern void spy_enter_message( INT flag, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
+extern const char *debugstr_msg_name( UINT msg, HWND hwnd );
+extern const char *debugstr_vkey_name( WPARAM wParam );
+extern void spy_enter_message( INT flag, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam );
 extern void spy_exit_message( INT flag, HWND hwnd, UINT msg,
-                              LRESULT lreturn, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
+                              LRESULT lreturn, WPARAM wparam, LPARAM lparam );

/* class.c */
-extern HINSTANCE user32_module DECLSPEC_HIDDEN;
-WNDPROC alloc_winproc( WNDPROC func, BOOL ansi ) DECLSPEC_HIDDEN;
-BOOL is_winproc_unicode( WNDPROC proc, BOOL def_val ) DECLSPEC_HIDDEN;
-DWORD get_class_long( HWND hwnd, INT offset, BOOL ansi ) DECLSPEC_HIDDEN;
-WNDPROC get_class_winproc( struct tagCLASS *class ) DECLSPEC_HIDDEN;
-ULONG_PTR get_class_long_ptr( HWND hwnd, INT offset, BOOL ansi ) DECLSPEC_HIDDEN;
-WORD get_class_word( HWND hwnd, INT offset ) DECLSPEC_HIDDEN;
-DLGPROC get_dialog_proc( DLGPROC proc, BOOL ansi ) DECLSPEC_HIDDEN;
-ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN;
-WNDPROC get_winproc( WNDPROC proc, BOOL ansi ) DECLSPEC_HIDDEN;
-void get_winproc_params( struct win_proc_params *params, BOOL fixup_ansi_dst ) DECLSPEC_HIDDEN;
-struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN;
-struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN;
-BOOL needs_ime_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern void register_builtin_classes(void) DECLSPEC_HIDDEN;
-extern void register_desktop_class(void) DECLSPEC_HIDDEN;
+extern HINSTANCE user32_module;
+WNDPROC alloc_winproc( WNDPROC func, BOOL ansi );
+BOOL is_winproc_unicode( WNDPROC proc, BOOL def_val );
+DWORD get_class_long( HWND hwnd, INT offset, BOOL ansi );
+WNDPROC get_class_winproc( struct tagCLASS *class );
+ULONG_PTR get_class_long_ptr( HWND hwnd, INT offset, BOOL ansi );
+WORD get_class_word( HWND hwnd, INT offset );
+DLGPROC get_dialog_proc( DLGPROC proc, BOOL ansi );
+ATOM get_int_atom_value( UNICODE_STRING *name );
+WNDPROC get_winproc( WNDPROC proc, BOOL ansi );
+void get_winproc_params( struct win_proc_params *params, BOOL fixup_ansi_dst );
+struct dce *get_class_dce( struct tagCLASS *class );
+struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce );
+BOOL needs_ime_window( HWND hwnd );
+extern void register_builtin_classes(void);
+extern void register_desktop_class(void);

/* imm.c */
 extern LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPARAM lparam,
-                                struct ime_driver_call_params *params ) DECLSPEC_HIDDEN;
+                                struct ime_driver_call_params *params );

/* cursoricon.c */
-HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN;
+HICON alloc_cursoricon_handle( BOOL is_icon );

/* dce.c */
-extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN;
-extern void invalidate_dce( WND *win, const RECT *extra_rect ) DECLSPEC_HIDDEN;
+extern void free_dce( struct dce *dce, HWND hwnd );
+extern void invalidate_dce( WND *win, const RECT *extra_rect );

/* window.c */
-HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type ) DECLSPEC_HIDDEN;
-void *free_user_handle( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN;
-void *get_user_handle_ptr( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN;
-void release_user_handle_ptr( void *ptr ) DECLSPEC_HIDDEN;
-void *next_process_user_handle_ptr( HANDLE *handle, unsigned int type ) DECLSPEC_HIDDEN;
-UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN;
+HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type );
+void *free_user_handle( HANDLE handle, unsigned int type );
+void *get_user_handle_ptr( HANDLE handle, unsigned int type );
+void release_user_handle_ptr( void *ptr );
+void *next_process_user_handle_ptr( HANDLE *handle, unsigned int type );
+UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask );

static inline UINT win_get_flags( HWND hwnd )
 {
     return win_set_flags( hwnd, 0, 0 );
 }

-WND *get_win_ptr( HWND hwnd ) DECLSPEC_HIDDEN;
-BOOL is_child( HWND parent, HWND child ) DECLSPEC_HIDDEN;
-BOOL is_window( HWND hwnd ) DECLSPEC_HIDDEN;
+WND *get_win_ptr( HWND hwnd );
+BOOL is_child( HWND parent, HWND child );
+BOOL is_window( HWND hwnd );

#endif /* __WINE_NTUSER_PRIVATE_H */
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index 922fd22fe46..3d00b09f5cd 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -34,213 +34,213 @@

/* clipboard.c */
-extern UINT enum_clipboard_formats( UINT format ) DECLSPEC_HIDDEN;
-extern void release_clipboard_owner( HWND hwnd ) DECLSPEC_HIDDEN;
+extern UINT enum_clipboard_formats( UINT format );
+extern void release_clipboard_owner( HWND hwnd );

/* cursoricon.c */
-extern BOOL process_wine_setcursor( HWND hwnd, HWND window, HCURSOR handle ) DECLSPEC_HIDDEN;
-extern HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN;
-extern ULONG_PTR get_icon_param( HICON handle ) DECLSPEC_HIDDEN;
-extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) DECLSPEC_HIDDEN;
+extern BOOL process_wine_setcursor( HWND hwnd, HWND window, HCURSOR handle );
+extern HICON alloc_cursoricon_handle( BOOL is_icon );
+extern ULONG_PTR get_icon_param( HICON handle );
+extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param );

/* dce.c */
-extern struct window_surface dummy_surface DECLSPEC_HIDDEN;
-extern BOOL create_dib_surface( HDC hdc, const BITMAPINFO *info ) DECLSPEC_HIDDEN;
+extern struct window_surface dummy_surface;
+extern BOOL create_dib_surface( HDC hdc, const BITMAPINFO *info );
 extern void create_offscreen_window_surface( const RECT *visible_rect,
-                                             struct window_surface **surface ) DECLSPEC_HIDDEN;
-extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN;
-extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN;
+                                             struct window_surface **surface );
+extern void erase_now( HWND hwnd, UINT rdw_flags );
+extern void flush_window_surfaces( BOOL idle );
 extern void move_window_bits( HWND hwnd, struct window_surface *old_surface,
                               struct window_surface *new_surface,
                               const RECT *visible_rect, const RECT *old_visible_rect,
-                              const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN;
+                              const RECT *window_rect, const RECT *valid_rects );
 extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect,
-                                     const RECT *valid_rects ) DECLSPEC_HIDDEN;
+                                     const RECT *valid_rects );
 extern void register_window_surface( struct window_surface *old,
-                                     struct window_surface *new ) DECLSPEC_HIDDEN;
+                                     struct window_surface *new );

/* defwnd.c */
 extern LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
-                                    BOOL ansi ) DECLSPEC_HIDDEN;
-extern LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
-extern BOOL draw_menu_button( HWND hwnd, HDC dc, RECT *r, enum NONCLIENT_BUTTON_TYPE, BOOL down, BOOL grayed ) DECLSPEC_HIDDEN;
-extern BOOL draw_frame_menu( HDC dc, RECT *r, UINT flags ) DECLSPEC_HIDDEN;
-extern BOOL draw_nc_sys_button( HWND hwnd, HDC hdc, BOOL down ) DECLSPEC_HIDDEN;
-extern BOOL draw_rect_edge( HDC hdc, RECT *rc, UINT uType, UINT uFlags, UINT width ) DECLSPEC_HIDDEN;
-extern void fill_rect( HDC dc, const RECT *rect, HBRUSH hbrush ) DECLSPEC_HIDDEN;
-extern void get_sys_popup_pos( HWND hwnd, RECT *rect ) DECLSPEC_HIDDEN;
-extern LRESULT handle_nc_hit_test( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN;
+                                    BOOL ansi );
+extern LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam );
+extern BOOL draw_menu_button( HWND hwnd, HDC dc, RECT *r, enum NONCLIENT_BUTTON_TYPE, BOOL down, BOOL grayed );
+extern BOOL draw_frame_menu( HDC dc, RECT *r, UINT flags );
+extern BOOL draw_nc_sys_button( HWND hwnd, HDC hdc, BOOL down );
+extern BOOL draw_rect_edge( HDC hdc, RECT *rc, UINT uType, UINT uFlags, UINT width );
+extern void fill_rect( HDC dc, const RECT *rect, HBRUSH hbrush );
+extern void get_sys_popup_pos( HWND hwnd, RECT *rect );
+extern LRESULT handle_nc_hit_test( HWND hwnd, POINT pt );

/* hook.c */
-extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
+extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam );
 extern LRESULT call_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam,
-                           size_t lparam_size ) DECLSPEC_HIDDEN;
-extern BOOL is_hooked( INT id ) DECLSPEC_HIDDEN;
-extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN;
+                           size_t lparam_size );
+extern BOOL is_hooked( INT id );
+extern BOOL unhook_windows_hook( INT id, HOOKPROC proc );

/* imm.c */
-extern void cleanup_imm_thread(void) DECLSPEC_HIDDEN;
-extern HWND get_default_ime_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HIMC get_default_input_context(void) DECLSPEC_HIDDEN;
-extern HIMC get_window_input_context( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL register_imm_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern void unregister_imm_window( HWND hwnd ) DECLSPEC_HIDDEN;
+extern void cleanup_imm_thread(void);
+extern HWND get_default_ime_window( HWND hwnd );
+extern HIMC get_default_input_context(void);
+extern HIMC get_window_input_context( HWND hwnd );
+extern BOOL register_imm_window( HWND hwnd );
+extern void unregister_imm_window( HWND hwnd );

/* input.c */
-extern BOOL grab_pointer DECLSPEC_HIDDEN;
-extern BOOL grab_fullscreen DECLSPEC_HIDDEN;
-extern BOOL destroy_caret(void) DECLSPEC_HIDDEN;
-extern LONG global_key_state_counter DECLSPEC_HIDDEN;
-extern HWND get_active_window(void) DECLSPEC_HIDDEN;
-extern HWND get_capture(void) DECLSPEC_HIDDEN;
-extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN;
-extern HWND get_focus(void) DECLSPEC_HIDDEN;
-extern DWORD get_input_state(void) DECLSPEC_HIDDEN;
-extern BOOL release_capture(void) DECLSPEC_HIDDEN;
-extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN;
-extern BOOL set_caret_blink_time( unsigned int time ) DECLSPEC_HIDDEN;
-extern BOOL set_caret_pos( int x, int y ) DECLSPEC_HIDDEN;
-extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN;
-extern void toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN;
-extern void update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN;
-extern BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ) DECLSPEC_HIDDEN;
-extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN;
+extern BOOL grab_pointer;
+extern BOOL grab_fullscreen;
+extern BOOL destroy_caret(void);
+extern LONG global_key_state_counter;
+extern HWND get_active_window(void);
+extern HWND get_capture(void);
+extern BOOL get_cursor_pos( POINT *pt );
+extern HWND get_focus(void);
+extern DWORD get_input_state(void);
+extern BOOL release_capture(void);
+extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret );
+extern BOOL set_caret_blink_time( unsigned int time );
+extern BOOL set_caret_pos( int x, int y );
+extern BOOL set_foreground_window( HWND hwnd, BOOL mouse );
+extern void toggle_caret( HWND hwnd );
+extern void update_mouse_tracking_info( HWND hwnd );
+extern BOOL get_clip_cursor( RECT *rect );
+extern BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset );
+extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset );

/* menu.c */
-extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN;
-extern BOOL draw_menu_bar( HWND hwnd ) DECLSPEC_HIDDEN;
-extern UINT draw_nc_menu_bar( HDC hdc, RECT *rect, HWND hwnd ) DECLSPEC_HIDDEN;
-extern void end_menu( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN;
-extern UINT get_menu_bar_height( HWND hwnd, UINT width, INT org_x, INT org_y ) DECLSPEC_HIDDEN;
-extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN;
-extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN;
-extern UINT get_menu_state( HMENU handle, UINT item_id, UINT flags ) DECLSPEC_HIDDEN;
-extern HMENU get_window_sys_sub_menu( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL is_menu( HMENU handle ) DECLSPEC_HIDDEN;
-extern HWND is_menu_active(void) DECLSPEC_HIDDEN;
+extern HMENU create_menu( BOOL is_popup );
+extern BOOL draw_menu_bar( HWND hwnd );
+extern UINT draw_nc_menu_bar( HDC hdc, RECT *rect, HWND hwnd );
+extern void end_menu( HWND hwnd );
+extern HMENU get_menu( HWND hwnd );
+extern UINT get_menu_bar_height( HWND hwnd, UINT width, INT org_x, INT org_y );
+extern BOOL get_menu_info( HMENU handle, MENUINFO *info );
+extern INT get_menu_item_count( HMENU handle );
+extern UINT get_menu_state( HMENU handle, UINT item_id, UINT flags );
+extern HMENU get_window_sys_sub_menu( HWND hwnd );
+extern BOOL is_menu( HMENU handle );
+extern HWND is_menu_active(void);
 extern LRESULT popup_menu_window_proc( HWND hwnd, UINT message, WPARAM wparam,
-                                       LPARAM lparam ) DECLSPEC_HIDDEN;
-extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN;
-extern void track_keyboard_menu_bar( HWND hwnd, UINT wparam, WCHAR ch ) DECLSPEC_HIDDEN;
-extern void track_mouse_menu_bar( HWND hwnd, INT ht, int x, int y ) DECLSPEC_HIDDEN;
+                                       LPARAM lparam );
+extern BOOL set_window_menu( HWND hwnd, HMENU handle );
+extern void track_keyboard_menu_bar( HWND hwnd, UINT wparam, WCHAR ch );
+extern void track_mouse_menu_bar( HWND hwnd, INT ht, int x, int y );

/* message.c */
-extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN;
-extern BOOL reply_message_result( LRESULT result ) DECLSPEC_HIDDEN;
+extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id );
+extern BOOL reply_message_result( LRESULT result );
 extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput,
-                                       UINT flags ) DECLSPEC_HIDDEN;
+                                       UINT flags );
 extern LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam,
                                               LPARAM lparam, UINT flags, UINT timeout,
-                                              PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN;
-extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
-extern BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN;
+                                              PDWORD_PTR res_ptr );
+extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam );
+extern BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi );
 extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
-                                     UINT flags, UINT timeout, BOOL ansi ) DECLSPEC_HIDDEN;
+                                     UINT flags, UINT timeout, BOOL ansi );

/* rawinput.c */
-extern BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) DECLSPEC_HIDDEN;
-extern BOOL rawinput_device_get_usages( HANDLE handle, USHORT *usage_page, USHORT *usage ) DECLSPEC_HIDDEN;
+extern BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data );
+extern BOOL rawinput_device_get_usages( HANDLE handle, USHORT *usage_page, USHORT *usage );

/* scroll.c */
-extern void draw_nc_scrollbar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) DECLSPEC_HIDDEN;
-extern BOOL get_scroll_info( HWND hwnd, INT bar, SCROLLINFO *info ) DECLSPEC_HIDDEN;
-extern void handle_scroll_event( HWND hwnd, INT bar, UINT msg, POINT pt ) DECLSPEC_HIDDEN;
+extern void draw_nc_scrollbar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical );
+extern BOOL get_scroll_info( HWND hwnd, INT bar, SCROLLINFO *info );
+extern void handle_scroll_event( HWND hwnd, INT bar, UINT msg, POINT pt );
 extern LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
-                                       BOOL ansi ) DECLSPEC_HIDDEN;
-extern void set_standard_scroll_painted( HWND hwnd, int bar, BOOL painted ) DECLSPEC_HIDDEN;
-extern void track_scroll_bar( HWND hwnd, int scrollbar, POINT pt ) DECLSPEC_HIDDEN;
+                                       BOOL ansi );
+extern void set_standard_scroll_painted( HWND hwnd, int bar, BOOL painted );
+extern void track_scroll_bar( HWND hwnd, int scrollbar, POINT pt );

/* sysparams.c */
-extern BOOL enable_thunk_lock DECLSPEC_HIDDEN;
-extern HBRUSH get_55aa_brush(void) DECLSPEC_HIDDEN;
-extern DWORD get_dialog_base_units(void) DECLSPEC_HIDDEN;
-extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, int *height ) DECLSPEC_HIDDEN;
-extern INT get_display_depth( UNICODE_STRING *name ) DECLSPEC_HIDDEN;
-extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN;
-extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN;
-extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN;
-extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN;
-extern RECT get_primary_monitor_rect( UINT dpi ) DECLSPEC_HIDDEN;
-extern DWORD get_process_layout(void) DECLSPEC_HIDDEN;
-extern COLORREF get_sys_color( int index ) DECLSPEC_HIDDEN;
-extern HBRUSH get_sys_color_brush( unsigned int index ) DECLSPEC_HIDDEN;
-extern HPEN get_sys_color_pen( unsigned int index ) DECLSPEC_HIDDEN;
-extern UINT get_system_dpi(void) DECLSPEC_HIDDEN;
-extern int get_system_metrics( int index ) DECLSPEC_HIDDEN;
-extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN;
-extern DPI_AWARENESS get_thread_dpi_awareness(void) DECLSPEC_HIDDEN;
-extern RECT get_virtual_screen_rect( UINT dpi ) DECLSPEC_HIDDEN;
-extern BOOL is_exiting_thread( DWORD tid ) DECLSPEC_HIDDEN;
-extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN;
-extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN;
-extern BOOL message_beep( UINT i ) DECLSPEC_HIDDEN;
-extern POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN;
-extern POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN;
-extern RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN;
-extern HMONITOR monitor_from_point( POINT pt, UINT flags, UINT dpi ) DECLSPEC_HIDDEN;
-extern HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) DECLSPEC_HIDDEN;
-extern HMONITOR monitor_from_window( HWND hwnd, UINT flags, UINT dpi ) DECLSPEC_HIDDEN;
-extern BOOL update_display_cache( BOOL force ) DECLSPEC_HIDDEN;
-extern void user_lock(void) DECLSPEC_HIDDEN;
-extern void user_unlock(void) DECLSPEC_HIDDEN;
-extern void user_check_not_lock(void) DECLSPEC_HIDDEN;
+extern BOOL enable_thunk_lock;
+extern HBRUSH get_55aa_brush(void);
+extern DWORD get_dialog_base_units(void);
+extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, int *height );
+extern INT get_display_depth( UNICODE_STRING *name );
+extern RECT get_display_rect( const WCHAR *display );
+extern UINT get_monitor_dpi( HMONITOR monitor );
+extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info );
+extern UINT get_win_monitor_dpi( HWND hwnd );
+extern RECT get_primary_monitor_rect( UINT dpi );
+extern DWORD get_process_layout(void);
+extern COLORREF get_sys_color( int index );
+extern HBRUSH get_sys_color_brush( unsigned int index );
+extern HPEN get_sys_color_pen( unsigned int index );
+extern UINT get_system_dpi(void);
+extern int get_system_metrics( int index );
+extern UINT get_thread_dpi(void);
+extern DPI_AWARENESS get_thread_dpi_awareness(void);
+extern RECT get_virtual_screen_rect( UINT dpi );
+extern BOOL is_exiting_thread( DWORD tid );
+extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to );
+extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to );
+extern BOOL message_beep( UINT i );
+extern POINT point_phys_to_win_dpi( HWND hwnd, POINT pt );
+extern POINT point_thread_to_win_dpi( HWND hwnd, POINT pt );
+extern RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect );
+extern HMONITOR monitor_from_point( POINT pt, UINT flags, UINT dpi );
+extern HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi );
+extern HMONITOR monitor_from_window( HWND hwnd, UINT flags, UINT dpi );
+extern BOOL update_display_cache( BOOL force );
+extern void user_lock(void);
+extern void user_unlock(void);
+extern void user_check_not_lock(void);

/* winstation.c */
-extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN;
+extern BOOL is_virtual_desktop(void);

/* window.c */
 struct tagWND;
-extern HDWP begin_defer_window_pos( INT count ) DECLSPEC_HIDDEN;
-extern BOOL client_to_screen( HWND hwnd, POINT *pt ) DECLSPEC_HIDDEN;
-extern void destroy_thread_windows(void) DECLSPEC_HIDDEN;
-extern LRESULT destroy_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL enable_window( HWND hwnd, BOOL enable ) DECLSPEC_HIDDEN;
-extern BOOL get_client_rect( HWND hwnd, RECT *rect ) DECLSPEC_HIDDEN;
-extern HWND get_desktop_window(void) DECLSPEC_HIDDEN;
-extern UINT get_dpi_for_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HWND get_full_window_handle( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HWND get_parent( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN;
-extern DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) DECLSPEC_HIDDEN;
-extern MINMAXINFO get_min_max_info( HWND hwnd ) DECLSPEC_HIDDEN;
-extern DWORD get_window_context_help_id( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HWND get_window_relative( HWND hwnd, UINT rel ) DECLSPEC_HIDDEN;
-extern DWORD get_window_thread( HWND hwnd, DWORD *process ) DECLSPEC_HIDDEN;
-extern HWND is_current_process_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HWND is_current_thread_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL is_iconic( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL is_window_drawable( HWND hwnd, BOOL icon ) DECLSPEC_HIDDEN;
-extern BOOL is_window_enabled( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL is_window_unicode( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL is_window_visible( HWND hwnd ) DECLSPEC_HIDDEN;
-extern BOOL is_zoomed( HWND hwnd ) DECLSPEC_HIDDEN;
-extern DWORD get_window_long( HWND hwnd, INT offset ) DECLSPEC_HIDDEN;
-extern ULONG_PTR get_window_long_ptr( HWND hwnd, INT offset, BOOL ansi ) DECLSPEC_HIDDEN;
-extern BOOL get_window_rect( HWND hwnd, RECT *rect, UINT dpi ) DECLSPEC_HIDDEN;
+extern HDWP begin_defer_window_pos( INT count );
+extern BOOL client_to_screen( HWND hwnd, POINT *pt );
+extern void destroy_thread_windows(void);
+extern LRESULT destroy_window( HWND hwnd );
+extern BOOL enable_window( HWND hwnd, BOOL enable );
+extern BOOL get_client_rect( HWND hwnd, RECT *rect );
+extern HWND get_desktop_window(void);
+extern UINT get_dpi_for_window( HWND hwnd );
+extern HWND get_full_window_handle( HWND hwnd );
+extern HWND get_parent( HWND hwnd );
+extern HWND get_hwnd_message_parent(void);
+extern DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd );
+extern MINMAXINFO get_min_max_info( HWND hwnd );
+extern DWORD get_window_context_help_id( HWND hwnd );
+extern HWND get_window_relative( HWND hwnd, UINT rel );
+extern DWORD get_window_thread( HWND hwnd, DWORD *process );
+extern HWND is_current_process_window( HWND hwnd );
+extern HWND is_current_thread_window( HWND hwnd );
+extern BOOL is_desktop_window( HWND hwnd );
+extern BOOL is_iconic( HWND hwnd );
+extern BOOL is_window_drawable( HWND hwnd, BOOL icon );
+extern BOOL is_window_enabled( HWND hwnd );
+extern BOOL is_window_unicode( HWND hwnd );
+extern BOOL is_window_visible( HWND hwnd );
+extern BOOL is_zoomed( HWND hwnd );
+extern DWORD get_window_long( HWND hwnd, INT offset );
+extern ULONG_PTR get_window_long_ptr( HWND hwnd, INT offset, BOOL ansi );
+extern BOOL get_window_rect( HWND hwnd, RECT *rect, UINT dpi );
 enum coords_relative;
 extern BOOL get_window_rects( HWND hwnd, enum coords_relative relative, RECT *window_rect,
-                              RECT *client_rect, UINT dpi ) DECLSPEC_HIDDEN;
+                              RECT *client_rect, UINT dpi );
 extern HWND *list_window_children( HDESK desktop, HWND hwnd, UNICODE_STRING *class,
-                                   DWORD tid ) DECLSPEC_HIDDEN;
+                                   DWORD tid );
 extern int map_window_points( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count,
-                              UINT dpi ) DECLSPEC_HIDDEN;
-extern void map_window_region( HWND from, HWND to, HRGN hrgn ) DECLSPEC_HIDDEN;
-extern BOOL screen_to_client( HWND hwnd, POINT *pt ) DECLSPEC_HIDDEN;
+                              UINT dpi );
+extern void map_window_region( HWND from, HWND to, HRGN hrgn );
+extern BOOL screen_to_client( HWND hwnd, POINT *pt );
 extern LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval,
-                                 BOOL ansi ) DECLSPEC_HIDDEN;
-extern BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ) DECLSPEC_HIDDEN;
-extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN;
-extern BOOL show_owned_popups( HWND owner, BOOL show ) DECLSPEC_HIDDEN;
-extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) DECLSPEC_HIDDEN;
-extern HWND get_shell_window(void) DECLSPEC_HIDDEN;
-extern HWND get_progman_window(void) DECLSPEC_HIDDEN;
-extern HWND set_progman_window( HWND hwnd ) DECLSPEC_HIDDEN;
-extern HWND get_taskman_window(void) DECLSPEC_HIDDEN;
-extern HWND set_taskman_window( HWND hwnd ) DECLSPEC_HIDDEN;
+                                 BOOL ansi );
+extern BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y );
+extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits );
+extern BOOL show_owned_popups( HWND owner, BOOL show );
+extern void update_window_state( HWND hwnd );
+extern HWND window_from_point( HWND hwnd, POINT pt, INT *hittest );
+extern HWND get_shell_window(void);
+extern HWND get_progman_window(void);
+extern HWND set_progman_window( HWND hwnd );
+extern HWND get_taskman_window(void);
+extern HWND set_taskman_window( HWND hwnd );

/* to release pointers retrieved by win_get_ptr */
 static inline void release_win_ptr( struct tagWND *ptr )
@@ -248,28 +248,28 @@ static inline void release_win_ptr( struct tagWND *ptr )
     user_unlock();
 }

-extern void gdi_init(void) DECLSPEC_HIDDEN;
-extern void winstation_init(void) DECLSPEC_HIDDEN;
-extern void sysparams_init(void) DECLSPEC_HIDDEN;
-extern int muldiv( int a, int b, int c ) DECLSPEC_HIDDEN;
+extern void gdi_init(void);
+extern void winstation_init(void);
+extern void sysparams_init(void);
+extern int muldiv( int a, int b, int c );

extern HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len,
-                            DWORD options, DWORD *disposition ) DECLSPEC_HIDDEN;
-extern HKEY reg_open_hkcu_key( const char *name ) DECLSPEC_HIDDEN;
-extern HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) DECLSPEC_HIDDEN;
+                            DWORD options, DWORD *disposition );
+extern HKEY reg_open_hkcu_key( const char *name );
+extern HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len );
 extern ULONG query_reg_value( HKEY hkey, const WCHAR *name,
-                              KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) DECLSPEC_HIDDEN;
+                              KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size );
 extern ULONG query_reg_ascii_value( HKEY hkey, const char *name,
-                                    KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) DECLSPEC_HIDDEN;
-extern void set_reg_ascii_value( HKEY hkey, const char *name, const char *value ) DECLSPEC_HIDDEN;
+                                    KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size );
+extern void set_reg_ascii_value( HKEY hkey, const char *name, const char *value );
 extern BOOL set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void *value,
-                           DWORD count ) DECLSPEC_HIDDEN;
-extern BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) DECLSPEC_HIDDEN;
-extern void reg_delete_value( HKEY hkey, const WCHAR *name ) DECLSPEC_HIDDEN;
+                           DWORD count );
+extern BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len );
+extern void reg_delete_value( HKEY hkey, const WCHAR *name );

-extern HKEY hkcu_key DECLSPEC_HIDDEN;
+extern HKEY hkcu_key;

-extern const struct user_driver_funcs *user_driver DECLSPEC_HIDDEN;
+extern const struct user_driver_funcs *user_driver;

static inline BOOL set_ntstatus( NTSTATUS status )
 {
@@ -282,17 +282,17 @@ static inline WCHAR win32u_towupper( WCHAR ch )
     return RtlUpcaseUnicodeChar( ch );
 }

-extern CPTABLEINFO ansi_cp DECLSPEC_HIDDEN;
+extern CPTABLEINFO ansi_cp;

-CPTABLEINFO *get_cptable( WORD cp ) DECLSPEC_HIDDEN;
-const NLS_LOCALE_DATA *get_locale_data( LCID lcid ) DECLSPEC_HIDDEN;
-extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) DECLSPEC_HIDDEN;
+CPTABLEINFO *get_cptable( WORD cp );
+const NLS_LOCALE_DATA *get_locale_data( LCID lcid );
+extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags );
 DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src,
-                     DWORD srclen ) DECLSPEC_HIDDEN;
+                     DWORD srclen );
 DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src,
-                     DWORD srclen ) DECLSPEC_HIDDEN;
-DWORD win32u_wctomb_size( CPTABLEINFO *info, const WCHAR *src, DWORD srclen ) DECLSPEC_HIDDEN;
-DWORD win32u_mbtowc_size( CPTABLEINFO *info, const char *src, DWORD srclen ) DECLSPEC_HIDDEN;
+                     DWORD srclen );
+DWORD win32u_wctomb_size( CPTABLEINFO *info, const WCHAR *src, DWORD srclen );
+DWORD win32u_mbtowc_size( CPTABLEINFO *info, const char *src, DWORD srclen );

static inline WCHAR *win32u_wcsdup( const WCHAR *str )
 {

[Rémi Bernon (＠rbernon)]

Rémi Bernon (@rbernon) commented about dlls/win32u/dibdrv/dibdrv.h:
> -extern const primitive_funcs funcs_24   DECLSPEC_HIDDEN;
> -extern const primitive_funcs funcs_555  DECLSPEC_HIDDEN;
> -extern const primitive_funcs funcs_16   DECLSPEC_HIDDEN;
> -extern const primitive_funcs funcs_8    DECLSPEC_HIDDEN;
> -extern const primitive_funcs funcs_4    DECLSPEC_HIDDEN;
> -extern const primitive_funcs funcs_1    DECLSPEC_HIDDEN;
> -extern const primitive_funcs funcs_null DECLSPEC_HIDDEN;
> +extern const primitive_funcs funcs_8888;
> +extern const primitive_funcs funcs_32  ;
> +extern const primitive_funcs funcs_24  ;
> +extern const primitive_funcs funcs_555 ;
> +extern const primitive_funcs funcs_16  ;
> +extern const primitive_funcs funcs_8   ;
> +extern const primitive_funcs funcs_4   ;
> +extern const primitive_funcs funcs_1   ;
> +extern const primitive_funcs funcs_null;

```suggestion:-8+0
extern const primitive_funcs funcs_8888;
extern const primitive_funcs funcs_32;
extern const primitive_funcs funcs_24;
extern const primitive_funcs funcs_555;
extern const primitive_funcs funcs_16;
extern const primitive_funcs funcs_8;
extern const primitive_funcs funcs_4;
extern const primitive_funcs funcs_1;
extern const primitive_funcs funcs_null;
```

[Rémi Bernon (＠rbernon)]

Do we actually want to expose every function in unix .so library to other .so libraries?

[Jacek Caban (＠jacek)]

On Thu Jul  6 11:19:11 2023 +0000, Rémi Bernon wrote:
> Do we actually want to expose every non-static function in unix .so
> library to other .so libraries?

No, not really. Alistair, DECLSPEC_HIDDEN is still meaningful in unixlibs, it's no-op only in PE modules.

[Alistair Leslie-Hughes (＠alesliehughes)]

On Thu Jul  6 11:19:11 2023 +0000, Jacek Caban wrote:
> No, not really. Alistair, DECLSPEC_HIDDEN is still meaningful in
> unixlibs, it's no-op only in PE modules.

Thanks for Clarification.

I'll update it be only for the PE side (unless I've misunderstood).

[PATCH 0/1] MR3255: win32u: Remove DECLSPEC_HIDDEN usage. - closed

[Alistair Leslie-Hughes (＠alesliehughes)]

This merge request was closed by Alistair Leslie-Hughes.