Win64 fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6413 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k
parent
e23b3db418
commit
e63fa6c53b
38 changed files with 389 additions and 331 deletions
|
|
@ -26,14 +26,17 @@ docs = Split("""
|
|||
|
||||
Import('BuildPlugin env')
|
||||
|
||||
conf = env.Configure()
|
||||
if conf.TryCompile('END', '.S'):
|
||||
files += ['Source/Call.S']
|
||||
elif conf.TryCompile('.end', '.sx'):
|
||||
files += ['Source/Call.sx']
|
||||
if env['TARGET_ARCH'] != 'amd64':
|
||||
conf = env.Configure()
|
||||
if conf.TryCompile('END', '.S'):
|
||||
files += ['Source/Call.S']
|
||||
elif conf.TryCompile('.end', '.sx'):
|
||||
files += ['Source/Call.sx']
|
||||
else:
|
||||
print 'WARNING: unable to find assembler for Call.S'
|
||||
conf.Finish()
|
||||
else:
|
||||
print 'WARNING: unable to find assembler for Call.S'
|
||||
conf.Finish()
|
||||
print 'WARNING: missing Win64 code, dynamic function calls not supported'
|
||||
|
||||
BuildPlugin(
|
||||
target,
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ TempStack *tempstack = NULL;
|
|||
|
||||
static void AllocWorker(unsigned int mult)
|
||||
{
|
||||
int size;
|
||||
if ((size = popint()) == 0)
|
||||
size_t size;
|
||||
if ((size = popintptr()) == 0)
|
||||
{
|
||||
system_pushint(0);
|
||||
return;
|
||||
|
|
@ -56,7 +56,7 @@ PLUGINFUNCTIONSHORT(Copy)
|
|||
// Ok, check the size
|
||||
if (size == 0) size = (SIZE_T) GlobalSize(source);
|
||||
// and the destinantion
|
||||
if ((int) dest == 0)
|
||||
if (!dest)
|
||||
{
|
||||
dest = GlobalAlloc((GPTR), size);
|
||||
system_pushintptr((INT_PTR) dest);
|
||||
|
|
|
|||
|
|
@ -134,20 +134,20 @@ void myitoa64(__int64 i, TCHAR *buffer)
|
|||
*buffer = 0;
|
||||
}
|
||||
|
||||
int system_popint()
|
||||
INT_PTR system_popintptr()
|
||||
{
|
||||
int value;
|
||||
INT_PTR value;
|
||||
TCHAR *str;
|
||||
if ((str = system_popstring()) == NULL) return -1;
|
||||
value = myatoi(str);
|
||||
value = StrToIntPtr(str);
|
||||
GlobalFree(str);
|
||||
return value;
|
||||
}
|
||||
|
||||
void system_pushint(int value)
|
||||
void system_pushintptr(INT_PTR value)
|
||||
{
|
||||
TCHAR buffer[80];
|
||||
wsprintf(buffer, _T("%d"), value);
|
||||
TCHAR buffer[50];
|
||||
wsprintf(buffer, sizeof(void*) > 4 ? _T("%Id") : _T("%d"), value);
|
||||
system_pushstring(buffer);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,15 +5,17 @@
|
|||
|
||||
// Always use system* functions to keep the size down
|
||||
#define pushstring error(use system_pushstring)
|
||||
#undef pushint
|
||||
#define pushint error(use system_pushint)
|
||||
#define pushintptr error(use system_pushintptr)
|
||||
|
||||
#define popint system_popint
|
||||
#undef myatoi
|
||||
#define myatoi(str) ( (int) myatoi64(str) )
|
||||
#define system_pushint(v) system_pushintptr((INT_PTR)(v))
|
||||
#define popintptr system_popintptr
|
||||
#ifdef _WIN64
|
||||
# error TODO
|
||||
# define StrToIntPtr(str) ( (INT_PTR)myatoi64((str)) )
|
||||
#else
|
||||
# define system_pushintptr system_pushint
|
||||
# define popintptr popint
|
||||
# define StrToIntPtr(str) ( (INT_PTR)myatoi((str)) )
|
||||
#endif
|
||||
|
||||
|
|
@ -39,8 +41,8 @@ extern TCHAR *system_setuservariable(int varnum, TCHAR *var);
|
|||
extern TCHAR* system_popstring(); // NULL - stack empty
|
||||
extern TCHAR* system_pushstring(TCHAR *str);
|
||||
extern __int64 myatoi64(TCHAR *s);
|
||||
extern int system_popint(); // -1 -> stack empty
|
||||
extern void system_pushint(int value);
|
||||
extern INT_PTR system_popintptr(); // -1 -> stack empty
|
||||
extern void system_pushintptr(INT_PTR value);
|
||||
|
||||
extern HANDLE GlobalCopy(HANDLE Old);
|
||||
extern void *copymem(void *output, void *input, size_t cbSize);
|
||||
|
|
|
|||
|
|
@ -30,18 +30,18 @@
|
|||
#define PCD_PARAMS 2
|
||||
#define PCD_DONE 3 // Just Continue
|
||||
|
||||
const int PARAMSIZEBYTYPE_PTR = (4==sizeof(void*)) ? 1 : 2;
|
||||
const int ParamSizeByType[7] = {
|
||||
0, // PAT_VOID (Size will be equal to 1)
|
||||
0, // PAT_VOID (Size will be equal to 1) //BUGBUG64?
|
||||
1, // PAT_INT
|
||||
2, // PAT_LONG
|
||||
1, // PAT_STRING
|
||||
1, // PAT_WSTRING
|
||||
1, // PAT_GUID
|
||||
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?
|
||||
const int PARAMSIZEBYTYPE_PTR = (4==sizeof(void*)) ? 1 : 2;
|
||||
|
||||
// Thomas needs to look at this.
|
||||
const int ByteSizeByType[7] = {
|
||||
static const int ByteSizeByType[7] = {
|
||||
1, // PAT_VOID
|
||||
1, // PAT_INT
|
||||
1, // PAT_LONG
|
||||
|
|
@ -55,7 +55,7 @@ int LastStackReal;
|
|||
DWORD LastError;
|
||||
volatile SystemProc *LastProc;
|
||||
int CallbackIndex;
|
||||
CallbackThunk* CallbackThunkListHead;
|
||||
CallbackThunk* g_CallbackThunkListHead;
|
||||
HINSTANCE g_hInstance;
|
||||
|
||||
// Return to callback caller with stack restore
|
||||
|
|
@ -145,7 +145,7 @@ PLUGINFUNCTION(Debug)
|
|||
GetLocalTime(&t);
|
||||
GetTimeFormat(LOCALE_SYSTEM_DEFAULT, LOCALE_NOUSEROVERRIDE, &t, NULL, buftime, 1024);
|
||||
GetDateFormat(LOCALE_SYSTEM_DEFAULT, LOCALE_NOUSEROVERRIDE, &t, NULL, bufdate, 1024);
|
||||
wsprintf(buffer, _T("System, %s %s [build ") __TTIME__ _T(" ") __TDATE__ _T("]\n"), buftime, bufdate);
|
||||
wsprintf(buffer, _T("System, %s %s [build %hs %hs]\n"), buftime, bufdate, __TIME__, __DATE__);
|
||||
WriteToLog(buffer);
|
||||
} else ;
|
||||
else
|
||||
|
|
@ -207,9 +207,9 @@ PLUGINFUNCTIONSHORT(Free)
|
|||
{
|
||||
HANDLE memtofree = (HANDLE)popintptr();
|
||||
|
||||
if (CallbackThunkListHead)
|
||||
if (g_CallbackThunkListHead)
|
||||
{
|
||||
CallbackThunk *pCb=CallbackThunkListHead,*pPrev=NULL;
|
||||
CallbackThunk *pCb=g_CallbackThunkListHead,*pPrev=NULL;
|
||||
do
|
||||
{
|
||||
if (GetAssociatedSysProcFromCallbackThunkPtr(pCb) == (SystemProc*)memtofree)
|
||||
|
|
@ -217,7 +217,7 @@ PLUGINFUNCTIONSHORT(Free)
|
|||
if (pPrev)
|
||||
pPrev->pNext=pCb->pNext;
|
||||
else
|
||||
CallbackThunkListHead=pCb->pNext;
|
||||
g_CallbackThunkListHead=pCb->pNext;
|
||||
|
||||
--(CallbackIndex);
|
||||
VirtualFree(pCb,0,MEM_RELEASE);
|
||||
|
|
@ -268,12 +268,45 @@ PLUGINFUNCTION(Get)
|
|||
}
|
||||
} PLUGINFUNCTIONEND
|
||||
|
||||
|
||||
#ifdef _WIN64
|
||||
/*
|
||||
TODO: CallProc/Back not implemeted.
|
||||
Fake the behavior of the System plugin for the LoadImage API function so MUI works.
|
||||
BUGBUG: Leaking DeleteObject and failing GetClientRect
|
||||
*/
|
||||
static SystemProc* CallProc(SystemProc *proc)
|
||||
{
|
||||
INT_PTR ret, *place;
|
||||
LastError = lstrcmp(proc->ProcName, sizeof(TCHAR) > 1 ? _T("LoadImageW") : _T("LoadImageA"));
|
||||
if (!LastError)
|
||||
{
|
||||
ret = (INT_PTR) LoadImage((HINSTANCE)proc->Params[1].Value,
|
||||
(LPCTSTR)proc->Params[2].Value, (UINT)proc->Params[3].Value,
|
||||
(int)proc->Params[4].Value, (int)proc->Params[5].Value,
|
||||
(UINT)proc->Params[6].Value);
|
||||
LastError = GetLastError();
|
||||
}
|
||||
else
|
||||
proc->ProcResult = PR_ERROR, ret = 0;
|
||||
place = (INT_PTR*) proc->Params[0].Value;
|
||||
if (proc->Params[0].Option != -1) place = (INT_PTR*) &(proc->Params[0].Value);
|
||||
if (place) *place = ret;
|
||||
return proc;
|
||||
}
|
||||
static SystemProc* CallBack(SystemProc *proc)
|
||||
{
|
||||
proc->ProcResult = PR_ERROR;
|
||||
return proc;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
PLUGINFUNCTION(Call)
|
||||
{
|
||||
// Prepare input
|
||||
SystemProc *proc = PrepareProc(TRUE);
|
||||
if (proc == NULL)
|
||||
return;
|
||||
if (proc == NULL) return;
|
||||
|
||||
SYSTEM_LOG_ADD(_T("Call "));
|
||||
SYSTEM_LOG_ADD(proc->DllName);
|
||||
|
|
@ -281,8 +314,7 @@ PLUGINFUNCTION(Call)
|
|||
SYSTEM_LOG_ADD(proc->ProcName);
|
||||
//SYSTEM_LOG_ADD(_T("\n"));
|
||||
SYSTEM_LOG_POST;
|
||||
if (proc->ProcResult != PR_CALLBACK)
|
||||
ParamAllocate(proc);
|
||||
if (proc->ProcResult != PR_CALLBACK) ParamAllocate(proc);
|
||||
ParamsIn(proc);
|
||||
|
||||
// Make the call
|
||||
|
|
@ -308,35 +340,30 @@ PLUGINFUNCTION(Call)
|
|||
// Always return flag set - return separate return and result
|
||||
ParamsOut(proc);
|
||||
GlobalFree(system_pushstring(GetResultStr(proc)));
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
if (proc->ProcResult != PR_OK)
|
||||
{
|
||||
ProcParameter pp;
|
||||
// Save old return param
|
||||
pp = proc->Params[0];
|
||||
ProcParameter pp = proc->Params[0]; // Save old return param
|
||||
|
||||
// Return result instead of return value
|
||||
proc->Params[0].Value = BUGBUG64(int) GetResultStr(proc);
|
||||
proc->Params[0].Value = (INT_PTR) GetResultStr(proc);
|
||||
proc->Params[0].Type = PAT_TSTRING;
|
||||
// Return all params
|
||||
ParamsOut(proc);
|
||||
|
||||
// Restore old return param
|
||||
proc->Params[0] = pp;
|
||||
} else
|
||||
ParamsOut(proc); // Return all params
|
||||
proc->Params[0] = pp; // Restore old return param
|
||||
}
|
||||
else
|
||||
ParamsOut(proc);
|
||||
}
|
||||
|
||||
if (proc->ProcResult != PR_CALLBACK)
|
||||
{
|
||||
// Deallocate params if not callback
|
||||
ParamsDeAllocate(proc);
|
||||
|
||||
// if not callback - check for unload library option
|
||||
if ((proc->Options & POPT_UNLOAD)
|
||||
&& (proc->ProcType == PT_PROC)
|
||||
&& (proc->Dll != NULL))
|
||||
if ((proc->Options & POPT_UNLOAD) && proc->ProcType == PT_PROC && proc->Dll)
|
||||
FreeLibrary(proc->Dll); // and unload it :)
|
||||
|
||||
// In case of POPT_ERROR - first pop will be proc error
|
||||
|
|
@ -344,8 +371,7 @@ PLUGINFUNCTION(Call)
|
|||
}
|
||||
|
||||
// If proc is permanent?
|
||||
if ((proc->Options & POPT_PERMANENT) == 0)
|
||||
GlobalFree((HANDLE) proc); // No, free it
|
||||
if ((proc->Options & POPT_PERMANENT) == 0) GlobalFree((HANDLE) proc); // No, free it
|
||||
} PLUGINFUNCTIONEND
|
||||
|
||||
PLUGINFUNCTIONSHORT(Int64Op)
|
||||
|
|
@ -602,13 +628,14 @@ SystemProc *PrepareProc(BOOL NeedForCall)
|
|||
case _T('v'):
|
||||
case _T('V'): temp2 = PAT_VOID; break;
|
||||
|
||||
#if !defined(SYSTEM_X86)
|
||||
#error "TODO: handle p"
|
||||
#else
|
||||
case _T('p'):
|
||||
#endif
|
||||
#ifndef _WIN64
|
||||
case _T('p'):
|
||||
#endif
|
||||
case _T('i'):
|
||||
case _T('I'): temp2 = PAT_INT; break;
|
||||
#ifdef _WIN64
|
||||
case _T('p'):
|
||||
#endif
|
||||
case _T('l'):
|
||||
case _T('L'): temp2 = PAT_LONG; break;
|
||||
case _T('m'):
|
||||
|
|
@ -865,12 +892,9 @@ SystemProc *PrepareProc(BOOL NeedForCall)
|
|||
void ParamAllocate(SystemProc *proc)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i <= proc->ParamCount; i++)
|
||||
if (((HANDLE) proc->Params[i].Value == NULL) && (proc->Params[i].Option == -1))
|
||||
{
|
||||
proc->Params[i].Value = BUGBUG64(int) GlobalAlloc(GPTR, 4*ParamSizeByType[proc->Params[i].Type]);
|
||||
}
|
||||
if (!proc->Params[i].Value && proc->Params[i].Option == -1)
|
||||
proc->Params[i].Value = (INT_PTR) GlobalAlloc(GPTR, 4*ParamSizeByType[proc->Params[i].Type]);
|
||||
}
|
||||
|
||||
void ParamsIn(SystemProc *proc)
|
||||
|
|
@ -958,7 +982,7 @@ void ParamsIn(SystemProc *proc)
|
|||
#ifdef SYSTEM_LOG_DEBUG
|
||||
{
|
||||
TCHAR buf[666];
|
||||
wsprintf(buf, _T("\t\t\tParam In %d: type %d value 0x%08X value2 0x%08X"), i,
|
||||
wsprintf(buf, _T("\t\t\tParam In %d: type %d value ")SYSFMT_HEXPTR _T(" value2 0x%08X"), i,
|
||||
par->Type, par->Value, par->_value);
|
||||
SYSTEM_LOG_ADD(buf);
|
||||
SYSTEM_LOG_POST;
|
||||
|
|
@ -974,18 +998,18 @@ void ParamsIn(SystemProc *proc)
|
|||
void ParamsDeAllocate(SystemProc *proc)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = proc->ParamCount; i >= 0; i--)
|
||||
if (((HANDLE) proc->Params[i].Value != NULL) && (proc->Params[i].Option == -1))
|
||||
if (proc->Params[i].Value && proc->Params[i].Option == -1)
|
||||
{
|
||||
GlobalFree((HANDLE) (proc->Params[i].Value));
|
||||
proc->Params[i].Value = (int) NULL;
|
||||
proc->Params[i].Value = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void ParamsOut(SystemProc *proc)
|
||||
{
|
||||
int i, *place;
|
||||
INT_PTR *place;
|
||||
int i;
|
||||
TCHAR *realbuf;
|
||||
LPWSTR wstr;
|
||||
|
||||
|
|
@ -993,8 +1017,8 @@ void ParamsOut(SystemProc *proc)
|
|||
do
|
||||
{
|
||||
// Retreive pointer to place
|
||||
if (proc->Params[i].Option == -1) place = BUGBUG64(int*) proc->Params[i].Value;
|
||||
else place = BUGBUG64(int*) &(proc->Params[i].Value);
|
||||
if (proc->Params[i].Option == -1) place = (INT_PTR*) proc->Params[i].Value;
|
||||
else place = (INT_PTR*) &(proc->Params[i].Value);
|
||||
|
||||
realbuf = AllocString();
|
||||
|
||||
|
|
@ -1005,7 +1029,7 @@ void ParamsOut(SystemProc *proc)
|
|||
lstrcpy(realbuf,_T(""));
|
||||
break;
|
||||
case PAT_INT:
|
||||
wsprintf(realbuf, _T("%d"), *((int*) place));
|
||||
wsprintf(realbuf, _T("%d"), (int)(*((INT_PTR*) place)));
|
||||
break;
|
||||
case PAT_LONG:
|
||||
myitoa64(*((__int64*) place), realbuf);
|
||||
|
|
@ -1038,7 +1062,7 @@ void ParamsOut(SystemProc *proc)
|
|||
#endif
|
||||
break;
|
||||
case PAT_CALLBACK:
|
||||
wsprintf(realbuf, _T("%d"), proc->Params[i].Value);
|
||||
wsprintf(realbuf, _T("%d"), BUGBUG64(proc->Params[i].Value));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1083,6 +1107,9 @@ void ParamsOut(SystemProc *proc)
|
|||
|
||||
HANDLE CreateCallback(SystemProc *cbproc)
|
||||
{
|
||||
#ifdef SYSTEM_X64
|
||||
return BUGBUG64(HANDLE) NULL;
|
||||
#else
|
||||
char *mem;
|
||||
|
||||
if (cbproc->Proc == NULL)
|
||||
|
|
@ -1093,8 +1120,8 @@ HANDLE CreateCallback(SystemProc *cbproc)
|
|||
|
||||
mem = (char *) (cbproc->Proc = VirtualAlloc(NULL, sizeof(CallbackThunk), MEM_COMMIT, PAGE_EXECUTE_READWRITE));
|
||||
|
||||
((CallbackThunk*)mem)->pNext=CallbackThunkListHead;
|
||||
CallbackThunkListHead=(CallbackThunk*)mem;
|
||||
((CallbackThunk*)mem)->pNext=g_CallbackThunkListHead;
|
||||
g_CallbackThunkListHead=(CallbackThunk*)mem;
|
||||
|
||||
#ifdef SYSTEM_X86
|
||||
*(mem++) = (char) 0xB8; // Mov eax, const
|
||||
|
|
@ -1111,6 +1138,7 @@ HANDLE CreateCallback(SystemProc *cbproc)
|
|||
|
||||
// Return proc address
|
||||
return cbproc->Proc;
|
||||
#endif
|
||||
}
|
||||
|
||||
void CallStruct(SystemProc *proc)
|
||||
|
|
@ -1215,7 +1243,7 @@ void CallStruct(SystemProc *proc)
|
|||
SYSTEM_LOG_POST;
|
||||
|
||||
// Proc virtual return - pointer to memory struct
|
||||
proc->Params[0].Value = (int) proc->Proc;
|
||||
proc->Params[0].Value = BUGBUG64(int) proc->Proc;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1231,25 +1259,28 @@ the same means as used for the _RPT0 macro. This leads to an endless recursion.
|
|||
|
||||
BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, LPVOID lpReserved)
|
||||
{
|
||||
g_hInstance=hInst;
|
||||
|
||||
if (DLL_PROCESS_ATTACH == fdwReason)
|
||||
{
|
||||
// change the protection of return command
|
||||
VirtualProtect(&retexpr, sizeof(retexpr), PAGE_EXECUTE_READWRITE, (PDWORD)&LastStackPlace);
|
||||
g_hInstance=hInst;
|
||||
|
||||
// initialize some variables
|
||||
LastStackPlace = 0;
|
||||
LastStackReal = 0;
|
||||
LastError = 0;
|
||||
LastProc = NULL;
|
||||
CallbackIndex = 0;
|
||||
CallbackThunkListHead = NULL;
|
||||
retexpr[0] = (char) 0xC2;
|
||||
retexpr[2] = 0x00;
|
||||
}
|
||||
if (DLL_PROCESS_ATTACH == fdwReason)
|
||||
{
|
||||
// change the protection of return command
|
||||
VirtualProtect(&retexpr, sizeof(retexpr), PAGE_EXECUTE_READWRITE, (PDWORD)&LastStackPlace);
|
||||
|
||||
return TRUE;
|
||||
// initialize some variables
|
||||
LastStackPlace = 0, LastStackReal = 0;
|
||||
LastError = 0;
|
||||
LastProc = NULL;
|
||||
CallbackIndex = 0, g_CallbackThunkListHead = NULL;
|
||||
#ifdef SYSTEM_X86
|
||||
retexpr[0] = (char) 0xC2;
|
||||
retexpr[2] = 0x00;
|
||||
#elif defined(SYSTEM_X64)
|
||||
retexpr[0] = BUGBUG64(0);
|
||||
#else
|
||||
#error TODO
|
||||
#endif
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -10,7 +10,11 @@
|
|||
#else
|
||||
# error "Unknown architecture!"
|
||||
#endif
|
||||
|
||||
#ifdef _WIN64
|
||||
#define SYSFMT_HEXPTR _T("0x%016IX")
|
||||
#else
|
||||
#define SYSFMT_HEXPTR _T("0x%08X")
|
||||
#endif
|
||||
|
||||
|
||||
// The following ifdef block is the standard way of creating macros which make exporting
|
||||
|
|
@ -76,8 +80,8 @@ typedef struct
|
|||
{
|
||||
int Type;
|
||||
int Option; // -1 -> Pointer, 1-... -> Special+1
|
||||
int Value; // it can hold any 4 byte value BUGBUG: What about pointers on Win64?
|
||||
int _value; // value buffer for structures > 4 bytes (I hope 8 bytes will be enough)
|
||||
INT_PTR Value; // it can hold any pointer sized value
|
||||
int _value; // value buffer for structures > 4 bytes (I hope 8 bytes will be enough) BUGBUG: Does Win64 need this?
|
||||
int Size; // Value real size (should be either 1 or 2 (the number of pushes))
|
||||
int Input; //BUGBUG: What about pointers on Win64?
|
||||
int Output;
|
||||
|
|
@ -119,6 +123,8 @@ struct tag_CallbackThunk
|
|||
#pragma pack(pop)
|
||||
*/
|
||||
char asm_code[10];
|
||||
#elif defined(SYSTEM_X64)
|
||||
char asm_code[BUGBUG64(1)]; // TODO: BUGBUG64
|
||||
#else
|
||||
#error "Asm thunk not implemeted for this architecture!"
|
||||
#endif
|
||||
|
|
@ -129,6 +135,8 @@ struct tag_CallbackThunk
|
|||
// Free() only knows about pNext in CallbackThunk, it does not know anything about the assembly, that is where this helper comes in...
|
||||
#ifdef SYSTEM_X86
|
||||
# define GetAssociatedSysProcFromCallbackThunkPtr(pCbT) ( (SystemProc*) *(unsigned int*) (((char*)(pCbT))+1) )
|
||||
#elif defined(SYSTEM_X64)
|
||||
# define GetAssociatedSysProcFromCallbackThunkPtr(pCbT) BUGBUG64(NULL)
|
||||
#else
|
||||
# error "GetAssociatedSysProcFromCallbackThunkPtr not defined for the current architecture!"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -14,105 +14,105 @@
|
|||
; ------------- Functions --------------
|
||||
|
||||
; LRESULT CALLBACK WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
!define sysWNDPROC "(i.s, i.s, i.s, i.s) iss"
|
||||
!define sysWNDPROC "(p.s, i.s, p.s, p.s) pss"
|
||||
|
||||
; LRESULT DefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
!define sysDefWindowProc "user32::DefWindowProc(i, i, i, i) i"
|
||||
!define sysDefWindowProc "user32::DefWindowProc(p, i, p, p) p"
|
||||
|
||||
!define sysMessageBox "user32::MessageBox(i, t, t, i) i"
|
||||
!define sysMessageBox "user32::MessageBox(p, t, t, i) i"
|
||||
|
||||
!define sysMessageBeep "user32::MessageBeep(i) i"
|
||||
|
||||
!define sysMessageBoxIndirect 'user32::MessageBoxIndirect(i) i'
|
||||
!define sysMessageBoxIndirect 'user32::MessageBoxIndirect(p) i'
|
||||
|
||||
; HMODULE GetModuleHandle(LPCTSTR lpModuleName);
|
||||
!define sysGetModuleHandle "kernel32::GetModuleHandle(t) i"
|
||||
|
||||
; HMODULE LoadLibrary(LPCTSTR lpFileName);
|
||||
!define sysLoadLibrary "kernel32::LoadLibrary(t) i"
|
||||
!define sysLoadLibrary "kernel32::LoadLibrary(t) p"
|
||||
|
||||
; BOOL FreeLibrary(HMODULE hModule);
|
||||
!define sysFreeLibrary "kernel32::FreeLibrary(i) i"
|
||||
!define sysFreeLibrary "kernel32::FreeLibrary(p) i"
|
||||
|
||||
; HCURSOR LoadCursor(HINSTANCE hInstance, LPCTSTR lpCursorName);
|
||||
!define sysLoadCursor "user32::LoadCursor(i, t) i"
|
||||
!define sysLoadCursor "user32::LoadCursor(p, t) p"
|
||||
|
||||
; ATOM RegisterClass(CONST WNDCLASS *lpWndClass);
|
||||
!define sysRegisterClass "user32::RegisterClass(i) i"
|
||||
!define sysRegisterClass "user32::RegisterClass(p) i"
|
||||
|
||||
; HANDLE LoadImage(HINSTANCE hinst, LPCTSTR lpszName, UINT uType,
|
||||
; int cxDesired, int cyDesired, UINT fuLoad);
|
||||
!define sysLoadImage "user32::LoadImage(i, t, i, i, i, i) i"
|
||||
!define sysLoadImage "user32::LoadImage(p, t, i, i, i, i) p"
|
||||
|
||||
; BOOL PlaySound(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound);
|
||||
!define sysPlaySound "winmm.dll::PlaySound(t, i, i) i"
|
||||
!define sysPlaySound "winmm.dll::PlaySound(t, p, i) i"
|
||||
|
||||
; HWND CreateWindowEx(DWORD dwExStyle, LPCTSTR lpClassName, LPCTSTR lpWindowName,
|
||||
; DWORD dwStyle, int x, int y, int nWidth, int nHeight, HWND hWndParent,
|
||||
; HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam);
|
||||
!define sysCreateWindowEx "user32::CreateWindowEx(i, t, t, i, i, i, i, i, i, i, i, i) i"
|
||||
!define sysCreateWindowEx "user32::CreateWindowEx(i, t, t, i, i, i, i, i, p, p, p, p) p"
|
||||
|
||||
; BOOL IsWindow(HWND hWnd);
|
||||
!define sysIsWindow "user32::IsWindow(i) i"
|
||||
!define sysIsWindow "user32::IsWindow(p) i"
|
||||
|
||||
; LONG SetWindowLong(HWND hWnd, int nIndex, LONG dwNewLong);
|
||||
!define sysSetWindowLong "user32::SetWindowLong(i, i, i) i"
|
||||
!define sysSetWindowLong "user32::SetWindowLong(p, i, p) p"
|
||||
|
||||
; BOOL SetWindowPos(HWND hWnd, HWND hWndInsertAfter, int X, int Y, int cx, int cy, UINT uFlags);
|
||||
!define sysSetWindowPos "user32::SetWindowPos(i, i, i, i, i, i, i) i"
|
||||
!define sysSetWindowPos "user32::SetWindowPos(p, p, i, i, i, i, i) i"
|
||||
|
||||
; BOOL ShowWindow(HWND hWnd, int nCmdShow);
|
||||
!define sysShowWindow "user32::ShowWindow(i, i) i"
|
||||
!define sysShowWindow "user32::ShowWindow(p, i) i"
|
||||
|
||||
; BOOL DestroyWindow(HWND hWnd);
|
||||
!define sysDestroyWindow "user32::DestroyWindow(i) i"
|
||||
!define sysDestroyWindow "user32::DestroyWindow(p) i"
|
||||
|
||||
; BOOL GetClientRect(HWND hWnd, LPRECT lpRect);
|
||||
!define sysGetClientRect "user32::GetClientRect(i, i) i"
|
||||
!define sysGetClientRect "user32::GetClientRect(p, p) i"
|
||||
|
||||
; BOOL GetMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax);
|
||||
!define sysGetMessage "user32::GetMessage(i, i, i, i) i"
|
||||
!define sysGetMessage "user32::GetMessage(p, p, i, i) i"
|
||||
|
||||
; LRESULT DispatchMessage(CONST MSG *lpmsg);
|
||||
!define sysDispatchMessage "user32::DispatchMessage(i) i"
|
||||
!define sysDispatchMessage "user32::DispatchMessage(p) p"
|
||||
|
||||
; BOOL DeleteObject(HGDIOBJ hObject);
|
||||
!define sysDeleteObject "gdi32::DeleteObject(i) i"
|
||||
!define sysDeleteObject "gdi32::DeleteObject(p) i"
|
||||
|
||||
; int GetObject(HGDIOBJ hgdiobj, int cbBuffer, LPVOID lpvObject);
|
||||
!define sysGetObject "gdi32::GetObject(i, i, i) i"
|
||||
!define sysGetObject "gdi32::GetObject(p, i, p) i"
|
||||
|
||||
; HGDIOBJ SelectObject(HDC hdc, HGDIOBJ hgdiobj);
|
||||
!define sysSelectObject "gdi32::SelectObject(i, i) i"
|
||||
!define sysSelectObject "gdi32::SelectObject(p, p) p"
|
||||
|
||||
; HDC CreateCompatibleDC(HDC hdc);
|
||||
!define sysCreateCompatibleDC "gdi32::CreateCompatibleDC(i) i"
|
||||
!define sysCreateCompatibleDC "gdi32::CreateCompatibleDC(p) p"
|
||||
|
||||
; BOOL DeleteDC(HDC hdc);
|
||||
!define sysDeleteDC "gdi32::DeleteDC(i) i"
|
||||
!define sysDeleteDC "gdi32::DeleteDC(p) i"
|
||||
|
||||
; BOOL BitBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight,
|
||||
; HDC hdcSrc, int nXSrc, int nYSrc, DWORD dwRop);
|
||||
!define sysBitBlt "gdi32::BitBlt(i, i, i, i, i, i, i, i, i) i"
|
||||
!define sysBitBlt "gdi32::BitBlt(p, i, i, i, i, p, i, i, i) i"
|
||||
|
||||
; proposed by abgandar
|
||||
; int AddFontResource(LPCTSTR lpszFilename);
|
||||
!define sysAddFontResource "gdi32::AddFontResource(t) i"
|
||||
|
||||
; HDC BeginPaint(HWND hwnd, LPPAINTSTRUCT lpPaint);
|
||||
!define sysBeginPaint "user32::BeginPaint(i, i) i"
|
||||
!define sysBeginPaint "user32::BeginPaint(p, p) p"
|
||||
|
||||
; BOOL EndPaint(HWND hWnd, CONST PAINTSTRUCT *lpPaint);
|
||||
!define sysEndPaint "user32::EndPaint(i, i) i"
|
||||
!define sysEndPaint "user32::EndPaint(p, p) i"
|
||||
|
||||
; BOOL SystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni);
|
||||
!define sysSystemParametersInfo "user32::SystemParametersInfo(i, i, i, i) i"
|
||||
!define sysSystemParametersInfo "user32::SystemParametersInfo(i, i, p, i) i"
|
||||
|
||||
; UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc);
|
||||
!define sysSetTimer "user32::SetTimer(i, i, i, k) i"
|
||||
!define sysSetTimer "user32::SetTimer(p, p, i, k) i"
|
||||
|
||||
; DWORD GetLogicalDriveStrings(DWORD nBufferLength, LPTSTR LpBuffer);
|
||||
!define sysGetLogicalDriveStrings 'kernel32::GetLogicalDriveStrings(i, i) i'
|
||||
!define sysGetLogicalDriveStrings 'kernel32::GetLogicalDriveStrings(i, p) i'
|
||||
|
||||
!define sysGetDiskFreeSpaceEx 'kernel32::GetDiskFreeSpaceEx(t, *l, *l, *l) i'
|
||||
|
||||
|
|
@ -120,14 +120,14 @@
|
|||
!define sysGetDriveType 'kernel32::GetDriveType(t) i'
|
||||
|
||||
; HANDLE FindFirstFile(LPCTSTR lpFileName,LPWIN32_FIND_DATA lpFindFileData);
|
||||
!define sysFindFirstFile 'kernel32::FindFirstFile(t, i) i'
|
||||
!define sysFindFirstFile 'kernel32::FindFirstFile(t, p) p'
|
||||
|
||||
; BOOL FindClose(HANDLE hFindFile);
|
||||
!define sysFindClose 'kernel32::FindClose(i) i'
|
||||
!define sysFindClose 'kernel32::FindClose(p) i'
|
||||
|
||||
; BOOL FileTimeToSystemTime(CONST FILETIME *lpFileTime,
|
||||
; LPSYSTEMTIME lpSystemTime);
|
||||
!define sysFileTimeToSystemTime 'kernel32::FileTimeToSystemTime(*l, i) i'
|
||||
!define sysFileTimeToSystemTime 'kernel32::FileTimeToSystemTime(*l, p) i'
|
||||
|
||||
; BOOL FileTimeToLocalFileTime(
|
||||
; CONST FILETIME *lpFileTime,
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
|
||||
; BOOL SystemTimeToTzSpecificLocalTime(LPTIME_ZONE_INFORMATION lpTimeZone,
|
||||
; LPSYSTEMTIME lpUniversalTime, LPSYSTEMTIME lpLocalTime);
|
||||
!define sysSystemTimeToTzSpecificLocalTime 'kernel32::SystemTimeToTzSpecificLocalTime(i, i, i) i'
|
||||
!define sysSystemTimeToTzSpecificLocalTime 'kernel32::SystemTimeToTzSpecificLocalTime(p, p, p) i'
|
||||
|
||||
!define syslstrlen 'kernel32::lstrlen(t) i'
|
||||
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
; LPCTSTR lpszMenuName;
|
||||
; LPCTSTR lpszClassName;
|
||||
; } WNDCLASS, *PWNDCLASS;
|
||||
!define stWNDCLASS "(i, k, i, i, i, i, i, i, t, t) i"
|
||||
!define stWNDCLASS "(i, k, i, i, p, p, p, p, t, t) p"
|
||||
|
||||
; typedef struct tagMSG {
|
||||
; HWND hwnd;
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
; DWORD time;
|
||||
; POINT pt; -> will be presented as two separate px and py
|
||||
; } MSG, *PMSG;
|
||||
!define stMSG "(i, i, i, i, i, i, i) i"
|
||||
!define stMSG "(p, i, p, p, i, i, i) p"
|
||||
|
||||
; typedef struct tagBITMAP {
|
||||
; LONG bmType;
|
||||
|
|
@ -178,7 +178,7 @@
|
|||
; WORD bmBitsPixel;
|
||||
; LPVOID bmBits;
|
||||
; } BITMAP, *PBITMAP;
|
||||
!define stBITMAP "(i, i, i, i, i, i, i) i"
|
||||
!define stBITMAP "(i, i, i, i, i, i, p) p"
|
||||
|
||||
; typedef struct _RECT {
|
||||
; LONG left;
|
||||
|
|
@ -186,7 +186,7 @@
|
|||
; LONG right;
|
||||
; LONG bottom;
|
||||
; } RECT, *PRECT;
|
||||
!define stRECT "(i, i, i, i) i"
|
||||
!define stRECT "(i, i, i, i) p"
|
||||
|
||||
; typedef struct tagPAINTSTRUCT {
|
||||
; HDC hdc;
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
; BOOL fIncUpdate;
|
||||
; BYTE rgbReserved[32];
|
||||
; } PAINTSTRUCT, *PPAINTSTRUCT;
|
||||
!define stPAINTSTRUCT "(i, i, i, i, i, i, i, i, &v32) i"
|
||||
!define stPAINTSTRUCT "(p, i, i, i, i, i, i, i, &v32) p"
|
||||
|
||||
; typedef struct {
|
||||
; UINT cbSize;
|
||||
|
|
@ -210,7 +210,7 @@
|
|||
; MSGBOXCALLBACK lpfnMsgBoxCallback;
|
||||
; DWORD dwLanguageId;
|
||||
; } MSGBOXPARAMS, *PMSGBOXPARAMS;
|
||||
!define stMSGBOXPARAMS '(&l4, i, i, t, t, i, t, i, k, i) i'
|
||||
!define stMSGBOXPARAMS '(&l4, p, p, t, t, i, t, p, k, i) p'
|
||||
|
||||
; typedef struct _SYSTEMTIME {
|
||||
; WORD wYear;
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
; WORD wSecond;
|
||||
; WORD wMilliseconds;
|
||||
; } SYSTEMTIME, *PSYSTEMTIME;
|
||||
!define stSYSTEMTIME '(&i2, &i2, &i2, &i2, &i2, &i2, &i2, &i2) i'
|
||||
!define stSYSTEMTIME '(&i2, &i2, &i2, &i2, &i2, &i2, &i2, &i2) p'
|
||||
|
||||
; Maximal windows path
|
||||
!define /ifndef MAX_PATH 260
|
||||
|
|
@ -239,7 +239,7 @@
|
|||
; TCHAR cFileName[ MAX_PATH ];
|
||||
; TCHAR cAlternateFileName[ 14 ];
|
||||
; } WIN32_FIND_DATA, *PWIN32_FIND_DATA;
|
||||
!define stWIN32_FIND_DATA '(i, l, l, l, i, i, i, i, &t${MAX_PATH}, &t14) i'
|
||||
!define stWIN32_FIND_DATA '(i, l, l, l, i, i, i, i, &t${MAX_PATH}, &t14) p'
|
||||
|
||||
; ------------- Constants --------------
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ enumex: ; End of drives or user cancel
|
|||
; ----- Sample 3 ----- Direct proc defenition -----
|
||||
|
||||
; Direct specification demo
|
||||
System::Call 'user32::MessageBox(i $HWNDPARENT, t "Just direct MessageBox specification demo ;)", t "System Example 3", i ${MB_OK}) i.s'
|
||||
System::Call 'user32::MessageBox(p $HWNDPARENT, t "Just direct MessageBox specification demo ;)", t "System Example 3", i ${MB_OK}) i.s'
|
||||
Pop $0
|
||||
|
||||
; ----- Sample 4 ----- Int64, mixed definition demo -----
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue