mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 12:02:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make 3rd+4th args of MiniFFI.initialize optional

Browse source
This commit is contained in:
Inori 2019-08-04 16:04:56 -04:00 • committed by Inori
parent d86650f157
commit 0b960e5c03
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
binding/miniffi-binding.cpp
View file

@ -1,14 +1,14 @@
// Most of the MiniFFI class was taken from Ruby 1.8's Win32API.c,
// it's just as basic but should work fine for the moment
#include <ruby.h>
#include <SDL.h>
#if defined(__WIN32__) && defined(USE_ESSENTIALS_FIXES)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include "sharedstate.h"
#endif
#include "binding-util.h"
#define _T_VOID 0
#define _T_NUMBER 1
#define _T_POINTER 2
@ -32,13 +32,13 @@ MiniFFI_alloc(VALUE self)
return Data_Wrap_Struct(self, 0, SDL_UnloadObject, 0);
}
static VALUE
MiniFFI_initialize(VALUE self, VALUE libname, VALUE func, VALUE imports, VALUE exports)
{
SafeStringValue(libname);
RB_METHOD(MiniFFI_initialize)
{
VALUE libname, func, imports, exports;
rb_scan_args(argc, argv, "22", &libname, &func, &imports, &exports);
SafeStringValue(libname);
SafeStringValue(func);
void *hlib = SDL_LoadObject(RSTRING_PTR(libname));
if (!hlib)
rb_raise(rb_eRuntimeError, SDL_GetError());
@ -146,8 +146,7 @@ MiniFFI_initialize(VALUE self, VALUE libname, VALUE func, VALUE imports, VALUE e
return Qnil;
}
static VALUE
MiniFFI_call(int argc, VALUE *argv, VALUE self)
RB_METHOD(MiniFFI_call)
{
struct {
unsigned long params[16];
@ -297,7 +296,7 @@ MiniFFIBindingInit()
{
VALUE cMiniFFI = rb_define_class("MiniFFI", rb_cObject);
rb_define_alloc_func(cMiniFFI, MiniFFI_alloc);
rb_define_method(cMiniFFI, "initialize", RUBY_METHOD_FUNC(MiniFFI_initialize), 4);
_rb_define_method(cMiniFFI, "initialize", MiniFFI_initialize);
rb_define_method(cMiniFFI, "call", RUBY_METHOD_FUNC(MiniFFI_call), -1);
rb_define_alias(cMiniFFI, "Call", "call");