From 7cd87494d3f9e584ba73383ef0261c8ea14bdc8f Mon Sep 17 00:00:00 2001 From: Yang Liu Date: Sat, 3 Jan 2026 23:34:09 +0800 Subject: [PATCH] [BOX32][WRAPPER] Fixed XPeekIfEvent wrapping --- src/wrapped32/generated/functions_list.txt | 3 +-- src/wrapped32/generated/wrappedlibx11types32.h | 3 +-- src/wrapped32/wrappedlibx11_private.h | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt index 5f932eddc..5f863f774 100644 --- a/src/wrapped32/generated/functions_list.txt +++ b/src/wrapped32/generated/functions_list.txt @@ -3161,8 +3161,6 @@ wrappedlibx11: - XkbGetMap - vFXLpL: - XSetWMSizeHints -- iFpppp: - - XPeekIfEvent - iFXLip: - XCheckTypedWindowEvent - iFXLlp: @@ -3183,6 +3181,7 @@ wrappedlibx11: - iFXppp: - XCheckIfEvent - XIfEvent + - XPeekIfEvent - LFXLpi: - XCreateColormap - pFXCip: diff --git a/src/wrapped32/generated/wrappedlibx11types32.h b/src/wrapped32/generated/wrappedlibx11types32.h index 385464f97..98818ff5c 100644 --- a/src/wrapped32/generated/wrappedlibx11types32.h +++ b/src/wrapped32/generated/wrappedlibx11types32.h @@ -44,7 +44,6 @@ typedef void* (*pFXip_t)(void*, int32_t, void*); typedef void* (*pFXCL_t)(void*, uint8_t, uintptr_t); typedef void* (*pFXuu_t)(void*, uint32_t, uint32_t); typedef void (*vFXLpL_t)(void*, uintptr_t, void*, uintptr_t); -typedef int32_t (*iFpppp_t)(void*, void*, void*, void*); typedef int32_t (*iFXLip_t)(void*, uintptr_t, int32_t, void*); typedef int32_t (*iFXLlp_t)(void*, uintptr_t, intptr_t, void*); typedef int32_t (*iFXLLp_t)(void*, uintptr_t, uintptr_t, void*); @@ -154,7 +153,6 @@ typedef uintptr_t (*LFXLiiuuuiupLp_t)(void*, uintptr_t, int32_t, int32_t, uint32 GO(_XGetRequest, pFXCL_t) \ GO(XkbGetMap, pFXuu_t) \ GO(XSetWMSizeHints, vFXLpL_t) \ - GO(XPeekIfEvent, iFpppp_t) \ GO(XCheckTypedWindowEvent, iFXLip_t) \ GO(XCheckWindowEvent, iFXLlp_t) \ GO(XWindowEvent, iFXLlp_t) \ @@ -168,6 +166,7 @@ typedef uintptr_t (*LFXLiiuuuiupLp_t)(void*, uintptr_t, int32_t, int32_t, uint32 GO(_XReply, iFXpii_t) \ GO(XCheckIfEvent, iFXppp_t) \ GO(XIfEvent, iFXppp_t) \ + GO(XPeekIfEvent, iFXppp_t) \ GO(XCreateColormap, LFXLpi_t) \ GO(XGetKeyboardMapping, pFXCip_t) \ GO(XGetVisualInfo, pFXlpp_t) \ diff --git a/src/wrapped32/wrappedlibx11_private.h b/src/wrapped32/wrappedlibx11_private.h index 463a07b9d..d5f880133 100644 --- a/src/wrapped32/wrappedlibx11_private.h +++ b/src/wrapped32/wrappedlibx11_private.h @@ -942,8 +942,8 @@ GO(XOpenOM, pFXppp) //GO(_XParseBaseFontNameList, GO(XParseColor, iFXLpbLWWWcc_) GO(XParseGeometry, iFppppp) -GOM(XPeekEvent, iFEXp) // Warning: failed to confirm -GOM(XPeekIfEvent, iFEpppp) +GOM(XPeekEvent, iFEXp) +GOM(XPeekIfEvent, iFEXppp) GO(XPending, iFX) GO(Xpermalloc, pFu) //GOM(XPlanesOfScreen, iFEbpXLiiiiipippLLLiiiil_)