svn merge ^/branches/released .

3 files changed, 172 insertions, 168 deletions

diff --git a/xorg-server/hw/xfree86/ddc/ddc.c b/xorg-server/hw/xfree86/ddc/ddc.c
index 3b70ce508..975e07620 100644
--- a/xorg-server/hw/xfree86/ddc/ddc.c
+++ b/xorg-server/hw/xfree86/ddc/ddc.c
@@ -102,7 +102,7 @@ resort(unsigned char *s_block)
 }

 

 static int

-DDC_checksum(unsigned char *block, int len)

+DDC_checksum(const unsigned char *block, int len)

 {

     int i, result = 0;

     int not_null = 0;

@@ -149,7 +149,10 @@ GetEDID_DDC1(unsigned int *s_ptr)
 	d_pos++;

     }

     free(s_ptr);

-    if (d_block && DDC_checksum(d_block,EDID1_LEN)) return NULL;

+    if (d_block && DDC_checksum(d_block,EDID1_LEN)) {

+	free(d_block);

+	return NULL;

+    }

     return (resort(d_block));

 }

 

diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index b432ec750..718727ebe 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -271,8 +271,7 @@ static void __glXAquaContextDestroy(__GLXcontext *baseContext) {
 

     __GLXAquaContext *context = (__GLXAquaContext *) baseContext;

     

-    GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx 0x%x)\n",

-                     (unsigned int) baseContext);

+    GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx %p)\n", baseContext);

     if (context != NULL) {

       if (context->sid != 0 && surface_hash != NULL) {

 		lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);

@@ -321,7 +320,7 @@ static void surface_notify(void *_arg, void *data) {
     case AppleDRISurfaceNotifyDestroyed:

         if (surface_hash != NULL)

             x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));

-	draw->base.pDraw = NULL;

+	draw->pDraw = NULL;

 	draw->sid = 0;

         break;

 

