about summary refs log tree commit diff stats
path: root/src/wrapped/wrappedlibx11_private.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/wrapped/wrappedlibx11_private.h')
-rw-r--r--src/wrapped/wrappedlibx11_private.h857
1 files changed, 502 insertions, 355 deletions
diff --git a/src/wrapped/wrappedlibx11_private.h b/src/wrapped/wrappedlibx11_private.h
index 72dc55e1..867c0e5d 100644
--- a/src/wrapped/wrappedlibx11_private.h
+++ b/src/wrapped/wrappedlibx11_private.h
@@ -1,43 +1,29 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
-// all those bss stuff are suspicious
-//DATAB(__bss_end__, 4)
-//DATAB(_bss_end__, 4)
-//DATAB(__bss_start, 4)
-//DATAB(__bss_start__, 4)
-//DATA(__data_start, 4)
-//DATA(_edata, 4)
-//DATAB(_end, 4)
-//DATAB(__end__, 4)
-// __exidx_end  // type r
-// __exidx_start    // type r
-// _fini
-// _init
-// KeySymToUcs4
-DATAB(_qfree, 4)
-//GO(_Utf8GetConvByName, 
-//GO(XActivateScreenSaver
+DATAB(_qfree, 4) // Warning: failed to confirm
+
+GO(XActivateScreenSaver, iFp)
 GOM(XAddConnectionWatch, iFEppp)
 GO(XAddExtension, pFp)
-GO(XAddHost, vFpp)
-GO(XAddHosts, vFppi)
+GO(XAddHost, iFpp)
+GO(XAddHosts, iFppi)
 GO(XAddPixel, vFpl)
-GO(XAddToExtensionList, vFpp)
-//GO(XAddToSaveSet
+GO(XAddToExtensionList, iFpp)
+GO(XAddToSaveSet, iFpL)
 GO(XAllocClassHint, pFv)
-GO(XAllocColor, iFppp)
+GO(XAllocColor, iFpLp)
 GO(XAllocColorCells, iFpLipupu)
 GO(XAllocColorPlanes, iFpLipiiiippp)
 GO(XAllocIconSize, pFv)
 GO(_XAllocID, LFp)
 GO(_XAllocIDs, vFppi)
-GO(XAllocNamedColor, iFppppp)
-//GO(_XAllocScratch, 
+GO(XAllocNamedColor, iFpLppp)
+GO(_XAllocScratch, pFpL)
 GO(XAllocSizeHints, pFv)
 GO(XAllocStandardColormap, pFv)
-//GO(_XAllocTemp, 
+GO(_XAllocTemp, pFpL)
 GO(XAllocWMHints, pFv)
 GO(XAllowEvents, iFpiL)
 GO(XAllPlanes, LFv)
@@ -50,99 +36,99 @@ GO(XBitmapBitOrder, iFp)
 GO(XBitmapPad, iFp)
 GO(XBitmapUnit, iFp)
 GO(XBlackPixel, LFpi)
-//GO(XBlackPixelOfScreen
-//GO(XCellsOfScreen
+GO(XBlackPixelOfScreen, LFp)
+GO(XCellsOfScreen, iFp)
 GO(XChangeActivePointerGrab, iFpuLL)
 GO(XChangeGC, iFppLp)
 GO(XChangeKeyboardControl, iFpLp)
 GO(XChangeKeyboardMapping, iFpiipi)
 GO(XChangePointerControl, iFpiiiii)
 GO(XChangeProperty, iFpLLLiipi)
-//GO(XChangeSaveSet
+GO(XChangeSaveSet, iFpLi)
 GO(XChangeWindowAttributes, iFpLLp)
 GOM(XCheckIfEvent, iFEpppp)
 GO(XCheckMaskEvent, iFplp)
 GO(XCheckTypedEvent, iFpip)
 GO(XCheckTypedWindowEvent, iFpLip)
-GO(XCheckWindowEvent, iFpplp)
+GO(XCheckWindowEvent, iFpLlp)
 GO(XCirculateSubwindows, iFpLi)
-//GO(XCirculateSubwindowsDown
-//GO(XCirculateSubwindowsUp
+GO(XCirculateSubwindowsDown, iFpL)
+GO(XCirculateSubwindowsUp, iFpL)
 GO(XClearArea, iFpLiiuui)
-GO(XClearWindow, iFpp)
+GO(XClearWindow, iFpL)
 GO(XClipBox, iFpp)
 GO(XCloseDisplay, iFp)
 GO(XCloseIM, iFp)
 //GO(_XCloseLC, 
 GO(XCloseOM, iFp)
 //GO(_XcmsAddCmapRec, 
-//GO(XcmsAddColorSpace
-//GO(XcmsAddFunctionSet
-//GO(XcmsAllocColor
-//GO(XcmsAllocNamedColor
+//GOM(XcmsAddColorSpace, iFEp)
+GO(XcmsAddFunctionSet, iFp)
+GO(XcmsAllocColor, iFpLpL)
+GO(XcmsAllocNamedColor, iFpLpppL)
 //GO(_XcmsArcTangent, 
-//GO(XcmsCCCOfColormap
-//GO(XcmsCIELabClipab
-//GO(XcmsCIELabClipL
-//GO(XcmsCIELabClipLab
+//GOM(XcmsCCCOfColormap, pFEpL)
+//GOM(XcmsCIELabClipab, iFEppuup)
+//GOM(XcmsCIELabClipL, iFEppuup)
+//GOM(XcmsCIELabClipLab, iFEppuup)
 DATA(XcmsCIELabColorSpace, 6*sizeof(void*))
-//GO(_XcmsCIELab_prefix   // type r, 
-//GO(XcmsCIELabQueryMaxC
-//GO(XcmsCIELabQueryMaxL
-//GO(XcmsCIELabQueryMaxLC
+//DATA(_XcmsCIELab_prefix, 
+//GOM(XcmsCIELabQueryMaxC, iFEpddp)
+//GOM(XcmsCIELabQueryMaxL, iFEpddp)
+//GOM(XcmsCIELabQueryMaxLC, iFEpdp)
 //GO(_XcmsCIELabQueryMaxLCRGB, 
-//GO(XcmsCIELabQueryMinL
-//GO(XcmsCIELabToCIEXYZ
-//GO(XcmsCIELabWhiteShiftColors
-//GO(XcmsCIELuvClipL
-//GO(XcmsCIELuvClipLuv
-//GO(XcmsCIELuvClipuv
+//GOM(XcmsCIELabQueryMinL, iFEpddp)
+//GOM(XcmsCIELabToCIEXYZ, iFEpppu)
+//GOM(XcmsCIELabWhiteShiftColors, iFEpppLpup)
+//GOM(XcmsCIELuvClipL, iFEppuup)
+//GOM(XcmsCIELuvClipLuv, iFEppuup)
+//GOM(XcmsCIELuvClipuv, iFEppuup)
 DATA(XcmsCIELuvColorSpace, 6*sizeof(void*))
-//GO(_XcmsCIELuv_prefix   // type r, 
-//GO(XcmsCIELuvQueryMaxC
-//GO(XcmsCIELuvQueryMaxL
-//GO(XcmsCIELuvQueryMaxLC
+//DATA(_XcmsCIELuv_prefix, 
+//GOM(XcmsCIELuvQueryMaxC, iFEpddp)
+//GOM(XcmsCIELuvQueryMaxL, iFEpddp)
+//GOM(XcmsCIELuvQueryMaxLC, iFEpdp)
 //GO(_XcmsCIELuvQueryMaxLCRGB, 
-//GO(XcmsCIELuvQueryMinL
-//GO(XcmsCIELuvToCIEuvY
-//GO(XcmsCIELuvWhiteShiftColors
+//GOM(XcmsCIELuvQueryMinL, iFEpddp)
+//GOM(XcmsCIELuvToCIEuvY, iFEpppu)
+//GOM(XcmsCIELuvWhiteShiftColors, iFEpppLpup)
 DATA(XcmsCIEuvYColorSpace, 6*sizeof(void*))
-//GO(_XcmsCIEuvY_prefix   // type r, 
-//GO(XcmsCIEuvYToCIELuv
-//GO(XcmsCIEuvYToCIEXYZ
-//GO(XcmsCIEuvYToTekHVC
+//DATA(_XcmsCIEuvY_prefix, 
+//GOM(XcmsCIEuvYToCIELuv, iFEpppu)
+//GOM(XcmsCIEuvYToCIEXYZ, iFEpppu)
+//GOM(XcmsCIEuvYToTekHVC, iFEpppu)
 //GO(_XcmsCIEuvY_ValidSpec, 
 DATA(XcmsCIExyYColorSpace, 6*sizeof(void*)) // probably need some wrapping
-//GO(_XcmsCIExyY_prefix   // type r, 
-//GO(XcmsCIExyYToCIEXYZ
+//DATA(_XcmsCIExyY_prefix, 
+//GOM(XcmsCIExyYToCIEXYZ, iFEpppu)
 DATA(XcmsCIEXYZColorSpace, 6*sizeof(void*))
-//GO(_XcmsCIEXYZ_prefix   // type r, 
-//GO(XcmsCIEXYZToCIELab
-//GO(XcmsCIEXYZToCIEuvY
-//GO(XcmsCIEXYZToCIExyY
-//GO(XcmsCIEXYZToRGBi
+//DATA(_XcmsCIEXYZ_prefix, 
+//GOM(XcmsCIEXYZToCIELab, iFEpppu)
+//GOM(XcmsCIEXYZToCIEuvY, iFEpppu)
+//GOM(XcmsCIEXYZToCIExyY, iFEpppu)
+//GOM(XcmsCIEXYZToRGBi, iFEppup)
 //GO(_XcmsCIEXYZ_ValidSpec, 
