Added support for 32-bit node. To test just use 32-bit node.

CatalystCode · Nov 8, 2016 · c7a784b · c7a784b
1 parent eae9acf
commit c7a784b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/lib/native/adv_api.js b/lib/native/adv_api.js
@@ -12,7 +12,7 @@ var advApi = ffi.Library('Advapi32', {
     _Out_ PHKEY  phkResult
     );
     */
-    RegOpenCurrentUser: ['uint64', [types.REGSAM, types.PHKEY]],
+    RegOpenCurrentUser: ['ulong', [types.REGSAM, types.PHKEY]],
     /*
     LONG WINAPI RegQueryValueEx(
     _In_        HKEY    hKey,
@@ -23,7 +23,7 @@ var advApi = ffi.Library('Advapi32', {
     _Inout_opt_ LPDWORD lpcbDataRegOpenKeyExA
     );
     */
-    RegQueryValueExA: ['uint64', [types.HKEY, 'string', 'pointer', types.LPDWORD, types.LPBYTE, types.LPDWORD]],
+    RegQueryValueExA: ['ulong', [types.HKEY, 'string', 'pointer', types.LPDWORD, types.LPBYTE, types.LPDWORD]],
     /*
     LONG WINAPI RegOpenKeyEx(
     _In_     HKEY    hKey,
@@ -33,7 +33,7 @@ var advApi = ffi.Library('Advapi32', {
     _Out_    PHKEY   phkResult
     );
     */
-    RegOpenKeyExA: ['uint64', ['uint64', 'string', types.DWORD, types.REGSAM, types.PHKEY]],
+    RegOpenKeyExA: ['ulong', ['ulong', 'string', types.DWORD, types.REGSAM, types.PHKEY]],
     /*
     LONG WINAPI RegSetValueEx(
     _In_             HKEY    hKey,
@@ -44,7 +44,7 @@ var advApi = ffi.Library('Advapi32', {
     _In_             DWORD   cbData
     );
     */
-    RegSetValueExA: ['uint64', [types.HKEY, 'string', 'pointer', types.DWORD, types.LPBYTE, types.DWORD]],
+    RegSetValueExA: ['ulong', [types.HKEY, 'string', 'pointer', types.DWORD, types.LPBYTE, types.DWORD]],
     /**
      * LONG WINAPI RegCreateKeyEx(
         _In_       HKEY                  hKey,
@@ -58,20 +58,20 @@ var advApi = ffi.Library('Advapi32', {
         _Out_opt_  LPDWORD               lpdwDisposition
       );
     */
-    RegCreateKeyExA: ['uint64', [types.HKEY, 'string', 'pointer', 'pointer', types.DWORD, types.REGSAM, 'pointer', types.PHKEY, 'pointer']],
+    RegCreateKeyExA: ['ulong', [types.HKEY, 'string', 'pointer', 'pointer', types.DWORD, types.REGSAM, 'pointer', types.PHKEY, 'pointer']],
     /*
       LONG WINAPI RegDeleteTree(
       _In_     HKEY    hKey,
       _In_opt_ LPCTSTR lpSubKey
       );
     */
-    RegDeleteTreeA: ['uint64', [types.HKEY, 'string']],
+    RegDeleteTreeA: ['ulong', [types.HKEY, 'string']],
     /*
     LONG WINAPI RegCloseKey(
     _In_ HKEY hKey
     );
     */
-    RegCloseKey: ['uint64', [types.HKEY]]
+    RegCloseKey: ['ulong', [types.HKEY]]
 });
 
 module.exports = advApi;
diff --git a/lib/registry.js b/lib/registry.js
@@ -30,7 +30,7 @@ var api = {
 
         // RegOpenKeyEx can also take an HKEY in addition to a predefined value
         var advApi2 = ffi.Library('Advapi32', {
-            RegOpenKeyExA: ['uint64', [types.HKEY, 'string', types.DWORD, types.REGSAM, types.PHKEY]]
+            RegOpenKeyExA: ['ulong', [types.HKEY, 'string', types.DWORD, types.REGSAM, types.PHKEY]]
         });
         var result = advApi2.RegOpenKeyExA(keyObject.handle.deref(), subKeyName, 0, accessLevel, pHkey);
 

diff --git a/lib/types.js b/lib/types.js
@@ -1,9 +1,9 @@
 var ref = require('ref');
 
 var types = {
-    REGSAM: ref.types.uint64,
+    REGSAM: ref.types.ulong,
     DWORD: ref.types.uint32,
-    ULONG: ref.types.uint32,
+    ULONG: ref.types.ulong,
     HWND: ref.refType(ref.types.void),
     BYTE: ref.types.uint8,
     HKEY: ref.refType(ref.types.void),
@@ -12,7 +12,7 @@ var types = {
     HINSTANCE: ref.refType(ref.types.void),
     LPCTSTR: ref.refType(ref.types.CString),
     STRING: ref.types.CString,
-    INT: ref.types.int32,
+    INT: ref.types.int,
     LPVOID: ref.refType(ref.types.void)
 };
 

diff --git a/test/utils.js b/test/utils.js
@@ -16,7 +16,7 @@ describe('File Association Test', () => {
 
 describe('UAC elevate tests', () => {
     it('Should get results for elevate for a given file', (done) => {
-        utils.elevate('C:\\Program Files\\nodejs\\node.exe', 'index.js', function (err, result) {
+        utils.elevate(process.execPath, 'index.js', function (err, result) {
             assert.equal(err, null);
             assert.equal(result, true);
             done();