- Added a new option 'noxshm'

include/options.h

@@ -74,6 +74,7 @@ struct options
     int    managed;	    /* Managed windows */
     int    perfectGraphics; /* Favor correctness over speed for graphics */
     int    noDGA;           /* Disable XFree86 DGA extensions */
+    int    noXSHM;          /* Disable use of XSHM extension */
     char * configFileName;  /* Command line config file */
     int screenDepth;
 };

misc/main.c

@@ -102,6 +102,7 @@ struct options Options =
     FALSE,          /* Managed windows */
     FALSE,          /* Perfect graphics */
     FALSE,          /* No DGA */
+    FALSE,          /* No XSHM */
     NULL,           /* Alternate config file name */
     0               /* screenDepth */
 };
@@ -130,6 +131,7 @@ static char szUsage[] =
   "    -mode mode      Start Wine in a particular mode (standard or enhanced)\n"
   "    -name name      Set the application name\n"
   "    -nodga          Disable XFree86 DGA extensions\n"
+  "    -noxshm         Disable XSHM extension\n"
   "    -perfect        Favor correctness over speed for graphical operations\n"
   "    -privatemap     Use a private color map\n"
   "    -synchronous    Turn on synchronous display mode\n"

windows/x11drv/main.c

@@ -70,6 +70,7 @@ static XrmOptionDescRec optionsTable[] =
     { "-winver",        ".winver",          XrmoptionSepArg, (caddr_t)NULL },
     { "-config",        ".config",          XrmoptionSepArg, (caddr_t)NULL },
     { "-nodga",         ".nodga",           XrmoptionNoArg,  (caddr_t)"off"},
+    { "-noxshm",        ".noxshm",          XrmoptionNoArg,  (caddr_t)"off"},
     { "-console",       ".console",         XrmoptionSepArg, (caddr_t)NULL },
     { "-dosver",        ".dosver",          XrmoptionSepArg, (caddr_t)NULL }
 };
@@ -288,6 +289,8 @@ void X11DRV_USER_ParseOptions(int *argc, char *argv[])
     Options.configFileName = xstrdup((char *)value.addr);
   if (X11DRV_USER_GetResource( db, ".nodga", &value))
     Options.noDGA = TRUE;
+  if (X11DRV_USER_GetResource( db, ".noxshm", &value))
+    Options.noXSHM = TRUE;
   if (X11DRV_USER_GetResource( db, ".console", &value))
       driver.driver_list = xstrdup((char *)value.addr);
   else