-//GO(XcmsClientWhitePointOfCCC
-//GO(XcmsConvertColors
+//GOM(XcmsClientWhitePointOfCCC, pFEp)
+//GOM(XcmsConvertColors, iFEppuLp)
 //GO(_XcmsConvertColorsWithWhitePt, 
 //GO(_XcmsCopyCmapRecAndFree, 
 //GO(_XcmsCopyISOLatin1Lowered, 
 //GO(_XcmsCopyPointerArray, 
 //GO(_XcmsCosine, 
-//GO(XcmsCreateCCC
+//GOM(XcmsCreateCCC, pFEpipppppp)
 //GO(_XcmsCubeRoot, 
 DATA(_XcmsDDColorSpaces, 6*sizeof(void*))
 DATA(_XcmsDDColorSpacesInit, 6*sizeof(void*))
 //GO(_XcmsDDConvertColors, 
-//GO(XcmsDefaultCCC
+//GOM(XcmsDefaultCCC, pFEpi)
 //GO(_XcmsDeleteCmapRec, 
 DATA(_XcmsDIColorSpaces, 6*sizeof(void*))
 DATA(_XcmsDIColorSpacesInit, 6*sizeof(void*))
 //GO(_XcmsDIConvertColors, 
-//GO(XcmsDisplayOfCCC
+//GOM(XcmsDisplayOfCCC, pFEp)
 //GO(_XcmsEqualWhitePts, 
 GO(XcmsFormatOfPrefix, LFp)
-//GO(XcmsFreeCCC
+//GOM(XcmsFreeCCC, vFEp)
 //GO(_XcmsFreeIntensityMaps, 
 //GO(_XcmsFreePointerArray, 
 //GO(_XcmsGetElement, 
@@ -155,72 +141,72 @@ GO(XcmsLookupColor, iFpLpppL)
 //GO(_XcmsLRGB_InitScrnDefault, 
 GO(XcmsPrefixOfFormat, pFL)
 //GO(_XcmsPushPointerArray, 
-//GO(XcmsQueryBlack
-//GO(XcmsQueryBlue
+//GOM(XcmsQueryBlack, iFEpLp)
+//GOM(XcmsQueryBlue, iFEpLp)
 GO(XcmsQueryColor, iFpLpL)
 GO(XcmsQueryColors, iFpLpuL)
-//GO(XcmsQueryGreen
-//GO(XcmsQueryRed
-//GO(XcmsQueryWhite
+//GOM(XcmsQueryGreen, iFEpLp)
+//GOM(XcmsQueryRed, iFEpLp)
+//GOM(XcmsQueryWhite, iFEpLp)
 DATA(_XcmsRegColorSpaces, 6*sizeof(void*))
 //GO(_XcmsRegFormatOfPrefix, 
 //GO(_XcmsResolveColor, 
 //GO(_XcmsResolveColorString, 
 DATA(XcmsRGBColorSpace, 6*sizeof(void*))
 DATA(XcmsRGBiColorSpace, 6*sizeof(void*))
-//GO(_XcmsRGBi_prefix // type r, 
-//GO(XcmsRGBiToCIEXYZ
-//GO(XcmsRGBiToRGB
-//GO(_XcmsRGB_prefix  // type r, 
-//GO(XcmsRGBToRGBi
+//DATA(_XcmsRGBi_prefix, 
+//GOM(XcmsRGBiToCIEXYZ, iFEppup)
+//GOM(XcmsRGBiToRGB, iFEppup)
+//DATA(_XcmsRGB_prefix, 
+//GOM(XcmsRGBToRGBi, iFEppup)
 //GO(_XcmsRGB_to_XColor, 
 DATA(_XcmsSCCFuncSets, 3*sizeof(void*))
 DATA(_XcmsSCCFuncSetsInit, 3*sizeof(void*))
-//GO(XcmsScreenNumberOfCCC
-//GO(XcmsScreenWhitePointOfCCC
-//GO(XcmsSetCCCOfColormap
-//GO(XcmsSetCompressionProc
+//GOM(XcmsScreenNumberOfCCC, iFEp)
+//GOM(XcmsScreenWhitePointOfCCC, pFEp)
+//GOM(XcmsSetCCCOfColormap, pFEpLp)
+//GOM(XcmsSetCompressionProc, pFEppp)
 //GO(_XcmsSetGetColor, 
 //GO(_XcmsSetGetColors, 
-//GO(XcmsSetWhiteAdjustProc
-//GO(XcmsSetWhitePoint
+//GOM(XcmsSetWhiteAdjustProc, pFEppp)
+//GOM(XcmsSetWhitePoint, iFEpp)
 //GO(_XcmsSine, 
 //GO(_XcmsSquareRoot, 
 GO(XcmsStoreColor, iFpLp)
 GO(XcmsStoreColors, iFpLpup)
 //GO(_XcmsTekHVC_CheckModify, 
-//GO(XcmsTekHVCClipC
-//GO(XcmsTekHVCClipV
-//GO(XcmsTekHVCClipVC
+//GOM(XcmsTekHVCClipC, iFEppuup)
+//GOM(XcmsTekHVCClipV, iFEppuup)
+//GOM(XcmsTekHVCClipVC, iFEppuup)
 DATA(XcmsTekHVCColorSpace, 6*sizeof(void*))
-//GO(_XcmsTekHVC_prefix   // type r, 
-//GO(XcmsTekHVCQueryMaxC
-//GO(XcmsTekHVCQueryMaxV
-//GO(XcmsTekHVCQueryMaxVC
+//DATA(_XcmsTekHVC_prefix, 
+//GOM(XcmsTekHVCQueryMaxC, iFEpddp)
+//GOM(XcmsTekHVCQueryMaxV, iFEpddp)
+//GOM(XcmsTekHVCQueryMaxVC, iFEpdp)
 //GO(_XcmsTekHVCQueryMaxVCRGB, 
-//GO(XcmsTekHVCQueryMaxVSamples
-//GO(XcmsTekHVCQueryMinV
-//GO(XcmsTekHVCToCIEuvY
-//GO(XcmsTekHVCWhiteShiftColors
+//GOM(XcmsTekHVCQueryMaxVSamples, iFEpdpu)
+//GOM(XcmsTekHVCQueryMinV, iFEpddp)
+//GOM(XcmsTekHVCToCIEuvY, iFEpppu)
+//GOM(XcmsTekHVCWhiteShiftColors, iFEpppLpup)
 DATA(XcmsUNDEFINEDColorSpace, 6*sizeof(void*))
 //GO(_XcmsUnresolveColor, 
-//GO(XcmsVisualOfCCC
+//GOM(XcmsVisualOfCCC, pFEp)
 //GO(_XColor_to_XcmsRGB, 
 GO(XConfigureWindow, iFpLup)
 GO(XConnectionNumber, iFp)
 //GO(_XConnectXCB, 
-//GO(XContextDependentDrawing
+GO(XContextDependentDrawing, iFp)
 GO(XContextualDrawing, iFp)
 GO(XConvertCase, vFLpp)
 GO(XConvertSelection, iFpLLLLL)
 GO(XCopyArea, iFpLLpiiuuii)
 GO(XCopyColormapAndFree, LFpL)
-//GO(_XCopyEventCookie, 
+GO(_XCopyEventCookie, iFppp)
 GO(XCopyGC, iFppLp)
 GO(XCopyPlane, iFpLLpiiuuiiL)
 //GO(_XCopyToArg, 
 GO(XCreateBitmapFromData, LFpLpuu)
-GO(XCreateColormap, pFpppi)
+GO(XCreateColormap, LFpLpi)
 GO(XCreateFontCursor, LFpu)
 GO(XCreateFontSet, pFppppp)
 GO(XCreateGC, pFpLLp)
@@ -229,22 +215,23 @@ GOM(XCreateIC, pFEpV)     // use vararg
 GOM(XCreateImage, pFEppuiipuuii)
 GO(dummy_XCreateImage, pFppuiipuuii)    // to have the wrapper
 DATAB(_XCreateMutex_fn, sizeof(void*))
-GO(XCreateOC, pFp)
+GO(XCreateOC, pFppppppppppppppppppp)    // is pFpV
 GO(XCreatePixmap, LFpLuuu)
 GO(XCreatePixmapCursor, LFpLLppuu)
 GO(XCreatePixmapFromBitmapData, LFpLpuuLLu)
 GO(XCreateRegion, pFv)
 GO(XCreateSimpleWindow, LFpLiiuuuLL)
-GO(XCreateWindow, pFppiiuuuiupLp)
+GO(XCreateWindow, LFpLiiuuuiupLp)
 DATAB(_Xdebug, sizeof(void*))
 GO(XDefaultColormap, LFpi)
 GO(XDefaultColormapOfScreen, LFp)
 GO(XDefaultDepth, iFpi)
 GO(XDefaultDepthOfScreen, iFp)
-//GO(_XDefaultError, 
+GO(_XDefaultError, iFpp)
 GO(XDefaultGC, pFpi)
 GO(XDefaultGCOfScreen, pFp)
 GO(_XDefaultIOError, iFp)
+GO(_XDefaultIOErrorExit, vFpp)
 //GO(_XDefaultOpenIM, 
 //GO(_XDefaultOpenOM, 
 GO(XDefaultRootWindow, LFp)
@@ -253,46 +240,46 @@ GO(XDefaultScreenOfDisplay, pFp)
 GO(XDefaultString, pFv)
 GO(XDefaultVisual, pFpi)
 GO(XDefaultVisualOfScreen, pFp)
-//GO(_XDefaultWireError, 
+GO(_XDefaultWireError, iFppp)
 GO(XDefineCursor, iFpLL)
 GO(XDeleteContext, iFpLi)
