ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Remove set-but-never-read hwnd and fbconfig_id fields of struct x11drv_escape_set_drawable.

This commit is contained in:
Ken Thomases 2014-03-31 21:47:04 -05:00 committed by Alexandre Julliard
parent 4325ecdca8
commit 809166def7
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/winex11.drv/opengl.c
View File

@ -2323,11 +2323,9 @@ static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object )
LeaveCriticalSection( &context_section ); LeaveCriticalSection( &context_section );
escape.code = X11DRV_SET_DRAWABLE; escape.code = X11DRV_SET_DRAWABLE;
escape.hwnd = 0;
escape.drawable = object->drawable; escape.drawable = object->drawable;
escape.mode = IncludeInferiors; escape.mode = IncludeInferiors;
SetRect( &escape.dc_rect, 0, 0, object->width, object->height ); SetRect( &escape.dc_rect, 0, 0, object->width, object->height );
escape.fbconfig_id = object->fmt->fmt_id;
ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL );
TRACE( "(%p)->(%p)\n", object, hdc ); TRACE( "(%p)->(%p)\n", object, hdc );

8
dlls/winex11.drv/window.c
View File

@ -1970,10 +1970,8 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,
struct x11drv_escape_set_drawable escape; struct x11drv_escape_set_drawable escape;
HWND parent; HWND parent;
escape.code = X11DRV_SET_DRAWABLE; escape.code = X11DRV_SET_DRAWABLE;
escape.hwnd = hwnd; escape.mode = IncludeInferiors;
escape.mode = IncludeInferiors;
escape.fbconfig_id = 0;
escape.dc_rect.left = win_rect->left - top_rect->left; escape.dc_rect.left = win_rect->left - top_rect->left;
escape.dc_rect.top = win_rect->top - top_rect->top; escape.dc_rect.top = win_rect->top - top_rect->top;
@ -2019,12 +2017,10 @@ void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc )
struct x11drv_escape_set_drawable escape; struct x11drv_escape_set_drawable escape;
escape.code = X11DRV_SET_DRAWABLE; escape.code = X11DRV_SET_DRAWABLE;
escape.hwnd = GetDesktopWindow();
escape.drawable = root_window; escape.drawable = root_window;
escape.mode = IncludeInferiors; escape.mode = IncludeInferiors;
escape.dc_rect = get_virtual_screen_rect(); escape.dc_rect = get_virtual_screen_rect();
OffsetRect( &escape.dc_rect, -2 * escape.dc_rect.left, -2 * escape.dc_rect.top ); OffsetRect( &escape.dc_rect, -2 * escape.dc_rect.left, -2 * escape.dc_rect.top );
escape.fbconfig_id = 0;
ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL );
} }

2
dlls/winex11.drv/x11drv.h
View File

@ -283,11 +283,9 @@ enum x11drv_escape_codes
struct x11drv_escape_set_drawable struct x11drv_escape_set_drawable
{ {
enum x11drv_escape_codes code; /* escape code (X11DRV_SET_DRAWABLE) */ enum x11drv_escape_codes code; /* escape code (X11DRV_SET_DRAWABLE) */
HWND hwnd; /* window for this drawable */
Drawable drawable; /* X drawable */ Drawable drawable; /* X drawable */
int mode; /* ClipByChildren or IncludeInferiors */ int mode; /* ClipByChildren or IncludeInferiors */
RECT dc_rect; /* DC rectangle relative to drawable */ RECT dc_rect; /* DC rectangle relative to drawable */
XID fbconfig_id; /* fbconfig id used by the GL drawable */
}; };
struct x11drv_escape_get_drawable struct x11drv_escape_get_drawable