rbdc 1.0.0 → 1.1.0

data/dyncall/dynload/dynload_windows.c

@@ -6,7 +6,7 @@
  Description: 
  License:
 
-   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>, 
+   Copyright (c) 2007-2020 Daniel Adler <dadler@uni-goettingen.de>,
                            Tassilo Philipp <tphilipp@potion-studios.com>
 
    Permission to use, copy, modify, and distribute this software for any
@@ -35,13 +35,44 @@
 
 
 #include "dynload.h"
+#include "dynload_alloc.h"
 
 #include <windows.h>
 
 
 DLLib* dlLoadLibrary(const char* libPath)
 {
-  return (DLLib*)(libPath != NULL ? LoadLibraryA(libPath) : GetModuleHandle(NULL));
+  if(libPath == NULL)
+    return (DLLib*)GetModuleHandle(NULL);
+  else {
+    /* convert from UTF-8 to wide chars, so count required size */
+    DLLib* pLib;
+    wchar_t* ws;
+    int r = MultiByteToWideChar(CP_UTF8, 0, libPath, -1, NULL, 0);
+    if(!r) {
+      return NULL;
+    }
+
+    /* Reserve temp space with room for extra '.' suffix (see below) */
+    ws = (wchar_t*)dlAllocMem((r+1) * sizeof(wchar_t));
+    if(!ws)
+      return NULL;
+
+    /* Convert path and add a '.' suffix, needed to tell windows not to add
+       .dll to any path that doesn't have it (see MS doc for LoadLibraryW).
+       This is to get same behaviour as on other platforms which don't  do any
+       magic like this. Library search path behaviour stays unaffected, though */
+    pLib = NULL;
+    if(MultiByteToWideChar(CP_UTF8, 0, libPath, -1, ws, r) == r) {
+        ws[r-1] = '.';
+        ws[r] = 0;
+        pLib = (DLLib*)LoadLibraryW(ws);
+    }
+
+    /* ... free temp space and return handle */
+    dlFreeMem(ws);
+    return pLib;
+  }
 }
 
 
@@ -59,6 +90,48 @@ void dlFreeLibrary(DLLib* pLib)
 
 int dlGetLibraryPath(DLLib* pLib, char* sOut, int bufSize)
 {
-  return GetModuleFileNameA((HMODULE)pLib, sOut, bufSize)+1; /* strlen + '\0' */
+  /* get the path name as wide chars, then convert to UTF-8; we need   */
+  /* some trial and error to figure out needed wide char string length */
+
+  wchar_t* ws;
+  int r;
+
+  /* num chars to alloc temp space for, and upper limit, must be both power */
+  /* of 2s for loop to be precise and to test allow testing up to 32768 chars */
+  /* (including \0), which is the extended path ("\\?\...") maximum */
+  static const int MAX_EXT_PATH = 1<<15; /* max extended path length (32768) */
+  int nc = 1<<6;                         /* guess start buffer size, */
+
+  while(nc <= MAX_EXT_PATH)/*@@@ add testcode for super long paths*/
+  {
+    ws = (wchar_t*)dlAllocMem(nc * sizeof(wchar_t));
+    if(!ws)
+      break;
+
+    r = GetModuleFileNameW((HMODULE)pLib, ws, nc);
+
+    /* r == nc if string was truncated, double temp buffer size */
+    if(r == nc) {
+      nc <<= 1;
+      dlFreeMem(ws);
+      continue;
+    }
+    /* error if r is 0 */
+    else if(!r) {
+      dlFreeMem(ws);
+      break;
+    }
+
+    /* check if output buffer is big enough */
+    r = WideCharToMultiByte(CP_UTF8, 0, ws, -1, NULL, 0, NULL, NULL);
+    if(r <= bufSize)
+      r = WideCharToMultiByte(CP_UTF8, 0, ws, -1, sOut, bufSize, NULL, NULL);
+
+    /* cleanup and return either size of copied bytes or needed buffer size */
+    dlFreeMem(ws);
+    return r;
+  }
+
+  return 0;
 }
 

data/dyncall/portasm/README.txt

@@ -26,7 +26,7 @@ Implement assembler sources in *.S files which use C preprocessor.
 #include portasm-<ARCH>.S at front
 
 In order to generate MASM files for X86 and X64, run 
-  'gen-masm.sh <name>' script which reads <name>.S and outputs <name>.masm file.
+  'gen-masm.sh <name> [<outsuffix>]' script which reads <name>.S and outputs <name><outsuffix>.masm file.
 
 
 Common Macros:

data/dyncall/portasm/gen-masm.sh

@@ -1,3 +1,7 @@
 #!/bin/sh
