[PATCH 0/5] MR2031: win32u: Make more definition static or hidden.

[PATCH 1/5] win32u: Make DrawTextW() hidden.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/win32u/font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index c3ba1a9a377..742a31b59a4 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -7083,7 +7083,7 @@ BOOL WINAPI NtGdiGetCharWidthInfo( HDC hdc, struct char_width_info *info )
 /***********************************************************************
  *           DrawTextW    (win32u.so)
  */
-INT WINAPI DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT *rect, UINT flags )
+INT WINAPI DECLSPEC_HIDDEN DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT *rect, UINT flags )
 {
     struct draw_text_params *params;
     ULONG ret_len, size;

[PATCH 2/5] win32u: Make get_winproc_ptr() static.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/win32u/class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c
index 9f3b4251e65..396e2285797 100644
--- a/dlls/win32u/class.c
+++ b/dlls/win32u/class.c
@@ -108,7 +108,7 @@ static WINDOWPROC *find_winproc( WNDPROC func, BOOL ansi )

/* return the window proc for a given handle, or NULL for an invalid handle,
  * or WINPROC_PROC16 for a handle to a 16-bit proc. */
-WINDOWPROC *get_winproc_ptr( WNDPROC handle )
+static WINDOWPROC *get_winproc_ptr( WNDPROC handle )
 {
     UINT index = LOWORD(handle);
     if ((ULONG_PTR)handle >> 16 != WINPROC_HANDLE) return NULL;

[PATCH 3/5] win32u: Make ImmProcessKey() hidden.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/win32u/imm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c
index e9d7c699130..554e3b632b3 100644
--- a/dlls/win32u/imm.c
+++ b/dlls/win32u/imm.c
@@ -394,7 +394,7 @@ void cleanup_imm_thread(void)
     NtUserDestroyInputContext( UlongToHandle( thread_info->client_info.default_imc ));
 }

-BOOL WINAPI ImmProcessKey( HWND hwnd, HKL hkl, UINT vkey, LPARAM key_data, DWORD unknown )
+BOOL WINAPI DECLSPEC_HIDDEN 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 };

[PATCH 4/5] win32u: Make ImmTranslateMessage() hidden.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/win32u/imm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c
index 554e3b632b3..54e1ef3662a 100644
--- a/dlls/win32u/imm.c
+++ b/dlls/win32u/imm.c
@@ -403,7 +403,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 ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM key_data )
+BOOL WINAPI DECLSPEC_HIDDEN 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 };

[PATCH 5/5] win32u: Make is_child() hidden.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/win32u/ntuser_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
index 4e13822c6fb..385e7c0ded5 100644
--- a/dlls/win32u/ntuser_private.h
+++ b/dlls/win32u/ntuser_private.h
@@ -253,7 +253,7 @@ static inline UINT win_get_flags( HWND hwnd )
 }

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

#endif /* __WINE_NTUSER_PRIVATE_H */

[PATCH 0/5] MR2031: win32u: Make more definition static or hidden. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.