Ken Thomases : winex11: Remove set-but-never-read hwnd and fbconfig_id fields of struct x11drv_escape_set_drawable.
Alexandre Julliard
julliard at winehq.org
Tue Apr 1 14:32:01 CDT 2014
Module: wine
Branch: master
Commit: 809166def711a8261647a31fb370a0d11c64971f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=809166def711a8261647a31fb370a0d11c64971f
Author: Ken Thomases <ken at codeweavers.com>
Date: Mon Mar 31 21:47:04 2014 -0500
winex11: Remove set-but-never-read hwnd and fbconfig_id fields of struct x11drv_escape_set_drawable.
---
dlls/winex11.drv/opengl.c | 2 --
dlls/winex11.drv/window.c | 8 ++------
dlls/winex11.drv/x11drv.h | 2 --
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 85231f0..0077ac3 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -2323,11 +2323,9 @@ static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object )
LeaveCriticalSection( &context_section );
escape.code = X11DRV_SET_DRAWABLE;
- escape.hwnd = 0;
escape.drawable = object->drawable;
escape.mode = IncludeInferiors;
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 );
TRACE( "(%p)->(%p)\n", object, hdc );
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 2ca5ec2..a9caa0d 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -1970,10 +1970,8 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,
struct x11drv_escape_set_drawable escape;
HWND parent;
- escape.code = X11DRV_SET_DRAWABLE;
- escape.hwnd = hwnd;
- escape.mode = IncludeInferiors;
- escape.fbconfig_id = 0;
+ escape.code = X11DRV_SET_DRAWABLE;
+ escape.mode = IncludeInferiors;
escape.dc_rect.left = win_rect->left - top_rect->left;
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;
escape.code = X11DRV_SET_DRAWABLE;
- escape.hwnd = GetDesktopWindow();
escape.drawable = root_window;
escape.mode = IncludeInferiors;
escape.dc_rect = get_virtual_screen_rect();
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 );
}
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 9008db6..7a3374d 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -283,11 +283,9 @@ enum x11drv_escape_codes
struct x11drv_escape_set_drawable
{
enum x11drv_escape_codes code; /* escape code (X11DRV_SET_DRAWABLE) */
- HWND hwnd; /* window for this drawable */
Drawable drawable; /* X drawable */
int mode; /* ClipByChildren or IncludeInferiors */
RECT dc_rect; /* DC rectangle relative to drawable */
- XID fbconfig_id; /* fbconfig id used by the GL drawable */
};
struct x11drv_escape_get_drawable
More information about the wine-cvs
mailing list