-//GO(XDeleteModifiermapEntry
+GO(XDeleteModifiermapEntry, pFpCi)
 GO(XDeleteProperty, iFpLL)
-//GO(_XDeq, 
+GO(_XDeq, vFppp)
 GOM(_XDeqAsyncHandler, vFEpp)
 GO(XDestroyIC, vFp)
 GOM(XDestroyImage, iFEp)  //need to unbridge
 GO(XDestroyOC, vFp)
 GO(XDestroyRegion, iFp)
-GO(XDestroySubwindows, iFpp)
-GO(XDestroyWindow, iFpp)
-//GO(XDirectionalDependentDrawing
-GO(XDisableAccessControl, vFp)
+GO(XDestroySubwindows, iFpL)
+GO(XDestroyWindow, iFpL)
+GO(XDirectionalDependentDrawing, iFp)
+GO(XDisableAccessControl, iFp)
 GO(XDisplayCells, iFpi)
 GO(XDisplayHeight, iFpi)
 GO(XDisplayHeightMM, iFpi)
 GO(XDisplayKeycodes, iFppp)
-//GO(XDisplayMotionBufferSize
+GO(XDisplayMotionBufferSize, LFp)
 GO(XDisplayName, pFp)
 GO(XDisplayOfIM, pFp)
 GO(XDisplayOfOM, pFp)
 GO(XDisplayOfScreen, pFp)
-//GO(XDisplayPlanes
+GO(XDisplayPlanes, iFpi)
 GO(XDisplayString, pFp)
 GO(XDisplayWidth, iFpi)
 GO(XDisplayWidthMM, iFpi)
-//GO(XDoesBackingStore
-//GO(XDoesSaveUnders
-GO(XDrawArc, iFpppiiuuii)
-//GO(XDrawArcs
-//GO(XDrawImageString
-//GO(XDrawImageString16
+GO(XDoesBackingStore, iFp)
+GO(XDoesSaveUnders, iFp)
+GO(XDrawArc, iFpLpiiuuii)
+GO(XDrawArcs, iFpLppi)
+GO(XDrawImageString, iFpLpiipi)
+GO(XDrawImageString16, iFpLpiipi)
 GO(XDrawLine, iFpLpiiii)
-GO(XDrawLines, iFppppii)
+GO(XDrawLines, iFpLppii)
 GO(XDrawPoint, iFpLpii)
 GO(XDrawPoints, iFpLppii)
-GO(XDrawRectangle, iFpppiiuu)
-GO(XDrawRectangles, iFppppi)
+GO(XDrawRectangle, iFpLpiiuu)
+GO(XDrawRectangles, iFpLppi)
 GO(XDrawSegments, iFpLppi)
 GO(XDrawString, iFpLpiipi)
 GO(XDrawString16, iFpLpiipi)
@@ -300,42 +287,42 @@ GO(XDrawText, iFpLpiipi)
 GO(XDrawText16, iFpLpiipi)
 GO(_XEatData, vFpL)
 GO(_XEatDataWords, vFpL)
-//GO(XEHeadOfExtensionList
+//GO(XEHeadOfExtensionList, 
 GO(XEmptyRegion, iFp)
-GO(XEnableAccessControl, vFp)
+GO(XEnableAccessControl, iFp)
 GO(_XEnq, vFpp)
 GO(XEqualRegion, iFpp)
-//GO(_XError, 
+GO(_XError, iFpp)
 DATAB(_XErrorFunction, sizeof(void*))
-//GO(XESetBeforeFlush
+//GOM(XESetBeforeFlush, pFEpip)
 GOM(XESetCloseDisplay, pFEpip)
-//GO(XESetCopyEventCookie
-//GO(XESetCopyGC
-//GO(XESetCreateFont
-//GO(XESetCreateGC
+//GOM(XESetCopyEventCookie, pFEpip)
+//GOM(XESetCopyGC, pFEpip)
+//GOM(XESetCreateFont, pFEpip)
+//GOM(XESetCreateGC, pFEpip)
 GOM(XESetError, pFEpip)
-//GO(XESetErrorString
+//GOM(XESetErrorString, pFEpip)
 GOM(XESetEventToWire, pFEpip)
-//GO(XESetFlushGC
-//GO(XESetFreeFont
-//GO(XESetFreeGC
-//GO(XESetPrintErrorValues
-//GO(XESetWireToError
+//GOM(XESetFlushGC, pFEpip)
+//GOM(XESetFreeFont, pFEpip)
+//GOM(XESetFreeGC, pFEpip)
+//GOM(XESetPrintErrorValues, pFEpip)
+//GOM(XESetWireToError, pFEpip)
 GOM(XESetWireToEvent, pFEpip)
-//GO(XESetWireToEventCookie
+//GOM(XESetWireToEventCookie, pFEpip)
 GO(XEventMaskOfScreen, lFp)
+GO(_XEventsQueued, iFpi)
 GO(XEventsQueued, iFpi)
-//GO(_XEventsQueued, 
-//GO(_Xevent_to_mask  // type r, 
-//GO(_XEventToWire, 
+//DATA(_Xevent_to_mask, 
+GO(_XEventToWire, iFppp)
 GO(XExtendedMaxRequestSize, lFp)
 GO(XExtentsOfFontSet, pFp)
 //GO(_XF86BigfontFreeFontMetrics, 
-//GO(_XF86LoadQueryLocaleFont, 
+GO(_XF86LoadQueryLocaleFont, iFpppp)
 GO(XFetchBuffer, pFppi)
 GO(XFetchBytes, pFpp)
-//GO(_XFetchEventCookie, 
-GO(XFetchName, iFppp)
+GO(_XFetchEventCookie, iFpp)
+GO(XFetchName, iFpLp)
 GO(XFillArc, iFpLpiiuuii)
 GO(XFillArcs, iFpLppi)
 GO(XFillPolygon, iFpLppiii)
@@ -343,23 +330,23 @@ GO(XFillRectangle, iFpLpiiuu)
 GO(XFillRectangles, iFpLppi)
 GO(XFilterEvent, iFpL)
 GO(XFindContext, iFpLip)
-//GO(XFindOnExtensionList
-GO(XFlush, iFp)
+GO(XFindOnExtensionList, pFpi)
 GO(_XFlush, vFp)
+GO(XFlush, iFp)
 GO(XFlushGC, vFpp)
 GO(_XFlushGCCache, vFpp)
 GO(XFontsOfFontSet, iFppp)
 GO(XForceScreenSaver, iFpi)
 GO(XFree, iFp)
 //GO(_XFreeAtomTable, 
-GO(XFreeColormap, iFpp)
+GO(XFreeColormap, iFpL)
 GO(XFreeColors, iFpLpiL)
 GO(XFreeCursor, iFpL)
 DATAB(_XFreeDisplayLock_fn, sizeof(void*))
 //GO(_XFreeDisplayStructure, 
-//GO(_XFreeEventCookies, 
+GO(_XFreeEventCookies, vFp)
 GO(XFreeEventData, vFpp)
-//GO(_XFreeExtData, 
+GO(_XFreeExtData, iFp)
 GO(XFreeExtensionList, iFp)
 GO(XFreeFont, iFpp)
 GO(XFreeFontInfo, iFppi)
@@ -371,7 +358,8 @@ GO(XFreeModifiermap, iFp)
 DATAB(_XFreeMutex_fn, sizeof(void*))
 GO(XFreePixmap, iFpL)
 GO(XFreeStringList, vFp)
-//GO(_XFreeTemp, 
+GO(_XFreeTemp, vFppL)
+GO(XFreeThreads, iFv)
 //GO(_XFreeX11XCBStructure, 
 GO(XGContextFromGC, LFp)
 GO(XGeometry, iFpippuuuiipppp)
@@ -380,7 +368,7 @@ GO(_XGetAsyncReply, pFppppiii)
 GO(XGetAtomName, pFpL)
 GO(XGetAtomNames, iFppip)
 //GO(_XGetBitsPerPixel, 
-GO(XGetClassHint, iFppp)
+GO(XGetClassHint, iFpLp)
 GO(XGetCommand, iFpLpp)
 GO(XGetDefault, pFppp)
 GO(XGetErrorDatabaseText, iFpppppi)
@@ -394,7 +382,7 @@ GO(_XGetHostname, iFpi)
 GO(XGetIconName, iFpLp)
 GO(XGetIconSizes, iFpLpp)
 GO(XGetICValues, pFpppppppppp)      // use varargs...
-GOM(XGetImage, pFEppiiuuLi)     // return an XImage with callbacks that needs wrapping
+GOM(XGetImage, pFEpLiiuuLi)     // return an XImage with callbacks that needs wrapping
 GO(XGetIMValues, pFppppppp)     // use varargs
 GO(XGetInputFocus, iFppp)
 GO(XGetKeyboardControl, iFpp)
@@ -402,36 +390,36 @@ GO(XGetKeyboardMapping, pFpCip)
 //GO(_XGetLCValues, 
 GO(XGetModifierMapping, pFp)
 GO(XGetMotionEvents, pFpLLLp)
-GO(XGetNormalHints, iFppp)
+GO(XGetNormalHints, iFpLp)
 GO(XGetOCValues, pFpppppppppp) // use varargs
 GO(XGetOMValues, pFp)
 //GOM(XGetPixel, LFEpii)  // need unbridging
 GO(dummy_XGetPixel, LFpii)     // for the wrapper
 GO(XGetPointerControl, iFpppp)
 GO(XGetPointerMapping, iFppi)
-GOM(_XGetRequest, pFEpuL)
+GOM(_XGetRequest, pFEpCL)
 GO(XGetRGBColormaps, iFpLppL)
 //GO(_XGetScanlinePad, 
 GO(XGetScreenSaver, iFppppp)
 GO(XGetSelectionOwner, LFpL)
