mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
70bbad3cfd
rb_exec_recursive() in eval.c. * eval.c (rb_exec_recursive): new function. * array.c (rb_ary_join): use rb_exec_recursive(). * array.c (rb_ary_inspect, rb_ary_hash): ditto. * file.c (rb_file_join): ditto. * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto. * io.c (rb_io_puts): ditto. * object.c (rb_obj_inspect): ditto * struct.c (rb_struct_inspect): ditto. * lib/set.rb (SortedSet::setup): a hack to shut up warning. [ruby-talk:132866] * lib/time.rb (Time::strptime): add new function. inspired by [ruby-talk:132815]. * lib/parsedate.rb (ParseDate::strptime): ditto. * regparse.c: move st_*_strend() functions from st.c. fixed some potential memory leaks. * exception error messages updated. [ruby-core:04497] * ext/socket/socket.c (Init_socket): add bunch of Socket constants. Patch from Sam Roberts <sroberts@uniserve.com>. [ruby-core:04409] * array.c (rb_ary_s_create): no need for negative argc check. [ruby-core:04463] * array.c (rb_ary_unshift_m): ditto. * lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass of StandardError class, not Exception class. [ruby-core:04429] * parse.y (fcall_gen): lvar(arg) will be evaluated as lvar.call(arg) when lvar is a defined local variable. [new] * object.c (rb_class_initialize): call inherited method before calling initializing block. * eval.c (rb_thread_start_1): initialize newly pushed frame. * lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE. fixed: [ruby-core:04444] * eval.c (is_defined): NODE_IASGN is an assignment. * ext/readline/readline.c (Readline.readline): use rl_outstream and rl_instream. [ruby-dev:25699] * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check [ruby-dev:25675] * misc/ruby-mode.el: [ruby-core:04415] * lib/rdoc/generators/html_generator.rb: [ruby-core:04412] * lib/rdoc/generators/ri_generator.rb: ditto. * struct.c (make_struct): fixed: [ruby-core:04402] * ext/curses/curses.c (window_color_set): [ruby-core:04393] * ext/socket/socket.c (Init_socket): SO_REUSEPORT added. [ruby-talk:130092] * object.c: [ruby-doc:818] * parse.y (open_args): fix too verbose warnings for the space before argument parentheses. [ruby-dev:25492] * parse.y (parser_yylex): ditto. * parse.y (parser_yylex): the first expression in the parentheses should not be a command. [ruby-dev:25492] * lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330] * object.c (Init_Object): remove Object#type. [ruby-core:04335] * st.c (st_foreach): report success/failure by return value. [ruby-Bugs-1396] * parse.y: forgot to initialize parser struct. [ruby-dev:25492] * parse.y (parser_yylex): no tLABEL on EXPR_BEG. [ruby-talk:127711] * document updates - [ruby-core:04296], [ruby-core:04301], [ruby-core:04302], [ruby-core:04307] * dir.c (rb_push_glob): should work for NUL delimited patterns. * dir.c (rb_glob2): should aware of offset in the pattern. * string.c (rb_str_new4): should propagate taintedness. * env.h: rename member names in struct FRAME; last_func -> callee, orig_func -> this_func, last_class -> this_class. * struct.c (rb_struct_set): use original method name, not callee name, to retrieve member slot. [ruby-core:04268] * time.c (time_strftime): protect from format modification from GC finalizers. * object.c (Init_Object): remove rb_obj_id_obsolete() * eval.c (rb_mod_define_method): incomplete subclass check. [ruby-dev:25464] * gc.c (rb_data_object_alloc): klass may be NULL. [ruby-list:40498] * bignum.c (rb_big_rand): should return positive random number. [ruby-dev:25401] * bignum.c (rb_big_rand): do not use rb_big_modulo to generate random bignums. [ruby-dev:25396] * variable.c (rb_autoload): [ruby-dev:25373] * eval.c (svalue_to_avalue): [ruby-dev:25366] * string.c (rb_str_justify): [ruby-dev:25367] * io.c (rb_f_select): [ruby-dev:25312] * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072] * struct.c (make_struct): [ruby-dev:25249] * dir.c (dir_open_dir): new function. [ruby-dev:25242] * io.c (rb_f_open): add type check for return value from to_open. * lib/pstore.rb (PStore#transaction): Use the empty content when a file is not found. [ruby-dev:24561] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
212 lines
4.7 KiB
C
212 lines
4.7 KiB
C
/*
|
|
Win32API - Ruby Win32 API Import Facility
|
|
*/
|
|
|
|
#if !defined _MSC_VER && !defined _WIN32
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
#include <stdio.h>
|
|
#endif
|
|
|
|
#define _T_VOID 0
|
|
#define _T_NUMBER 1
|
|
#define _T_POINTER 2
|
|
#define _T_INTEGER 3
|
|
|
|
#include "ruby.h"
|
|
|
|
typedef struct {
|
|
HANDLE dll;
|
|
HANDLE proc;
|
|
VALUE dllname;
|
|
VALUE import;
|
|
VALUE export;
|
|
} Win32API;
|
|
|
|
static void
|
|
Win32API_FreeLibrary(hdll)
|
|
HINSTANCE hdll;
|
|
{
|
|
FreeLibrary(hdll);
|
|
}
|
|
|
|
static VALUE
|
|
Win32API_initialize(self, dllname, proc, import, export)
|
|
VALUE self;
|
|
VALUE dllname;
|
|
VALUE proc;
|
|
VALUE import;
|
|
VALUE export;
|
|
{
|
|
HANDLE hproc;
|
|
HINSTANCE hdll;
|
|
VALUE str;
|
|
VALUE a_import;
|
|
VALUE *ptr;
|
|
char *s;
|
|
int i;
|
|
int len;
|
|
int ex = _T_VOID;
|
|
|
|
SafeStringValue(dllname);
|
|
SafeStringValue(proc);
|
|
hdll = LoadLibrary(RSTRING(dllname)->ptr);
|
|
if (!hdll)
|
|
rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
|
|
rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, hdll));
|
|
hproc = GetProcAddress(hdll, RSTRING(proc)->ptr);
|
|
if (!hproc) {
|
|
str = rb_str_new3(proc);
|
|
str = rb_str_cat(str, "A", 1);
|
|
hproc = GetProcAddress(hdll, RSTRING(str)->ptr);
|
|
if (!hproc)
|
|
rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
|
|
RSTRING(proc)->ptr, RSTRING(str)->ptr);
|
|
}
|
|
rb_iv_set(self, "__dll__", UINT2NUM((unsigned long)hdll));
|
|
rb_iv_set(self, "__dllname__", dllname);
|
|
rb_iv_set(self, "__proc__", UINT2NUM((unsigned long)hproc));
|
|
|
|
a_import = rb_ary_new();
|
|
switch (TYPE(import)) {
|
|
case T_NIL:
|
|
break;
|
|
case T_ARRAY:
|
|
ptr = RARRAY(import)->ptr;
|
|
for (i = 0, len = RARRAY(import)->len; i < len; i++) {
|
|
SafeStringValue(ptr[i]);
|
|
switch (*(char *)RSTRING(ptr[i])->ptr) {
|
|
case 'N': case 'n': case 'L': case 'l':
|
|
rb_ary_push(a_import, INT2FIX(_T_NUMBER));
|
|
break;
|
|
case 'P': case 'p':
|
|
rb_ary_push(a_import, INT2FIX(_T_POINTER));
|
|
break;
|
|
case 'I': case 'i':
|
|
rb_ary_push(a_import, INT2FIX(_T_INTEGER));
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
SafeStringValue(import);
|
|
s = RSTRING(import)->ptr;
|
|
for (i = 0, len = RSTRING(import)->len; i < len; i++) {
|
|
switch (*s++) {
|
|
case 'N': case 'n': case 'L': case 'l':
|
|
rb_ary_push(a_import, INT2FIX(_T_NUMBER));
|
|
break;
|
|
case 'P': case 'p':
|
|
rb_ary_push(a_import, INT2FIX(_T_POINTER));
|
|
break;
|
|
case 'I': case 'i':
|
|
rb_ary_push(a_import, INT2FIX(_T_INTEGER));
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
|
|
if (16 < RARRAY(a_import)->len) {
|
|
rb_raise(rb_eRuntimeError, "too many parameters: %d\n", RARRAY(a_import)->len);
|
|
}
|
|
|
|
rb_iv_set(self, "__import__", a_import);
|
|
|
|
if (NIL_P(export)) {
|
|
ex = _T_VOID;
|
|
} else {
|
|
SafeStringValue(export);
|
|
switch (*RSTRING(export)->ptr) {
|
|
case 'V': case 'v':
|
|
ex = _T_VOID;
|
|
break;
|
|
case 'N': case 'n': case 'L': case 'l':
|
|
ex = _T_NUMBER;
|
|
break;
|
|
case 'P': case 'p':
|
|
ex = _T_POINTER;
|
|
break;
|
|
case 'I': case 'i':
|
|
ex = _T_INTEGER;
|
|
break;
|
|
}
|
|
}
|
|
rb_iv_set(self, "__export__", INT2FIX(ex));
|
|
|
|
return Qnil;
|
|
}
|
|
|
|
static VALUE
|
|
Win32API_Call(argc, argv, obj)
|
|
int argc;
|
|
VALUE *argv;
|
|
VALUE obj;
|
|
{
|
|
VALUE args;
|
|
unsigned long ret;
|
|
int i;
|
|
struct {
|
|
unsigned long params[16];
|
|
} param;
|
|
#define params param.params
|
|
|
|
VALUE obj_proc = rb_iv_get(obj, "__proc__");
|
|
VALUE obj_import = rb_iv_get(obj, "__import__");
|
|
VALUE obj_export = rb_iv_get(obj, "__export__");
|
|
FARPROC ApiFunction = (FARPROC)NUM2ULONG(obj_proc);
|
|
int items = rb_scan_args(argc, argv, "0*", &args);
|
|
int nimport = RARRAY(obj_import)->len;
|
|
|
|
|
|
if (items != nimport)
|
|
rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
|
|
nimport, items);
|
|
|
|
for (i = 0; i < nimport; i++) {
|
|
unsigned long lParam = 0;
|
|
switch (FIX2INT(rb_ary_entry(obj_import, i))) {
|
|
VALUE str;
|
|
case _T_NUMBER:
|
|
case _T_INTEGER:
|
|
default:
|
|
lParam = NUM2ULONG(rb_ary_entry(args, i));
|
|
break;
|
|
case _T_POINTER:
|
|
str = rb_ary_entry(args, i);
|
|
if (NIL_P(str)) {
|
|
lParam = 0;
|
|
} else if (FIXNUM_P(str)) {
|
|
lParam = NUM2ULONG(str);
|
|
} else {
|
|
StringValue(str);
|
|
rb_str_modify(str);
|
|
lParam = (unsigned long)StringValuePtr(str);
|
|
}
|
|
break;
|
|
}
|
|
params[i] = lParam;
|
|
}
|
|
|
|
ret = ApiFunction(param);
|
|
|
|
switch (FIX2INT(obj_export)) {
|
|
case _T_NUMBER:
|
|
case _T_INTEGER:
|
|
return INT2NUM(ret);
|
|
case _T_POINTER:
|
|
return rb_str_new2((char *)ret);
|
|
case _T_VOID:
|
|
default:
|
|
return INT2NUM(0);
|
|
}
|
|
}
|
|
|
|
void
|
|
Init_Win32API()
|
|
{
|
|
VALUE cWin32API = rb_define_class("Win32API", rb_cObject);
|
|
rb_define_method(cWin32API, "initialize", Win32API_initialize, 4);
|
|
rb_define_method(cWin32API, "call", Win32API_Call, -1);
|
|
rb_define_alias(cWin32API, "Call", "call");
|
|
}
|