diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2021-04-14 14:54:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 14:54:30 +0200 |
| commit | 6f217d78da0a49b3f3cf99443cfa95a9a6507303 (patch) | |
| tree | 8d790b143339b5b910594dd919754622b0885d40 /src/wrapped | |
| parent | 0d38b1cd91d4265042396d3d1dbacac2e662ba00 (diff) | |
| parent | cdf71c4cbc8c07510708cb7396cd1035300f587f (diff) | |
| download | box64-6f217d78da0a49b3f3cf99443cfa95a9a6507303.tar.gz box64-6f217d78da0a49b3f3cf99443cfa95a9a6507303.zip | |
Merge pull request #10 from rajdakin/warnFixRefactor
Warnings and fixes
Diffstat (limited to 'src/wrapped')
73 files changed, 238 insertions, 130 deletions
diff --git a/src/wrapped/generated/wrappedbz2types.h b/src/wrapped/generated/wrappedbz2types.h index 7ea64a63..ec0f499a 100644 --- a/src/wrapped/generated/wrappedbz2types.h +++ b/src/wrapped/generated/wrappedbz2types.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedbz2TYPES_H_ #define __wrappedbz2TYPES_H_ diff --git a/src/wrapped/generated/wrappedcryptotypes.h b/src/wrapped/generated/wrappedcryptotypes.h index 30d8180f..3e37a464 100644 --- a/src/wrapped/generated/wrappedcryptotypes.h +++ b/src/wrapped/generated/wrappedcryptotypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedcryptoTYPES_H_ #define __wrappedcryptoTYPES_H_ diff --git a/src/wrapped/generated/wrappedcurltypes.h b/src/wrapped/generated/wrappedcurltypes.h index 5f0cccfd..95fae23c 100644 --- a/src/wrapped/generated/wrappedcurltypes.h +++ b/src/wrapped/generated/wrappedcurltypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedcurlTYPES_H_ #define __wrappedcurlTYPES_H_ diff --git a/src/wrapped/generated/wrappeddbustypes.h b/src/wrapped/generated/wrappeddbustypes.h index ea6dd689..f7468c89 100644 --- a/src/wrapped/generated/wrappeddbustypes.h +++ b/src/wrapped/generated/wrappeddbustypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappeddbusTYPES_H_ #define __wrappeddbusTYPES_H_ diff --git a/src/wrapped/generated/wrappedfontconfigtypes.h b/src/wrapped/generated/wrappedfontconfigtypes.h index 46e77c3f..580e5974 100644 --- a/src/wrapped/generated/wrappedfontconfigtypes.h +++ b/src/wrapped/generated/wrappedfontconfigtypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedfontconfigTYPES_H_ #define __wrappedfontconfigTYPES_H_ diff --git a/src/wrapped/generated/wrappedfreetypetypes.h b/src/wrapped/generated/wrappedfreetypetypes.h index 9378eb8f..034f108b 100644 --- a/src/wrapped/generated/wrappedfreetypetypes.h +++ b/src/wrapped/generated/wrappedfreetypetypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedfreetypeTYPES_H_ #define __wrappedfreetypeTYPES_H_ diff --git a/src/wrapped/generated/wrappedgnutlstypes.h b/src/wrapped/generated/wrappedgnutlstypes.h index d465739c..62fe8d58 100644 --- a/src/wrapped/generated/wrappedgnutlstypes.h +++ b/src/wrapped/generated/wrappedgnutlstypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedgnutlsTYPES_H_ #define __wrappedgnutlsTYPES_H_ diff --git a/src/wrapped/generated/wrappedldlinuxtypes.h b/src/wrapped/generated/wrappedldlinuxtypes.h index 4a7a4158..45bb4eba 100644 --- a/src/wrapped/generated/wrappedldlinuxtypes.h +++ b/src/wrapped/generated/wrappedldlinuxtypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedldlinuxTYPES_H_ #define __wrappedldlinuxTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibasoundtypes.h b/src/wrapped/generated/wrappedlibasoundtypes.h index ab06d481..a82a4d58 100644 --- a/src/wrapped/generated/wrappedlibasoundtypes.h +++ b/src/wrapped/generated/wrappedlibasoundtypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibasoundTYPES_H_ #define __wrappedlibasoundTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibctypes.h b/src/wrapped/generated/wrappedlibctypes.h index d252e38a..894b8e08 100644 --- a/src/wrapped/generated/wrappedlibctypes.h +++ b/src/wrapped/generated/wrappedlibctypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibcTYPES_H_ #define __wrappedlibcTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibdltypes.h b/src/wrapped/generated/wrappedlibdltypes.h index 9a903f6d..a30c1185 100644 --- a/src/wrapped/generated/wrappedlibdltypes.h +++ b/src/wrapped/generated/wrappedlibdltypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibdlTYPES_H_ #define __wrappedlibdlTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibgltypes.h b/src/wrapped/generated/wrappedlibgltypes.h index 463bced6..5295a21b 100644 --- a/src/wrapped/generated/wrappedlibgltypes.h +++ b/src/wrapped/generated/wrappedlibgltypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibglTYPES_H_ #define __wrappedlibglTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibglutypes.h b/src/wrapped/generated/wrappedlibglutypes.h index c3f295fa..eecbceff 100644 --- a/src/wrapped/generated/wrappedlibglutypes.h +++ b/src/wrapped/generated/wrappedlibglutypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibgluTYPES_H_ #define __wrappedlibgluTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibpthreadtypes.h b/src/wrapped/generated/wrappedlibpthreadtypes.h index 87d38988..107e43eb 100644 --- a/src/wrapped/generated/wrappedlibpthreadtypes.h +++ b/src/wrapped/generated/wrappedlibpthreadtypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibpthreadTYPES_H_ #define __wrappedlibpthreadTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibrttypes.h b/src/wrapped/generated/wrappedlibrttypes.h index f3c61b10..2b3bd15e 100644 --- a/src/wrapped/generated/wrappedlibrttypes.h +++ b/src/wrapped/generated/wrappedlibrttypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibrtTYPES_H_ #define __wrappedlibrtTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibsmtypes.h b/src/wrapped/generated/wrappedlibsmtypes.h index 27f9c636..26e2a700 100644 --- a/src/wrapped/generated/wrappedlibsmtypes.h +++ b/src/wrapped/generated/wrappedlibsmtypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibsmTYPES_H_ #define __wrappedlibsmTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibssltypes.h b/src/wrapped/generated/wrappedlibssltypes.h index a56ea812..b8c176e1 100644 --- a/src/wrapped/generated/wrappedlibssltypes.h +++ b/src/wrapped/generated/wrappedlibssltypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibsslTYPES_H_ #define __wrappedlibsslTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibx11types.h b/src/wrapped/generated/wrappedlibx11types.h index 0810f2a3..e9a2e3e5 100644 --- a/src/wrapped/generated/wrappedlibx11types.h +++ b/src/wrapped/generated/wrappedlibx11types.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibx11TYPES_H_ #define __wrappedlibx11TYPES_H_ diff --git a/src/wrapped/generated/wrappedlibxexttypes.h b/src/wrapped/generated/wrappedlibxexttypes.h index cb48dac5..e813ec93 100644 --- a/src/wrapped/generated/wrappedlibxexttypes.h +++ b/src/wrapped/generated/wrappedlibxexttypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibxextTYPES_H_ #define __wrappedlibxextTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibxtsttypes.h b/src/wrapped/generated/wrappedlibxtsttypes.h index f13097ea..c4e2ed70 100644 --- a/src/wrapped/generated/wrappedlibxtsttypes.h +++ b/src/wrapped/generated/wrappedlibxtsttypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibxtstTYPES_H_ #define __wrappedlibxtstTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibxttypes.h b/src/wrapped/generated/wrappedlibxttypes.h index 8d49e866..dbc64d50 100644 --- a/src/wrapped/generated/wrappedlibxttypes.h +++ b/src/wrapped/generated/wrappedlibxttypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibxtTYPES_H_ #define __wrappedlibxtTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibztypes.h b/src/wrapped/generated/wrappedlibztypes.h index b2201a7d..a4aaf3c8 100644 --- a/src/wrapped/generated/wrappedlibztypes.h +++ b/src/wrapped/generated/wrappedlibztypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedlibzTYPES_H_ #define __wrappedlibzTYPES_H_ diff --git a/src/wrapped/generated/wrappedopenaltypes.h b/src/wrapped/generated/wrappedopenaltypes.h index 6889c3ba..d63b7311 100644 --- a/src/wrapped/generated/wrappedopenaltypes.h +++ b/src/wrapped/generated/wrappedopenaltypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedopenalTYPES_H_ #define __wrappedopenalTYPES_H_ diff --git a/src/wrapped/generated/wrappedpangotypes.h b/src/wrapped/generated/wrappedpangotypes.h index 7e535062..ee78f918 100644 --- a/src/wrapped/generated/wrappedpangotypes.h +++ b/src/wrapped/generated/wrappedpangotypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedpangoTYPES_H_ #define __wrappedpangoTYPES_H_ diff --git a/src/wrapped/generated/wrappedpulsetypes.h b/src/wrapped/generated/wrappedpulsetypes.h index 2fc994fd..43292d65 100644 --- a/src/wrapped/generated/wrappedpulsetypes.h +++ b/src/wrapped/generated/wrappedpulsetypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedpulseTYPES_H_ #define __wrappedpulseTYPES_H_ diff --git a/src/wrapped/generated/wrappedsdl1imagetypes.h b/src/wrapped/generated/wrappedsdl1imagetypes.h index 89c5e486..1b7e989b 100644 --- a/src/wrapped/generated/wrappedsdl1imagetypes.h +++ b/src/wrapped/generated/wrappedsdl1imagetypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsdl1imageTYPES_H_ #define __wrappedsdl1imageTYPES_H_ diff --git a/src/wrapped/generated/wrappedsdl1mixertypes.h b/src/wrapped/generated/wrappedsdl1mixertypes.h index 26106a46..5d4c5819 100644 --- a/src/wrapped/generated/wrappedsdl1mixertypes.h +++ b/src/wrapped/generated/wrappedsdl1mixertypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsdl1mixerTYPES_H_ #define __wrappedsdl1mixerTYPES_H_ diff --git a/src/wrapped/generated/wrappedsdl1ttftypes.h b/src/wrapped/generated/wrappedsdl1ttftypes.h index b61ad3e7..058a8b12 100644 --- a/src/wrapped/generated/wrappedsdl1ttftypes.h +++ b/src/wrapped/generated/wrappedsdl1ttftypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsdl1ttfTYPES_H_ #define __wrappedsdl1ttfTYPES_H_ diff --git a/src/wrapped/generated/wrappedsdl1types.h b/src/wrapped/generated/wrappedsdl1types.h index b510c583..f4b819d2 100644 --- a/src/wrapped/generated/wrappedsdl1types.h +++ b/src/wrapped/generated/wrappedsdl1types.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsdl1TYPES_H_ #define __wrappedsdl1TYPES_H_ diff --git a/src/wrapped/generated/wrappedsdl2imagetypes.h b/src/wrapped/generated/wrappedsdl2imagetypes.h index 57120cbe..dde655f7 100644 --- a/src/wrapped/generated/wrappedsdl2imagetypes.h +++ b/src/wrapped/generated/wrappedsdl2imagetypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsdl2imageTYPES_H_ #define __wrappedsdl2imageTYPES_H_ diff --git a/src/wrapped/generated/wrappedsdl2mixertypes.h b/src/wrapped/generated/wrappedsdl2mixertypes.h index 7bc662db..45585588 100644 --- a/src/wrapped/generated/wrappedsdl2mixertypes.h +++ b/src/wrapped/generated/wrappedsdl2mixertypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsdl2mixerTYPES_H_ #define __wrappedsdl2mixerTYPES_H_ diff --git a/src/wrapped/generated/wrappedsdl2ttftypes.h b/src/wrapped/generated/wrappedsdl2ttftypes.h index fe3c4815..81c411cd 100644 --- a/src/wrapped/generated/wrappedsdl2ttftypes.h +++ b/src/wrapped/generated/wrappedsdl2ttftypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsdl2ttfTYPES_H_ #define __wrappedsdl2ttfTYPES_H_ diff --git a/src/wrapped/generated/wrappedsdl2types.h b/src/wrapped/generated/wrappedsdl2types.h index 3c8bb639..d59b86a1 100644 --- a/src/wrapped/generated/wrappedsdl2types.h +++ b/src/wrapped/generated/wrappedsdl2types.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsdl2TYPES_H_ #define __wrappedsdl2TYPES_H_ diff --git a/src/wrapped/generated/wrappedsmpeg2types.h b/src/wrapped/generated/wrappedsmpeg2types.h index 8fe02baf..0b1b13ed 100644 --- a/src/wrapped/generated/wrappedsmpeg2types.h +++ b/src/wrapped/generated/wrappedsmpeg2types.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsmpeg2TYPES_H_ #define __wrappedsmpeg2TYPES_H_ diff --git a/src/wrapped/generated/wrappedsmpegtypes.h b/src/wrapped/generated/wrappedsmpegtypes.h index 658adb1e..fa6f397b 100644 --- a/src/wrapped/generated/wrappedsmpegtypes.h +++ b/src/wrapped/generated/wrappedsmpegtypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedsmpegTYPES_H_ #define __wrappedsmpegTYPES_H_ diff --git a/src/wrapped/generated/wrappedutiltypes.h b/src/wrapped/generated/wrappedutiltypes.h index 33e5ddec..050f59ec 100644 --- a/src/wrapped/generated/wrappedutiltypes.h +++ b/src/wrapped/generated/wrappedutiltypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedutilTYPES_H_ #define __wrappedutilTYPES_H_ diff --git a/src/wrapped/generated/wrappedvorbisfiletypes.h b/src/wrapped/generated/wrappedvorbisfiletypes.h index c135492f..f430cab5 100644 --- a/src/wrapped/generated/wrappedvorbisfiletypes.h +++ b/src/wrapped/generated/wrappedvorbisfiletypes.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __wrappedvorbisfileTYPES_H_ #define __wrappedvorbisfileTYPES_H_ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index b6a0083a..0b90c863 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #include <stdio.h> #include <stdlib.h> @@ -1236,7 +1236,7 @@ typedef double (*KFKp_t)(double, void*); #endif void vFE(x64emu_t *emu, uintptr_t fcn) { vFE_t fn = (vFE_t)fcn; fn(emu); } -void vFv(x64emu_t *emu, uintptr_t fcn) { vFv_t fn = (vFv_t)fcn; fn(); } +void vFv(x64emu_t *emu, uintptr_t fcn) { vFv_t fn = (vFv_t)fcn; fn(); (void)emu; } void vFi(x64emu_t *emu, uintptr_t fcn) { vFi_t fn = (vFi_t)fcn; fn((int64_t)R_RDI); } void vFu(x64emu_t *emu, uintptr_t fcn) { vFu_t fn = (vFu_t)fcn; fn((uint64_t)R_RDI); } void vFf(x64emu_t *emu, uintptr_t fcn) { vFf_t fn = (vFf_t)fcn; fn(emu->xmm[0].f[0]); } diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index d17274b4..b15e3e17 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -1,5 +1,5 @@ /******************************************************************* - * File automatically generated by rebuild_wrappers.py (v1.3.0.10) * + * File automatically generated by rebuild_wrappers.py (v1.3.0.11) * *******************************************************************/ #ifndef __WRAPPER_H_ #define __WRAPPER_H_ diff --git a/src/wrapped/wrappedbz2.c b/src/wrapped/wrappedbz2.c index 0f4b76b8..686d845f 100755 --- a/src/wrapped/wrappedbz2.c +++ b/src/wrapped/wrappedbz2.c @@ -54,6 +54,7 @@ void* getBz2My(library_t* lib) void freeBz2My(void* lib) { + (void)lib; //bz2_my_t *my = (bz2_my_t *)lib; } @@ -159,6 +160,7 @@ typedef struct { EXPORT int my_BZ2_bzCompressInit(x64emu_t* emu, my_bz_stream_t* strm, int blocksize, int verbosity, int work) { + (void)emu; library_t * lib = GetLibInternal(bz2Name); bz2_my_t *my = (bz2_my_t*)lib->priv.w.p2; WRAP_BZ(strm); @@ -169,6 +171,7 @@ EXPORT int my_BZ2_bzCompressInit(x64emu_t* emu, my_bz_stream_t* strm, int blocks EXPORT int my_BZ2_bzCompress(x64emu_t* emu, my_bz_stream_t* strm, int action) { + (void)emu; library_t * lib = GetLibInternal(bz2Name); bz2_my_t *my = (bz2_my_t*)lib->priv.w.p2; WRAP_BZ(strm); @@ -179,6 +182,7 @@ EXPORT int my_BZ2_bzCompress(x64emu_t* emu, my_bz_stream_t* strm, int action) EXPORT int my_BZ2_bzCompressEnd(x64emu_t* emu, my_bz_stream_t* strm) { + (void)emu; library_t * lib = GetLibInternal(bz2Name); bz2_my_t *my = (bz2_my_t*)lib->priv.w.p2; WRAP_BZ(strm); @@ -189,6 +193,7 @@ EXPORT int my_BZ2_bzCompressEnd(x64emu_t* emu, my_bz_stream_t* strm) EXPORT int my_BZ2_bzDecompressInit(x64emu_t* emu, my_bz_stream_t* strm, int verbosity, int small) { + (void)emu; library_t * lib = GetLibInternal(bz2Name); bz2_my_t *my = (bz2_my_t*)lib->priv.w.p2; WRAP_BZ(strm); @@ -199,6 +204,7 @@ EXPORT int my_BZ2_bzDecompressInit(x64emu_t* emu, my_bz_stream_t* strm, int verb EXPORT int my_BZ2_bzDecompress(x64emu_t* emu, my_bz_stream_t* strm) { + (void)emu; library_t * lib = GetLibInternal(bz2Name); bz2_my_t *my = (bz2_my_t*)lib->priv.w.p2; WRAP_BZ(strm); @@ -209,6 +215,7 @@ EXPORT int my_BZ2_bzDecompress(x64emu_t* emu, my_bz_stream_t* strm) EXPORT int my_BZ2_bzDecompressEnd(x64emu_t* emu, my_bz_stream_t* strm) { + (void)emu; library_t * lib = GetLibInternal(bz2Name); bz2_my_t *my = (bz2_my_t*)lib->priv.w.p2; WRAP_BZ(strm); @@ -227,4 +234,3 @@ EXPORT int my_BZ2_bzDecompressEnd(x64emu_t* emu, my_bz_stream_t* strm) my_lib = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedcrypto.c b/src/wrapped/wrappedcrypto.c index 1cfcf62f..aad3ec7a 100755 --- a/src/wrapped/wrappedcrypto.c +++ b/src/wrapped/wrappedcrypto.c @@ -69,6 +69,7 @@ void* getCryptoMy(library_t* lib) void freeCryptoMy(void* lib) { + (void)lib; //crypto_my_t *my = (crypto_my_t *)lib; } @@ -228,106 +229,106 @@ static void* find_passphrase_Fct(void* fct) EXPORT int32_t my_ENGINE_ctrl(x64emu_t* emu, void* e, int32_t cmd, int32_t i, void* p, void* f) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - return my->ENGINE_ctrl(e, cmd, i, p, find_ENGINE_ctrl_cb_Fct(f)); } EXPORT int32_t my_ENGINE_ctrl_cmd(x64emu_t* emu, void* e, void* cmd, long i, void* p, void* f, int optional) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - return my->ENGINE_ctrl_cmd(e, cmd, i, p, find_ENGINE_ctrl_cb_Fct(f), optional); } EXPORT void my_CRYPTO_set_id_callback(x64emu_t* emu, void* cb) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->CRYPTO_set_id_callback(find_id_func_Fct(cb)); } EXPORT void my_CRYPTO_set_locking_callback(x64emu_t* emu, void* cb) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->CRYPTO_set_locking_callback(find_lock_func_Fct(cb)); } EXPORT void my_PEM_read_bio_DSAPrivateKey(x64emu_t* emu, void* bp, void* x, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->PEM_read_bio_DSAPrivateKey(bp, x, find_passphrase_Fct(cb), u); } EXPORT void my_PEM_read_bio_DSA_PUBKEY(x64emu_t* emu, void* bp, void* x, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->PEM_read_bio_DSA_PUBKEY(bp, x, find_passphrase_Fct(cb), u); } EXPORT void my_PEM_read_bio_RSAPrivateKey(x64emu_t* emu, void* bp, void* x, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->PEM_read_bio_RSAPrivateKey(bp, x, find_passphrase_Fct(cb), u); } EXPORT void my_PEM_read_bio_RSA_PUBKEY(x64emu_t* emu, void* bp, void* x, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->PEM_read_bio_RSA_PUBKEY(bp, x, find_passphrase_Fct(cb), u); } EXPORT void my_PEM_read_bio_ECPrivateKey(x64emu_t* emu, void* bp, void* x, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->PEM_read_bio_ECPrivateKey(bp, x, find_passphrase_Fct(cb), u); } EXPORT void my_PEM_read_bio_EC_PUBKEY(x64emu_t* emu, void* bp, void* x, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->PEM_read_bio_EC_PUBKEY(bp, x, find_passphrase_Fct(cb), u); } EXPORT int my_PEM_write_bio_DSAPrivateKey(x64emu_t* emu, void* bp, void* x, void* e, void* str, int len, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - return my->PEM_write_bio_DSAPrivateKey(bp, x, e, str, len, find_passphrase_Fct(cb), u); } EXPORT int my_PEM_write_bio_RSAPrivateKey(x64emu_t* emu, void* bp, void* x, void* e, void* str, int len, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - return my->PEM_write_bio_RSAPrivateKey(bp, x, e, str, len, find_passphrase_Fct(cb), u); } EXPORT int my_PEM_write_bio_ECPrivateKey(x64emu_t* emu, void* bp, void* x, void* e, void* str, int len, void* cb, void* u) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - return my->PEM_write_bio_ECPrivateKey(bp, x, e, str, len, find_passphrase_Fct(cb), u); } EXPORT void* my_sk_new(x64emu_t* emu, void* f) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - return my->sk_new(find_cmp_fnc_Fct(f)); } EXPORT void my_sk_pop_free(x64emu_t* emu, void* st, void* f) { + (void)emu; crypto_my_t *my = (crypto_my_t*)my_lib->priv.w.p2; - my->sk_pop_free(st, find_free_fnc_Fct(f)); } diff --git a/src/wrapped/wrappedcurl.c b/src/wrapped/wrappedcurl.c index 9bb7867d..e7955c1b 100755 --- a/src/wrapped/wrappedcurl.c +++ b/src/wrapped/wrappedcurl.c @@ -48,8 +48,8 @@ void* getCurlMy(library_t* lib) void freeCurlMy(void* lib) { + (void)lib; // curl_my_t *my = (curl_my_t *)lib; - } #undef SUPER @@ -489,6 +489,7 @@ static void* find_progress_Fct(void* fct) EXPORT uint32_t my_curl_easy_setopt(x64emu_t* emu, void* handle, uint32_t option, void* param) { + (void)emu; curl_my_t *my = (curl_my_t*)my_lib->priv.w.p2; switch(option) { @@ -559,4 +560,3 @@ EXPORT uint32_t my_curl_easy_setopt(x64emu_t* emu, void* handle, uint32_t option my_lib = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappeddbus.c b/src/wrapped/wrappeddbus.c index 3db5a8da..643d15a9 100755 --- a/src/wrapped/wrappeddbus.c +++ b/src/wrapped/wrappeddbus.c @@ -68,6 +68,7 @@ static void* getDBusMy(library_t* lib) static void freeDBusMy(void* lib) { + (void)lib; //dbus_my_t *my = (dbus_my_t *)lib; } @@ -398,6 +399,7 @@ static void* finddbus_internal_padFct(void* fct) EXPORT void my_dbus_timeout_set_data(x64emu_t* emu, void* e, void* p, void* f) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; my->dbus_timeout_set_data(e, p, find_DBusFreeFunction_Fct(f)); } @@ -405,6 +407,7 @@ EXPORT void my_dbus_timeout_set_data(x64emu_t* emu, void* e, void* p, void* f) EXPORT int32_t my_dbus_connection_set_timeout_functions(x64emu_t* emu, void* c, void* a, void* r, void* t, void* d, void* f) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; return my->dbus_connection_set_timeout_functions(c, @@ -416,18 +419,21 @@ EXPORT int32_t my_dbus_connection_set_timeout_functions(x64emu_t* emu, void* c, EXPORT int my_dbus_connection_add_filter(x64emu_t* emu, void* connection, void* fnc, void* data, void* fr) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; return my->dbus_connection_add_filter(connection, find_DBusHandleMessageFunction_Fct(fnc), data, find_DBusFreeFunction_Fct(fr)); } EXPORT void my_dbus_connection_remove_filter(x64emu_t* emu, void* connection, void* fnc, void* data) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; my->dbus_connection_remove_filter(connection, find_DBusHandleMessageFunction_Fct(fnc), data); } EXPORT int my_dbus_message_get_args_valist(x64emu_t* emu, void* message, void* e, int arg, x64_va_list_t b) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; CONVERT_VALIST(b); return my->dbus_message_get_args_valist(message, e, arg, VARARGS); @@ -435,6 +441,7 @@ EXPORT int my_dbus_message_get_args_valist(x64emu_t* emu, void* message, void* e /*EXPORT int my_dbus_message_get_args(x64emu_t* emu, void* message, void* e, int arg, uint64_t* V) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; return my->dbus_message_get_args_valist(message, e, arg, V); @@ -442,6 +449,7 @@ EXPORT int my_dbus_message_get_args_valist(x64emu_t* emu, void* message, void* e EXPORT int my_dbus_message_set_data(x64emu_t* emu, void* message, int32_t slot, void* data, void* free_func) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; return my->dbus_message_set_data(message, slot, data, find_DBusFreeFunction_Fct(free_func)); @@ -449,6 +457,7 @@ EXPORT int my_dbus_message_set_data(x64emu_t* emu, void* message, int32_t slot, EXPORT int my_dbus_pending_call_set_notify(x64emu_t* emu, void* pending, void* func, void* data, void* free_func) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; return my->dbus_pending_call_set_notify(pending, findDBusPendingCallNotifyFunctionFct(func), data, find_DBusFreeFunction_Fct(free_func)); @@ -456,6 +465,7 @@ EXPORT int my_dbus_pending_call_set_notify(x64emu_t* emu, void* pending, void* f EXPORT int my_dbus_pending_call_set_data(x64emu_t* emu, void* pending, int32_t slot, void* data, void* free_func) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; return my->dbus_pending_call_set_data(pending, slot, data, find_DBusFreeFunction_Fct(free_func)); @@ -463,6 +473,7 @@ EXPORT int my_dbus_pending_call_set_data(x64emu_t* emu, void* pending, int32_t s EXPORT void my_dbus_watch_set_data(x64emu_t* emu, void* watch, void* data, void* free_func) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; my->dbus_watch_set_data(watch, data, find_DBusFreeFunction_Fct(free_func)); @@ -470,6 +481,7 @@ EXPORT void my_dbus_watch_set_data(x64emu_t* emu, void* watch, void* data, void* EXPORT void my_dbus_connection_set_dispatch_status_function(x64emu_t* emu, void* connection, void* dispatch, void* data, void* free_func) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; my->dbus_connection_set_dispatch_status_function(connection, findDBusDispatchStatusFunctionFct(dispatch), data, find_DBusFreeFunction_Fct(free_func)); @@ -477,6 +489,7 @@ EXPORT void my_dbus_connection_set_dispatch_status_function(x64emu_t* emu, void* EXPORT int my_dbus_connection_set_watch_functions(x64emu_t* emu, void* connection, void* add, void* remove, void* toggled, void* data, void* free_func) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; return my->dbus_connection_set_watch_functions(connection, findDBusAddWatchFunctionFct(add), findDBusRemoveWatchFunctionFct(remove), findDBusWatchToggledFunctionFct(toggled), data, find_DBusFreeFunction_Fct(free_func)); @@ -494,6 +507,7 @@ typedef struct my_DBusObjectPathVTable_s EXPORT int my_dbus_connection_try_register_object_path(x64emu_t* emu, void* connection, void* path, my_DBusObjectPathVTable_t* vtable, void* data, void* error) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; my_DBusObjectPathVTable_t vt = {0}; @@ -511,6 +525,7 @@ EXPORT int my_dbus_connection_try_register_object_path(x64emu_t* emu, void* conn EXPORT int my_dbus_connection_set_data(x64emu_t* emu, void* connection, int slot, void* data, void* free_func) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; return my->dbus_connection_set_data(connection, slot, data, find_DBusFreeFunction_Fct(free_func)); @@ -518,6 +533,7 @@ EXPORT int my_dbus_connection_set_data(x64emu_t* emu, void* connection, int slot EXPORT void my_dbus_connection_set_wakeup_main_function(x64emu_t* emu, void* connection, void* wakeup, void* data, void* free_func) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; my->dbus_connection_set_wakeup_main_function(connection, find_DBusWakeupMainFunction_Fct(wakeup), data, find_DBusFreeFunction_Fct(free_func)); @@ -525,6 +541,7 @@ EXPORT void my_dbus_connection_set_wakeup_main_function(x64emu_t* emu, void* con EXPORT int my_dbus_connection_try_register_fallback(x64emu_t* emu, void* connection, void* path, my_DBusObjectPathVTable_t* vtable, void* data, void* error) { + (void)emu; dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2; my_DBusObjectPathVTable_t vt = {0}; @@ -552,4 +569,3 @@ EXPORT int my_dbus_connection_try_register_fallback(x64emu_t* emu, void* connect my_lib = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedfontconfig.c b/src/wrapped/wrappedfontconfig.c index 007d1bd5..5481fef7 100755 --- a/src/wrapped/wrappedfontconfig.c +++ b/src/wrapped/wrappedfontconfig.c @@ -34,6 +34,7 @@ void* getFontconfigMy(library_t* lib) { fontconfig_my_t* my = (fontconfig_my_t*)calloc(1, sizeof(fontconfig_my_t)); #define GO(A, W) my->A = (W)dlsym(lib->priv.w.lib, #A); + (void)lib; // So many wrapping here SUPER() #undef GO return my; @@ -42,6 +43,7 @@ void* getFontconfigMy(library_t* lib) void freeFontconfigMy(void* lib) { + (void)lib; //fontconfig_my_t *my = (fontconfig_my_t *)lib; } @@ -53,4 +55,3 @@ void freeFontconfigMy(void* lib) free(lib->priv.w.p2); #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedfreetype.c b/src/wrapped/wrappedfreetype.c index 25a25e47..f830e10b 100755 --- a/src/wrapped/wrappedfreetype.c +++ b/src/wrapped/wrappedfreetype.c @@ -83,6 +83,7 @@ void* getFreeTypeMy(library_t* lib) void freeFreeTypeMy(void* lib) { + (void)lib; //freetype_my_t *my = (freetype_my_t *)lib; } @@ -133,6 +134,7 @@ static void my_FT_Stream_CloseFunc(FT_StreamRec_t* stream) EXPORT int my_FT_Open_Face(x64emu_t* emu, void* library, FT_Open_Args_t* args, long face_index, void* aface) { + (void)emu; library_t* lib = GetLibInternal(freetypeName); freetype_my_t* my = (freetype_my_t*)lib->priv.w.p2; @@ -155,6 +157,7 @@ EXPORT int my_FT_Open_Face(x64emu_t* emu, void* library, FT_Open_Args_t* args, l EXPORT int my_FTC_Manager_New(x64emu_t* emu, void* l, uint32_t max_faces, uint32_t max_sizes, uintptr_t max_bytes, void* req, void* data, void* aman) { + (void)emu; library_t* lib = GetLibInternal(freetypeName); freetype_my_t* my = (freetype_my_t*)lib->priv.w.p2; diff --git a/src/wrapped/wrappedgnutls.c b/src/wrapped/wrappedgnutls.c index 287a1005..5ee86f8a 100755 --- a/src/wrapped/wrappedgnutls.c +++ b/src/wrapped/wrappedgnutls.c @@ -50,6 +50,7 @@ void* getGnutlsMy(library_t* lib) void freeGnutlsMy(void* lib) { + (void)lib; //gnutls_my_t *my = (gnutls_my_t *)lib; } @@ -114,21 +115,21 @@ static void* find_pullpush_Fct(void* fct) EXPORT void my_gnutls_global_set_log_function(x64emu_t* emu, void* f) { + (void)emu; gnutls_my_t *my = (gnutls_my_t*)my_lib->priv.w.p2; - my->gnutls_global_set_log_function(find_gnutls_log_Fct(f)); } EXPORT void my_gnutls_transport_set_pull_function(x64emu_t* emu, void* session, void* f) { + (void)emu; gnutls_my_t *my = (gnutls_my_t*)my_lib->priv.w.p2; - my->gnutls_transport_set_pull_function(session, find_pullpush_Fct(f)); } EXPORT void my_gnutls_transport_set_push_function(x64emu_t* emu, void* session, void* f) { + (void)emu; gnutls_my_t *my = (gnutls_my_t*)my_lib->priv.w.p2; - my->gnutls_transport_set_push_function(session, find_pullpush_Fct(f)); } @@ -142,4 +143,3 @@ EXPORT void my_gnutls_transport_set_push_function(x64emu_t* emu, void* session, free(lib->priv.w.p2); #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedlib_init.h b/src/wrapped/wrappedlib_init.h index 3f946286..a3a2049c 100755 --- a/src/wrapped/wrappedlib_init.h +++ b/src/wrapped/wrappedlib_init.h @@ -84,7 +84,9 @@ static const map_onedata_t MAPNAME(mydatamap)[] = { int FUNC(_init)(library_t* lib, box64context_t* box64) { -// Init first + (void)box64; + + // Init first free(lib->path); lib->path=NULL; #ifdef PRE_INIT PRE_INIT @@ -169,7 +171,7 @@ int FUNC(_init)(library_t* lib, box64context_t* box64) #ifdef CUSTOM_INIT CUSTOM_INIT #endif - + return 0; } @@ -192,10 +194,10 @@ int FUNC(_fini)(library_t* lib) return 1; } -int FUNC(_get)(library_t* lib, const char* name, uintptr_t *offs, uint32_t *sz) +int FUNC(_get)(library_t* lib, const char* name, uintptr_t *offs, uintptr_t *sz) { uintptr_t addr = 0; - uint32_t size = 0; + uintptr_t size = 0; #ifdef CUSTOM_FAIL void* symbol = NULL; #endif @@ -215,10 +217,10 @@ int FUNC(_get)(library_t* lib, const char* name, uintptr_t *offs, uint32_t *sz) return 1; } -int FUNC(_getnoweak)(library_t* lib, const char* name, uintptr_t *offs, uint32_t *sz) +int FUNC(_getnoweak)(library_t* lib, const char* name, uintptr_t *offs, uintptr_t *sz) { uintptr_t addr = 0; - uint32_t size = 0; + uintptr_t size = 0; #ifdef CUSTOM_FAIL void* symbol = NULL; #endif diff --git a/src/wrapped/wrappedlibasound.c b/src/wrapped/wrappedlibasound.c index acb5f3de..13885062 100755 --- a/src/wrapped/wrappedlibasound.c +++ b/src/wrapped/wrappedlibasound.c @@ -30,6 +30,7 @@ typedef int (*iFpppp_t) (void*, void*, void*, void*); EXPORT uintptr_t my_snd_lib_error = 0; static void default_error_handler(const char *file, int line, const char *function, int err, const char *fmt, va_list ap) { + (void)file; (void)line; (void)function; (void)err; vprintf(fmt, ap); } @@ -53,13 +54,14 @@ void* getAsoundMy(library_t* lib) #undef GO // setup custom error handler my_snd_lib_error = AddCheckBridge(my_context->system, vFpipipV, default_error_handler, 0, "ASoundCustomErrorHandler"); - //all done + // all done return my; } #undef SUPER void freeAsoundMy(void* lib) { + (void)lib; // asound_my_t *my = (asound_my_t *)lib; my_snd_lib_error = 0; // no removing of bridge } @@ -111,6 +113,7 @@ EXPORT int my_snd_async_add_pcm_handler(x64emu_t *emu, void *handler, void* pcm, static void* current_error_handler = NULL; static void dummy_error_handler(const char *file, int line, const char *function, int err, const char *fmt, ...) { + (void)function; (void)err; va_list ap; fprintf(ftrace, "Warning: this is a dummy snd_lib error handler\n"); @@ -123,6 +126,7 @@ static void dummy_error_handler(const char *file, int line, const char *function static void empty_error_handler(const char *file, int line, const char *function, int err, const char *fmt, ...) { + (void)file; (void)line; (void)function; (void)err; (void)fmt; // do nothing } @@ -133,7 +137,7 @@ EXPORT int my_snd_lib_error_set_handler(x64emu_t* emu, void* handler) void *error_handler; uint8_t *code = (uint8_t *)handler; if (code) { - if (code && ((code[0] == 0xC3) || ((code[0] == 0xF3) && (code[1] == 0xC3)))) { + if ((code[0] == 0xC3) || ((code[0] == 0xF3) && (code[1] == 0xC3))) { error_handler = &empty_error_handler; } else { error_handler = &dummy_error_handler; @@ -175,4 +179,3 @@ EXPORT void* my_snd_dlsym(x64emu_t* emu, void* handle, void* name, void* version free(lib->priv.w.p2); #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index 09b52edd..881d57ce 100755 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -110,6 +110,7 @@ void* getLIBCMy(library_t* lib) void freeLIBCMy(void* lib) { + (void)lib; // empty for now } @@ -339,6 +340,7 @@ int32_t my___libc_start_main(x64emu_t* emu, int *(main) (int, char * *, char * * EXPORT void my___libc_init_first(x64emu_t* emu, int argc, char* arg0, char** b) { // do nothing specific for now + (void)emu; (void)argc; (void)arg0; (void)b; return; } uintptr_t my_syscall(x64emu_t *emu); // implemented in x64syscall.c @@ -354,11 +356,13 @@ void EXPORT my___stack_chk_fail(x64emu_t* emu) } void EXPORT my___gmon_start__(x64emu_t *emu) { + (void)emu; printf_log(LOG_DEBUG, "__gmon_start__ called (dummy call)\n"); } -int EXPORT my___cxa_atexit(x64emu_t* emu, void* p, void* a, void* d) +int EXPORT my___cxa_atexit(x64emu_t* emu, void* p, void* a, void* dso_handle) { + (void)dso_handle; AddCleanup1Arg(emu, p, a); return 0; } @@ -516,13 +520,13 @@ int of_unconvert(int a) } #undef SUPER -EXPORT void* my__ZGTtnaX (size_t a) { printf("warning _ZGTtnaX called\n"); return NULL; } -EXPORT void my__ZGTtdlPv (void* a) { printf("warning _ZGTtdlPv called\n"); } -EXPORT uint8_t my__ITM_RU1(const uint8_t * a) { printf("warning _ITM_RU1 called\n"); return 0; } -EXPORT uint32_t my__ITM_RU4(const uint32_t * a) { printf("warning _ITM_RU4 called\n"); return 0; } -EXPORT uint64_t my__ITM_RU8(const uint64_t * a) { printf("warning _ITM_RU8 called\n"); return 0; } -EXPORT void my__ITM_memcpyRtWn(void * a, const void * b, size_t c) {printf("warning _ITM_memcpyRtWn called\n"); } -EXPORT void my__ITM_memcpyRnWt(void * a, const void * b, size_t c) {printf("warning _ITM_memcpyRtWn called\n"); } +EXPORT void* my__ZGTtnaX (size_t a) { (void)a; printf("warning _ZGTtnaX called\n"); return NULL; } +EXPORT void my__ZGTtdlPv (void* a) { (void)a; printf("warning _ZGTtdlPv called\n"); } +EXPORT uint8_t my__ITM_RU1(const uint8_t * a) { (void)a; printf("warning _ITM_RU1 called\n"); return 0; } +EXPORT uint32_t my__ITM_RU4(const uint32_t * a) { (void)a; printf("warning _ITM_RU4 called\n"); return 0; } +EXPORT uint64_t my__ITM_RU8(const uint64_t * a) { (void)a; printf("warning _ITM_RU8 called\n"); return 0; } +EXPORT void my__ITM_memcpyRtWn(void * a, const void * b, size_t c) { (void)a; (void)b; (void)c; printf("warning _ITM_memcpyRtWn called\n"); } +EXPORT void my__ITM_memcpyRnWt(void * a, const void * b, size_t c) { (void)a; (void)b; (void)c; printf("warning _ITM_memcpyRnWt called\n"); } EXPORT void my_longjmp(x64emu_t* emu, /*struct __jmp_buf_tag __env[1]*/void *p, int32_t __val); EXPORT void my__longjmp(x64emu_t* emu, /*struct __jmp_buf_tag __env[1]*/void *p, int32_t __val) __attribute__((alias("my_longjmp"))); @@ -540,18 +544,21 @@ EXPORT int my_printf(x64emu_t *emu, void* fmt, void* b) { } EXPORT int my___printf_chk(x64emu_t *emu, int chk, void* fmt, void* b) { + (void)chk; myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 2); PREPARE_VALIST; return vprintf((const char*)fmt, VARARGS); } EXPORT int my_vprintf(x64emu_t *emu, void* fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b); return vprintf(fmt, VARARGS); } EXPORT int my___vprintf_chk(x64emu_t *emu, void* fmt, x64_va_list_t b) __attribute__((alias("my_vprintf"))); EXPORT int my_vfprintf(x64emu_t *emu, void* F, void* fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b); return vfprintf(F, fmt, VARARGS); } @@ -564,6 +571,7 @@ EXPORT int my_fprintf(x64emu_t *emu, void* F, void* fmt, void* b) { return vfprintf(F, fmt, VARARGS); } EXPORT int my___fprintf_chk(x64emu_t *emu, void* F, int flag, void* fmt, void* b) { + (void)flag; myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 3); PREPARE_VALIST; return vfprintf(F, fmt, VARARGS); @@ -646,6 +654,7 @@ EXPORT int my_snprintf(x64emu_t* emu, void* buff, size_t s, void * fmt, uint64_t EXPORT int my___snprintf(x64emu_t* emu, void* buff, size_t s, void * fmt, uint64_t * b) __attribute__((alias("my_snprintf"))); EXPORT int my___snprintf_chk(x64emu_t* emu, void* buff, size_t s, int flags, size_t maxlen, void * fmt, uint64_t * b) { + (void)flags; (void)maxlen; myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 5); PREPARE_VALIST; int r = vsnprintf(buff, s, fmt, VARARGS); @@ -658,6 +667,7 @@ EXPORT int my_sprintf(x64emu_t* emu, void* buff, void * fmt, void * b) { return vsprintf(buff, (const char*)fmt, VARARGS); } EXPORT int my___sprintf_chk(x64emu_t* emu, void* buff, int flag, size_t l, void * fmt, void * b) { + (void)flag; (void)l; myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 4); PREPARE_VALIST; return vsprintf(buff, (const char*)fmt, VARARGS); @@ -678,31 +688,29 @@ EXPORT int my___asprintf(x64emu_t* emu, void** buff, void * fmt, void * b, va_li #endif EXPORT int my_vasprintf(x64emu_t* emu, char** buff, void* fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b); - return vasprintf(buff, fmt, VARARGS); } EXPORT int my_vsprintf(x64emu_t* emu, void* buff, void * fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b); - return vsprintf(buff, fmt, VARARGS); } EXPORT int my___vsprintf_chk(x64emu_t* emu, void* buff, void * fmt, x64_va_list_t b) __attribute__((alias("my_vsprintf"))); EXPORT int my_vfscanf(x64emu_t* emu, void* stream, void* fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b); - return vfscanf(stream, fmt, VARARGS); } - - EXPORT int my_vsscanf(x64emu_t* emu, void* stream, void* fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b); - return vsscanf(stream, fmt, VARARGS); } @@ -738,6 +746,7 @@ EXPORT int my___isoc99_sscanf(x64emu_t* emu, void* stream, void* fmt, uint64_t* } EXPORT int my_vsnprintf(x64emu_t* emu, void* buff, size_t s, void * fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b); int r = vsnprintf(buff, s, fmt, VARARGS); return r; @@ -763,6 +772,7 @@ EXPORT int my_vasprintf(x64emu_t* emu, void* strp, void* fmt, void* b, va_list V #endif EXPORT int my___vasprintf_chk(x64emu_t* emu, void* buff, int flags, void* fmt, x64_va_list_t b) { + (void)emu; (void)flags; CONVERT_VALIST(b); int r = vasprintf(buff, fmt, VARARGS); return r; @@ -781,6 +791,7 @@ EXPORT int my___asprintf_chk(x64emu_t* emu, void* result_ptr, int flags, void* f } #endif EXPORT int my_vswprintf(x64emu_t* emu, void* buff, size_t s, void * fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b); int r = vswprintf(buff, s, fmt, VARARGS); return r; @@ -828,6 +839,7 @@ EXPORT void my_syslog(x64emu_t* emu, int priority, const char* fmt, uint64_t* b) } EXPORT void my___syslog_chk(x64emu_t* emu, int priority, int flags, const char* fmt, uint64_t* b) { + (void)flags; myStackAlign(emu, fmt, b, emu->scratch, R_EAX, 3); PREPARE_VALIST; return vsyslog(priority, fmt, VARARGS); @@ -835,6 +847,8 @@ EXPORT void my___syslog_chk(x64emu_t* emu, int priority, int flags, const char* EXPORT int my___swprintf_chk(x64emu_t* emu, void* s, size_t n, int32_t flag, size_t slen, void* fmt, uint64_t* b) { + (void)flag; + (void)slen; myStackAlignW(emu, (const char*)fmt, b, emu->scratch, R_EAX, 5); PREPARE_VALIST; return vswprintf(s, n, (const wchar_t*)fmt, VARARGS); @@ -856,15 +870,17 @@ EXPORT void my__ITM_addUserCommitAction(x64emu_t* emu, void* cb, uint32_t b, voi my->_ITM_addUserCommitAction(libc1ArgCallback, b, cbemu); // should keep track of cbemu to remove at some point... #else + (void)emu; (void)cb; (void)b; (void)c; printf("warning _ITM_addUserCommitAction called\n"); #endif } -EXPORT void my__ITM_registerTMCloneTable(x64emu_t* emu, void* p, uint32_t s) {} -EXPORT void my__ITM_deregisterTMCloneTable(x64emu_t* emu, void* p) {} +EXPORT void my__ITM_registerTMCloneTable(x64emu_t* emu, void* p, uint32_t s) { (void)emu; (void)p; (void)s; } +EXPORT void my__ITM_deregisterTMCloneTable(x64emu_t* emu, void* p) { (void)emu; (void)p; } EXPORT int my___fxstat(x64emu_t *emu, int vers, int fd, void* buf) { + (void)emu; (void)vers; struct stat64 st; int r = fstat64(fd, &st); UnalignStat64(&st, buf); @@ -873,6 +889,7 @@ EXPORT int my___fxstat(x64emu_t *emu, int vers, int fd, void* buf) EXPORT int my___fxstat64(x64emu_t *emu, int vers, int fd, void* buf) { + (void)emu; (void)vers; struct stat64 st; int r = fstat64(fd, &st); //int r = syscall(__NR_stat64, fd, &st); @@ -882,6 +899,7 @@ EXPORT int my___fxstat64(x64emu_t *emu, int vers, int fd, void* buf) EXPORT int my___xstat(x64emu_t* emu, int v, void* path, void* buf) { + (void)emu; (void)v; struct stat64 st; int r = stat64((const char*)path, &st); UnalignStat64(&st, buf); @@ -890,6 +908,7 @@ EXPORT int my___xstat(x64emu_t* emu, int v, void* path, void* buf) EXPORT int my___xstat64(x64emu_t* emu, int v, void* path, void* buf) { + (void)emu; (void)v; struct stat64 st; int r = stat64((const char*)path, &st); UnalignStat64(&st, buf); @@ -898,6 +917,7 @@ EXPORT int my___xstat64(x64emu_t* emu, int v, void* path, void* buf) EXPORT int my___lxstat(x64emu_t* emu, int v, void* name, void* buf) { + (void)emu; (void)v; struct stat64 st; int r = lstat64((const char*)name, &st); UnalignStat64(&st, buf); @@ -906,6 +926,7 @@ EXPORT int my___lxstat(x64emu_t* emu, int v, void* name, void* buf) EXPORT int my___lxstat64(x64emu_t* emu, int v, void* name, void* buf) { + (void)emu; (void)v; struct stat64 st; int r = lstat64((const char*)name, &st); UnalignStat64(&st, buf); @@ -914,6 +935,7 @@ EXPORT int my___lxstat64(x64emu_t* emu, int v, void* name, void* buf) EXPORT int my___fxstatat(x64emu_t* emu, int v, int d, void* path, void* buf, int flags) { + (void)emu; (void)v; struct stat64 st; int r = fstatat64(d, path, &st, flags); UnalignStat64(&st, buf); @@ -922,6 +944,7 @@ EXPORT int my___fxstatat(x64emu_t* emu, int v, int d, void* path, void* buf, int EXPORT int my___fxstatat64(x64emu_t* emu, int v, int d, void* path, void* buf, int flags) { + (void)emu; (void)v; struct stat64 st; int r = fstatat64(d, path, &st, flags); UnalignStat64(&st, buf); @@ -979,20 +1002,24 @@ EXPORT void my_qsort_r(x64emu_t* emu, void* base, size_t nmemb, size_t size, voi } EXPORT void* my_bsearch(x64emu_t* emu, void* key, void* base, size_t nmemb, size_t size, void* fnc) { + (void)emu; return bsearch(key, base, nmemb, size, findcompareFct(fnc)); } EXPORT void* my_lsearch(x64emu_t* emu, void* key, void* base, size_t* nmemb, size_t size, void* fnc) { + (void)emu; return lsearch(key, base, nmemb, size, findcompareFct(fnc)); } EXPORT void* my_lfind(x64emu_t* emu, void* key, void* base, size_t* nmemb, size_t size, void* fnc) { + (void)emu; return lfind(key, base, nmemb, size, findcompareFct(fnc)); } EXPORT void* my_fts_open(x64emu_t* emu, void* path, int options, void* c) { + (void)emu; return fts_open(path, options, findcompareFct(c)); } #if 0 @@ -1247,13 +1274,13 @@ EXPORT int32_t my_open(x64emu_t* emu, void* pathname, int32_t flags, uint32_t mo } EXPORT int32_t my___open(x64emu_t* emu, void* pathname, int32_t flags, uint32_t mode) __attribute__((alias("my_open"))); -#ifdef DYNAREC +//#ifdef DYNAREC //static int hasDBFromAddress(uintptr_t addr) //{ // int idx = (addr>>DYNAMAP_SHIFT); // return getDB(idx)?1:0; //} -#endif +//#endif //EXPORT int32_t my_read(int fd, void* buf, uint32_t count) //{ @@ -1440,24 +1467,28 @@ EXPORT int32_t my_epoll_wait(x64emu_t* emu, int32_t epfd, void* events, int32_t #endif EXPORT int32_t my_glob64(x64emu_t *emu, void* pat, int32_t flags, void* errfnc, void* pglob) { + (void)emu; return glob64(pat, flags, findgloberrFct(errfnc), pglob); } EXPORT int32_t my_glob(x64emu_t *emu, void* pat, int32_t flags, void* errfnc, void* pglob) __attribute__((alias("my_glob64"))); EXPORT int my_scandir64(x64emu_t *emu, void* dir, void* namelist, void* sel, void* comp) { + (void)emu; return scandir64(dir, namelist, findfilter64Fct(sel), findcompare64Fct(comp)); } EXPORT int my_scandir(x64emu_t *emu, void* dir, void* namelist, void* sel, void* comp) __attribute__((alias("my_scandir64"))); EXPORT int my_ftw64(x64emu_t* emu, void* filename, void* func, int descriptors) { + (void)emu; return ftw64(filename, findftw64Fct(func), descriptors); } EXPORT int my_ftw(x64emu_t* emu, void* filename, void* func, int descriptors) __attribute__((alias("my_ftw64"))); EXPORT int32_t my_nftw64(x64emu_t* emu, void* pathname, void* B, int32_t nopenfd, int32_t flags) { + (void)emu; return nftw64(pathname, findnftw64Fct(B), nopenfd, flags); } @@ -1604,12 +1635,14 @@ EXPORT void my__Jv_RegisterClasses() {} EXPORT int32_t my___cxa_thread_atexit_impl(x64emu_t* emu, void* dtor, void* obj, void* dso) { + (void)emu; printf_log(LOG_INFO, "Warning, call to __cxa_thread_atexit_impl(%p, %p, %p) ignored\n", dtor, obj, dso); return 0; } EXPORT int32_t my___register_atfork(x64emu_t *emu, void* prepare, void* parent, void* child, void* handle) { + (void)emu; // this is partly incorrect, because the emulated funcionts should be executed by actual fork and not by my_atfork... if(my_context->atfork_sz==my_context->atfork_cap) { my_context->atfork_cap += 4; @@ -1642,6 +1675,7 @@ EXPORT int32_t my___poll_chk(void* a, uint32_t b, int c, int l) #endif EXPORT int32_t my_fcntl64(x64emu_t* emu, int32_t a, int32_t b, void* c) { + (void)emu; if(b==F_SETFL) c = (void*)(uintptr_t)of_convert((intptr_t)c); #if 0 @@ -1663,6 +1697,7 @@ EXPORT int32_t my_fcntl64(x64emu_t* emu, int32_t a, int32_t b, void* c) EXPORT int32_t my_fcntl(x64emu_t* emu, int32_t a, int32_t b, void* c) { + (void)emu; if(b==F_SETFL && (intptr_t)c==0xFFFFF7FF) { // special case for ~O_NONBLOCK... int flags = fcntl(a, F_GETFL); @@ -1790,9 +1825,11 @@ void stSetup(box64context_t* context) EXPORT void my___register_frame_info(void* a, void* b) { // nothing + (void)a; (void)b; } EXPORT void* my___deregister_frame_info(void* a) { + (void)a; return NULL; } @@ -1854,6 +1891,7 @@ EXPORT int32_t my_setjmp(x64emu_t* emu, /*struct __jmp_buf_tag __env[1]*/void *p EXPORT void my___explicit_bzero_chk(x64emu_t* emu, void* dst, uint32_t len, uint32_t dstlen) { + (void)emu; (void)dstlen; memset(dst, 0, len); } @@ -1868,6 +1906,7 @@ EXPORT void* my_realpath(x64emu_t* emu, void* path, void* resolved_path) EXPORT void* my_mmap64(x64emu_t* emu, void *addr, unsigned long length, int prot, int flags, int fd, int64_t offset) { + (void)emu; if(prot&PROT_WRITE) prot|=PROT_READ; // PROT_READ is implicit with PROT_WRITE on i386 if(box64_log<LOG_DEBUG) {dynarec_log(LOG_DEBUG, "mmap64(%p, %lu, 0x%x, 0x%x, %d, %ld) =>", addr, length, prot, flags, fd, offset);} @@ -1905,6 +1944,7 @@ EXPORT void* my_mmap(x64emu_t* emu, void *addr, unsigned long length, int prot, EXPORT void* my_mremap(x64emu_t* emu, void* old_addr, size_t old_size, size_t new_size, int flags, void* new_addr) { + (void)emu; dynarec_log(LOG_DEBUG, "mremap(%p, %lu, %lu, %d, %p)=>", old_addr, old_size, new_size, flags, new_addr); void* ret = mremap(old_addr, old_size, new_size, flags, new_addr); dynarec_log(LOG_DEBUG, "%p\n", ret); @@ -1954,6 +1994,7 @@ EXPORT void* my_mremap(x64emu_t* emu, void* old_addr, size_t old_size, size_t ne EXPORT int my_munmap(x64emu_t* emu, void* addr, unsigned long length) { + (void)emu; dynarec_log(LOG_DEBUG, "munmap(%p, %lu)\n", addr, length); #ifdef DYNAREC if(box64_dynarec) { @@ -1968,9 +2009,10 @@ EXPORT int my_munmap(x64emu_t* emu, void* addr, unsigned long length) EXPORT int my_mprotect(x64emu_t* emu, void *addr, unsigned long len, int prot) { + (void)emu; dynarec_log(LOG_DEBUG, "mprotect(%p, %lu, 0x%x)\n", addr, len, prot); if(prot&PROT_WRITE) - prot|=PROT_READ; // PROT_READ is implicit with PROT_WRITE on i386 + prot|=PROT_READ; // PROT_READ is implicit with PROT_WRITE on x86_64 int ret = mprotect(addr, len, prot); #ifdef DYNAREC if(box64_dynarec) { @@ -2214,11 +2256,12 @@ EXPORT int my_backtrace(x64emu_t* emu, void** buffer, int size) EXPORT char** my_backtrace_symbols(x64emu_t* emu, uintptr_t* buffer, int size) { + (void)emu; char** ret = (char**)calloc(1, size*sizeof(char*) + size*100); // capping each strings to 100 chars char* s = (char*)(ret+size*sizeof(char*)); for (int i=0; i<size; ++i) { uintptr_t start = 0; - uint32_t sz = 0; + uint64_t sz = 0; const char* symbname = FindNearestSymbolName(FindElfAddress(my_context, buffer[i]), (void*)buffer[i], &start, &sz); if(symbname && buffer[i]>=start && (buffer[i]<(start+sz) || !sz)) snprintf(s, 100, "%s+%ld [%p]\n", symbname, buffer[i] - start, (void*)buffer[i]); @@ -2231,10 +2274,11 @@ EXPORT char** my_backtrace_symbols(x64emu_t* emu, uintptr_t* buffer, int size) EXPORT void my_backtrace_symbols_fd(x64emu_t* emu, uintptr_t* buffer, int size, int fd) { + (void)emu; char s[100]; for (int i=0; i<size; ++i) { uintptr_t start = 0; - uint32_t sz = 0; + uint64_t sz = 0; const char* symbname = FindNearestSymbolName(FindElfAddress(my_context, buffer[i]), (void*)buffer[i], &start, &sz); if(symbname && buffer[i]>=start && (buffer[i]<(start+sz) || !sz)) snprintf(s, 100, "%s+%ld [%p]\n", symbname, buffer[i] - start, (void*)buffer[i]); diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c index 91732a61..0d9aa8cb 100755 --- a/src/wrapped/wrappedlibdl.c +++ b/src/wrapped/wrappedlibdl.c @@ -185,6 +185,7 @@ int my_dlsym_lib(library_t* lib, const char* rsymbol, uintptr_t *start, uintptr_ } void* my_dlsym(x64emu_t* emu, void *handle, void *symbol) { + (void)emu; dlprivate_t *dl = emu->context->dlprivate; uintptr_t start = 0, end = 0; char* rsymbol = (char*)symbol; @@ -228,7 +229,8 @@ void* my_dlsym(x64emu_t* emu, void *handle, void *symbol) } size_t nlib = (size_t)handle; --nlib; - if(nlib<0 || nlib>=dl->lib_sz) { + // size_t is unsigned + if(nlib>=dl->lib_sz) { if(!dl->last_error) dl->last_error = malloc(129); snprintf(dl->last_error, 129, "Bad handle %p)\n", handle); @@ -295,6 +297,7 @@ void* my_dlsym(x64emu_t* emu, void *handle, void *symbol) } int my_dlclose(x64emu_t* emu, void *handle) { + (void)emu; if(dlsym_error || box64_log>=LOG_DEBUG) { printf_log(LOG_NONE, "Call to dlclose(%p)\n", handle); } @@ -302,7 +305,8 @@ int my_dlclose(x64emu_t* emu, void *handle) CLEARERR size_t nlib = (size_t)handle; --nlib; - if(nlib<0 || nlib>=dl->lib_sz) { + // size_t is unsigned + if(nlib>=dl->lib_sz) { if(!dl->last_error) dl->last_error = malloc(129); snprintf(dl->last_error, 129, "Bad handle %p)\n", handle); @@ -368,6 +372,7 @@ typedef struct link_map_s { int my_dlinfo(x64emu_t* emu, void* handle, int request, void* info) { + (void)emu; if(dlsym_error || box64_log>=LOG_DEBUG) { printf_log(LOG_NONE, "Call to dlinfo(%p, %d, %p)\n", handle, request, info); } @@ -375,7 +380,8 @@ int my_dlinfo(x64emu_t* emu, void* handle, int request, void* info) CLEARERR size_t nlib = (size_t)handle; --nlib; - if(nlib<0 || nlib>=dl->lib_sz) { + // size_t is unsigned + if(nlib>=dl->lib_sz) { if(!dl->last_error) dl->last_error = malloc(129); snprintf(dl->last_error, 129, "Bad handle %p)\n", handle); diff --git a/src/wrapped/wrappedlibglu.c b/src/wrapped/wrappedlibglu.c index be9a6023..afab9a21 100755 --- a/src/wrapped/wrappedlibglu.c +++ b/src/wrapped/wrappedlibglu.c @@ -45,6 +45,7 @@ void* getGLUMy(library_t* lib) void freeGLUMy(void* lib) { + (void)lib; //libglu_my_t *my = (libglu_my_t *)lib; } #undef SUPER @@ -136,11 +137,13 @@ static void* findglu_callback5Fct(void* fct) #define GLU_TESS_COMBINE_DATA 100111 void EXPORT my_gluQuadricCallback(x64emu_t* emu, void* a, int32_t b, void* cb) { + (void)emu; libglu_my_t *my = (libglu_my_t*)my_lib->priv.w.p2; my->gluQuadricCallback(a, b, findglu_callbackFct(cb)); } void EXPORT my_gluTessCallback(x64emu_t* emu, void* a, int32_t b, void* cb) { + (void)emu; libglu_my_t *my = (libglu_my_t*)my_lib->priv.w.p2; if(b==GLU_TESS_COMBINE) my->gluTessCallback(a, b, findglu_callback4Fct(cb)); @@ -151,6 +154,7 @@ void EXPORT my_gluTessCallback(x64emu_t* emu, void* a, int32_t b, void* cb) } void EXPORT my_gluNurbsCallback(x64emu_t* emu, void* a, int32_t b, void* cb) { + (void)emu; libglu_my_t *my = (libglu_my_t*)my_lib->priv.w.p2; my->gluNurbsCallback(a, b, findglu_callbackFct(cb)); } diff --git a/src/wrapped/wrappedlibpthread.c b/src/wrapped/wrappedlibpthread.c index d9b81d5b..d29218ed 100755 --- a/src/wrapped/wrappedlibpthread.c +++ b/src/wrapped/wrappedlibpthread.c @@ -61,6 +61,7 @@ const char* libpthreadName = "libpthread.so.0"; EXPORT int32_t my_pthread_atfork(x64emu_t *emu, void* prepare, void* parent, void* child) { + (void)emu; // this is partly incorrect, because the emulated functions should be executed by actual fork and not by my_atfork... if(my_context->atfork_sz==my_context->atfork_cap) { my_context->atfork_cap += 4; @@ -82,4 +83,3 @@ EXPORT void my___pthread_initialize() } #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedlibrt.c b/src/wrapped/wrappedlibrt.c index a6877c58..29fa375c 100755 --- a/src/wrapped/wrappedlibrt.c +++ b/src/wrapped/wrappedlibrt.c @@ -62,6 +62,7 @@ static void* findsigev_notifyFct(void* fct) EXPORT int my_timer_create(x64emu_t* emu, uint32_t clockid, void* sevp, timer_t* timerid) { + (void)emu; struct sigevent sevent; memcpy(&sevent, sevp, sizeof(sevent)); diff --git a/src/wrapped/wrappedlibsm.c b/src/wrapped/wrappedlibsm.c index 75f08e98..06891111 100755 --- a/src/wrapped/wrappedlibsm.c +++ b/src/wrapped/wrappedlibsm.c @@ -49,6 +49,7 @@ void* getSMMy(library_t* lib) void freeSMMy(void* lib) { + (void)lib; //libsm_my_t *my = (libsm_my_t *)lib; } @@ -105,6 +106,7 @@ static void my_save_complete(void* smcConn, void* clientData) EXPORT void* my_SmcOpenConnection(x64emu_t* emu, void* networkIdsList, void* context, int major, int minor, unsigned long mask, my_SmcCallbacks_t* cb, void* previousId, void* clientIdRet, int errorLength, void* errorRet) { + (void)emu; libsm_my_t* my = (libsm_my_t*)GetLibInternal(libsmName)->priv.w.p2; my_SmcCallbacks_t nat = {0}; #define GO(A, B) if(mask&A) {my_##B##_fct = (uintptr_t)cb->B.callback; nat.B.callback = my_##B; nat.B.client_data=cb->B.client_data;} @@ -152,15 +154,15 @@ static void* findRequestFct(void* fct) EXPORT int my_SmcInteractRequest(x64emu_t* emu, void* smcConn, int f, void* cb, void* data) { + (void)emu; libsm_my_t* my = (libsm_my_t*)GetLibInternal(libsmName)->priv.w.p2; - return my->SmcInteractRequest(smcConn, f, findRequestFct(cb), data); } EXPORT int my_SmcRequestSaveYourselfPhase2(x64emu_t* emu, void* smcConn, void* cb, void* data) { + (void)emu; libsm_my_t* my = (libsm_my_t*)GetLibInternal(libsmName)->priv.w.p2; - return my->SmcRequestSaveYourselfPhase2(smcConn, findRequestFct(cb), data); } @@ -172,4 +174,3 @@ EXPORT int my_SmcRequestSaveYourselfPhase2(x64emu_t* emu, void* smcConn, void* c free(lib->priv.w.p2); #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedlibssl.c b/src/wrapped/wrappedlibssl.c index 8bb38d76..9d3c9b5d 100755 --- a/src/wrapped/wrappedlibssl.c +++ b/src/wrapped/wrappedlibssl.c @@ -59,6 +59,7 @@ void* getSllMy(library_t* lib) void freeSllMy(void* lib) { + (void)lib; //libssl_my_t *my = (libssl_my_t *)lib; } @@ -267,57 +268,57 @@ static void* find_proto_select_Fct(void* fct) EXPORT void my_SSL_CTX_set_default_passwd_cb(x64emu_t* emu, void* ctx, void* cb) { + (void)emu; libssl_my_t* my = (libssl_my_t*)my_lib->priv.w.p2; - my->SSL_CTX_set_default_passwd_cb(ctx, find_pem_passwd_cb_Fct(cb)); } EXPORT long my_SSL_CTX_callback_ctrl(x64emu_t* emu, void* ctx, int cmd, void* f) { + (void)emu; libssl_my_t* my = (libssl_my_t*)my_lib->priv.w.p2; - return my->SSL_CTX_callback_ctrl(ctx, cmd, find_anonymous_Fct(f)); } EXPORT long my_SSL_callback_ctrl(x64emu_t* emu, void* ctx, int cmd, void* f) { + (void)emu; libssl_my_t* my = (libssl_my_t*)my_lib->priv.w.p2; - return my->SSL_callback_ctrl(ctx, cmd, find_anonymous_Fct(f)); } EXPORT void my_SSL_CTX_set_verify(x64emu_t* emu, void* ctx, int mode, void* f) { + (void)emu; libssl_my_t* my = (libssl_my_t*)my_lib->priv.w.p2; - my->SSL_CTX_set_verify(ctx, mode, find_verify_Fct(f)); } EXPORT void my_SSL_set_verify(x64emu_t* emu, void* ctx, int mode, void* f) { + (void)emu; libssl_my_t* my = (libssl_my_t*)my_lib->priv.w.p2; - my->SSL_set_verify(ctx, mode, find_verify_Fct(f)); } EXPORT void my_SSL_get_ex_new_index(x64emu_t* emu, long argl, void* argp, void* new_func, void* dup_func, void* free_func) { + (void)emu; libssl_my_t* my = (libssl_my_t*)my_lib->priv.w.p2; - my->SSL_get_ex_new_index(argl, argp, find_ex_new_Fct(new_func), find_ex_dup_Fct(dup_func), find_ex_free_Fct(free_func)); } EXPORT void my_SSL_set_psk_client_callback(x64emu_t* emu, void* ctx, void* cb) { + (void)emu; libssl_my_t* my = (libssl_my_t*)my_lib->priv.w.p2; - my->SSL_set_psk_client_callback(ctx, find_client_cb_Fct(cb)); } EXPORT void my_SSL_CTX_set_next_proto_select_cb(x64emu_t* emu, void* ctx, void* cb, void* arg) { + (void)emu; libssl_my_t* my = (libssl_my_t*)my_lib->priv.w.p2; - my->SSL_CTX_set_next_proto_select_cb(ctx, find_proto_select_Fct(cb), arg); } diff --git a/src/wrapped/wrappedlibvorbis.c b/src/wrapped/wrappedlibvorbis.c index ebe7ac68..c433be2b 100755 --- a/src/wrapped/wrappedlibvorbis.c +++ b/src/wrapped/wrappedlibvorbis.c @@ -29,12 +29,14 @@ void* getVorbisMy(library_t* lib) { vorbis_my_t* my = (vorbis_my_t*)calloc(1, sizeof(vorbis_my_t)); #define GO(A, W) my->A = (W)dlsym(lib->priv.w.lib, #A); + (void)lib; // So many wrapped functions here too #undef GO return my; } void freeVorbisMy(void* lib) { + (void)lib; //vorbis_my_t *my = (vorbis_my_t *)lib; } @@ -48,4 +50,3 @@ void freeVorbisMy(void* lib) lib->context->vorbis = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedlibx11.c b/src/wrapped/wrappedlibx11.c index 1c6ca8f3..e0a8d43f 100755 --- a/src/wrapped/wrappedlibx11.c +++ b/src/wrapped/wrappedlibx11.c @@ -155,6 +155,7 @@ void* getX11My(library_t* lib) void freeX11My(void* lib) { + (void)lib; // x11_my_t *my = (x11_my_t *)lib; } #undef SUPER @@ -617,6 +618,7 @@ void BridgeImageFunc(x64emu_t *emu, XImage *img) void UnbridgeImageFunc(x64emu_t *emu, XImage *img) { + (void)emu; #define GO(A, W) \ fnc = GetNativeFnc((uintptr_t)img->f.A); \ if(fnc) \ diff --git a/src/wrapped/wrappedlibxext.c b/src/wrapped/wrappedlibxext.c index ab73af17..63182f2f 100755 --- a/src/wrapped/wrappedlibxext.c +++ b/src/wrapped/wrappedlibxext.c @@ -71,6 +71,7 @@ void* getXextMy(library_t* lib) void freeXextMy(void* lib) { + (void)lib; //xext_my_t *my = (xext_my_t *)lib; } @@ -155,6 +156,7 @@ EXPORT int32_t my_XShmGetImage(x64emu_t* emu, void* disp, void* drawable, void* EXPORT void* my_XSetExtensionErrorHandler(x64emu_t* emu, void* handler) { + (void)emu; xext_my_t *my = (xext_my_t*)my_lib->priv.w.p2; return reverse_exterrorhandleFct(my->XSetExtensionErrorHandler(find_exterrorhandle_Fct(handler))); } @@ -268,4 +270,3 @@ EXPORT int32_t my_XextAddDisplay(x64emu_t* emu, void* extinfo, void* dpy, void* my_lib = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedlibxt.c b/src/wrapped/wrappedlibxt.c index 8b74258c..a0802a31 100755 --- a/src/wrapped/wrappedlibxt.c +++ b/src/wrapped/wrappedlibxt.c @@ -44,6 +44,7 @@ void* getXtMy(library_t* lib) void freeXtMy(void* lib) { + (void)lib; //libxt_my_t *my = (libxt_my_t *)lib; } @@ -82,6 +83,7 @@ static void* findEventFct(void* fct) EXPORT void my_XtAddEventHandler(x64emu_t* emu, void* w, uint32_t mask, int32_t maskable, void* cb, void* data) { + (void)emu; void* fct = findEventFct(cb); library_t* lib = GetLibInternal(libxtName); libxt_my_t* my = (libxt_my_t*)lib->priv.w.p2; @@ -101,4 +103,3 @@ EXPORT void my_XtAddEventHandler(x64emu_t* emu, void* w, uint32_t mask, int32_t free(lib->priv.w.p2); #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedlibxtst.c b/src/wrapped/wrappedlibxtst.c index 4fae5d30..3c1ed488 100755 --- a/src/wrapped/wrappedlibxtst.c +++ b/src/wrapped/wrappedlibxtst.c @@ -45,6 +45,7 @@ void* getXtstMy(library_t* lib) void freeXtstMy(void* lib) { + (void)lib; //libxtst_my_t *my = (libxtst_my_t *)lib; } @@ -80,6 +81,7 @@ static void* find_XRecordInterceptProc_Fct(void* fct) EXPORT int my_XRecordEnableContextAsync(x64emu_t* emu, void* display, void* context, void* cb, void* closure) { + (void)emu; library_t* lib = GetLibInternal(libxtstName); libxtst_my_t* my = (libxtst_my_t*)lib->priv.w.p2; return my->XRecordEnableContextAsync(display, context, find_XRecordInterceptProc_Fct(cb), closure); @@ -87,6 +89,7 @@ EXPORT int my_XRecordEnableContextAsync(x64emu_t* emu, void* display, void* cont EXPORT int my_XRecordEnableContext(x64emu_t* emu, void* display, void* context, void* cb, void* closure) { + (void)emu; library_t* lib = GetLibInternal(libxtstName); libxtst_my_t* my = (libxtst_my_t*)lib->priv.w.p2; return my->XRecordEnableContext(display, context, find_XRecordInterceptProc_Fct(cb), closure); @@ -104,4 +107,3 @@ EXPORT int my_XRecordEnableContext(x64emu_t* emu, void* display, void* context, free(lib->priv.w.p2); #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedlibz.c b/src/wrapped/wrappedlibz.c index 9a1cd6f3..81756501 100755 --- a/src/wrapped/wrappedlibz.c +++ b/src/wrapped/wrappedlibz.c @@ -40,6 +40,7 @@ void* getZMy(library_t* lib) void freeZMy(void* lib) { + (void)lib; //libz_my_t *my = (libz_my_t *)lib; } @@ -115,6 +116,7 @@ typedef struct z_stream_s { static void wrapper_stream_z(x64emu_t* emu, void* str) { + (void)emu; z_stream *stream = (z_stream*)str; stream->zalloc = find_alloc_Fct(stream->zalloc); stream->zfree = find_free_Fct(stream->zfree); diff --git a/src/wrapped/wrappedlzma.c b/src/wrapped/wrappedlzma.c index 8bfb5707..72be8f66 100755 --- a/src/wrapped/wrappedlzma.c +++ b/src/wrapped/wrappedlzma.c @@ -36,6 +36,7 @@ void* getLzmaMy(library_t* lib) { lzma_my_t* my = (lzma_my_t*)calloc(1, sizeof(lzma_my_t)); #define GO(A, W) my->A = (W)dlsym(lib->priv.w.lib, #A); + (void)lib; // So many wrapped functions here SUPER() #undef GO return my; @@ -44,6 +45,7 @@ void* getLzmaMy(library_t* lib) void freeLzmaMy(void* lib) { + (void)lib; //lzma_my_t *my = (lzma_my_t *)lib; } @@ -57,4 +59,3 @@ void freeLzmaMy(void* lib) my_lib = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedopenal.c b/src/wrapped/wrappedopenal.c index 27b1af20..6aa73f2f 100755 --- a/src/wrapped/wrappedopenal.c +++ b/src/wrapped/wrappedopenal.c @@ -46,6 +46,7 @@ void* getOpenALMy(library_t* lib) void freeOpenALMy(void* lib) { + (void)lib; //openal_my_t *my = (openal_my_t *)lib; } #define SUPER() \ @@ -214,13 +215,14 @@ EXPORT void* my_alcGetProcAddress(x64emu_t* emu, void* device, void* name) EXPORT void my_alRequestFoldbackStart(x64emu_t *emu, int32_t mode, int32_t count, int32_t length, void* mem, void* cb) { + (void)emu; openal_my_t* my = (openal_my_t*)GetLibInternal(libname)->priv.w.p2; my->alRequestFoldbackStart(mode, count, length, mem, find_Request_Fct(cb)); } EXPORT void my_alRequestFoldbackStop(x64emu_t* emu) { + (void)emu; openal_my_t* my = (openal_my_t*)GetLibInternal(libname)->priv.w.p2; my->alRequestFoldbackStop(); } - diff --git a/src/wrapped/wrappedpango.c b/src/wrapped/wrappedpango.c index c966d366..0e6569c9 100755 --- a/src/wrapped/wrappedpango.c +++ b/src/wrapped/wrappedpango.c @@ -45,6 +45,7 @@ void* getPangoMy(library_t* lib) void freePangoMy(void* lib) { + (void)lib; //pango_my_t *my = (pango_my_t *)lib; } @@ -112,8 +113,8 @@ static void* find_PangoAttrClass_Fct(my_PangoAttrClass_t* klass) EXPORT void my_pango_attribute_init(x64emu_t* emu, void* attr, my_PangoAttrClass_t* klass) { + (void)emu; pango_my_t* my = (pango_my_t*)my_lib->priv.w.p2; - my->pango_attribute_init(attr, find_PangoAttrClass_Fct(klass)); } diff --git a/src/wrapped/wrappedpulse.c b/src/wrapped/wrappedpulse.c index 81fb38c7..f0c9a14a 100755 --- a/src/wrapped/wrappedpulse.c +++ b/src/wrapped/wrappedpulse.c @@ -159,8 +159,8 @@ void* getPulseMy(library_t* lib) void freePulseMy(void* lib) { + (void)lib; //pulse_my_t *my = (pulse_my_t *)lib; - } // TODO: change that static for a map ptr2ptr? @@ -1508,4 +1508,3 @@ EXPORT void my_pa_log_level_meta(x64emu_t* emu, int level, void* file, int line, free(lib->priv.w.p2); #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedsdl1.c b/src/wrapped/wrappedsdl1.c index 8c1070ff..34d41708 100755 --- a/src/wrapped/wrappedsdl1.c +++ b/src/wrapped/wrappedsdl1.c @@ -80,6 +80,7 @@ void* getSDL1My(library_t* lib) void freeSDL1My(void* lib) { + (void)lib; //sdl1_my_t *my = (sdl1_my_t *)lib; } diff --git a/src/wrapped/wrappedsdl1mixer.c b/src/wrapped/wrappedsdl1mixer.c index b7933ecb..760f0f05 100755 --- a/src/wrapped/wrappedsdl1mixer.c +++ b/src/wrapped/wrappedsdl1mixer.c @@ -182,6 +182,7 @@ static void* find_MusicFinished_Fct(void* fct) static void freeSDL1MixerMy(library_t* lib) { + (void)lib; //sdl1mixer_my_t *my = lib->priv.w.p2; } @@ -261,4 +262,3 @@ const char* sdl1mixerName = "libSDL_mixer-1.2.so.0"; ((box64context_t*)(lib->context))->sdl1mixerlib = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedsdl2.c b/src/wrapped/wrappedsdl2.c index 0c021103..5771d27c 100755 --- a/src/wrapped/wrappedsdl2.c +++ b/src/wrapped/wrappedsdl2.c @@ -99,7 +99,8 @@ void* getSDL2My(library_t* lib) void freeSDL2My(void* lib) { - /*sdl2_my_t *my = (sdl2_my_t *)lib;*/ + (void)lib; + //sdl2_my_t *my = (sdl2_my_t *)lib; } #undef SUPER @@ -550,6 +551,7 @@ EXPORT void my2_SDL_LogSetOutputFunction(x64emu_t* emu, void* f, void* arg) EXPORT int my2_SDL_vsnprintf(x64emu_t* emu, void* buff, size_t s, void * fmt, x64_va_list_t b) { + (void)emu; CONVERT_VALIST(b) int r = vsnprintf(buff, s, fmt, VARARGS); return r; @@ -840,13 +842,14 @@ EXPORT int64_t my2_SDL_IsJoystickHIDAPI(x64emu_t* emu, uint64_t a, uint64_t b) void* my_vkGetInstanceProcAddr(x64emu_t* emu, void* device, void* name); EXPORT void* my2_SDL_Vulkan_GetVkGetInstanceProcAddr(x64emu_t* emu) { -// sdl2_my_t *my = (sdl2_my_t *)emu->context->sdl2lib->priv.w.p2; + (void)emu; + //sdl2_my_t *my = (sdl2_my_t *)emu->context->sdl2lib->priv.w.p2; -// if(!emu->context->vkprocaddress) -// emu->context->vkprocaddress = (vkprocaddess_t)my->SDL_Vulkan_GetVkGetInstanceProcAddr(); + //if(!emu->context->vkprocaddress) + // emu->context->vkprocaddress = (vkprocaddess_t)my->SDL_Vulkan_GetVkGetInstanceProcAddr(); -// if(emu->context->vkprocaddress) -// return (void*)AddCheckBridge(my_context->sdl2lib->priv.w.bridge, pFEpp, my_vkGetInstanceProcAddr, 0); + //if(emu->context->vkprocaddress) + // return (void*)AddCheckBridge(my_context->sdl2lib->priv.w.bridge, pFEpp, my_vkGetInstanceProcAddr, 0); return NULL; } diff --git a/src/wrapped/wrappedsdl2mixer.c b/src/wrapped/wrappedsdl2mixer.c index e8901c5f..df4fc67f 100755 --- a/src/wrapped/wrappedsdl2mixer.c +++ b/src/wrapped/wrappedsdl2mixer.c @@ -57,7 +57,8 @@ static void* getSDL2MixerMy(library_t* lib) static void freeSDL2MixerMy(library_t* lib) { -// sdl2mixer_my_t *my = lib->priv.w.p2; + (void)lib; + //sdl2mixer_my_t *my = lib->priv.w.p2; } #undef SUPER @@ -281,4 +282,3 @@ const char* sdl2mixerName = "libSDL2_mixer-2.0.so.0"; ((box64context_t*)(lib->context))->sdl2mixerlib = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedsdl2net.c b/src/wrapped/wrappedsdl2net.c index dcb3f7a8..ead8d048 100755 --- a/src/wrapped/wrappedsdl2net.c +++ b/src/wrapped/wrappedsdl2net.c @@ -23,6 +23,7 @@ static void* getSDL2NetMy(library_t* lib) { sdl2net_my_t* my = (sdl2net_my_t*)calloc(1, sizeof(sdl2net_my_t)); #define GO(A, W) my->A = (W)dlsym(lib->priv.w.lib, #A); + (void)lib; // So many wrapped functions here #undef GO return my; } @@ -43,4 +44,3 @@ const char* sdl2netName = "libSDL2_net-2.0.so.0"; my_lib = NULL; #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedsmpeg.c b/src/wrapped/wrappedsmpeg.c index 47700059..0df09581 100755 --- a/src/wrapped/wrappedsmpeg.c +++ b/src/wrapped/wrappedsmpeg.c @@ -44,6 +44,7 @@ static void* getSMPEGMy(library_t* lib) static void freeSMPEGMy(void* lib) { + (void)lib; //smpeg_my_t *my = (smpeg_my_t *)lib; } @@ -80,6 +81,7 @@ static void* find_dispcallback_Fct(void* fct) EXPORT void my_SMPEG_setdisplay(x64emu_t* emu, void* mpeg, void* surf, void* lock, void* cb) { + (void)emu; library_t* lib = GetLibInternal(smpegName); smpeg_my_t* my = (smpeg_my_t*)lib->priv.w.p2; my->SMPEG_setdisplay(mpeg, surf, lock, find_dispcallback_Fct(cb)); @@ -103,4 +105,3 @@ EXPORT void* my_SMPEG_new_rwops(x64emu_t* emu, void* src, void* info, int32_t sd free(lib->priv.w.p2); \ #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedsmpeg2.c b/src/wrapped/wrappedsmpeg2.c index eac26700..05be193e 100755 --- a/src/wrapped/wrappedsmpeg2.c +++ b/src/wrapped/wrappedsmpeg2.c @@ -45,6 +45,7 @@ static void* getSMPEG2My(library_t* lib) static void freeSMPEG2My(void* lib) { + (void)lib; //smpeg2_my_t *my = (smpeg2_my_t *)lib; } @@ -82,6 +83,7 @@ static void* find_dispcallback_Fct(void* fct) EXPORT void my2_SMPEG_setdisplay(x64emu_t* emu, void* mpeg, void* cb, void* data, void* lock) { + (void)emu; library_t* lib = GetLibInternal(smpeg2Name); smpeg2_my_t* my = (smpeg2_my_t*)lib->priv.w.p2; my->SMPEG_setdisplay(mpeg, find_dispcallback_Fct(cb), data, lock); @@ -108,4 +110,3 @@ EXPORT void* my2_SMPEG_new_rwops(x64emu_t* emu, void* src, void* info, int32_t f free(lib->priv.w.p2); \ #include "wrappedlib_init.h" - diff --git a/src/wrapped/wrappedvorbisfile.c b/src/wrapped/wrappedvorbisfile.c index b342523e..aa276de3 100755 --- a/src/wrapped/wrappedvorbisfile.c +++ b/src/wrapped/wrappedvorbisfile.c @@ -48,6 +48,7 @@ void* getVorbisfileMy(library_t* lib) void freeVorbisfileMy(void* lib) { + (void)lib; //vorbisfile_my_t *my = (vorbisfile_my_t *)lib; } |