-//GO(XGetSizeHints
+GO(XGetSizeHints, iFpLpL)
 GO(XGetStandardColormap, iFpLpL)
-GOM(XGetSubImage, pFEppiiuuuipii)
+GOM(XGetSubImage, pFEpLiiuuLipii)
 GO(XGetTextProperty, iFpLpL)
 GO(XGetTransientForHint, iFpLp)
 GO(XGetVisualInfo, pFplpp)
-GO(XGetWindowAttributes, iFppp)
-//GO(_XGetWindowAttributes, 
+GO(_XGetWindowAttributes, iFpLp)
+GO(XGetWindowAttributes, iFpLp)
 GO(XGetWindowProperty, iFpLLlliLppppp)
-//GO(XGetWMClientMachine
+GO(XGetWMClientMachine, iFpLp)
 GO(XGetWMColormapWindows, iFpLpp)
 GO(XGetWMHints, pFpL)
-GO(XGetWMIconName, iFppp)
+GO(XGetWMIconName, iFpLp)
 GO(XGetWMName, iFpLp)
 GO(XGetWMNormalHints, iFpLpp)
 GO(XGetWMProtocols, iFpLpp)
 GO(XGetWMSizeHints, iFpLppL)
-//GO(XGetZoomHints
+GO(XGetZoomHints, iFpLp)
 DATAB(_Xglobal_lock, sizeof(void*))
 GO(XGrabButton, iFpuuLiuiiLL)
 GO(XGrabKey, iFpiuLiii)
@@ -442,16 +430,137 @@ DATAB(_XHeadOfDisplayList, sizeof(void*))
 GO(XHeightMMOfScreen, iFp)
 GO(XHeightOfScreen, iFp)
 DATAB(_Xi18n_lock, sizeof(void*))
-GO(XIconifyWindow, iFppi)
+GO(XIconifyWindow, iFpLi)
 GOM(XIfEvent, iFEpppp)
 GO(XImageByteOrder, iFp)
+//GO(_XimCbDispatch, 
+//GO(_XimCheckCreateICValues, 
+//GO(_XimCheckDataSize, 
+//GO(_XimCheckICMode, 
+//GO(_XimCheckIfLocalProcessing, 
+//GO(_XimCheckIfThaiProcessing, 
+//GO(_XimCheckIMMode, 
+//GO(_XimCheckLocalInputStyle, 
+//GO(_XimCommitCallback, 
 //GO(_XIMCompileResourceList, 
+//GO(_XimConnect, 
+//GO(_Ximctstombs, 
+//GO(_Ximctstoutf8, 
+//GO(_Ximctstowcs, 
+//GO(_XimDecodeICATTRIBUTE, 
+//GO(_XimDecodeIMATTRIBUTE, 
+//GO(_XimDecodeLocalICAttr, 
+//GO(_XimDecodeLocalIMAttr, 
+//GO(_XimDestroyIMStructureList, 
+//GO(_XimDispatchInit, 
+//GO(_XimEncodeICATTRIBUTE, 
+//GO(_XimEncodeIMATTRIBUTE, 
+//GO(_XimEncodeLocalICAttr, 
+//GO(_XimEncodeLocalIMAttr, 
+//GO(_XimError, 
+//GO(_XimErrorCallback, 
+//GO(_XimExtension, 
+//GO(_XimFilterWaitEvent, 
+//GO(_XimFlush, 
+//GO(_XimForwardEvent, 
+//GO(_XimForwardEventCallback, 
+//GO(_XimFreeCommitInfo, 
+//GO(_XimFreeProtoIntrCallback, 
+//GO(_XimFreeTransIntrCallback, 
+//GO(_XimGetAttributeID, 
 //GO(_XimGetCharCode, 
+//GO(_XimGetCurrentICValues, 
+//GO(_XimGetCurrentIMValues, 
+//GO(_XimGetICValueData, 
+//GO(_XimGetIMValueData, 
 //GO(_XimGetLocaleCode, 
+//GO(_XimGetMyEndian, 
+//GO(_XimGetResourceListRec, 
+//GO(_XimGetResourceListRecByQuark, 
+//GO(_XimGetWindowEventmask, 
+//GO(_XimICOfXICID, 
+//DATA(_XimImSportRec, 
+//GO(_XimInitialResourceInfo, 
+//GO(_XimLcctstombs, 
+//GO(_XimLcctstoutf8, 
+//GO(_XimLcctstowcs, 
+//GO(_XimLocalCreateIC, 
+//GO(_XimLocalFilter, 
+//GO(_XimLocalGetICValues, 
+//GO(_XimLocalGetIMValues, 
+//GO(_XimLocalIMFree, 
+//GO(_XimLocalMbLookupString, 
+//GO(_XimLocalOpenIM, 
+//GO(_XimLocalSetICValues, 
+//GO(_XimLocalSetIMValues, 
+//GO(_XimLocalUtf8LookupString, 
+//GO(_XimLocalWcLookupString, 
 //GO(_XimLookupMBText, 
 //GO(_XimLookupUTF8Text, 
 //GO(_XimLookupWCText, 
+//GO(_XimMakeICAttrIDList, 
+//GO(_XimMakeIMAttrIDList, 
 GO(XIMOfIC, pFp)
+//GO(_XimOpenIM, 
+//GO(_XimParseStringFile, 
+//GO(_XimProcError, 
+//GO(_XimProcSyncReply, 
+//GO(_XimProtoCreateIC, 
+//GO(_XimProtoEventToWire, 
+//GO(_XimProtoIMFree, 
+//GO(_XimProtoMbLookupString, 
+//GO(_XimProtoOpenIM, 
+//GO(_XimProtoUtf8LookupString, 
+//GO(_XimProtoWcLookupString, 
+//GO(_XimProtoWireToEvent, 
+//GO(_XimRead, 
+//GO(_XimRegisterDispatcher, 
+//GO(_XimRegisterFilter, 
+//GO(_XimRegisterIMInstantiateCallback, 
+//GO(_XimRegisterServerFilter, 
+//GO(_XimRegisterTriggerKeysCallback, 
+//GO(_XimRegProtoIntrCallback, 
+//GO(_XimReregisterFilter, 
+//GO(_XimResetIMInstantiateCallback, 
+//GO(_XimRespSyncReply, 
+//GO(_XimServerDestroy, 
+//GO(_XimSetCurrentICValues, 
+//GO(_XimSetCurrentIMValues, 
+//GO(_XimSetEventMaskCallback, 
+//GO(_XimSetHeader, 
+//GO(_XimSetICDefaults, 
+//GO(_XimSetICMode, 
+//GO(_XimSetICResourceList, 
+//GO(_XimSetICValueData, 
+//GO(_XimSetIMMode, 
+//GO(_XimSetIMResourceList, 
+//GO(_XimSetIMValueData, 
+//GO(_XimSetInnerICResourceList, 
+//GO(_XimSetInnerIMResourceList, 
+//GO(_XimSetLocalIMDefaults, 
+//GO(_XimShutdown, 
+//GO(_XimSync, 
+//GO(_XimSyncCallback, 
+//GO(_XimThaiCloseIM, 
+//GO(_XimThaiCreateIC, 
+//GO(_XimThaiFilter, 
+//GO(_XimThaiIMFree, 
+//GO(_XimThaiOpenIM, 
+//GO(_XimTransCallDispatcher, 
+//GO(_XimTransConf, 
+//GO(_XimTransFilterWaitEvent, 
+//GO(_XimTransFlush, 
+//GO(_XimTransInternalConnection, 
+//DATA(_XimTransportRec, 
+//GO(_XimTransRead, 
+//GO(_XimTransRegisterDispatcher, 
+//GO(_XimTransWrite, 
+//GO(_XimTriggerNotify, 
+//GO(_XimUnregisterFilter, 
+//GO(_XimUnRegisterIMInstantiateCallback, 
+//GO(_XimUnregisterServerFilter, 
+//GO(_XimWrite, 
+//GO(_XimXConf, 
 //GO(_XimXTransBytesReadable, 
 //GO(_XimXTransClose, 
 //GO(_XimXTransCloseForCloning, 
@@ -460,10 +569,8 @@ GO(XIMOfIC, pFp)
 //GO(_XimXTransFreeConnInfo, 
 //GO(_XimXTransGetConnectionNumber, 
 //GO(_XimXTransGetHostname, 
-//GO(_XimXTransGetMyAddr, 
 //GO(_XimXTransGetPeerAddr, 
 //GO(_XimXTransIsLocal, 
-//GO(_XimXTransOpenCLTSClient, 
 //GO(_XimXTransOpenCOTSClient, 
 //GO(_XimXTransRead, 
 //GO(_XimXTransReadv, 
@@ -475,137 +582,135 @@ DATA(_XimXTransSocketTCPFuncs, sizeof(void*))
 DATA(_XimXTransSocketUNIXFuncs, sizeof(void*))
 //GO(_XimXTransWrite, 
 //GO(_XimXTransWritev, 
-//GO(_XInitDefaultIM, 
-//GO(_XInitDefaultOM, 
 DATAB(_XInitDisplayLock_fn, sizeof(void*))
-//GO(_XInitDynamicIM, 
-//GO(_XInitDynamicOM, 
 GO(XInitExtension, pFpp)
+//GO(_XInitIM, 
 GOM(XInitImage, iFEp)
 GOM(_XInitImageFuncPtrs, iFEp)
 //GO(_XInitKeysymDB, 
+//GO(_XInitOM, 
 GO(XInitThreads, iFv)
 GO(XInsertModifiermapEntry, pFpCi)