diff --git a/xorg-server/hw/xquartz/pbproxy/main.m b/xorg-server/hw/xquartz/pbproxy/main.m
index 560cf0182..cfdc7696d 100644
--- a/xorg-server/hw/xquartz/pbproxy/main.m
+++ b/xorg-server/hw/xquartz/pbproxy/main.m
@@ -1,163 +1,165 @@
-/* main.m
-   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization.
- */
-
-#include "pbproxy.h"
-#import "x-selection.h"
-
-#include <pthread.h>
-#include <unistd.h>
-#include <X11/extensions/applewm.h>
-
-Display *xpbproxy_dpy;
-int xpbproxy_apple_wm_event_base, xpbproxy_apple_wm_error_base;
-int xpbproxy_xfixes_event_base, xpbproxy_xfixes_error_base;
-BOOL xpbproxy_have_xfixes;
-
-extern char *display;
-
-#ifdef STANDALONE_XPBPROXY
-BOOL xpbproxy_is_standalone = NO;
-#endif
-
-x_selection *_selection_object;
-
-extern BOOL serverInitComplete;
-extern pthread_mutex_t serverInitCompleteMutex;
-extern pthread_cond_t serverInitCompleteCond;
-
-static inline void wait_for_server_init(void) {
-    /* If the server hasn't finished initializing, wait for it... */
-    if(!serverInitComplete) {
-        pthread_mutex_lock(&serverInitCompleteMutex);
-        while(!serverInitComplete)
-            pthread_cond_wait(&serverInitCompleteCond, &serverInitCompleteMutex);
-        pthread_mutex_unlock(&serverInitCompleteMutex);
-    }
-}
-
-static int x_io_error_handler (Display *dpy) {
-    /* We lost our connection to the server. */
-    
-    TRACE ();
-
-    /* trigger the thread to restart?
-     *   NO - this would be to a "deeper" problem, and restarts would just
-     *        make things worse...
-     */
-#ifdef STANDALONE_XPBPROXY
-    if(xpbproxy_is_standalone)
-        exit(EXIT_FAILURE);
-#endif
-
-    return 0;
-}
-
-static int x_error_handler (Display *dpy, XErrorEvent *errevent) {
-    return 0;
-}
-
-int xpbproxy_run (void) {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    size_t i;
-    
-    wait_for_server_init();
-    
-    for(i=0, xpbproxy_dpy=NULL; !xpbproxy_dpy && i<5; i++) {
-        xpbproxy_dpy = XOpenDisplay(NULL);
-        
-        if(!xpbproxy_dpy && display) {
-            char _display[32];
-            snprintf(_display, sizeof(_display), ":%s", display);
-            setenv("DISPLAY", _display, TRUE);
-            
-            xpbproxy_dpy=XOpenDisplay(_display);
-        }
-        if(!xpbproxy_dpy)
-            sleep(1);
-    }
-    
-    if (xpbproxy_dpy == NULL) {
-        fprintf (stderr, "xpbproxy: can't open default display\n");
-        [pool release];
-        return EXIT_FAILURE;
-    }
-    
-    XSetIOErrorHandler (x_io_error_handler);
-    XSetErrorHandler (x_error_handler);
-    
-    if (!XAppleWMQueryExtension (xpbproxy_dpy, &xpbproxy_apple_wm_event_base,
-                                 &xpbproxy_apple_wm_error_base)) {
-        fprintf (stderr, "xpbproxy: can't open AppleWM server extension\n");
-        [pool release];
-        return EXIT_FAILURE;
-    }
-
-    xpbproxy_have_xfixes = XFixesQueryExtension(xpbproxy_dpy, &xpbproxy_xfixes_event_base, &xpbproxy_xfixes_error_base);
-
-    XAppleWMSelectInput (xpbproxy_dpy, AppleWMActivationNotifyMask |
-                         AppleWMPasteboardNotifyMask);
-    
-    _selection_object = [[x_selection alloc] init];
-    
-    if(!xpbproxy_input_register()) {
-        [pool release];
-        return EXIT_FAILURE;
-    }
-    
-    [pool release];
-    
-    CFRunLoopRun();
-
-    return EXIT_SUCCESS;
-}
-
-id xpbproxy_selection_object (void) {
-    return _selection_object;
-}
-
-Time xpbproxy_current_timestamp (void) {
-    /* FIXME: may want to fetch a timestamp from the server.. */
-    return CurrentTime;
-}
-
-void debug_printf (const char *fmt, ...) {
-    static int spew = -1;
-    
-    if (spew == -1) {
-        char *x = getenv ("DEBUG");
-        spew = (x != NULL && atoi (x) != 0);
-    }
-    
-    if (spew) {
-        va_list args;
-        va_start(args, fmt);
-        vfprintf (stderr, fmt, args);
-        va_end(args);
-    }
-}
+/* main.m

+   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.

+

+   Permission is hereby granted, free of charge, to any person

+   obtaining a copy of this software and associated documentation files

+   (the "Software"), to deal in the Software without restriction,

+   including without limitation the rights to use, copy, modify, merge,

+   publish, distribute, sublicense, and/or sell copies of the Software,

+   and to permit persons to whom the Software is furnished to do so,

+   subject to the following conditions:

+

+   The above copyright notice and this permission notice shall be

+   included in all copies or substantial portions of the Software.

+

+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT

+   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+   DEALINGS IN THE SOFTWARE.

+

+   Except as contained in this notice, the name(s) of the above

+   copyright holders shall not be used in advertising or otherwise to

+   promote the sale, use or other dealings in this Software without

+   prior written authorization.

+ */

+

+#include "pbproxy.h"

+#import "x-selection.h"

+

+#include <pthread.h>

+#include <unistd.h>

+#include <X11/extensions/applewm.h>

+

+Display *xpbproxy_dpy;

+int xpbproxy_apple_wm_event_base, xpbproxy_apple_wm_error_base;

+int xpbproxy_xfixes_event_base, xpbproxy_xfixes_error_base;

+BOOL xpbproxy_have_xfixes;

+

+extern char *display;

+

+#ifdef STANDALONE_XPBPROXY

