Module: wine Branch: master Commit: 0953de5cab03d4582ae4e5c900cec7bf7223a46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0953de5cab03d4582ae4e5c90...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Apr 13 15:09:19 2022 +0200
user32: Get rid of __wine_set_pixel_format.
Use NtUserSetWindowPixelFormat in drivers instead.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/opengl32/make_opengl | 3 +-- dlls/user32/user32.spec | 8 -------- dlls/user32/win.c | 9 --------- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- include/wine/wgl_driver.h | 1 - 7 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index ebfd3c9161e..09531731f8d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -645,8 +645,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n";
-print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n"; -print HEADER "extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format );\n\n"; +print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER;
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4bd42fea425..af63ae007a1 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -831,11 +831,3 @@ @ varargs wsprintfW(wstr wstr) @ stdcall wvsprintfA(ptr str ptr) @ stdcall wvsprintfW(ptr wstr ptr) - -################################################################ -# Wine internal extensions -# -# All functions must be prefixed with '__wine_' (for internal functions) -# or 'wine_' (for user-visible functions) to avoid namespace conflicts. -# -@ cdecl __wine_set_pixel_format(long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index de0dc2f2fb7..f5c22bfbadc 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1698,15 +1698,6 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) }
-/*********************************************************************** - * __wine_set_pixel_format - */ -BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) -{ - return NtUserSetWindowPixelFormat( hwnd, format ); -} - - /***************************************************************************** * UpdateLayeredWindowIndirect (USER32.@) */ diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 3d18f99fb1a..9f20e51b8da 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -245,7 +245,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl );
if (prev && prev != format && !allow_change) return FALSE; - if (__wine_set_pixel_format( hwnd, format )) return TRUE; + if (NtUserSetWindowPixelFormat( hwnd, format )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ca7c45aa966..d61d0a6ea66 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1600,7 +1600,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset)
done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) __wine_set_pixel_format(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) NtUserSetWindowPixelFormat(hwnd, fmt); return ret; }
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 422f52a521a..ba38549e0e4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1398,7 +1398,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl );
- __wine_set_pixel_format( hwnd, pixel_format_index( format )); + NtUserSetWindowPixelFormat( hwnd, pixel_format_index( format )); return TRUE; }
@@ -1508,7 +1508,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - __wine_set_pixel_format( hwnd, 0 ); + NtUserSetWindowPixelFormat( hwnd, 0 ); } release_gl_drawable( old ); } diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index f077a3d0f09..36b1f384ddf 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -3406,6 +3406,5 @@ struct opengl_funcs USE_GL_FUNC(glViewport)
extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); -extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format );
#endif /* __WINE_WGL_DRIVER_H */