-GO(XInstallColormap, iFpp)
+GO(XInstallColormap, iFpL)
 GO(XInternalConnectionNumbers, iFppp)
 GO(XInternAtom, LFppi)
 GO(XInternAtoms, iFppiip)
 GO(XIntersectRegion, iFppp)
 GO(_XIOError, iFp)
 DATAB(_XIOErrorFunction, sizeof(void*))
-//GO(_XIsEventCookie, 
+GO(_XIsEventCookie, iFpp)
 GO(XkbAddDeviceLedInfo, pFpuu)
-//GO(XkbAddGeomColor
-//GO(XkbAddGeomDoodad
-//GO(XkbAddGeomKey
-//GO(XkbAddGeomKeyAlias
-//GO(XkbAddGeomOutline
-//GO(XkbAddGeomOverlay
-//GO(XkbAddGeomOverlayKey
-//GO(XkbAddGeomOverlayRow
-//GO(XkbAddGeomProperty
-//GO(XkbAddGeomRow
-//GO(XkbAddGeomSection
-//GO(XkbAddGeomShape
+GO(XkbAddGeomColor, pFppu)
+GO(XkbAddGeomDoodad, pFppL)
+GO(XkbAddGeomKey, pFp)
+GO(XkbAddGeomKeyAlias, pFppp)
+GO(XkbAddGeomOutline, pFpi)
+GO(XkbAddGeomOverlay, pFpLi)
+GO(XkbAddGeomOverlayKey, pFpppp)
+GO(XkbAddGeomOverlayRow, pFpii)
+GO(XkbAddGeomProperty, pFppp)
+GO(XkbAddGeomRow, pFpi)
+GO(XkbAddGeomSection, pFpLiii)
+GO(XkbAddGeomShape, pFpLi)
 GO(XkbAddKeyType, pFpLiii)
-//GO(XkbAllocClientMap
+GO(XkbAllocClientMap, iFpuu)
 GO(XkbAllocCompatMap, iFpuu)
 GO(XkbAllocControls, iFpu)
 GO(XkbAllocDeviceInfo, pFuuu)
-//GO(XkbAllocGeomColors
-//GO(XkbAllocGeomDoodads
-//GO(XkbAllocGeometry
-//GO(XkbAllocGeomKeyAliases
-//GO(XkbAllocGeomKeys
-//GO(XkbAllocGeomOutlines
-//GO(XkbAllocGeomOverlayKeys
-//GO(XkbAllocGeomOverlayRows
-//GO(XkbAllocGeomOverlays
-//GO(XkbAllocGeomPoints
-//GO(XkbAllocGeomProps
-//GO(XkbAllocGeomRows
-//GO(XkbAllocGeomSectionDoodads
-//GO(XkbAllocGeomSections
-//GO(XkbAllocGeomShapes
+GO(XkbAllocGeomColors, iFpi)
+GO(XkbAllocGeomDoodads, iFpi)
+GO(XkbAllocGeometry, iFpp)
+GO(XkbAllocGeomKeyAliases, iFpi)
+GO(XkbAllocGeomKeys, iFpi)
+GO(XkbAllocGeomOutlines, iFpi)
+GO(XkbAllocGeomOverlayKeys, iFpi)
+GO(XkbAllocGeomOverlayRows, iFpi)
+GO(XkbAllocGeomOverlays, iFpi)
+GO(XkbAllocGeomPoints, iFpi)
+GO(XkbAllocGeomProps, iFpi)
+GO(XkbAllocGeomRows, iFpi)
+GO(XkbAllocGeomSectionDoodads, iFpi)
+GO(XkbAllocGeomSections, iFpi)
+GO(XkbAllocGeomShapes, iFpi)
 GO(XkbAllocIndicatorMaps, iFp)
 GO(XkbAllocKeyboard, pFv)
 GO(XkbAllocNames, iFpuii)
-//GO(XkbAllocServerMap
+GO(XkbAllocServerMap, iFpuu)
 GO(XkbApplyCompatMapToKey, iFpCp)
 GO(XkbApplyVirtualModChanges, iFpup)
-GO(XkbBell, iFppip)
+GO(XkbBell, iFpLiL)
 GO(XkbBellEvent, iFpLiL)
 GO(XkbChangeDeviceInfo, iFppp)
-//GO(XkbChangeEnabledControls
+GO(XkbChangeEnabledControls, iFpuuu)
 GO(XkbChangeKeycodeRange, iFpiip)
 GO(XkbChangeMap, iFppp)
 GO(XkbChangeNames, iFppp)
 GO(XkbChangeTypesOfKey, iFpiiupp)
 GO(XkbComputeEffectiveMap, iFppp)
-//GO(XkbComputeRowBounds
-//GO(XkbComputeSectionBounds
-//GO(XkbComputeShapeBounds
-//GO(XkbComputeShapeTop
+GO(XkbComputeRowBounds, iFppp)
+GO(XkbComputeSectionBounds, iFpp)
+GO(XkbComputeShapeBounds, iFp)
+GO(XkbComputeShapeTop, iFpp)
 //GO(_XkbCopyFromReadBuffer, 
 GO(XkbCopyKeyType, iFpp)
 GO(XkbCopyKeyTypes, iFppi)
-//GO(XkbDeviceBell
+GO(XkbDeviceBell, iFpLiiiiL)
 GO(XkbDeviceBellEvent, iFpLiiiiL)
-//GO(XkbFindOverlayForKey
+GO(XkbFindOverlayForKey, pFppp)
 GO(XkbForceBell, iFpi)
 GO(XkbForceDeviceBell, iFpiiii)
 GO(XkbFreeClientMap, vFpui)
-//GO(XkbFreeCompatMap
+GO(XkbFreeCompatMap, vFpui)
 GO(XkbFreeComponentList, vFp)
-//GO(XkbFreeControls
+GO(XkbFreeControls, vFpui)
 GO(XkbFreeDeviceInfo, vFpui)
-//GO(XkbFreeGeomColors
-//GO(XkbFreeGeomDoodads
-//GO(XkbFreeGeometry
-//GO(XkbFreeGeomKeyAliases
-//GO(XkbFreeGeomKeys
-//GO(XkbFreeGeomOutlines
-//GO(XkbFreeGeomOverlayKeys
-//GO(XkbFreeGeomOverlayRows
-//GO(XkbFreeGeomOverlays
-//GO(XkbFreeGeomPoints
-//GO(XkbFreeGeomProperties
-//GO(XkbFreeGeomRows
-//GO(XkbFreeGeomSections
-//GO(XkbFreeGeomShapes
+GO(XkbFreeGeomColors, vFpiii)
+GO(XkbFreeGeomDoodads, vFpii)
+GO(XkbFreeGeometry, vFpui)
+GO(XkbFreeGeomKeyAliases, vFpiii)
+GO(XkbFreeGeomKeys, vFpiii)
+GO(XkbFreeGeomOutlines, vFpiii)
+GO(XkbFreeGeomOverlayKeys, vFpiii)
+GO(XkbFreeGeomOverlayRows, vFpiii)
+GO(XkbFreeGeomOverlays, vFpiii)
+GO(XkbFreeGeomPoints, vFpiii)
+GO(XkbFreeGeomProperties, vFpiii)
+GO(XkbFreeGeomRows, vFpiii)
+GO(XkbFreeGeomSections, vFpiii)
+GO(XkbFreeGeomShapes, vFpiii)
 GO(XkbFreeIndicatorMaps, vFp)
 GO(XkbFreeKeyboard, vFpui)
 GO(XkbFreeNames, vFpui)
 //GO(_XkbFreeReadBuffer, 
-//GO(XkbFreeServerMap
+GO(XkbFreeServerMap, vFpui)
 DATA(_XkbGetAtomNameFunc, sizeof(void*))
-//GO(XkbGetAutoRepeatRate
+GO(XkbGetAutoRepeatRate, iFpupp)
 GO(XkbGetAutoResetControls, iFppp)
 //GO(_XkbGetCharset, 
-//GO(XkbGetCompatMap
+GO(XkbGetCompatMap, iFpup)
 GO(XkbGetControls, iFpLp)
 //GO(_XkbGetConverters, 
 GO(XkbGetDetectableAutoRepeat, iFpp)
 GO(XkbGetDeviceButtonActions, iFppiuu)
 GO(XkbGetDeviceInfo, pFpuuuu)
-//GO(XkbGetDeviceInfoChanges
-//GO(XkbGetDeviceLedInfo
-//GO(XkbGetGeometry
-//GO(XkbGetIndicatorMap
+GO(XkbGetDeviceInfoChanges, iFppp)
+GO(XkbGetDeviceLedInfo, iFppuuu)
+GO(XkbGetGeometry, iFpp)
+GO(XkbGetIndicatorMap, iFpLp)
 GO(XkbGetIndicatorState, iFpup)
-//GO(XkbGetKeyActions
-//GO(XkbGetKeyBehaviors
+GO(XkbGetKeyActions, iFpuup)
+GO(XkbGetKeyBehaviors, iFpuup)
 GO(XkbGetKeyboard, pFpuu)
 GO(XkbGetKeyboardByName, pFpupuui)
-//GO(XkbGetKeyExplicitComponents
-//GO(XkbGetKeyModifierMap
-//GO(XkbGetKeySyms
-//GO(XkbGetKeyTypes
+GO(XkbGetKeyExplicitComponents, iFpuup)
+GO(XkbGetKeyModifierMap, iFpuup)
+GO(XkbGetKeySyms, iFpuup)
+GO(XkbGetKeyTypes, iFpuup)
 GO(XkbGetKeyVirtualModMap, iFpuup)
 GO(XkbGetMap, pFpuu)
