win32-api 1.0.5 → 1.0.6

data/CHANGES

@@ -1,3 +1,13 @@
+= 1.0.6 - 18-Apr-2008
+* Added the effective_function_name method. This allows you to see what the
+  actual function name is that was defined, e.g. GetUserNameA vs GetUserNameW.
+* Replaced an instance of _tcscmp with strcmp. The case in question was always
+  going to be ASCII.
+* Cleaned up some -W3 warnings.
+* Added the build_manifest task to the Rakefile, which is automatically run if
+  you're using a version of Ruby built with VC++ 8 or later. This builds a
+  ruby.exe.manifest file (if it doesn't already exist).
+
 = 1.0.5 - 20-Nov-2007
 * The API.new method now defaults to "W" (wide character functions) before "A"
   (ANSI functions) if the $KCODE global variable is set to 'u' (UTF8).

data/ext/Makefile

@@ -0,0 +1,181 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = win32
+topdir = C:/ruby/lib/ruby/1.8/i386-mswin32
+hdrdir = $(topdir)
+VPATH = $(srcdir);$(topdir);$(hdrdir)
+
+DESTDIR = C:
+prefix = $(DESTDIR)/ruby
+exec_prefix = $(DESTDIR)/ruby
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+top_srcdir = $(DESTDIR)/develop/win/ruby/ruby-1.8.5
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+datadir = $(prefix)/share
+includedir = $(prefix)/include
+infodir = $(prefix)/info
+sysconfdir = $(prefix)/etc
+mandir = $(prefix)/man
+libdir = $(DESTDIR)/ruby/lib
+sharedstatedir = $(DESTDIR)/etc
+oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+localstatedir = $(DESTDIR)/var
+bindir = $(exec_prefix)/bin
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = cl -nologo
+LIBRUBY = $(RUBY_SO_NAME).lib
+LIBRUBY_A = msvcrt-ruby18-static.lib
+LIBRUBYARG_SHARED = $(LIBRUBY)
+LIBRUBYARG_STATIC = $(LIBRUBY_A)
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -MD -Zi -O2b2xg- -G6 
+INCFLAGS = -I. -I. -IC:/ruby/lib/ruby/1.8/i386-mswin32 -I.
+CPPFLAGS =  
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS =  -link -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH) -def:$(DEFFILE) -implib:$(*F:.so=)-$(arch).lib -pdb:$(*F:.so=)-$(arch).pdb 
+LDSHARED = cl -nologo -LD
+AR = lib -nologo
+EXEEXT = .exe
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = msvcrt-ruby18
+arch = i386-mswin32
+sitearch = i386-msvcrt
+ruby_version = 1.8
+ruby = C:/ruby/bin/ruby
+RUBY = $(ruby:/=\)
+RM = $(RUBY) -run -e rm -- -f
+MAKEDIRS = @$(RUBY) -run -e mkdir -- -p
+INSTALL = copy > nul
+INSTALL_PROG = $(INSTALL)
+INSTALL_DATA = $(INSTALL)
+COPY = copy > nul
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = $(libdir)
+LIBPATH =  -libpath:"$(libdir)"
+DEFFILE = $(TARGET)-$(arch).def
+
+CLEANFILES = 
+DISTCLEANFILES = vc*.pdb $(DEFFILE)
+
+extout = 
+extout_prefix = 
+target_prefix = /win32
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  oldnames.lib user32.lib advapi32.lib wsock32.lib  
+SRCS = api.c
+OBJS = api.obj
+TARGET = api
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.obj *.lib *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS:/=\) $(CLEANOBJS:/=\) $(CLEANFILES:/=\)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES:/=\)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB:/=\) $(RUBYARCHDIR:/=\)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .obj
+
+{$(srcdir)}.cc{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cc{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cc{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cc.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cxx{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cxx{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cxx{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cxx.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cpp{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cpp{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cpp{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cpp.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.c{}.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+{$(topdir)}.c{}.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+{$(hdrdir)}.c{}.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+.c.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+$(DLLIB): $(DEFFILE) $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) -Fe$(@) $(OBJS) $(LIBS) $(LOCAL_LIBS) $(DLDFLAGS)
+
+
+
+$(DEFFILE): 
+	$(RUBY) -e "puts 'EXPORTS', 'Init_$(TARGET)'"  > $@
+
+$(OBJS): {.;$(srcdir);$(topdir);$(hdrdir)}ruby.h {.;$(srcdir);$(topdir);$(hdrdir)}defines.h

data/ext/api-i386-mswin32.def

@@ -0,0 +1,2 @@
+EXPORTS
+Init_api

data/ext/extconf.rb

@@ -7,4 +7,5 @@
 require 'mkmf'
 
 have_func('strncpy_s')
-create_makefile('win32/api', 'win32')
+
+create_makefile('win32/api', 'win32')

data/ext/mkmf.log

@@ -0,0 +1,28 @@
+have_func: checking for strncpy_s()... -------------------- no
+
+"cl -nologo -Feconftest -I. -IC:/ruby/lib/ruby/1.8/i386-mswin32 -I. -IC:/ruby/lib/ruby/1.8/i386-mswin32  -MD -Zi -O2b2xg- -G6 conftest.c   msvcrt-ruby18-static.lib  oldnames.lib user32.lib advapi32.lib wsock32.lib   -link    -libpath:"C:/ruby/lib" -stack:0x2000000"
+conftest.c
+conftest.obj : error LNK2001: unresolved external symbol _strncpy_s
+conftest.exe : fatal error LNK1120: 1 unresolved externals
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { strncpy_s(); return 0; }
+/* end */
+
+"cl -nologo -Feconftest -I. -IC:/ruby/lib/ruby/1.8/i386-mswin32 -I. -IC:/ruby/lib/ruby/1.8/i386-mswin32  -MD -Zi -O2b2xg- -G6 conftest.c   msvcrt-ruby18-static.lib  oldnames.lib user32.lib advapi32.lib wsock32.lib   -link    -libpath:"C:/ruby/lib" -stack:0x2000000"
+conftest.c
+conftest.c(6) : error C2065: 'strncpy_s' : undeclared identifier
+checked program was:
+/* begin */
+1: #include <windows.h>
+2: #include <winsock.h>
+3: 
+4: /*top*/
+5: int main() { return 0; }
+6: int t() { void ((*volatile p)()); p = (void ((*)()))strncpy_s; return 0; }
+/* end */
+
+--------------------
+

data/ext/win32/api.c

@@ -2,7 +2,7 @@
 #include <windows.h>
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.0.5"
+#define WINDOWS_API_VERSION "1.0.6"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -71,7 +71,7 @@ static VALUE callback_init(int argc, VALUE* argv, VALUE self)
    VALUE v_proto, v_return, v_proc;
    int i;
     
-   rb_scan_args(argc, argv, "11", &v_proto, &v_return);
+   rb_scan_args(argc, argv, "11&", &v_proto, &v_return, &v_proc);
    
    /* Validate prototype characters */
    for(i = 0; i < RSTRING(v_proto)->len; i++){
@@ -87,14 +87,9 @@ static VALUE callback_init(int argc, VALUE* argv, VALUE self)
    if(NIL_P(v_return) || RARRAY(v_return)->len == 0)
       v_return = rb_str_new2("L");
 
-   if(rb_block_given_p())
-      v_proc = rb_block_proc();
-   else
-      v_proc = Qnil;
-
-    rb_iv_set(self, "@function", v_proc);
-    rb_iv_set(self, "@prototype", v_proto);
-    rb_iv_set(self, "@return_type", v_return);
+   rb_iv_set(self, "@function", v_proc);
+   rb_iv_set(self, "@prototype", v_proto);
+   rb_iv_set(self, "@return_type", v_return);
     
     return self;
 }
@@ -148,7 +143,7 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
    int i;
    char* first  = "A";
    char* second = "W";
-   VALUE v_proc, v_proto, v_return, v_dll, v_bool, v_name;
+   VALUE v_proc, v_proto, v_return, v_dll;
    
    rb_scan_args(argc, argv, "13", &v_proc, &v_proto, &v_return, &v_dll);
    
@@ -198,7 +193,7 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
    fProc = GetProcAddress(hLibrary, TEXT(RSTRING(v_proc)->ptr));
 
    /* The order of 'A' and 'W' is reversed if $KCODE is set to 'UTF8'. */
-   if(!_tcscmp(rb_get_kcode(), "UTF8")){
+   if(!strcmp(rb_get_kcode(), "UTF8")){
       first  = "W";
       second = "A";
    }
@@ -223,8 +218,17 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
                StringError(GetLastError())
             );
          }
+         else{
+            rb_iv_set(self, "@effective_function_name", v_unicode);
+         }
+      }
+      else{
+         rb_iv_set(self, "@effective_function_name", v_ascii);
       }
    }
+   else{
+      rb_iv_set(self, "@effective_function_name", v_proc);
+   }
 
    ptr->function = fProc;
 
@@ -508,9 +512,15 @@ void Init_api(){
    /* The name of the DLL that exports the API function */
    rb_define_attr(cAPI, "dll_name", 1, 0);
    
-   /* The name of the function */
+   /* The name of the function passed to the constructor */
    rb_define_attr(cAPI, "function_name", 1, 0);
    
+   /* The name of the actual function that is returned by the constructor.
+    * For example, if you passed 'GetUserName' to the constructor, then the
+    * effective function name would be either 'GetUserNameA' or 'GetUserNameW'.
+    */
+   rb_define_attr(cAPI, "effective_function_name", 1, 0);
+   
    /* The prototype, returned as an array of characters */
    rb_define_attr(cAPI, "prototype", 1, 0);
    

data/test/tc_win32_api.rb

@@ -16,7 +16,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.0.5', API::VERSION)
+      assert_equal('1.0.6', API::VERSION)
    end
  
    def test_call
@@ -40,6 +40,11 @@ class TC_Win32_API < Test::Unit::TestCase
       assert_equal('GetCurrentDirectory', @api.function_name)
    end
    
+   def test_effective_function_name
+      assert_respond_to(@api, :effective_function_name)
+      assert_equal('GetCurrentDirectoryA', @api.effective_function_name)
+   end
+   
    def test_prototype
       assert_respond_to(@api, :prototype)
       assert_equal(['L', 'P'], @api.prototype)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-api
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-11-20 00:00:00 -07:00
+date: 2008-04-18 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -25,9 +25,18 @@ extra_rdoc_files:
 - MANIFEST
 - ext/win32/api.c
 files: 
+- ext/api-i386-mswin32.def
+- ext/api-i386-mswin32.exp
+- ext/api-i386-mswin32.lib
+- ext/api-i386-mswin32.pdb
+- ext/api.obj
 - ext/extconf.rb
+- ext/Makefile
+- ext/mkmf.log
+- ext/vc60.pdb
 - ext/win32
 - ext/win32/api.c
+- ext/win32/api.so
 - test/tc_win32_api.rb
 - test/tc_win32_api_callback.rb
 - README
@@ -55,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 0.9.5
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: A superior replacement for Win32API