wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 538324 - Move ctypes into js/src. Part 5: Remove nsILocalFile option, and corresponding XPCOM dependency, for ctypes.open(). r=jorendorff

Browse Source
This commit is contained in:
Dan Witte 2010-04-02 13:07:02 -07:00
parent 0f073ef219
commit 084f8dbd80
2 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ctypes/tests/unit/test_jsctypes.js.in
View File

@ -75,8 +75,8 @@ function run_test()
// Test ctypes.CType and ctypes.CData are set up correctly.
run_abstract_class_tests();
// open the library with an nsILocalFile
let libfile = do_get_file(CTYPES_TEST_LIB);
// open the library
let libfile = do_get_file(CTYPES_TEST_LIB).path;
let library = ctypes.open(libfile);
// Make sure we can call a function in the library.
@ -193,11 +193,6 @@ function run_test()
run_closure_tests(library);
run_variadic_tests(library);
// test the string version of ctypes.open() as well
let libpath = libfile.path;
library = ctypes.open(libpath);
run_void_tests(library);
// test library.close
let test_void_t = library.declare("test_void_t_cdecl", ctypes.default_abi, ctypes.void_t);
library.close();
@ -207,7 +202,7 @@ function run_test()
}, Error);
// test that library functions throw when bound to other objects
library = ctypes.open(libpath);
library = ctypes.open(libfile);
let obj = {};
obj.declare = library.declare;
do_check_throws(function () { run_void_tests(obj); }, Error);

76
js/src/ctypes/Library.cpp
View File

@ -41,10 +41,7 @@
#include "jscntxt.h"
#include "Library.h"
#include "CTypes.h"
#include "nsServiceManagerUtils.h"
#include "nsIXPConnect.h"
#include "nsILocalFile.h"
#include "nsNativeCharsetUtils.h"
#include "prlink.h"
namespace js {
namespace ctypes {
@ -98,56 +95,37 @@ Library::Create(JSContext* cx, jsval aPath)
if (!JS_DefineFunctions(cx, libraryObj, sLibraryFunctions))
return NULL;
nsresult rv;
PRLibrary* library;
if (!JSVAL_IS_STRING(aPath)) {
JS_ReportError(cx, "open takes a string argument");
return NULL;
}
// get the path argument. we accept either an nsILocalFile or a string path.
// determine which we have...
if (JSVAL_IS_STRING(aPath)) {
const PRUnichar* path = reinterpret_cast<const PRUnichar*>(
JS_GetStringCharsZ(cx, JSVAL_TO_STRING(aPath)));
if (!path)
return NULL;
// We don't use nsILocalFile, because it doesn't use the system search
// rules when resolving library path.
PRLibSpec libSpec;
PRLibSpec libSpec;
#ifdef XP_WIN
// On Windows, converting to native charset may corrupt path string.
// So, we have to use Unicode path directly.
libSpec.value.pathname_u = path;
libSpec.type = PR_LibSpec_PathnameU;
// On Windows, converting to native charset may corrupt path string.
// So, we have to use Unicode path directly.
const PRUnichar* path = reinterpret_cast<const PRUnichar*>(
JS_GetStringCharsZ(cx, JSVAL_TO_STRING(aPath)));
if (!path)
return NULL;
libSpec.value.pathname_u = path;
libSpec.type = PR_LibSpec_PathnameU;
#else
nsCAutoString nativePath;
NS_CopyUnicodeToNative(nsDependentString(path), nativePath);
libSpec.value.pathname = nativePath.get();
libSpec.type = PR_LibSpec_Pathname;
// Assume the JS string is not UTF-16, but is in the platform's native
// charset. (This basically means ASCII.) It would be nice to have a
// UTF-16 -> native charset implementation available. :(
const char* path = JS_GetStringBytesZ(cx, JSVAL_TO_STRING(aPath));
if (!path)
return NULL;
libSpec.value.pathname = path;
libSpec.type = PR_LibSpec_Pathname;
#endif
library = PR_LoadLibraryWithFlags(libSpec, 0);
if (!library) {
JS_ReportError(cx, "couldn't open library");
return NULL;
}
} else if (!JSVAL_IS_PRIMITIVE(aPath)) {
nsCOMPtr<nsIXPConnect> xpc = do_GetService(nsIXPConnect::GetCID());
nsISupports* file = xpc->GetNativeOfWrapper(cx, JSVAL_TO_OBJECT(aPath));
nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(file);
if (!localFile) {
JS_ReportError(cx, "open takes a string or nsILocalFile argument");
return NULL;
}
rv = localFile->Load(&library);
if (NS_FAILED(rv)) {
JS_ReportError(cx, "couldn't open library");
return NULL;
}
} else {
// don't convert the argument
JS_ReportError(cx, "open takes a string or nsIFile argument");
PRLibrary* library = PR_LoadLibraryWithFlags(libSpec, 0);
if (!library) {
JS_ReportError(cx, "couldn't open library");
return NULL;
}