-//GO(XkbGetMapChanges
+GO(XkbGetMapChanges, iFppp)
 GO(XkbGetNamedDeviceIndicator, iFpuuuLpppp)
-//GO(XkbGetNamedGeometry
+GO(XkbGetNamedGeometry, iFppL)
 GO(XkbGetNamedIndicator, iFpLpppp)
 GO(XkbGetNames, iFpup)
 GO(XkbGetPerClientControls, iFpp)
@@ -613,7 +718,7 @@ GO(XkbGetPerClientControls, iFpp)
 //GO(_XkbGetReadBufferPtr, 
 GO(XkbGetState, iFpup)
 GO(XkbGetUpdatedMap, iFpup)
-//GO(XkbGetVirtualMods
+GO(XkbGetVirtualMods, iFpup)
 GO(XkbGetXlibControls, uFp)
 GO(XkbIgnoreExtension, iFi)
 GO(XkbInitCanonicalKeyTypes, iFpui)
@@ -626,8 +731,8 @@ GO(XkbLatchGroup, iFpuu)
 GO(XkbLatchModifiers, iFpuuu)
 GO(XkbLibraryVersion, iFpp)
 GO(XkbListComponents, pFpupp)
-//GO(XkbLockGroup
-//GO(XkbLockModifiers
+GO(XkbLockGroup, iFpuu)
+GO(XkbLockModifiers, iFpuuu)
 GO(XkbLookupKeyBinding, iFpLupip)
 GO(XkbLookupKeySym, iFpCupp)
 GO(XkbNoteControlsChanges, vFppu)
@@ -638,7 +743,9 @@ GO(XkbNoteNameChanges, vFppu)
 GO(XkbOpenDisplay, pFpppppp)
 //GO(_XkbPeekAtReadBuffer, 
 GO(XkbQueryExtension, iFpppppp)
+//GO(_XkbReadBufferCopy32, 
 //GO(_XkbReadBufferCopyKeySyms, 
+//GO(_XkbReadCopyData32, 
 //GO(_XkbReadCopyKeySyms, 
 //GO(_XkbReadGetCompatMapReply, 
 //GO(_XkbReadGetGeometryReply, 
@@ -652,30 +759,30 @@ GO(XkbResizeKeyActions, pFpii)
 GO(XkbResizeKeySyms, pFpii)
 GO(XkbResizeKeyType, iFpiiii)
 GO(XkbSelectEventDetails, iFpuuLL)
-GO(XkbSelectEvents, iFpuLL)
-//GO(XkbSetAtomFuncs
-//GO(XkbSetAutoRepeatRate
+GO(XkbSelectEvents, iFpuuu)
+//GOM(XkbSetAtomFuncs, vFEpp)
+GO(XkbSetAutoRepeatRate, iFpuuu)
 GO(XkbSetAutoResetControls, iFpupp)
 GO(XkbSetCompatMap, iFpupi)
-//GO(XkbSetControlslib
+GO(XkbSetControls, iFpLp)
 GO(XkbSetDebuggingFlags, iFpuupuupp)
 GO(XkbSetDetectableAutoRepeat, iFpip)
 GO(XkbSetDeviceButtonActions, iFppuu)
 GO(XkbSetDeviceInfo, iFpup)
 GO(XkbSetDeviceLedInfo, iFppuuu)
-//GO(XkbSetGeometry
+GO(XkbSetGeometry, iFpup)
 GO(XkbSetIgnoreLockMods, iFpuuuuu)
-//GO(XkbSetIndicatorMap
+GO(XkbSetIndicatorMap, iFpLp)
 GO(XkbSetMap, iFpup)
 GO(XkbSetNamedDeviceIndicator, iFpuuuLiiip)
 GO(XkbSetNamedIndicator, iFpLiiip)
 GO(XkbSetNames, iFpuuup)
 GO(XkbSetPerClientControls, iFpup)
-//GO(XkbSetServerInternalMods
+GO(XkbSetServerInternalMods, iFpuuuuu)
 GO(XkbSetXlibControls, uFpuu)
 //GO(_XkbSkipReadBufferData, 
-GO(XkbToControl, CFC)
-//GO(XkbTranslateKey
+GO(XkbToControl, cFc)
+//GO(XkbTranslateKey, 
 GO(XkbTranslateKeyCode, iFpCupp)
 GO(XkbTranslateKeySym, iFppupip)
 GO(XkbUpdateActionVirtualMods, iFppu)
@@ -683,16 +790,17 @@ GO(XkbUpdateKeyTypeVirtualMods, vFppup)
 GO(XkbUpdateMapFromCore, iFpCiipp)
 GO(XkbUseExtension, iFppp)
 GO(XkbVirtualModsToReal, iFpup)
+//GO(_XkbWriteCopyData32, 
 //GO(_XkbWriteCopyKeySyms, 
 GO(XkbXlibControlsImplemented, uFv)
-GO(XKeycodeToKeysym, LFpCi)
 //GO(_XKeycodeToKeysym, 
+GO(XKeycodeToKeysym, LFpCi)
 //GO(_XKeyInitialize, 
-GO(XKeysymToKeycode, CFpL)
 //GO(_XKeysymToKeycode, 
+GO(XKeysymToKeycode, CFpL)
 //GO(_XKeysymToModifiers, 
 GO(XKeysymToString, pFL)
-//GO(_XkeyTable   // type r, 
+//DATA(_XkeyTable, 
 GO(XKillClient, iFpL)
 GO(XLastKnownRequestProcessed, LFp)
 //GO(_XlcAddCharSet, 
@@ -713,12 +821,13 @@ GO(XLastKnownRequestProcessed, LFp)
 //GO(_XlcCreateLocaleDataBase, 
 //GO(_XlcCurrentLC, 
 //GO(_XlcDbg_printValue, 
+//GO(_XlcDefaultLoader, 
 //GO(_XlcDefaultMapModifiers, 
 //GO(_XlcDeInitLoader, 
 //GO(_XlcDestroyLC, 
 //GO(_XlcDestroyLocaleDataBase, 
-//GO(_XlcDynamicLoad, 
 //GO(_XlcFileName, 
+//GO(_XlcGenericLoader, 
 DATA(_XlcGenericMethods, sizeof(void*))
 //GO(_XlcGetCharSet, 
 //GO(_XlcGetCharSetWithSide, 
@@ -745,6 +854,7 @@ DATA(_XlcPublicMethods, sizeof(void*))
 //GO(_XlcResolveLocaleName, 
 //GO(_XlcSetConverter, 
 //GO(_XlcSetValues, 
+//GO(_XlcUtf8Loader, 
 //GO(_XlcValidModSyntax, 
 //GO(_XlcVaToArgList, 
 //GO(_Xlcwcstombs, 
@@ -759,43 +869,53 @@ GO(XListPixmapFormats, pFpp)
 GO(XListProperties, pFpLp)
 GO(XLoadFont, LFpp)
 GO(XLoadQueryFont, pFpp)
-// xlocaledir
+GO(xlocaledir, vFpi)
 GO(XLocaleOfFontSet, pFp)
 GO(XLocaleOfIM, pFp)
 GO(XLocaleOfOM, pFp)
 GO(XLockDisplay, vFp)
 DATAB(_XLockMutex_fn, sizeof(void*))
 GO(XLookupColor, iFpLppp)
-GO(XLookupKeysym, LFpi)
 //GO(_XLookupKeysym, 
-GO(XLookupString, iFppipp)
+GO(XLookupKeysym, LFpi)
 //GO(_XLookupString, 
-GO(XLowerWindow, iFpp)
-GO(XMapRaised, iFpp)
-GO(XMapSubwindows, iFpp)
-GO(XMapWindow, iFpp)
+GO(XLookupString, iFppipp)
+GO(XLowerWindow, iFpL)
+GO(XMapRaised, iFpL)
+GO(XMapSubwindows, iFpL)
+GO(XMapWindow, iFpL)
 GO(XMaskEvent, iFplp)
 GO(XMatchVisualInfo, iFpiiip)
-//GO(XMaxCmapsOfScreen
-GO(XMaxRequestSize, iFp)
-//GO(XmbDrawImageString
-GO(XmbDrawString, vFppppiipi)
-//GO(XmbDrawText
+GO(XMaxCmapsOfScreen, iFp)
+GO(XMaxRequestSize, lFp)
+//GO(_XmbDefaultDrawImageString, 
+//GO(_XmbDefaultDrawString, 
+//GO(_XmbDefaultTextEscapement, 
+//GO(_XmbDefaultTextExtents, 
+//GO(_XmbDefaultTextPerCharExtents, 
+GO(XmbDrawImageString, vFpLppiipi)
+GO(XmbDrawString, vFpLppiipi)
+GO(XmbDrawText, vFpLpiipi)
+//GO(_XmbGenericDrawImageString, 
+//GO(_XmbGenericDrawString, 
+//GO(_XmbGenericTextEscapement, 
+//GO(_XmbGenericTextExtents, 
+//GO(_XmbGenericTextPerCharExtents, 
 GO(_Xmblen, iFpi)
 GO(XmbLookupString, iFpppipp)
 GO(XmbResetIC, pFp)
-GO(XmbSetWMProperties, vFpppppippp)
+GO(XmbSetWMProperties, vFpLpppippp)
 //GO(_Xmbstoutf8, 
 //GO(_Xmbstowcs, 
 GO(XmbTextEscapement, iFppi)
 GO(XmbTextExtents, iFppipp)
-GO(XmbTextListToTextProperty, iFppiip)
 //GO(_XmbTextListToTextProperty, 
-GO(XmbTextPerCharExtents, iFppippppp)
-GO(XmbTextPropertyToTextList, iFpppp)
+GO(XmbTextListToTextProperty, iFppiup)
+GO(XmbTextPerCharExtents, iFppippippp)
 //GO(_XmbTextPropertyToTextList, 