+BOOL xpbproxy_is_standalone = NO;

+#endif

+

+x_selection *_selection_object;

+

+extern BOOL serverInitComplete;

+extern pthread_mutex_t serverInitCompleteMutex;

+extern pthread_cond_t serverInitCompleteCond;

+

+static inline void wait_for_server_init(void) {

+    /* If the server hasn't finished initializing, wait for it... */

+    if(!serverInitComplete) {

+        pthread_mutex_lock(&serverInitCompleteMutex);

+        while(!serverInitComplete)

+            pthread_cond_wait(&serverInitCompleteCond, &serverInitCompleteMutex);

+        pthread_mutex_unlock(&serverInitCompleteMutex);

+    }

+}

+

+static int x_io_error_handler (Display *dpy) {

+    /* We lost our connection to the server. */

+    

+    TRACE ();

+

+    /* trigger the thread to restart?

+     *   NO - this would be to a "deeper" problem, and restarts would just

+     *        make things worse...

+     */

+#ifdef STANDALONE_XPBPROXY

+    if(xpbproxy_is_standalone)

+        exit(EXIT_FAILURE);

+#endif

+

+    /* Prevent _XIOError from calling exit() */

+    pthread_exit(NULL);

+    return 0;

+}

+

+static int x_error_handler (Display *dpy, XErrorEvent *errevent) {

+    return 0;

+}

+

+int xpbproxy_run (void) {

+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

+    size_t i;

+    

+    wait_for_server_init();

+    

+    for(i=0, xpbproxy_dpy=NULL; !xpbproxy_dpy && i<5; i++) {

+        xpbproxy_dpy = XOpenDisplay(NULL);

+        

+        if(!xpbproxy_dpy && display) {

+            char _display[32];

+            snprintf(_display, sizeof(_display), ":%s", display);

+            setenv("DISPLAY", _display, TRUE);

+            

+            xpbproxy_dpy=XOpenDisplay(_display);

+        }

+        if(!xpbproxy_dpy)

+            sleep(1);

+    }

+    

+    if (xpbproxy_dpy == NULL) {

+        fprintf (stderr, "xpbproxy: can't open default display\n");

+        [pool release];

+        return EXIT_FAILURE;

+    }

+    

+    XSetIOErrorHandler (x_io_error_handler);

+    XSetErrorHandler (x_error_handler);

+    

+    if (!XAppleWMQueryExtension (xpbproxy_dpy, &xpbproxy_apple_wm_event_base,

+                                 &xpbproxy_apple_wm_error_base)) {

+        fprintf (stderr, "xpbproxy: can't open AppleWM server extension\n");

+        [pool release];

+        return EXIT_FAILURE;

+    }

+

+    xpbproxy_have_xfixes = XFixesQueryExtension(xpbproxy_dpy, &xpbproxy_xfixes_event_base, &xpbproxy_xfixes_error_base);

+

+    XAppleWMSelectInput (xpbproxy_dpy, AppleWMActivationNotifyMask |

+                         AppleWMPasteboardNotifyMask);

+    

+    _selection_object = [[x_selection alloc] init];

+    

+    if(!xpbproxy_input_register()) {

+        [pool release];

+        return EXIT_FAILURE;

+    }

+    

+    [pool release];

+    

+    CFRunLoopRun();

+

+    return EXIT_SUCCESS;

+}

+

+id xpbproxy_selection_object (void) {

+    return _selection_object;

+}

+

+Time xpbproxy_current_timestamp (void) {

+    /* FIXME: may want to fetch a timestamp from the server.. */

+    return CurrentTime;

+}

+

+void debug_printf (const char *fmt, ...) {

+    static int spew = -1;

+    

+    if (spew == -1) {

+        char *x = getenv ("DEBUG");

+        spew = (x != NULL && atoi (x) != 0);

+    }

+    

+    if (spew) {

+        va_list args;

+        va_start(args, fmt);

+        vfprintf (stderr, fmt, args);

+        va_end(args);

+    }

+}