system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

user32: Get rid of __wine_set_pixel_format.

Browse source 
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>
This commit is contained in:
Jacek Caban 2022-04-13 15:09:19 +02:00 committed by Alexandre Julliard
parent 55f4cf8c85
commit 0953de5cab
7 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/opengl32/make_opengl
View file

@ -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;

8
dlls/user32/user32.spec
View file

@ -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)

9
dlls/user32/win.c
View file

@ -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.@)
*/

2
dlls/wineandroid.drv/opengl.c
View file

@ -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;
}

2
dlls/winemac.drv/opengl.c
View file

@ -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;
}

4
dlls/winex11.drv/opengl.c
View file

@ -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 );
}

1
include/wine/wgl_driver.h
View file

@ -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 */