-gcc -E -P -DGEN_MASM $1.S >$1.asm
+`which gcc || which clang` -E -P -DGEN_MASM ${1:?Usage: $0 <name> [<outsuffix>]}.S \
+	| sed "/^$/d;1i\\
+; auto-generated by `basename $0`
+;s/$/
+	> $1$2.asm
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbdc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tassilo Philipp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies: []
 description: Ruby interface to dyncall, allowing programmers to call C functions in
   shared libraries from ruby without writing any glue code at all (e.g. "l.load('/usr/lib/libm.so');
@@ -23,12 +23,14 @@ files:
 - dyncall/BUGS
 - dyncall/CMakeLists.txt
 - dyncall/ChangeLog
+- dyncall/ChangeLog.orig
 - dyncall/LICENSE
 - dyncall/Makefile.embedded
 - dyncall/Makefile.generic
 - dyncall/Nmakefile
 - dyncall/README
 - dyncall/ToDo
+- dyncall/ToDo.orig
 - dyncall/autovar/LICENSE.txt
 - dyncall/autovar/README.txt
 - dyncall/autovar/autovar_ABI.h
@@ -65,8 +67,8 @@ files:
 - dyncall/buildsys/scripts/setenv-cross-ios.sh
 - dyncall/buildsys/scripts/setenv-sdk-ios.sh
 - dyncall/buildsys/vs2005/dyncall/dyncall.vcproj
-- dyncall/buildsys/vs2005/test_plain/test_plain.vcproj
 - dyncall/buildsys/vs2005/vs2005.sln
+- dyncall/cconv.lang
 - dyncall/configure
 - dyncall/configure.bat
 - dyncall/configure.rc
@@ -95,13 +97,12 @@ files:
 - dyncall/dyncall/dyncall_call_mips.h
 - dyncall/dyncall/dyncall_call_mips_eabi.h
 - dyncall/dyncall/dyncall_call_mips_eabi_gas.s
-- dyncall/dyncall/dyncall_call_mips_gas.S
+- dyncall/dyncall/dyncall_call_mips_n32.S
 - dyncall/dyncall/dyncall_call_mips_n32.h
-- dyncall/dyncall/dyncall_call_mips_n32_gas.s
+- dyncall/dyncall/dyncall_call_mips_n64.S
 - dyncall/dyncall/dyncall_call_mips_n64.h
-- dyncall/dyncall/dyncall_call_mips_n64_gas.s
+- dyncall/dyncall/dyncall_call_mips_o32.S
 - dyncall/dyncall/dyncall_call_mips_o32.h
-- dyncall/dyncall/dyncall_call_mips_o32_gas.s
 - dyncall/dyncall/dyncall_call_ppc32.S
 - dyncall/dyncall/dyncall_call_ppc32.h
 - dyncall/dyncall/dyncall_call_ppc64.S
@@ -141,6 +142,7 @@ files:
 - dyncall/dyncall/dyncall_callvm_mips_n64.c
 - dyncall/dyncall/dyncall_callvm_mips_n64.h
 - dyncall/dyncall/dyncall_callvm_mips_o32.c
+- dyncall/dyncall/dyncall_callvm_mips_o32.c.orig
 - dyncall/dyncall/dyncall_callvm_mips_o32.h
 - dyncall/dyncall/dyncall_callvm_ppc32.c
 - dyncall/dyncall/dyncall_callvm_ppc32.h
@@ -163,6 +165,7 @@ files:
 - dyncall/dyncall/dyncall_utils.h
 - dyncall/dyncall/dyncall_value.h
 - dyncall/dyncall/dyncall_vector.c
+- dyncall/dyncall/dyncall_vector.c.orig
 - dyncall/dyncall/dyncall_vector.h
 - dyncall/dyncall/gen-masm.sh
 - dyncall/dyncall/mkfile
@@ -211,10 +214,9 @@ files:
 - dyncall/dyncallback/dyncall_callback_arm64.c
 - dyncall/dyncallback/dyncall_callback_mips.c
 - dyncall/dyncallback/dyncall_callback_mips_eabi_gas.s
-- dyncall/dyncallback/dyncall_callback_mips_gas.S
-- dyncall/dyncallback/dyncall_callback_mips_n32_gas.s
-- dyncall/dyncallback/dyncall_callback_mips_n64_gas.s
-- dyncall/dyncallback/dyncall_callback_mips_o32_gas.s
+- dyncall/dyncallback/dyncall_callback_mips_n32.S
+- dyncall/dyncallback/dyncall_callback_mips_n64.S
+- dyncall/dyncallback/dyncall_callback_mips_o32.S
 - dyncall/dyncallback/dyncall_callback_ppc32.S
 - dyncall/dyncallback/dyncall_callback_ppc32.c
 - dyncall/dyncallback/dyncall_callback_ppc32_apple.s
@@ -302,8 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: foreign function interface for C calls

data/dyncall/buildsys/vs2005/test_plain/test_plain.vcproj

@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="test_plain"
-	ProjectGUID="{65E1A63C-079D-4F72-8307-E070A499D2EA}"
-	RootNamespace="test_plain"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../dyncall"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\test\plain\test_main.cc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\test\plain\test_framework.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

data/dyncall/dyncall/dyncall_call_mips_gas.S

@@ -1,37 +0,0 @@
-/*
-
- Package: dyncall
- Library: dyncall
- File: dyncall/dyncall_call_mips_gas.S
- Description: auto-select (via C preprocessor) mips abi call kernel
- License:
-
-   Copyright (c) 2007-2018 Daniel Adler <dadler@uni-goettingen.de>,
-                           Tassilo Philipp <tphilipp@potion-studios.com>
-
-   Permission to use, copy, modify, and distribute this software for any
-   purpose with or without fee is hereby granted, provided that the above
-   copyright notice and this permission notice appear in all copies.
-
-   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-   ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-*/
-
-
-
-#if defined(DC__ABI_MIPS_O32)
-#include "dyncall_call_mips_o32_gas.s"
-#elif defined(DC__ABI_MIPS_N64)
-#include "dyncall_call_mips_n64_gas.s"
-#elif defined(DC__ABI_MIPS_N32)
-#include "dyncall_call_mips_n32_gas.s"
-#else
-#include "dyncall_call_mips_eabi_gas.s"
-#endif
-