+GO(XmbTextPropertyToTextList, iFpppp)
 GO(_Xmbtowc, iFppi)
-//GO(XMinCmapsOfScreen
+GO(XMinCmapsOfScreen, iFp)
 GO(XMoveResizeWindow, iFpLiiuu)
 GO(XMoveWindow, iFpLii)
 GO(XNewModifiermap, pFi)
@@ -805,6 +925,12 @@ GO(XNoOp, iFp)
 //GO(_XNoticeCreateBitmap, 
 //GO(_XNoticePutBitmap, 
 GO(XOffsetRegion, iFpii)
+//GO(_XomConvert, 
+//GO(_XomGenericDrawString, 
+//GO(_XomGenericOpenOM, 
+//GO(_XomGenericTextExtents, 
+//GO(_XomGetFontDataFromFontSet, 
+//GO(_XomInitConverter, 
 GO(XOMOfOC, pFp)
 GOM(XOpenDisplay, pFEp)
 GO(XOpenIM, pFpppp)
@@ -816,29 +942,29 @@ GO(XParseGeometry, iFppppp)
 GO(XPeekEvent, iFpp)
 GOM(XPeekIfEvent, iFEpppp)
 GO(XPending, iFp)
-//GO(Xpermalloc
+GO(Xpermalloc, pFu)
 GO(XPlanesOfScreen, iFp)
-GO(XPointInRegion, iFpp)
-//GO(_XPollfdCacheAdd, 
-//GO(_XPollfdCacheDel, 
-//GO(_XPollfdCacheInit, 
+GO(XPointInRegion, iFpii)
+GO(_XPollfdCacheAdd, vFpi)
+GO(_XPollfdCacheDel, vFpi)
+GO(_XPollfdCacheInit, iFp)
 GO(XPolygonRegion, pFpii)
+//GOM(_XProcessInternalConnection, vFEpp)
 GO(XProcessInternalConnection, vFpi)
-//GO(_XProcessInternalConnection, 
-//GO(_XProcessWindowAttributes, 
+GO(_XProcessWindowAttributes, vFppLp)
 GO(XProtocolRevision, iFp)
 GO(XProtocolVersion, iFp)
+GO(_XPutBackEvent, iFpp)
 GO(XPutBackEvent, iFpp)
-//GO(_XPutBackEvent, 
-GOM(XPutImage, iFEppppiiiiuu)
-//GO(XPutPixel
+GOM(XPutImage, iFEpLppiiiiuu)
+//GO(XPutPixel, 
 GO(XQLength, iFp)
-GO(XQueryBestCursor, iFppuupp)
+GO(XQueryBestCursor, iFpLuupp)
 GO(XQueryBestSize, iFpiLuupp)
-//GO(XQueryBestStipple
+GO(XQueryBestStipple, iFpLuupp)
 GO(XQueryBestTile, iFpLuupp)
-GO(XQueryColor, iFppp)
-GO(XQueryColors, iFpppi)
+GO(XQueryColor, iFpLp)
+GO(XQueryColors, iFpLpi)
 GOM(XQueryExtension, iFEppppp)
 GO(XQueryFont, pFpL)
 GO(XQueryKeymap, iFpp)
@@ -846,24 +972,24 @@ GO(XQueryPointer, iFpLppppppp)
 GO(XQueryTextExtents, iFpLpipppp)
 GO(XQueryTextExtents16, iFpLpipppp)
 GO(XQueryTree, iFpLpppp)
-GO(XRaiseWindow, iFpp)
-GO(_XRead, iFppi)
+GO(XRaiseWindow, iFpL)
+GO(_XRead, iFppl)
 GO(XReadBitmapFile, iFpLpppppp)
 GO(XReadBitmapFileData, iFpppppp)
 GO(_XReadEvents, vFp)
-GO(_XReadPad, vFppi)
+GO(_XReadPad, vFppl)
 GO(XRebindKeysym, iFpLpipi)
 GO(XRecolorCursor, iFpLpp)
 GO(XReconfigureWMWindow, iFpLiup)
 GO(XRectInRegion, iFpiiuu)
-GO(XRefreshKeyboardMapping, iFp)
 //GO(_XRefreshKeyboardMapping, 
+GO(XRefreshKeyboardMapping, iFp)
 //GO(_XRegisterFilterByMask, 
 //GO(_XRegisterFilterByType, 
 GOM(XRegisterIMInstantiateCallback, iFEpppppp)
-//GO(_XRegisterInternalConnection, 
-GOM(XRemoveConnectionWatch, iFEppp)
-//GO(XRemoveFromSaveSet
+//GOM(_XRegisterInternalConnection, iFEpipp)
+GOM(XRemoveConnectionWatch, vFEppp)
+GO(XRemoveFromSaveSet, iFpL)
 GO(XRemoveHost, iFpp)
 GO(XRemoveHosts, iFppi)
 GO(XReparentWindow, iFpLLii)
@@ -877,7 +1003,7 @@ GO(XrmCombineDatabase, vFppi)
 GO(XrmCombineFileDatabase, iFppi)
 //GO(_XrmDefaultInitParseInfo, 
 GO(XrmDestroyDatabase, vFp)
-//GOM(XrmEnumerateDatabase
+//GOM(XrmEnumerateDatabase, iFEpppipp)
 GO(XrmGetDatabase, pFp)
 GO(XrmGetFileDatabase, pFp)
 GO(XrmGetResource, iFppppp)
@@ -885,25 +1011,25 @@ GO(XrmGetStringDatabase, pFp)
 GO(XrmInitialize, vFv)
 //GO(_XrmInitParseInfo, 
 //GO(_XrmInternalStringToQuark, 
-//GO(XrmLocaleOfDatabase
-//GO(XrmMergeDatabases
-//GO(XrmParseCommand
-//GO(XrmPermStringToQuark
-//GO(XrmPutFileDatabase
-//GO(XrmPutLineResource
-//GO(XrmPutResource
-//GO(XrmPutStringResource
-//GO(XrmQGetResource
-//GO(XrmQGetSearchList
-//GO(XrmQGetSearchResource
-//GO(XrmQPutResource
-//GO(XrmQPutStringResource
-//GO(XrmQuarkToString
-//GO(XrmSetDatabase
-//GO(XrmStringToBindingQuarkList
-//GO(XrmStringToQuark
-//GO(XrmStringToQuarkList
-GO(XrmUniqueQuark, iFv) //typedef int XrmQuark, *XrmQuarkList;
+GO(XrmLocaleOfDatabase, pFp)
+GO(XrmMergeDatabases, vFpp)
+GO(XrmParseCommand, vFppippp)
+GO(XrmPermStringToQuark, iFp)
+GO(XrmPutFileDatabase, vFpp)
+GO(XrmPutLineResource, vFpp)
+GO(XrmPutResource, vFpppp)
+GO(XrmPutStringResource, vFppp)
+GO(XrmQGetResource, iFppppp)
+GO(XrmQGetSearchList, iFppppi)
+GO(XrmQGetSearchResource, iFpiipp)
+GO(XrmQPutResource, vFpppip)
+GO(XrmQPutStringResource, vFpppp)
+GO(XrmQuarkToString, pFi)
+GO(XrmSetDatabase, vFpp)
+GO(XrmStringToBindingQuarkList, vFppp)
+GO(XrmStringToQuark, iFp)
+GO(XrmStringToQuarkList, vFpp)
+GO(XrmUniqueQuark, iFv)
 GO(XRootWindow, LFpi)
 GO(XRootWindowOfScreen, LFp)
 GO(XRotateBuffers, iFpi)
@@ -912,48 +1038,49 @@ GO(XSaveContext, iFpLip)
 GO(XScreenCount, iFp)
 GO(XScreenNumberOfScreen, iFp)
 GO(XScreenOfDisplay, pFpi)
-//GO(_XScreenOfWindow, 
+GO(_XScreenOfWindow, pFpL)
 GO(XScreenResourceString, pFp)
 GO(XSelectInput, iFpLl)
-GO(_XSend, vFppi)
+GO(_XSend, vFppl)
 GO(XSendEvent, iFpLilp)
 GO(XServerVendor, pFp)
-GO(XSetAccessControl, vFpi)
+GO(XSetAccessControl, iFpi)
 GOM(XSetAfterFunction, pFEpp)
 GO(XSetArcMode, iFppi)
 GO(XSetAuthorization, vFpipi)
 GO(XSetBackground, iFppL)
 GO(XSetClassHint, iFpLp)
-GO(XSetClipMask, iFppp)
+GO(XSetClipMask, iFppL)
 GO(XSetClipOrigin, iFppii)
+GO(_XSetClipRectangles, vFppiipii)
 GO(XSetClipRectangles, iFppiipii)
-//GO(_XSetClipRectangles, 
 GO(XSetCloseDownMode, iFpi)
 GO(XSetCommand, iFpLpi)
 GO(XSetDashes, iFppipi)
 GOM(XSetErrorHandler, pFEp)
 GO(XSetFillRule, iFppi)
-GO(XSetFillStyle, iFppp)
+GO(XSetFillStyle, iFppi)
 GO(XSetFont, iFppL)
 GO(XSetFontPath, iFppi)
 GO(XSetForeground, iFppL)
 GO(XSetFunction, iFppi)
 GO(XSetGraphicsExposures, iFppi)
 GO(XSetICFocus, vFp)
-GO(XSetIconName, iFppp)
+GO(XSetIconName, iFpLp)
 GO(XSetIconSizes, iFpLpi)
-GOM(XSetICValues, pFEpV)         // use vaarg
+GOM(XSetICValues, pFEpV)
 //GO(_XSetImage, 
