1 files changed, 47 insertions, 59 deletions

diff --git a/xorg-server/Xext/xvdix.h b/xorg-server/Xext/xvdix.h
index a516cf113..44f8f6b18 100644
--- a/xorg-server/Xext/xvdix.h
+++ b/xorg-server/Xext/xvdix.h
@@ -55,20 +55,22 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include <X11/extensions/Xvproto.h>
 
-extern unsigned long XvExtensionGeneration;
-extern unsigned long XvScreenGeneration;
-extern unsigned long XvResourceGeneration;
-
-extern int XvReqCode;
-extern int XvEventBase;
-extern int XvErrorBase;
-
-extern unsigned long XvRTPort;
-extern unsigned long XvRTEncoding;
-extern unsigned long XvRTGrab;
-extern unsigned long XvRTVideoNotify;
-extern unsigned long XvRTVideoNotifyList;
-extern unsigned long XvRTPortNotify;
+#ifndef XorgLoader
+extern _X_EXPORT unsigned long XvExtensionGeneration;
+extern _X_EXPORT unsigned long XvScreenGeneration;
+extern _X_EXPORT unsigned long XvResourceGeneration;
+
+extern _X_EXPORT int XvReqCode;
+extern _X_EXPORT int XvEventBase;
+extern _X_EXPORT int XvErrorBase;
+
+extern _X_EXPORT unsigned long XvRTPort;
+extern _X_EXPORT unsigned long XvRTEncoding;
+extern _X_EXPORT unsigned long XvRTGrab;
+extern _X_EXPORT unsigned long XvRTVideoNotify;
+extern _X_EXPORT unsigned long XvRTVideoNotifyList;
+extern _X_EXPORT unsigned long XvRTPortNotify;
+#endif
 
 typedef struct {
   int numerator;
@@ -199,17 +201,13 @@ typedef struct _XvPortRec {
   DevUnion devPriv;
 } XvPortRec, *XvPortPtr;
 
-#define LOOKUP_PORT(_id, client)\
-     ((XvPortPtr)LookupIDByType(_id, XvRTPort))
-
-#define LOOKUP_ENCODING(_id, client)\
-     ((XvEncodingPtr)LookupIDByType(_id, XvRTEncoding))
-
-#define LOOKUP_VIDEONOTIFY_LIST(_id, client)\
-     ((XvVideoNotifyPtr)LookupIDByType(_id, XvRTVideoNotifyList))
-
-#define LOOKUP_PORTNOTIFY_LIST(_id, client)\
-     ((XvPortNotifyPtr)LookupIDByType(_id, XvRTPortNotifyList))
+#define VALIDATE_XV_PORT(portID, pPort, mode)\
+    {\
+	int rc = dixLookupResourceByType((pointer *)&(pPort), portID,\
+	                                 XvRTPort, client, mode);\
+	if (rc != Success)\
+	    return (rc == BadValue) ? _XvBadPort : rc;\
+    }
 
 typedef struct {
   int version, revision;
@@ -234,54 +232,44 @@ typedef struct {
 #define _XvBadPort (XvBadPort+XvErrorBase)
 #define _XvBadEncoding (XvBadEncoding+XvErrorBase)
 
-extern int ProcXvDispatch(ClientPtr);
-extern int SProcXvDispatch(ClientPtr);
+#ifndef XorgLoader
+extern _X_EXPORT int ProcXvDispatch(ClientPtr);
+extern _X_EXPORT int SProcXvDispatch(ClientPtr);
 
-extern void XvExtensionInit(void);
-extern int XvScreenInit(ScreenPtr);
-extern DevPrivateKey XvGetScreenKey(void);
-extern unsigned long XvGetRTPort(void);
-extern int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
-extern int XvdiVideoStopped(XvPortPtr, int);
+extern _X_EXPORT void XvExtensionInit(void);
+extern _X_EXPORT int XvScreenInit(ScreenPtr);
+extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
+extern _X_EXPORT unsigned long XvGetRTPort(void);
+extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
+extern _X_EXPORT int XvdiVideoStopped(XvPortPtr, int);
 
-extern int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
    				INT16, INT16, CARD16, CARD16, 
 				INT16, INT16, CARD16, CARD16);
-extern int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
    				INT16, INT16, CARD16, CARD16, 
 				INT16, INT16, CARD16, CARD16);
-extern int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
    				INT16, INT16, CARD16, CARD16, 
 				INT16, INT16, CARD16, CARD16);
-extern int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
    				INT16, INT16, CARD16, CARD16, 
 				INT16, INT16, CARD16, CARD16);
-extern int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
    				INT16, INT16, CARD16, CARD16, 
 				INT16, INT16, CARD16, CARD16,
 				XvImagePtr, unsigned char*, Bool,
 				CARD16, CARD16);
-extern int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL);
-extern int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL);
-extern int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
-extern int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*);
-extern int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
-extern int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr);
-extern int XvdiMatchPort(XvPortPtr, DrawablePtr);
-extern int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
-extern int XvdiUngrabPort( ClientPtr, XvPortPtr, Time);
-
-
-#if !defined(UNIXCPP)
-
-#define XVCALL(name) Xv##name
-
-#else
-
-#define XVCALL(name) Xv/**/name
-
-#endif
-
+extern _X_EXPORT int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL);
+extern _X_EXPORT int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL);
+extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
+extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*);
+extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
+extern _X_EXPORT int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr);
+extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr);
+extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
+extern _X_EXPORT int XvdiUngrabPort( ClientPtr, XvPortPtr, Time);
+#endif /* XorgLoader */
 
 #endif /* XVDIX_H */