Added System::Call direct register memory access type

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6505 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/System/Source/Plugin.h

@@ -15,8 +15,10 @@
 #define popintptr system_popintptr
 #ifdef _WIN64
 #	define StrToIntPtr(str) ( (INT_PTR)myatoi64((str)) )
+#	define IntPtrToStr(p,buf) myitoa64((p),(buf))
 #else
 #	define StrToIntPtr(str) ( (INT_PTR)myatoi((str)) )
+#	define IntPtrToStr(p,buf) myitoa64((p),(buf))
 #endif
 
 #define BUGBUG64(brokencast) (brokencast) // Cast that needs fixing on x64
@@ -36,7 +38,8 @@
 extern TCHAR *AllocStr(TCHAR *str);
 extern void myitoa64(__int64 i, TCHAR *buffer);
 extern TCHAR *AllocString();
-extern TCHAR *system_getuservariable(int varnum);
+#define system_getuservariableptr(varnum) ( (g_variables)+(varnum)*(g_stringsize) )
+extern TCHAR *system_getuservariable(int varnum); // NOTE: This dupes with GlobalAlloc!
 extern TCHAR *system_setuservariable(int varnum, TCHAR *var);
 extern TCHAR* system_popstring();  // NULL - stack empty
 extern TCHAR* system_pushstring(TCHAR *str);

Contrib/System/Source/System.c

@@ -31,24 +31,28 @@
 #define PCD_DONE    3   // Just Continue
 
 const int PARAMSIZEBYTYPE_PTR = (4==sizeof(void*)) ? 1 : 2;
-const int ParamSizeByType[7] = {
+static const int ParamSizeByType[8] = {
     0, // PAT_VOID (Size will be equal to 1) //BUGBUG64?
     1, // PAT_INT
     2, // PAT_LONG
     sizeof(void*) / 4, // PAT_STRING //BUGBUG64?
     sizeof(void*) / 4, // PAT_WSTRING //BUGBUG64?
     sizeof(void*) / 4, // PAT_GUID //BUGBUG64?
-    0}; // PAT_CALLBACK (Size will be equal to 1) //BUGBUG64?
+    0, // PAT_CALLBACK (Size will be equal to 1) //BUGBUG64?
+    1 // PAT_REGMEM
+};
 
 // Thomas needs to look at this.
-static const int ByteSizeByType[7] = {
+static const int ByteSizeByType[8] = {
     1, // PAT_VOID
     1, // PAT_INT
     1, // PAT_LONG
     1, // PAT_STRING
     2, // PAT_WSTRING (special case for &wN notation: N is a number of WCHAR, not a number of bytes)
     1, // PAT_GUID
-    1}; // PAT_CALLBACK
+    1, // PAT_CALLBACK
+    1 // PAT_REGMEM
+};
 
 int LastStackPlace;
 int LastStackReal;
@@ -648,6 +652,7 @@ SystemProc *PrepareProc(BOOL NeedForCall)
                 temp = -1; break; // Pointer parameter option
 
             // Types
+            case _T('@'): temp2 = PAT_REGMEM; break;
             case _T('v'):
             case _T('V'): temp2 = PAT_VOID; break;
 
@@ -996,6 +1001,12 @@ void ParamsIn(SystemProc *proc)
             if (lstrlen(realbuf) > 0)
                 par->Value = (INT_PTR) CreateCallback((SystemProc*) StrToIntPtr(realbuf));
             break;
+        case PAT_REGMEM:
+            (LPTSTR)place = system_getuservariableptr(par->Input - 1);
+            par->Value = (INT_PTR) place;
+            par->Value += sizeof(void*) > 4 ? sizeof(_T("-9223372036854775807")) : sizeof(_T("-2147483647"));
+            IntPtrToStr(par->Value, (LPTSTR)place);
+            break;
         }
         GlobalFree(realbuf);
 
@@ -1051,9 +1062,15 @@ void ParamsOut(SystemProc *proc)
         case PAT_VOID:
             *realbuf = _T('\0');
             break;
+#ifndef _WIN64
+        case PAT_REGMEM:
+#endif
         case PAT_INT:
             wsprintf(realbuf, _T("%d"), (int)(*((INT_PTR*) place)));
             break;
+#ifdef _WIN64
+        case PAT_REGMEM:
+#endif
         case PAT_LONG:
             myitoa64(*((__int64*) place), realbuf);
             break;

Contrib/System/Source/System.h

@@ -52,6 +52,7 @@
 #define PAT_WSTRING     4
 #define PAT_GUID        5
 #define PAT_CALLBACK    6
+#define PAT_REGMEM      7
 #ifdef _UNICODE
 #define PAT_TSTRING     PAT_WSTRING
 #else

Contrib/System/System.html

@@ -281,6 +281,10 @@ DetailPrint $4
 <th>k</th>
 <td>callback</td>
 </tr>
+<th>@</th>
+<td>Direct register memory access (Buffer is limited to <code>(NSIS_MAX_STRLEN - 21) * NSIS_CHAR_SIZE</code> bytes)</td>
+</tr>
+<tr>
 <tr>
 <th>&amp;v<i>N</i></th>
 <td><i>N</i> bytes padding (structures only)</td>
@@ -371,6 +375,7 @@ DetailPrint $4
 <td>null for source, no output required for destination</td>
 </tr>
 </table>
+<p>Source is required when using the @ type and must be a register. When the call returns the source register already contains the memory address in string form so using destination is usually <a href="#directvarmemparam">not necessary</a>.
 </blockquote>
 
 <h4>Callbacks</h4>
@@ -492,16 +497,23 @@ DetailPrint "Return value - $2"
 <blockquote><pre>
 <a name="structaddr"></a>System::Alloc 4
 Pop $0
-System::<b>Call</b> "*$0(i 5)"
-System::<b>Call</b> "*$0(i .r1)"
+System::<b>Call</b> "*$0(i 5)" ; Write
+System::<b>Call</b> "*$0(i .r1)" ; Read
+System::Free $0
 DetailPrint $1
 </pre></blockquote>
 <blockquote><pre>
 <a name="newstruct"></a>System::<b>Call</b> "*(i 5) p .r0"
 System::<b>Call</b> "*$0(i .r1)"
+System::Free $0
 DetailPrint $1
 </pre></blockquote>
 <blockquote><pre>
+<a name="directvarmemparam"></a>System::<b>Call</b> "user32::GetClientRect(p $hwndparent, @ r0)"
+System::<b>Call</b> "*$0(i,i,i.r1,i.r2)"
+DetailPrint ClientRect=$1x$2
+</pre></blockquote>
+<blockquote><pre>
 <a name="com"></a># defines
 !define CLSCTX_INPROC_SERVER 1
 !define CLSID_ActiveDesktop {75048700-EF1F-11D0-9888-006097DEACF9}