diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 32 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedlibx11types.h | 19 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedlibxfttypes.h | 4 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 42 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 19 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibx11.c | 22 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibx11_private.h | 857 |
7 files changed, 563 insertions, 432 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index e6651027..4df39143 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -48,7 +48,6 @@ #() IFS #() CFv #() CFi -#() CFC #() CFW #() CFu #() CFU @@ -1231,6 +1230,7 @@ #() LFpLCL #() LFpLLp #() LFpLLS +#() LFpLpi #() LFpLpL #() LFpLpp #() LFppii @@ -1249,7 +1249,7 @@ #() pFEpii #() pFEpip #() pFEpiV -#() pFEpuL +#() pFEpCL #() pFEppi #() pFEppp #() pFEppV @@ -2162,7 +2162,6 @@ #() iFpppupu #() iFpppupp #() iFpppLpp -#() iFppppii #() iFppppiu #() iFppppip #() iFppppui @@ -2384,6 +2383,7 @@ #() vFppcuupp #() vFppiiiii #() vFppiiipi +#() vFppiipii #() vFppiipuu #() vFppiippp #() vFppilppi @@ -2489,7 +2489,6 @@ #() iFppLuuii #() iFppLLLLu #() iFppLpppp -#() iFpppiiuu #() iFpppiiup #() iFpppiuwu #() iFpppippi @@ -2719,7 +2718,6 @@ #() iFppiiipip #() iFppillppp #() iFppipiipi -#() iFppippppp #() iFppIIIppp #() iFppuiiuuu #() iFppuuuuuu @@ -2855,7 +2853,6 @@ #() vFpppiiiiii #() vFpppffffff #() vFppppipiip -#() vFpppppippp #() iFEpiiiiipi #() iFEppuppppp #() iFEpppupppp @@ -2888,7 +2885,6 @@ #() iFppupppupp #() iFppLpiuppp #() iFpppiiipip -#() iFpppiiuuii #() iFpppiipiiu #() iFpppippipi #() iFpppLLLupp @@ -2908,7 +2904,7 @@ #() lFpppippppp #() LFEppppppii #() LFpLiiuuuLL -#() pFEppiiuuLi +#() pFEpLiiuuLi #() pFEppuippuu #() pFEpppppiiV #() pFEpppppppi @@ -3038,9 +3034,9 @@ #() vFppupppuiiii #() vFppppppppppp #() iFEiipppppppp +#() iFEpLppiiiiuu #() iFEppLpLpLLpp #() iFEpppupppppp -#() iFEppppiiiiuu #() iFEpppppppppp #() iFuiiiiuuiiip #() iFpiippiiipip @@ -3091,10 +3087,10 @@ #() iFpLLlliLppppp #() iFpppllipppppp #() iFpppppppppppp -#() pFEppiiuuuipii +#() LFpLiiuuuiupLp +#() pFEpLiiuuLipii #() pFEppppppppppp #() pFWWiCCCCiipup -#() pFppiiuuuiupLp #() pFppippLLLiLpp #() pFppuuppppuppp #() pFpppppppppppp @@ -3163,6 +3159,7 @@ #() vFpiiiiiiiiiiiiiiiiii #() uFbWWWCCCCCCCCWCCCCCC #() pFiiiippppppppppppppp +#() pFppppppppppppppppppp #() pFpupupppppppppppppppp #() iFpppppppppppppppppppppp #() uFippuuuuiiiiuuiiiiiiiipp @@ -5030,15 +5027,16 @@ wrappedlibx11: - XCreateIC - XSetICValues - XSetIMValues +- vFppp: + - XRemoveConnectionWatch - iFppp: - XAddConnectionWatch - - XRemoveConnectionWatch - pFpip: - XESetCloseDisplay - XESetError - XESetEventToWire - XESetWireToEvent -- pFpuL: +- pFpCL: - _XGetRequest - iFpppp: - XCheckIfEvent @@ -5049,13 +5047,13 @@ wrappedlibx11: - iFpppppp: - XRegisterIMInstantiateCallback - XUnregisterIMInstantiateCallback -- pFppiiuuLi: +- pFpLiiuuLi: - XGetImage -- iFppppiiiiuu: +- iFpLppiiiiuu: - XPutImage - pFppuiipuuii: - XCreateImage -- pFppiiuuuipii: +- pFpLiiuuLipii: - XGetSubImage wrappedlibx11xcb: - pFp: @@ -5105,8 +5103,6 @@ wrappedlibxfixes: wrappedlibxft: - pFpiV: - XftFontOpen -- pFpipppppppppppppp: - - XftListFonts wrappedlibxi: wrappedlibxmu: wrappedlibxpm: diff --git a/src/wrapped/generated/wrappedlibx11types.h b/src/wrapped/generated/wrappedlibx11types.h index 7e1dbfbd..1651619f 100644 --- a/src/wrapped/generated/wrappedlibx11types.h +++ b/src/wrapped/generated/wrappedlibx11types.h @@ -18,16 +18,17 @@ typedef void* (*pFiV_t)(int32_t, ...); typedef void* (*pFpi_t)(void*, int32_t); typedef void* (*pFpp_t)(void*, void*); typedef void* (*pFpV_t)(void*, ...); +typedef void (*vFppp_t)(void*, void*, void*); typedef int32_t (*iFppp_t)(void*, void*, void*); typedef void* (*pFpip_t)(void*, int32_t, void*); -typedef void* (*pFpuL_t)(void*, uint32_t, uintptr_t); +typedef void* (*pFpCL_t)(void*, uint8_t, uintptr_t); typedef int32_t (*iFpppp_t)(void*, void*, void*, void*); typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*); typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*); -typedef void* (*pFppiiuuLi_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t, uintptr_t, int32_t); -typedef int32_t (*iFppppiiiiuu_t)(void*, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t); +typedef void* (*pFpLiiuuLi_t)(void*, uintptr_t, int32_t, int32_t, uint32_t, uint32_t, uintptr_t, int32_t); +typedef int32_t (*iFpLppiiiiuu_t)(void*, uintptr_t, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t); typedef void* (*pFppuiipuuii_t)(void*, void*, uint32_t, int32_t, int32_t, void*, uint32_t, uint32_t, int32_t, int32_t); -typedef void* (*pFppiiuuuipii_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, int32_t, void*, int32_t, int32_t); +typedef void* (*pFpLiiuuLipii_t)(void*, uintptr_t, int32_t, int32_t, uint32_t, uint32_t, uintptr_t, int32_t, void*, int32_t, int32_t); #define SUPER() ADDED_FUNCTIONS() \ GO(XDestroyImage, iFp_t) \ @@ -43,22 +44,22 @@ typedef void* (*pFppiiuuuipii_t)(void*, void*, int32_t, int32_t, uint32_t, uint3 GO(XCreateIC, pFpV_t) \ GO(XSetICValues, pFpV_t) \ GO(XSetIMValues, pFpV_t) \ + GO(XRemoveConnectionWatch, vFppp_t) \ GO(XAddConnectionWatch, iFppp_t) \ - GO(XRemoveConnectionWatch, iFppp_t) \ GO(XESetCloseDisplay, pFpip_t) \ GO(XESetError, pFpip_t) \ GO(XESetEventToWire, pFpip_t) \ GO(XESetWireToEvent, pFpip_t) \ - GO(_XGetRequest, pFpuL_t) \ + GO(_XGetRequest, pFpCL_t) \ GO(XCheckIfEvent, iFpppp_t) \ GO(XIfEvent, iFpppp_t) \ GO(XPeekIfEvent, iFpppp_t) \ GO(XQueryExtension, iFppppp_t) \ GO(XRegisterIMInstantiateCallback, iFpppppp_t) \ GO(XUnregisterIMInstantiateCallback, iFpppppp_t) \ - GO(XGetImage, pFppiiuuLi_t) \ - GO(XPutImage, iFppppiiiiuu_t) \ + GO(XGetImage, pFpLiiuuLi_t) \ + GO(XPutImage, iFpLppiiiiuu_t) \ GO(XCreateImage, pFppuiipuuii_t) \ - GO(XGetSubImage, pFppiiuuuipii_t) + GO(XGetSubImage, pFpLiiuuLipii_t) #endif // __wrappedlibx11TYPES_H_ diff --git a/src/wrapped/generated/wrappedlibxfttypes.h b/src/wrapped/generated/wrappedlibxfttypes.h index 6678ee43..dbd1a0a0 100644 --- a/src/wrapped/generated/wrappedlibxfttypes.h +++ b/src/wrapped/generated/wrappedlibxfttypes.h @@ -12,10 +12,8 @@ #endif typedef void* (*pFpiV_t)(void*, int32_t, ...); -typedef void* (*pFpipppppppppppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); #define SUPER() ADDED_FUNCTIONS() \ - GO(XftFontOpen, pFpiV_t) \ - GO(XftListFonts, pFpipppppppppppppp_t) + GO(XftFontOpen, pFpiV_t) #endif // __wrappedlibxftTYPES_H_ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index d7f2b493..442f378f 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -98,7 +98,6 @@ typedef int64_t (*IFp_t)(void*); typedef int64_t (*IFS_t)(void*); typedef uint8_t (*CFv_t)(void); typedef uint8_t (*CFi_t)(int32_t); -typedef uint8_t (*CFC_t)(uint8_t); typedef uint8_t (*CFW_t)(uint16_t); typedef uint8_t (*CFu_t)(uint32_t); typedef uint8_t (*CFU_t)(uint64_t); @@ -1261,6 +1260,7 @@ typedef uintptr_t (*LFpupL_t)(void*, uint32_t, void*, uintptr_t); typedef uintptr_t (*LFpLCL_t)(void*, uintptr_t, uint8_t, uintptr_t); typedef uintptr_t (*LFpLLp_t)(void*, uintptr_t, uintptr_t, void*); typedef uintptr_t (*LFpLLS_t)(void*, uintptr_t, uintptr_t, void*); +typedef uintptr_t (*LFpLpi_t)(void*, uintptr_t, void*, int32_t); typedef uintptr_t (*LFpLpL_t)(void*, uintptr_t, void*, uintptr_t); typedef uintptr_t (*LFpLpp_t)(void*, uintptr_t, void*, void*); typedef uintptr_t (*LFppii_t)(void*, void*, int32_t, int32_t); @@ -1279,7 +1279,7 @@ typedef void* (*pFELpA_t)(x64emu_t*, uintptr_t, void*, void*); typedef void* (*pFEpii_t)(x64emu_t*, void*, int32_t, int32_t); typedef void* (*pFEpip_t)(x64emu_t*, void*, int32_t, void*); typedef void* (*pFEpiV_t)(x64emu_t*, void*, int32_t, void*); -typedef void* (*pFEpuL_t)(x64emu_t*, void*, uint32_t, uintptr_t); +typedef void* (*pFEpCL_t)(x64emu_t*, void*, uint8_t, uintptr_t); typedef void* (*pFEppi_t)(x64emu_t*, void*, void*, int32_t); typedef void* (*pFEppp_t)(x64emu_t*, void*, void*, void*); typedef void* (*pFEppV_t)(x64emu_t*, void*, void*, void*); @@ -2190,7 +2190,6 @@ typedef int32_t (*iFpppuup_t)(void*, void*, void*, uint32_t, uint32_t, void*); typedef int32_t (*iFpppupu_t)(void*, void*, void*, uint32_t, void*, uint32_t); typedef int32_t (*iFpppupp_t)(void*, void*, void*, uint32_t, void*, void*); typedef int32_t (*iFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*); -typedef int32_t (*iFppppii_t)(void*, void*, void*, void*, int32_t, int32_t); typedef int32_t (*iFppppiu_t)(void*, void*, void*, void*, int32_t, uint32_t); typedef int32_t (*iFppppip_t)(void*, void*, void*, void*, int32_t, void*); typedef int32_t (*iFppppui_t)(void*, void*, void*, void*, uint32_t, int32_t); @@ -2412,6 +2411,7 @@ typedef void (*vFpLpiipi_t)(void*, uintptr_t, void*, int32_t, int32_t, void*, in typedef void (*vFppcuupp_t)(void*, void*, int8_t, uint32_t, uint32_t, void*, void*); typedef void (*vFppiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t); typedef void (*vFppiiipi_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t); +typedef void (*vFppiipii_t)(void*, void*, int32_t, int32_t, void*, int32_t, int32_t); typedef void (*vFppiipuu_t)(void*, void*, int32_t, int32_t, void*, uint32_t, uint32_t); typedef void (*vFppiippp_t)(void*, void*, int32_t, int32_t, void*, void*, void*); typedef void (*vFppilppi_t)(void*, void*, int32_t, intptr_t, void*, void*, int32_t); @@ -2517,7 +2517,6 @@ typedef int32_t (*iFppLippp_t)(void*, void*, uintptr_t, int32_t, void*, void*, v typedef int32_t (*iFppLuuii_t)(void*, void*, uintptr_t, uint32_t, uint32_t, int32_t, int32_t); typedef int32_t (*iFppLLLLu_t)(void*, void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uint32_t); typedef int32_t (*iFppLpppp_t)(void*, void*, uintptr_t, void*, void*, void*, void*); -typedef int32_t (*iFpppiiuu_t)(void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t); typedef int32_t (*iFpppiiup_t)(void*, void*, void*, int32_t, int32_t, uint32_t, void*); typedef int32_t (*iFpppiuwu_t)(void*, void*, void*, int32_t, uint32_t, int16_t, uint32_t); typedef int32_t (*iFpppippi_t)(void*, void*, void*, int32_t, void*, void*, int32_t); @@ -2747,7 +2746,6 @@ typedef int32_t (*iFpLpppppp_t)(void*, uintptr_t, void*, void*, void*, void*, vo typedef int32_t (*iFppiiipip_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*); typedef int32_t (*iFppillppp_t)(void*, void*, int32_t, intptr_t, intptr_t, void*, void*, void*); typedef int32_t (*iFppipiipi_t)(void*, void*, int32_t, void*, int32_t, int32_t, void*, int32_t); -typedef int32_t (*iFppippppp_t)(void*, void*, int32_t, void*, void*, void*, void*, void*); typedef int32_t (*iFppIIIppp_t)(void*, void*, int64_t, int64_t, int64_t, void*, void*, void*); typedef int32_t (*iFppuiiuuu_t)(void*, void*, uint32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t); typedef int32_t (*iFppuuuuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t); @@ -2882,7 +2880,6 @@ typedef void (*vFpplpppppi_t)(void*, void*, intptr_t, void*, void*, void*, void* typedef void (*vFpppiiiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t); typedef void (*vFpppffffff_t)(void*, void*, void*, float, float, float, float, float, float); typedef void (*vFppppipiip_t)(void*, void*, void*, void*, int32_t, void*, int32_t, int32_t, void*); -typedef void (*vFpppppippp_t)(void*, void*, void*, void*, void*, int32_t, void*, void*, void*); typedef int32_t (*iFEpiiiiipi_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t); typedef int32_t (*iFEppuppppp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*, void*, void*, void*); typedef int32_t (*iFEpppupppp_t)(x64emu_t*, void*, void*, void*, uint32_t, void*, void*, void*, void*); @@ -2915,7 +2912,6 @@ typedef int32_t (*iFppuppuuuu_t)(void*, void*, uint32_t, void*, void*, uint32_t, typedef int32_t (*iFppupppupp_t)(void*, void*, uint32_t, void*, void*, void*, uint32_t, void*, void*); typedef int32_t (*iFppLpiuppp_t)(void*, void*, uintptr_t, void*, int32_t, uint32_t, void*, void*, void*); typedef int32_t (*iFpppiiipip_t)(void*, void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*); -typedef int32_t (*iFpppiiuuii_t)(void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t); typedef int32_t (*iFpppiipiiu_t)(void*, void*, void*, int32_t, int32_t, void*, int32_t, int32_t, uint32_t); typedef int32_t (*iFpppippipi_t)(void*, void*, void*, int32_t, void*, void*, int32_t, void*, int32_t); typedef int32_t (*iFpppLLLupp_t)(void*, void*, void*, uintptr_t, uintptr_t, uintptr_t, uint32_t, void*, void*); @@ -2935,7 +2931,7 @@ typedef intptr_t (*lFpppipiipp_t)(void*, void*, void*, int32_t, void*, int32_t, typedef intptr_t (*lFpppippppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*, void*); typedef uintptr_t (*LFEppppppii_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, int32_t, int32_t); typedef uintptr_t (*LFpLiiuuuLL_t)(void*, uintptr_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uintptr_t, uintptr_t); -typedef void* (*pFEppiiuuLi_t)(x64emu_t*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, uintptr_t, int32_t); +typedef void* (*pFEpLiiuuLi_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, uint32_t, uint32_t, uintptr_t, int32_t); typedef void* (*pFEppuippuu_t)(x64emu_t*, void*, void*, uint32_t, int32_t, void*, void*, uint32_t, uint32_t); typedef void* (*pFEpppppiiV_t)(x64emu_t*, void*, void*, void*, void*, void*, int32_t, int32_t, void*); typedef void* (*pFEpppppppi_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*, int32_t); @@ -3065,9 +3061,9 @@ typedef void (*vFppupipiuuuu_t)(void*, void*, uint32_t, void*, int32_t, void*, i typedef void (*vFppupppuiiii_t)(void*, void*, uint32_t, void*, void*, void*, uint32_t, int32_t, int32_t, int32_t, int32_t); typedef void (*vFppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); typedef int32_t (*iFEiipppppppp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*, void*); +typedef int32_t (*iFEpLppiiiiuu_t)(x64emu_t*, void*, uintptr_t, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t); typedef int32_t (*iFEppLpLpLLpp_t)(x64emu_t*, void*, void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, uintptr_t, void*, void*); typedef int32_t (*iFEpppupppppp_t)(x64emu_t*, void*, void*, void*, uint32_t, void*, void*, void*, void*, void*, void*); -typedef int32_t (*iFEppppiiiiuu_t)(x64emu_t*, void*, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t); typedef int32_t (*iFEpppppppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); typedef int32_t (*iFuiiiiuuiiip_t)(uint32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, void*); typedef int32_t (*iFpiippiiipip_t)(void*, int32_t, int32_t, void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*); @@ -3118,10 +3114,10 @@ typedef int32_t (*iFpCCCWCWCCCWp_t)(void*, uint8_t, uint8_t, uint8_t, uint16_t, typedef int32_t (*iFpLLlliLppppp_t)(void*, uintptr_t, uintptr_t, intptr_t, intptr_t, int32_t, uintptr_t, void*, void*, void*, void*, void*); typedef int32_t (*iFpppllipppppp_t)(void*, void*, void*, intptr_t, intptr_t, int32_t, void*, void*, void*, void*, void*, void*); typedef int32_t (*iFpppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); -typedef void* (*pFEppiiuuuipii_t)(x64emu_t*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, int32_t, void*, int32_t, int32_t); +typedef uintptr_t (*LFpLiiuuuiupLp_t)(void*, uintptr_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, int32_t, uint32_t, void*, uintptr_t, void*); +typedef void* (*pFEpLiiuuLipii_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, uint32_t, uint32_t, uintptr_t, int32_t, void*, int32_t, int32_t); typedef void* (*pFEppppppppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); typedef void* (*pFWWiCCCCiipup_t)(uint16_t, uint16_t, int32_t, uint8_t, uint8_t, uint8_t, uint8_t, int32_t, int32_t, void*, uint32_t, void*); -typedef void* (*pFppiiuuuiupLp_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, int32_t, uint32_t, void*, uintptr_t, void*); typedef void* (*pFppippLLLiLpp_t)(void*, void*, int32_t, void*, void*, uintptr_t, uintptr_t, uintptr_t, int32_t, uintptr_t, void*, void*); typedef void* (*pFppuuppppuppp_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, void*, uint32_t, void*, void*, void*); typedef void* (*pFpppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); @@ -3190,6 +3186,7 @@ typedef void* (*pFpupppppppppppppppp_t)(void*, uint32_t, void*, void*, void*, vo typedef void (*vFpiiiiiiiiiiiiiiiiii_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t); typedef uint32_t (*uFbWWWCCCCCCCCWCCCCCC_t)(void*, uint16_t, uint16_t, uint16_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint16_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t); typedef void* (*pFiiiippppppppppppppp_t)(int32_t, int32_t, int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); +typedef void* (*pFppppppppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); typedef void* (*pFpupupppppppppppppppp_t)(void*, uint32_t, void*, uint32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); typedef int32_t (*iFpppppppppppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*); typedef uint32_t (*uFippuuuuiiiiuuiiiiiiiipp_t)(int32_t, void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*); @@ -3322,7 +3319,6 @@ void IFp(x64emu_t *emu, uintptr_t fcn) { IFp_t fn = (IFp_t)fcn; R_RAX=(int64_t)f void IFS(x64emu_t *emu, uintptr_t fcn) { IFS_t fn = (IFS_t)fcn; R_RAX=(int64_t)fn(io_convert((void*)R_RDI)); } void CFv(x64emu_t *emu, uintptr_t fcn) { CFv_t fn = (CFv_t)fcn; R_RAX=(unsigned char)fn(); } void CFi(x64emu_t *emu, uintptr_t fcn) { CFi_t fn = (CFi_t)fcn; R_RAX=(unsigned char)fn((int32_t)R_RDI); } -void CFC(x64emu_t *emu, uintptr_t fcn) { CFC_t fn = (CFC_t)fcn; R_RAX=(unsigned char)fn((uint8_t)R_RDI); } void CFW(x64emu_t *emu, uintptr_t fcn) { CFW_t fn = (CFW_t)fcn; R_RAX=(unsigned char)fn((uint16_t)R_RDI); } void CFu(x64emu_t *emu, uintptr_t fcn) { CFu_t fn = (CFu_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI); } void CFU(x64emu_t *emu, uintptr_t fcn) { CFU_t fn = (CFU_t)fcn; R_RAX=(unsigned char)fn((uint64_t)R_RDI); } @@ -4485,6 +4481,7 @@ void LFpupL(x64emu_t *emu, uintptr_t fcn) { LFpupL_t fn = (LFpupL_t)fcn; R_RAX=( void LFpLCL(x64emu_t *emu, uintptr_t fcn) { LFpLCL_t fn = (LFpLCL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint8_t)R_RDX, (uintptr_t)R_RCX); } void LFpLLp(x64emu_t *emu, uintptr_t fcn) { LFpLLp_t fn = (LFpLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); } void LFpLLS(x64emu_t *emu, uintptr_t fcn) { LFpLLS_t fn = (LFpLLS_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, io_convert((void*)R_RCX)); } +void LFpLpi(x64emu_t *emu, uintptr_t fcn) { LFpLpi_t fn = (LFpLpi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); } void LFpLpL(x64emu_t *emu, uintptr_t fcn) { LFpLpL_t fn = (LFpLpL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); } void LFpLpp(x64emu_t *emu, uintptr_t fcn) { LFpLpp_t fn = (LFpLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); } void LFppii(x64emu_t *emu, uintptr_t fcn) { LFppii_t fn = (LFppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); } @@ -4503,7 +4500,7 @@ void pFELpA(x64emu_t *emu, uintptr_t fcn) { pFELpA_t fn = (pFELpA_t)fcn; R_RAX=( void pFEpii(x64emu_t *emu, uintptr_t fcn) { pFEpii_t fn = (pFEpii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); } void pFEpip(x64emu_t *emu, uintptr_t fcn) { pFEpip_t fn = (pFEpip_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); } void pFEpiV(x64emu_t *emu, uintptr_t fcn) { pFEpiV_t fn = (pFEpiV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)(R_RSP + 8)); } -void pFEpuL(x64emu_t *emu, uintptr_t fcn) { pFEpuL_t fn = (pFEpuL_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX); } +void pFEpCL(x64emu_t *emu, uintptr_t fcn) { pFEpCL_t fn = (pFEpCL_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint8_t)R_RSI, (uintptr_t)R_RDX); } void pFEppi(x64emu_t *emu, uintptr_t fcn) { pFEppi_t fn = (pFEppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX); } void pFEppp(x64emu_t *emu, uintptr_t fcn) { pFEppp_t fn = (pFEppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); } void pFEppV(x64emu_t *emu, uintptr_t fcn) { pFEppV_t fn = (pFEppV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); } @@ -5414,7 +5411,6 @@ void iFpppuup(x64emu_t *emu, uintptr_t fcn) { iFpppuup_t fn = (iFpppuup_t)fcn; R void iFpppupu(x64emu_t *emu, uintptr_t fcn) { iFpppupu_t fn = (iFpppupu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); } void iFpppupp(x64emu_t *emu, uintptr_t fcn) { iFpppupp_t fn = (iFpppupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); } void iFpppLpp(x64emu_t *emu, uintptr_t fcn) { iFpppLpp_t fn = (iFpppLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); } -void iFppppii(x64emu_t *emu, uintptr_t fcn) { iFppppii_t fn = (iFppppii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); } void iFppppiu(x64emu_t *emu, uintptr_t fcn) { iFppppiu_t fn = (iFppppiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uint32_t)R_R9); } void iFppppip(x64emu_t *emu, uintptr_t fcn) { iFppppip_t fn = (iFppppip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); } void iFppppui(x64emu_t *emu, uintptr_t fcn) { iFppppui_t fn = (iFppppui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); } @@ -5636,6 +5632,7 @@ void vFpLpiipi(x64emu_t *emu, uintptr_t fcn) { vFpLpiipi_t fn = (vFpLpiipi_t)fcn void vFppcuupp(x64emu_t *emu, uintptr_t fcn) { vFppcuupp_t fn = (vFppcuupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int8_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } void vFppiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiii_t fn = (vFppiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); } void vFppiiipi(x64emu_t *emu, uintptr_t fcn) { vFppiiipi_t fn = (vFppiiipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); } +void vFppiipii(x64emu_t *emu, uintptr_t fcn) { vFppiipii_t fn = (vFppiipii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); } void vFppiipuu(x64emu_t *emu, uintptr_t fcn) { vFppiipuu_t fn = (vFppiipuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); } void vFppiippp(x64emu_t *emu, uintptr_t fcn) { vFppiippp_t fn = (vFppiippp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } void vFppilppi(x64emu_t *emu, uintptr_t fcn) { vFppilppi_t fn = (vFppilppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); } @@ -5741,7 +5738,6 @@ void iFppLippp(x64emu_t *emu, uintptr_t fcn) { iFppLippp_t fn = (iFppLippp_t)fcn void iFppLuuii(x64emu_t *emu, uintptr_t fcn) { iFppLuuii_t fn = (iFppLuuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); } void iFppLLLLu(x64emu_t *emu, uintptr_t fcn) { iFppLLLLu_t fn = (iFppLLLLu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(uint32_t*)(R_RSP + 8)); } void iFppLpppp(x64emu_t *emu, uintptr_t fcn) { iFppLpppp_t fn = (iFppLpppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } -void iFpppiiuu(x64emu_t *emu, uintptr_t fcn) { iFpppiiuu_t fn = (iFpppiiuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); } void iFpppiiup(x64emu_t *emu, uintptr_t fcn) { iFpppiiup_t fn = (iFpppiiup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); } void iFpppiuwu(x64emu_t *emu, uintptr_t fcn) { iFpppiuwu_t fn = (iFpppiuwu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int16_t)R_R9, *(uint32_t*)(R_RSP + 8)); } void iFpppippi(x64emu_t *emu, uintptr_t fcn) { iFpppippi_t fn = (iFpppippi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); } @@ -5971,7 +5967,6 @@ void iFpLpppppp(x64emu_t *emu, uintptr_t fcn) { iFpLpppppp_t fn = (iFpLpppppp_t) void iFppiiipip(x64emu_t *emu, uintptr_t fcn) { iFppiiipip_t fn = (iFppiiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); } void iFppillppp(x64emu_t *emu, uintptr_t fcn) { iFppillppp_t fn = (iFppillppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } void iFppipiipi(x64emu_t *emu, uintptr_t fcn) { iFppipiipi_t fn = (iFppipiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); } -void iFppippppp(x64emu_t *emu, uintptr_t fcn) { iFppippppp_t fn = (iFppippppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } void iFppIIIppp(x64emu_t *emu, uintptr_t fcn) { iFppIIIppp_t fn = (iFppIIIppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } void iFppuiiuuu(x64emu_t *emu, uintptr_t fcn) { iFppuiiuuu_t fn = (iFppuiiuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); } void iFppuuuuuu(x64emu_t *emu, uintptr_t fcn) { iFppuuuuuu_t fn = (iFppuuuuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); } @@ -6106,7 +6101,6 @@ void vFpplpppppi(x64emu_t *emu, uintptr_t fcn) { vFpplpppppi_t fn = (vFpplpppppi void vFpppiiiiii(x64emu_t *emu, uintptr_t fcn) { vFpppiiiiii_t fn = (vFpppiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); } void vFpppffffff(x64emu_t *emu, uintptr_t fcn) { vFpppffffff_t fn = (vFpppffffff_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0]); } void vFppppipiip(x64emu_t *emu, uintptr_t fcn) { vFppppipiip_t fn = (vFppppipiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); } -void vFpppppippp(x64emu_t *emu, uintptr_t fcn) { vFpppppippp_t fn = (vFpppppippp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } void iFEpiiiiipi(x64emu_t *emu, uintptr_t fcn) { iFEpiiiiipi_t fn = (iFEpiiiiipi_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); } void iFEppuppppp(x64emu_t *emu, uintptr_t fcn) { iFEppuppppp_t fn = (iFEppuppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } void iFEpppupppp(x64emu_t *emu, uintptr_t fcn) { iFEpppupppp_t fn = (iFEpppupppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } @@ -6139,7 +6133,6 @@ void iFppuppuuuu(x64emu_t *emu, uintptr_t fcn) { iFppuppuuuu_t fn = (iFppuppuuuu void iFppupppupp(x64emu_t *emu, uintptr_t fcn) { iFppupppupp_t fn = (iFppupppupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } void iFppLpiuppp(x64emu_t *emu, uintptr_t fcn) { iFppLpiuppp_t fn = (iFppLpiuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } void iFpppiiipip(x64emu_t *emu, uintptr_t fcn) { iFpppiiipip_t fn = (iFpppiiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); } -void iFpppiiuuii(x64emu_t *emu, uintptr_t fcn) { iFpppiiuuii_t fn = (iFpppiiuuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); } void iFpppiipiiu(x64emu_t *emu, uintptr_t fcn) { iFpppiipiiu_t fn = (iFpppiipiiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); } void iFpppippipi(x64emu_t *emu, uintptr_t fcn) { iFpppippipi_t fn = (iFpppippipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); } void iFpppLLLupp(x64emu_t *emu, uintptr_t fcn) { iFpppLLLupp_t fn = (iFpppLLLupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } @@ -6159,7 +6152,7 @@ void lFpppipiipp(x64emu_t *emu, uintptr_t fcn) { lFpppipiipp_t fn = (lFpppipiipp void lFpppippppp(x64emu_t *emu, uintptr_t fcn) { lFpppippppp_t fn = (lFpppippppp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } void LFEppppppii(x64emu_t *emu, uintptr_t fcn) { LFEppppppii_t fn = (LFEppppppii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); } void LFpLiiuuuLL(x64emu_t *emu, uintptr_t fcn) { LFpLiiuuuLL_t fn = (LFpLiiuuuLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24)); } -void pFEppiiuuLi(x64emu_t *emu, uintptr_t fcn) { pFEppiiuuLi_t fn = (pFEppiiuuLi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); } +void pFEpLiiuuLi(x64emu_t *emu, uintptr_t fcn) { pFEpLiiuuLi_t fn = (pFEpLiiuuLi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); } void pFEppuippuu(x64emu_t *emu, uintptr_t fcn) { pFEppuippuu_t fn = (pFEppuippuu_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); } void pFEpppppiiV(x64emu_t *emu, uintptr_t fcn) { pFEpppppiiV_t fn = (pFEpppppiiV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), (void*)(R_RSP + 16)); } void pFEpppppppi(x64emu_t *emu, uintptr_t fcn) { pFEpppppppi_t fn = (pFEpppppppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); } @@ -6289,9 +6282,9 @@ void vFppupipiuuuu(x64emu_t *emu, uintptr_t fcn) { vFppupipiuuuu_t fn = (vFppupi void vFppupppuiiii(x64emu_t *emu, uintptr_t fcn) { vFppupppuiiii_t fn = (vFppupppuiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); } void vFppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFppppppppppp_t fn = (vFppppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); } void iFEiipppppppp(x64emu_t *emu, uintptr_t fcn) { iFEiipppppppp_t fn = (iFEiipppppppp_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); } +void iFEpLppiiiiuu(x64emu_t *emu, uintptr_t fcn) { iFEpLppiiiiuu_t fn = (iFEpLppiiiiuu_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); } void iFEppLpLpLLpp(x64emu_t *emu, uintptr_t fcn) { iFEppLpLpLLpp_t fn = (iFEppLpLpLLpp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); } void iFEpppupppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppupppppp_t fn = (iFEpppupppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); } -void iFEppppiiiiuu(x64emu_t *emu, uintptr_t fcn) { iFEppppiiiiuu_t fn = (iFEppppiiiiuu_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); } void iFEpppppppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppppppppp_t fn = (iFEpppppppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); } void iFuiiiiuuiiip(x64emu_t *emu, uintptr_t fcn) { iFuiiiiuuiiip_t fn = (iFuiiiiuuiiip_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(void**)(R_RSP + 40)); } void iFpiippiiipip(x64emu_t *emu, uintptr_t fcn) { iFpiippiiipip_t fn = (iFpiippiiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(void**)(R_RSP + 40)); } @@ -6342,10 +6335,10 @@ void iFpCCCWCWCCCWp(x64emu_t *emu, uintptr_t fcn) { iFpCCCWCWCCCWp_t fn = (iFpCC void iFpLLlliLppppp(x64emu_t *emu, uintptr_t fcn) { iFpLLlliLppppp_t fn = (iFpLLlliLppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); } void iFpppllipppppp(x64emu_t *emu, uintptr_t fcn) { iFpppllipppppp_t fn = (iFpppllipppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); } void iFpppppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppppppppp_t fn = (iFpppppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); } -void pFEppiiuuuipii(x64emu_t *emu, uintptr_t fcn) { pFEppiiuuuipii_t fn = (pFEppiiuuuipii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); } +void LFpLiiuuuiupLp(x64emu_t *emu, uintptr_t fcn) { LFpLiiuuuiupLp_t fn = (LFpLiiuuuiupLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(uintptr_t*)(R_RSP + 40), *(void**)(R_RSP + 48)); } +void pFEpLiiuuLipii(x64emu_t *emu, uintptr_t fcn) { pFEpLiiuuLipii_t fn = (pFEpLiiuuLipii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); } void pFEppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFEppppppppppp_t fn = (pFEppppppppppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); } void pFWWiCCCCiipup(x64emu_t *emu, uintptr_t fcn) { pFWWiCCCCiipup_t fn = (pFWWiCCCCiipup_t)fcn; R_RAX=(uintptr_t)fn((uint16_t)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48)); } -void pFppiiuuuiupLp(x64emu_t *emu, uintptr_t fcn) { pFppiiuuuiupLp_t fn = (pFppiiuuuiupLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(uintptr_t*)(R_RSP + 40), *(void**)(R_RSP + 48)); } void pFppippLLLiLpp(x64emu_t *emu, uintptr_t fcn) { pFppippLLLiLpp_t fn = (pFppippLLLiLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uintptr_t*)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); } void pFppuuppppuppp(x64emu_t *emu, uintptr_t fcn) { pFppuuppppuppp_t fn = (pFppuuppppuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); } void pFpppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFpppppppppppp_t fn = (pFpppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); } @@ -6414,6 +6407,7 @@ void pFpupppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFpupppppppppppppppp_t void vFpiiiiiiiiiiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFpiiiiiiiiiiiiiiiiii_t fn = (vFpiiiiiiiiiiiiiiiiii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(int32_t*)(R_RSP + 72), *(int32_t*)(R_RSP + 80), *(int32_t*)(R_RSP + 88), *(int32_t*)(R_RSP + 96), *(int32_t*)(R_RSP + 104)); } void uFbWWWCCCCCCCCWCCCCCC(x64emu_t *emu, uintptr_t fcn) { uFbWWWCCCCCCCCWCCCCCC_t fn = (uFbWWWCCCCCCCCWCCCCCC_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8), *(uint8_t*)(R_RSP + 16), *(uint8_t*)(R_RSP + 24), *(uint8_t*)(R_RSP + 32), *(uint8_t*)(R_RSP + 40), *(uint8_t*)(R_RSP + 48), *(uint16_t*)(R_RSP + 56), *(uint8_t*)(R_RSP + 64), *(uint8_t*)(R_RSP + 72), *(uint8_t*)(R_RSP + 80), *(uint8_t*)(R_RSP + 88), *(uint8_t*)(R_RSP + 96), *(uint8_t*)(R_RSP + 104)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); } void pFiiiippppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFiiiippppppppppppppp_t fn = (pFiiiippppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104)); } +void pFppppppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFppppppppppppppppppp_t fn = (pFppppppppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104)); } void pFpupupppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFpupupppppppppppppppp_t fn = (pFpupupppppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104), *(void**)(R_RSP + 112)); } void iFpppppppppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppppppppppppppppppp_t fn = (iFpppppppppppppppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104), *(void**)(R_RSP + 112), *(void**)(R_RSP + 120), *(void**)(R_RSP + 128)); } void uFippuuuuiiiiuuiiiiiiiipp(x64emu_t *emu, uintptr_t fcn) { uFippuuuuiiiiuuiiiiiiiipp_t fn = (uFippuuuuiiiiuuiiiiiiiipp_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(uint32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(int32_t*)(R_RSP + 72), *(int32_t*)(R_RSP + 80), *(int32_t*)(R_RSP + 88), *(int32_t*)(R_RSP + 96), *(int32_t*)(R_RSP + 104), *(int32_t*)(R_RSP + 112), *(int32_t*)(R_RSP + 120), *(void**)(R_RSP + 128), *(void**)(R_RSP + 136)); } @@ -6551,7 +6545,6 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &IFp) return 1; if (fun == &CFv) return 1; if (fun == &CFi) return 1; - if (fun == &CFC) return 1; if (fun == &CFW) return 1; if (fun == &CFu) return 1; if (fun == &CFU) return 1; @@ -7479,6 +7472,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &LFpupL) return 1; if (fun == &LFpLCL) return 1; if (fun == &LFpLLp) return 1; + if (fun == &LFpLpi) return 1; if (fun == &LFpLpL) return 1; if (fun == &LFpLpp) return 1; if (fun == &LFppii) return 1; @@ -8242,7 +8236,6 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &iFpppupu) return 1; if (fun == &iFpppupp) return 1; if (fun == &iFpppLpp) return 1; - if (fun == &iFppppii) return 1; if (fun == &iFppppiu) return 1; if (fun == &iFppppip) return 1; if (fun == &iFppppui) return 1; @@ -8407,7 +8400,6 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &IFd) return 3; if (fun == &IFp) return 1; if (fun == &CFv) return 1; - if (fun == &CFC) return 1; if (fun == &CFW) return 1; if (fun == &CFu) return 1; if (fun == &CFU) return 1; diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index 61b37833..e840969f 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -85,7 +85,6 @@ void IFp(x64emu_t *emu, uintptr_t fnc); void IFS(x64emu_t *emu, uintptr_t fnc); void CFv(x64emu_t *emu, uintptr_t fnc); void CFi(x64emu_t *emu, uintptr_t fnc); -void CFC(x64emu_t *emu, uintptr_t fnc); void CFW(x64emu_t *emu, uintptr_t fnc); void CFu(x64emu_t *emu, uintptr_t fnc); void CFU(x64emu_t *emu, uintptr_t fnc); @@ -1268,6 +1267,7 @@ void LFpupL(x64emu_t *emu, uintptr_t fnc); void LFpLCL(x64emu_t *emu, uintptr_t fnc); void LFpLLp(x64emu_t *emu, uintptr_t fnc); void LFpLLS(x64emu_t *emu, uintptr_t fnc); +void LFpLpi(x64emu_t *emu, uintptr_t fnc); void LFpLpL(x64emu_t *emu, uintptr_t fnc); void LFpLpp(x64emu_t *emu, uintptr_t fnc); void LFppii(x64emu_t *emu, uintptr_t fnc); @@ -1286,7 +1286,7 @@ void pFELpA(x64emu_t *emu, uintptr_t fnc); void pFEpii(x64emu_t *emu, uintptr_t fnc); void pFEpip(x64emu_t *emu, uintptr_t fnc); void pFEpiV(x64emu_t *emu, uintptr_t fnc); -void pFEpuL(x64emu_t *emu, uintptr_t fnc); +void pFEpCL(x64emu_t *emu, uintptr_t fnc); void pFEppi(x64emu_t *emu, uintptr_t fnc); void pFEppp(x64emu_t *emu, uintptr_t fnc); void pFEppV(x64emu_t *emu, uintptr_t fnc); @@ -2199,7 +2199,6 @@ void iFpppuup(x64emu_t *emu, uintptr_t fnc); void iFpppupu(x64emu_t *emu, uintptr_t fnc); void iFpppupp(x64emu_t *emu, uintptr_t fnc); void iFpppLpp(x64emu_t *emu, uintptr_t fnc); -void iFppppii(x64emu_t *emu, uintptr_t fnc); void iFppppiu(x64emu_t *emu, uintptr_t fnc); void iFppppip(x64emu_t *emu, uintptr_t fnc); void iFppppui(x64emu_t *emu, uintptr_t fnc); @@ -2421,6 +2420,7 @@ void vFpLpiipi(x64emu_t *emu, uintptr_t fnc); void vFppcuupp(x64emu_t *emu, uintptr_t fnc); void vFppiiiii(x64emu_t *emu, uintptr_t fnc); void vFppiiipi(x64emu_t *emu, uintptr_t fnc); +void vFppiipii(x64emu_t *emu, uintptr_t fnc); void vFppiipuu(x64emu_t *emu, uintptr_t fnc); void vFppiippp(x64emu_t *emu, uintptr_t fnc); void vFppilppi(x64emu_t *emu, uintptr_t fnc); @@ -2526,7 +2526,6 @@ void iFppLippp(x64emu_t *emu, uintptr_t fnc); void iFppLuuii(x64emu_t *emu, uintptr_t fnc); void iFppLLLLu(x64emu_t *emu, uintptr_t fnc); void iFppLpppp(x64emu_t *emu, uintptr_t fnc); -void iFpppiiuu(x64emu_t *emu, uintptr_t fnc); void iFpppiiup(x64emu_t *emu, uintptr_t fnc); void iFpppiuwu(x64emu_t *emu, uintptr_t fnc); void iFpppippi(x64emu_t *emu, uintptr_t fnc); @@ -2756,7 +2755,6 @@ void iFpLpppppp(x64emu_t *emu, uintptr_t fnc); void iFppiiipip(x64emu_t *emu, uintptr_t fnc); void iFppillppp(x64emu_t *emu, uintptr_t fnc); void iFppipiipi(x64emu_t *emu, uintptr_t fnc); -void iFppippppp(x64emu_t *emu, uintptr_t fnc); void iFppIIIppp(x64emu_t *emu, uintptr_t fnc); void iFppuiiuuu(x64emu_t *emu, uintptr_t fnc); void iFppuuuuuu(x64emu_t *emu, uintptr_t fnc); @@ -2892,7 +2890,6 @@ void vFpplpppppi(x64emu_t *emu, uintptr_t fnc); void vFpppiiiiii(x64emu_t *emu, uintptr_t fnc); void vFpppffffff(x64emu_t *emu, uintptr_t fnc); void vFppppipiip(x64emu_t *emu, uintptr_t fnc); -void vFpppppippp(x64emu_t *emu, uintptr_t fnc); void iFEpiiiiipi(x64emu_t *emu, uintptr_t fnc); void iFEppuppppp(x64emu_t *emu, uintptr_t fnc); void iFEpppupppp(x64emu_t *emu, uintptr_t fnc); @@ -2925,7 +2922,6 @@ void iFppuppuuuu(x64emu_t *emu, uintptr_t fnc); void iFppupppupp(x64emu_t *emu, uintptr_t fnc); void iFppLpiuppp(x64emu_t *emu, uintptr_t fnc); void iFpppiiipip(x64emu_t *emu, uintptr_t fnc); -void iFpppiiuuii(x64emu_t *emu, uintptr_t fnc); void iFpppiipiiu(x64emu_t *emu, uintptr_t fnc); void iFpppippipi(x64emu_t *emu, uintptr_t fnc); void iFpppLLLupp(x64emu_t *emu, uintptr_t fnc); @@ -2945,7 +2941,7 @@ void lFpppipiipp(x64emu_t *emu, uintptr_t fnc); void lFpppippppp(x64emu_t *emu, uintptr_t fnc); void LFEppppppii(x64emu_t *emu, uintptr_t fnc); void LFpLiiuuuLL(x64emu_t *emu, uintptr_t fnc); -void pFEppiiuuLi(x64emu_t *emu, uintptr_t fnc); +void pFEpLiiuuLi(x64emu_t *emu, uintptr_t fnc); void pFEppuippuu(x64emu_t *emu, uintptr_t fnc); void pFEpppppiiV(x64emu_t *emu, uintptr_t fnc); void pFEpppppppi(x64emu_t *emu, uintptr_t fnc); @@ -3075,9 +3071,9 @@ void vFppupipiuuuu(x64emu_t *emu, uintptr_t fnc); void vFppupppuiiii(x64emu_t *emu, uintptr_t fnc); void vFppppppppppp(x64emu_t *emu, uintptr_t fnc); void iFEiipppppppp(x64emu_t *emu, uintptr_t fnc); +void iFEpLppiiiiuu(x64emu_t *emu, uintptr_t fnc); void iFEppLpLpLLpp(x64emu_t *emu, uintptr_t fnc); void iFEpppupppppp(x64emu_t *emu, uintptr_t fnc); -void iFEppppiiiiuu(x64emu_t *emu, uintptr_t fnc); void iFEpppppppppp(x64emu_t *emu, uintptr_t fnc); void iFuiiiiuuiiip(x64emu_t *emu, uintptr_t fnc); void iFpiippiiipip(x64emu_t *emu, uintptr_t fnc); @@ -3128,10 +3124,10 @@ void iFpCCCWCWCCCWp(x64emu_t *emu, uintptr_t fnc); void iFpLLlliLppppp(x64emu_t *emu, uintptr_t fnc); void iFpppllipppppp(x64emu_t *emu, uintptr_t fnc); void iFpppppppppppp(x64emu_t *emu, uintptr_t fnc); -void pFEppiiuuuipii(x64emu_t *emu, uintptr_t fnc); +void LFpLiiuuuiupLp(x64emu_t *emu, uintptr_t fnc); +void pFEpLiiuuLipii(x64emu_t *emu, uintptr_t fnc); void pFEppppppppppp(x64emu_t *emu, uintptr_t fnc); void pFWWiCCCCiipup(x64emu_t *emu, uintptr_t fnc); -void pFppiiuuuiupLp(x64emu_t *emu, uintptr_t fnc); void pFppippLLLiLpp(x64emu_t *emu, uintptr_t fnc); void pFppuuppppuppp(x64emu_t *emu, uintptr_t fnc); void pFpppppppppppp(x64emu_t *emu, uintptr_t fnc); @@ -3200,6 +3196,7 @@ void pFpupppppppppppppppp(x64emu_t *emu, uintptr_t fnc); void vFpiiiiiiiiiiiiiiiiii(x64emu_t *emu, uintptr_t fnc); void uFbWWWCCCCCCCCWCCCCCC(x64emu_t *emu, uintptr_t fnc); void pFiiiippppppppppppppp(x64emu_t *emu, uintptr_t fnc); +void pFppppppppppppppppppp(x64emu_t *emu, uintptr_t fnc); void pFpupupppppppppppppppp(x64emu_t *emu, uintptr_t fnc); void iFpppppppppppppppppppppp(x64emu_t *emu, uintptr_t fnc); void uFippuuuuiiiiuuiiiiiiiipp(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappedlibx11.c b/src/wrapped/wrappedlibx11.c index df4bb26f..3686265a 100644 --- a/src/wrapped/wrappedlibx11.c +++ b/src/wrapped/wrappedlibx11.c @@ -715,16 +715,16 @@ void* my_XCreateImage(x64emu_t* emu, void* disp, void* vis, uint32_t depth, int3 int32_t my_XInitImage(x64emu_t* emu, void* img); -void* my_XGetImage(x64emu_t* emu, void* disp, void* drawable, int32_t x, int32_t y +void* my_XGetImage(x64emu_t* emu, void* disp, size_t drawable, int32_t x, int32_t y , uint32_t w, uint32_t h, uint32_t plane, int32_t fmt); -int32_t my_XPutImage(x64emu_t* emu, void* disp, void* drawable, void* gc, void* image +int32_t my_XPutImage(x64emu_t* emu, void* disp, size_t drawable, void* gc, void* image , int32_t src_x, int32_t src_y, int32_t dst_x, int32_t dst_y , uint32_t w, uint32_t h); -void* my_XGetSubImage(x64emu_t* emu, void* disp, void* drawable +void* my_XGetSubImage(x64emu_t* emu, void* disp, size_t drawable , int32_t x, int32_t y - , uint32_t w, uint32_t h, uint32_t plane, int32_t fmt + , uint32_t w, uint32_t h, size_t plane, int32_t fmt , void* image, int32_t dst_x, int32_t dst_y); void my_XDestroyImage(x64emu_t* emu, void* image); @@ -1266,7 +1266,7 @@ EXPORT int32_t my_XInitImage(x64emu_t* emu, void* img) return ret; } -EXPORT void* my_XGetImage(x64emu_t* emu, void* disp, void* drawable, int32_t x, int32_t y +EXPORT void* my_XGetImage(x64emu_t* emu, void* disp, size_t drawable, int32_t x, int32_t y , uint32_t w, uint32_t h, uint32_t plane, int32_t fmt) { @@ -1284,7 +1284,7 @@ EXPORT void my__XInitImageFuncPtrs(x64emu_t* emu, XImage* img) BridgeImageFunc(emu, img); } -EXPORT int32_t my_XPutImage(x64emu_t* emu, void* disp, void* drawable, void* gc, void* image +EXPORT int32_t my_XPutImage(x64emu_t* emu, void* disp, size_t drawable, void* gc, void* image , int32_t src_x, int32_t src_y, int32_t dst_x, int32_t dst_y , uint32_t w, uint32_t h) { @@ -1295,9 +1295,9 @@ EXPORT int32_t my_XPutImage(x64emu_t* emu, void* disp, void* drawable, void* gc, return r; } -EXPORT void* my_XGetSubImage(x64emu_t* emu, void* disp, void* drawable +EXPORT void* my_XGetSubImage(x64emu_t* emu, void* disp, size_t drawable , int32_t x, int32_t y - , uint32_t w, uint32_t h, uint32_t plane, int32_t fmt + , uint32_t w, uint32_t h, size_t plane, int32_t fmt , void* image, int32_t dst_x, int32_t dst_y) { @@ -1377,9 +1377,9 @@ EXPORT int my_XAddConnectionWatch(x64emu_t* emu, void* display, char* f, void* d return my->XAddConnectionWatch(display, findXConnectionWatchProcFct(f), data); } -EXPORT int my_XRemoveConnectionWatch(x64emu_t* emu, void* display, char* f, void* data) +EXPORT void my_XRemoveConnectionWatch(x64emu_t* emu, void* display, char* f, void* data) { - return my->XRemoveConnectionWatch(display, findXConnectionWatchProcFct(f), data); + my->XRemoveConnectionWatch(display, findXConnectionWatchProcFct(f), data); } EXPORT void* my_XSetAfterFunction(x64emu_t* emu, void* display, void* f) @@ -1601,7 +1601,7 @@ EXPORT void* my_XOpenDisplay(x64emu_t* emu, void* d) return ret; } -EXPORT void* my__XGetRequest(x64emu_t* emu, my_XDisplay_t* dpy, int type, size_t len) +EXPORT void* my__XGetRequest(x64emu_t* emu, my_XDisplay_t* dpy, uint8_t type, size_t len) { // check if asynchandler needs updated wrapping struct my_XInternalAsync * p = dpy->async_handlers; 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) |