CVS: winex/dlls/x11drv glx.c, 1.157, 1.158 glx_private.h, 1.23, 1.24

Subject: winex/dlls/x11drv glx.c,1.157,1.158 glx_private.h,1.23,1.24Update of /var/lib/cvsd/cvsroot/winex/dlls/x11drv
In directory agravaine:/tmp/cvs-serv18875/dlls/x11drv

Modified Files:
	glx.c glx_private.h 
Log Message:

- remove unused unix_tid from x11drv and __wine_send_user_signal
- remove no longer necessary raise_signal_if_unexpected_thread



Index: glx.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/x11drv/glx.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- glx.c	27 Mar 2007 13:59:07 -0000	1.157
+++ glx.c	26 Apr 2007 20:30:54 -0000	1.158
@@ -58,7 +58,7 @@
 extern void X11DRV_DD_Update(void);
 extern void X11DRV_DD_PrimaryReset(void);
 
-extern int __wine_send_user_signal(DWORD tid, pid_t unix_tid);
+extern int __wine_send_user_signal(DWORD tid);
 
 DWORD X11DRV_GLX_TLS = INVALID_HANDLE_VALUE;
 
@@ -1286,10 +1286,8 @@
       TRACE("cleared (1) to: ctx %p, draw %08lx\n", old_ctx->save_ctx, old_ctx->save_draw);
     } else TRACE("skipped clear (1)\n");
 
-    if (tid == GetCurrentThreadId()) {
+    if (tid == GetCurrentThreadId())
       parent->owner_tid = 0;
-      parent->owner_unix_tid = 0;
-    }
     if (&parent->p != old_ctx) {
       TRACE("killing slave context %p (ctx %p, parent=%p)\n", old_ctx, old_ctx->ctx, parent);
       if (old_ctx->prev) old_ctx->prev->next = old_ctx->next;
@@ -1384,7 +1382,7 @@
     if (ctx->owner_tid) {
       TRACE("requesting context from owner thread\n");
       /* invoke owner thread's X11DRV_GLX_UserSignal handler */
-      __wine_send_user_signal(ctx->owner_tid, ctx->owner_unix_tid);
+      __wine_send_user_signal(ctx->owner_tid);
       do {
         int v;
         read(ctx->sync_pipe[0], &v, sizeof(v));
@@ -1513,7 +1511,6 @@
       TRACE("rendering to GL_FRONT\n");
     }
     ctx->owner_tid = GetCurrentThreadId();
-    ctx->owner_unix_tid = wine_gettid();
     ctx->owner_ctx = new_ctx->ctx;
     ctx->owner_last_draw = tgt->draw;
     X11DRV_GLX_SetCurrentT(new_ctx);
@@ -1563,10 +1560,8 @@
   glXMakeCurrent(gdi_display, old_ctx->save_draw, old_ctx->save_ctx);
   old_ctx->last_draw = 0;
   TRACE("cleared to: ctx %p, draw %08lx\n", old_ctx->save_ctx, old_ctx->save_draw);
-  if (tid == GetCurrentThreadId()) {
+  if (tid == GetCurrentThreadId())
     parent->owner_tid = 0;
-    parent->owner_unix_tid = 0;
-  }
   if (dont_free) return TRUE;
   if (&parent->p != old_ctx) {
     TRACE("killing slave context %p (ctx %p, parent=%p)\n", old_ctx, old_ctx->ctx, parent);
@@ -1752,7 +1747,7 @@
   if (data->u2.lpDDSLcl) {
     X11DRV_GLX_KillCurrent(ctx);
     glXDestroyContext(gdi_display, ctx->p.ctx);
-    ctx->p.ctx = 0; ctx->owner_ctx = 0; ctx->owner_tid = 0; ctx->owner_unix_tid = 0; ctx->owner_last_draw = 0;
+    ctx->p.ctx = 0; ctx->owner_ctx = 0; ctx->owner_tid = 0; ctx->owner_last_draw = 0;
     template.visualid = XVisualIDFromVisual(visual);
     if (ctx->vis) XFree(ctx->vis);
     ctx->vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num);

Index: glx_private.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/x11drv/glx_private.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- glx_private.h	28 Jul 2004 17:58:32 -0000	1.23
+++ glx_private.h	26 Apr 2007 20:30:54 -0000	1.24
@@ -93,7 +93,6 @@
 
   XVisualInfo*	vis;
   DWORD		owner_tid;
-  pid_t		owner_unix_tid;
   GLXContext	owner_ctx;
   GLXDrawable	owner_last_draw;
   BOOL		borked, cant_copy;