-GOM(XSetIMValues, pFEpV)    // use vaarg
+GOM(XSetIMValues, pFEpV)
 GO(XSetInputFocus, iFpLiL)
+//GOM(XSetIOErrorExitHandler, vFEppp)
 GOM(XSetIOErrorHandler, pFEp)
-GO(_XSetLastRequestRead, uFpp)
+GO(_XSetLastRequestRead, LFpp)
 GO(XSetLineAttributes, iFppuiii)
 GO(XSetLocaleModifiers, pFp)
 GO(XSetModifierMapping, iFpp)
-GO(XSetNormalHints, iFpppp)
+GO(XSetNormalHints, iFpLp)
 GO(XSetOCValues, pFpppppppppppppppp) // use vaarg
-GO(XSetOMValues, pFp)
+GO(XSetOMValues, pFpppppppppppppppp) // use vaarg
 GO(XSetPlaneMask, iFppL)
 GO(XSetPointerMapping, iFppi)
 GO(XSetRegion, iFppp)
@@ -964,22 +1091,22 @@ GO(XSetSizeHints, iFpLpL)
 GO(XSetStandardColormap, vFpLpL)
 GO(XSetStandardProperties, iFpLppLpip)
 GO(XSetState, iFppLLiL)
-GO(XSetStipple, iFppp)
+GO(XSetStipple, iFppL)
 GO(XSetSubwindowMode, iFppi)
 GO(XSetTextProperty, vFpLpL)
 GO(XSetTile, iFppL)
 GO(XSetTransientForHint, iFpLL)
 GO(XSetTSOrigin, iFppii)
-GO(XSetWindowBackground, iFppu)
-GO(XSetWindowBackgroundPixmap, iFppp)
+GO(XSetWindowBackground, iFpLL)
+GO(XSetWindowBackgroundPixmap, iFpLL)
 GO(XSetWindowBorder, iFpLL)
 GO(XSetWindowBorderPixmap, iFpLL)
 GO(XSetWindowBorderWidth, iFpLu)
 GO(XSetWindowColormap, iFpLL)
-GO(XSetWMClientMachine, vFppp)
+GO(XSetWMClientMachine, vFpLp)
 GO(XSetWMColormapWindows, iFpLpi)
 GO(XSetWMHints, iFpLp)
-GO(XSetWMIconName, vFppp)
+GO(XSetWMIconName, vFpLp)
 GO(XSetWMName, vFpLp)
 GO(XSetWMNormalHints, vFpLp)
 GO(XSetWMProperties, vFpLpppippp)
@@ -991,12 +1118,12 @@ GO(XStoreBuffer, iFppii)
 GO(XStoreBytes, iFppi)
 GO(XStoreColor, iFpLp)
 GO(XStoreColors, iFpLpi)
-//GO(_XStoreEventCookie, 
+GO(_XStoreEventCookie, vFpp)
 GO(XStoreName, iFpLp)
 GO(XStoreNamedColor, iFpLpLi)
 GO(XStringListToTextProperty, iFpip)
 GO(XStringToKeysym, LFp)
-//GOM(XSubImage, pFEpiiuu)    // need unbridging
+//GOM(XSubImage, pFEpiiuu)    // need unbridging  
 GO(dummy_XSubImage, pFpiiuu)    // for the wrapper
 GO(XSubtractRegion, iFppp)
 GO(XSupportsLocale, iFv)
@@ -1014,7 +1141,7 @@ GO(XTranslateCoordinates, iFpLLiippp)
 //GO(_XTranslateKey, 
 //GO(_XTranslateKeySym, 
 //GO(_XTryShapeBitmapCursor, 
-GO(XUndefineCursor, iFpp)
+GO(XUndefineCursor, iFpL)
 GO(XUngrabButton, iFpuuL)
 GO(XUngrabKey, iFpiuL)
 GO(XUngrabKeyboard, iFpL)
@@ -1023,45 +1150,65 @@ GO(XUngrabServer, iFp)
 GO(XUninstallColormap, iFpL)
 GO(XUnionRectWithRegion, iFppp)
 GO(XUnionRegion, iFppp)
-//GO(_XUnknownCopyEventCookie, 
-//GO(_XUnknownNativeEvent, 
-//GO(_XUnknownWireEvent, 
-//GO(_XUnknownWireEventCookie, 
+GO(_XUnknownCopyEventCookie, iFppp)
+GO(_XUnknownNativeEvent, iFppp)
+GO(_XUnknownWireEvent, iFppp)
+GO(_XUnknownWireEventCookie, iFppp)
 GO(XUnloadFont, iFpL)
 GO(XUnlockDisplay, vFp)
-DATAB(_XUnlockMutex_fn, sizeof(void*))
-GO(XUnmapSubwindows, iFpp)
+DATAM(_XUnlockMutex_fn, sizeof(void*))
+GO(XUnmapSubwindows, iFpL)
 GO(XUnmapWindow, iFpL)
 //GO(_XUnregisterFilter, 
 GOM(XUnregisterIMInstantiateCallback, iFEpppppp)
-//GO(_XUnregisterInternalConnection, 
+GO(_XUnregisterInternalConnection, vFpi)
 //GO(_XUnresolveColor, 
 GO(XUnsetICFocus, vFp)
 //GO(_XUpdateAtomCache, 
 //GO(_XUpdateGCCache, 
+//GO(_Xutf8DefaultDrawImageString, 
+//GO(_Xutf8DefaultDrawString, 
+//GO(_Xutf8DefaultTextEscapement, 
+//GO(_Xutf8DefaultTextExtents, 
+//GO(_Xutf8DefaultTextPerCharExtents, 
 GO(Xutf8DrawImageString, vFpLppiipi)
-GO(Xutf8DrawString, vFppppiipi)
+GO(Xutf8DrawString, vFpLppiipi)
 GO(Xutf8DrawText, vFpLpiipi)
+//GO(_Xutf8GenericDrawImageString, 
+//GO(_Xutf8GenericDrawString, 
+//GO(_Xutf8GenericTextEscapement, 
+//GO(_Xutf8GenericTextExtents, 
+//GO(_Xutf8GenericTextPerCharExtents, 
 GO(Xutf8LookupString, iFpppipp)
 GO(Xutf8ResetIC, pFp)
 GO(Xutf8SetWMProperties, vFpLpppippp)
 GO(Xutf8TextEscapement, iFppi)
 GO(Xutf8TextExtents, iFppipp)
-GO(Xutf8TextListToTextProperty, iFppiup)
 //GO(_Xutf8TextListToTextProperty, 
+GO(Xutf8TextListToTextProperty, iFppiup)
 GO(Xutf8TextPerCharExtents, iFppippippp)
-GO(Xutf8TextPropertyToTextList, iFpppp)
 //GO(_Xutf8TextPropertyToTextList, 
+GO(Xutf8TextPropertyToTextList, iFpppp)
 GOM(XVaCreateNestedList, pFEiV)
 GO(XVendorRelease, iFp)
-GO(_XVIDtoVisual, pFpp)
+GO(_XVIDtoVisual, pFpL)
 GO(XVisualIDFromVisual, LFp)
 GO(XWarpPointer, iFpLLiiuuii)
+//GO(_XwcDefaultDrawImageString, 
+//GO(_XwcDefaultDrawString, 
+//GO(_XwcDefaultTextEscapement, 
+//GO(_XwcDefaultTextExtents, 
+//GO(_XwcDefaultTextPerCharExtents, 
 GO(XwcDrawImageString, vFpLppiipi)
-GO(XwcDrawString, vFppppiipi)
+GO(XwcDrawString, vFpLppiipi)
 GO(XwcDrawText, vFpLpiipi)
-GO(XwcFreeStringList, vFp)
 //GO(_XwcFreeStringList, 
+GO(XwcFreeStringList, vFp)
+//GO(_XwcGenericDrawImageString, 
+//GO(_XwcGenericDrawString, 
+//GO(_XwcGenericTextEscapement, 
+//GO(_XwcGenericTextExtents, 
+//GO(_XwcGenericTextPerCharExtents, 
 GO(XwcLookupString, iFpppipp)
 GO(XwcResetIC, pFp)
 //GO(_Xwcscmp, 
@@ -1072,25 +1219,25 @@ GO(XwcResetIC, pFp)
 //GO(_Xwcstombs, 
 GO(XwcTextEscapement, iFppi)
 GO(XwcTextExtents, iFppipp)
-GO(XwcTextListToTextProperty, iFppiup)
 //GO(_XwcTextListToTextProperty, 
+GO(XwcTextListToTextProperty, iFppiup)
 GO(XwcTextPerCharExtents, iFppippippp)
-GO(XwcTextPropertyToTextList, iFpppp)
 //GO(_XwcTextPropertyToTextList, 
-GO(_Xwctomb, iFpu)
+GO(XwcTextPropertyToTextList, iFpppp)
+GO(_Xwctomb, iFpi)
 GO(XWhitePixel, LFpi)
 GO(XWhitePixelOfScreen, LFp)
-//GO(XWidthMMOfScreen
+GO(XWidthMMOfScreen, iFp)
 GO(XWidthOfScreen, iFp)
 GO(XWindowEvent, iFpLlp)
 GO(_XWireToEvent, iFppp)
-GO(XWithdrawWindow, iFppi)
+GO(XWithdrawWindow, iFpLi)
 GO(XWMGeometry, iFpippupppppp)
 GO(XWriteBitmapFile, iFppLuuii)
 GO(XXorRegion, iFppp)
 
 GO(_XData32, iFppu)
-GO(_XRead32, iFppL)
+GO(_XRead32, vFppl)
 
 GO(dummy_putpixel, iFpiiL)
 GO(dummy_addpixel, iFpl)