in/out specifications, added a few helpers in module.c, added wow64st…

…dcall by darthton
Synestraa · Mar 2, 2017 · 9305c65 · 9305c65
1 parent 8af0dd0
commit 9305c65
Show file tree

Hide file tree

Showing 20 changed files with 708 additions and 1,393 deletions.
diff --git a/Current/Build/Include/highcall.c b/Current/Build/Include/highcall.c
@@ -41,15 +41,15 @@ static HIGHCALL_STATUS InitializeModules(VOID)
 		}
 
 		/* Load anything we need from ntdll while we're at it. */
-		if (HcStringCompareContentW(L"ntdll.dll", pLdrDataTableEntry->FullModuleName.Buffer))
+		if (HcStringCompareW(L"ntdll.dll", pLdrDataTableEntry->FullModuleName.Buffer))
 		{
 			HcGlobal.HandleNtdll = (HMODULE)pLdrDataTableEntry->InInitializationOrderLinks.Flink;
 		}
-		else if (HcStringCompareContentW(L"user32.dll", pLdrDataTableEntry->FullModuleName.Buffer))
+		else if (HcStringCompareW(L"user32.dll", pLdrDataTableEntry->FullModuleName.Buffer))
 		{
 			HcGlobal.HandleUser32 = (HMODULE)pLdrDataTableEntry->InInitializationOrderLinks.Flink;
 		}
-		else if (HcStringCompareContentW(L"kernel32.dll", pLdrDataTableEntry->FullModuleName.Buffer))
+		else if (HcStringCompareW(L"kernel32.dll", pLdrDataTableEntry->FullModuleName.Buffer))
 		{
 			HcGlobal.HandleKernel32 = (HMODULE)pLdrDataTableEntry->InInitializationOrderLinks.Flink;
 		}
@@ -135,7 +135,7 @@ static VOID InitializeSecurity(VOID)
 	if (NT_SUCCESS(Status))
 	{
 		HcTokenIsElevated(hToken, &(HcGlobal.IsElevated));
-		HcObjectClose(hToken);
+		HcObjectClose(&hToken);
 	}
 }
 

diff --git a/Current/Build/Include/highcall.h b/Current/Build/Include/highcall.h
diff --git a/Current/Current.vcxproj b/Current/Current.vcxproj
@@ -333,6 +333,16 @@
     <ClInclude Include="public\wintype.h" />
   </ItemGroup>
   <ItemGroup>
+    <MASM Include="private\wow64\wow64stdcall.asm">
+      <UseSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</UseSafeExceptionHandlers>
+      <UseSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='DYNAMIC_DEBUG|Win32'">true</UseSafeExceptionHandlers>
+      <UseSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='DYNAMIC_RELEASE|Win32'">true</UseSafeExceptionHandlers>
+      <UseSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</UseSafeExceptionHandlers>
+      <CallingConvention Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">2</CallingConvention>
+      <CallingConvention Condition="'$(Configuration)|$(Platform)'=='DYNAMIC_DEBUG|Win32'">2</CallingConvention>
+      <CallingConvention Condition="'$(Configuration)|$(Platform)'=='DYNAMIC_RELEASE|Win32'">2</CallingConvention>
+      <CallingConvention Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">2</CallingConvention>
+    </MASM>
     <MASM Include="private\sys\asm\AcceptConnectPort.asm">
       <UseSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</UseSafeExceptionHandlers>
       <UseSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='DYNAMIC_DEBUG|x64'">false</UseSafeExceptionHandlers>

diff --git a/Current/Current.vcxproj.filters b/Current/Current.vcxproj.filters
@@ -1490,6 +1490,7 @@
     <MASM Include="private\sys\asm\Wow64WriteVirtualMemory64.asm">
       <Filter>private\sys\asm</Filter>
     </MASM>
+    <MASM Include="private\wow64\wow64stdcall.asm" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="private">

diff --git a/Current/private/kernel/common.c b/Current/private/kernel/common.c
@@ -2,8 +2,6 @@
 
 #include "../sys/syscall.h"
 
-#define WAIT_IO_COMPLETION 0xC0
-
 DECL_EXTERN_API(VOID, Sleep, CONST IN DWORD dwMilliseconds)
 {
 	LARGE_INTEGER Time;

diff --git a/Current/private/kernel/construct.c b/Current/private/kernel/construct.c
@@ -1,6 +1,6 @@
 #include <highcall.h>
 
-DECL_EXTERN_API(PHC_MODULE_INFORMATIONW, InitializeModuleInformationW, DWORD tNameSize, DWORD tPathSize)
+DECL_EXTERN_API(PHC_MODULE_INFORMATIONW, InitializeModuleInformationW, CONST IN DWORD tNameSize, CONST IN DWORD tPathSize)
 {
 	PHC_MODULE_INFORMATIONW obj = HcAlloc(sizeof(*obj));
 
@@ -10,14 +10,14 @@ DECL_EXTERN_API(PHC_MODULE_INFORMATIONW, InitializeModuleInformationW, DWORD tNa
 	return obj;
 }
 
-DECL_EXTERN_API(VOID, DestroyModuleInformationW, PHC_MODULE_INFORMATIONW o)
+DECL_EXTERN_API(VOID, DestroyModuleInformationW, IN PHC_MODULE_INFORMATIONW o)
 {
 	HcFree(o->Name);
 	HcFree(o->Path);
 	HcFree(o);
 }
 
-DECL_EXTERN_API(PHC_PROCESS_INFORMATION_EXW, InitializeProcessInformationExW, DWORD tNameSize)
+DECL_EXTERN_API(PHC_PROCESS_INFORMATION_EXW, InitializeProcessInformationExW, CONST IN DWORD tNameSize)
 {
 	PHC_PROCESS_INFORMATION_EXW obj = HcAlloc(sizeof(*obj));
 
@@ -27,14 +27,14 @@ DECL_EXTERN_API(PHC_PROCESS_INFORMATION_EXW, InitializeProcessInformationExW, DW
 	return obj;
 }
 
-DECL_EXTERN_API(VOID, DestroyProcessInformationExW, PHC_PROCESS_INFORMATION_EXW o)
+DECL_EXTERN_API(VOID, DestroyProcessInformationExW, IN PHC_PROCESS_INFORMATION_EXW o)
 {
 	HcFree(o->Name);
 	HcDestroyModuleInformationW(o->MainModule);
 	HcFree(o);
 }
 
-DECL_EXTERN_API(PHC_PROCESS_INFORMATIONW, InitializeProcessInformationW, DWORD tNameSize)
+DECL_EXTERN_API(PHC_PROCESS_INFORMATIONW, InitializeProcessInformationW, CONST IN DWORD tNameSize)
 {
 	PHC_PROCESS_INFORMATIONW obj;
 
@@ -44,7 +44,7 @@ DECL_EXTERN_API(PHC_PROCESS_INFORMATIONW, InitializeProcessInformationW, DWORD t
 	return obj;
 }
 
-DECL_EXTERN_API(VOID, DestroyProcessInformationW, PHC_PROCESS_INFORMATIONW o)
+DECL_EXTERN_API(VOID, DestroyProcessInformationW, IN PHC_PROCESS_INFORMATIONW o)
 {
 	HcFree(o->Name);
 	HcFree(o);

diff --git a/Current/private/kernel/error.c b/Current/private/kernel/error.c
@@ -61,18 +61,21 @@ DECL_EXTERN_API(DWORD, ErrorStatusToDos, IN NTSTATUS Status)
 	return HcErrorStatusTranslate(Status);
 }
 
-DECL_EXTERN_API(VOID, ErrorSetDosError, IN DWORD dwErrCode)
+DECL_EXTERN_API(VOID, ErrorSetDosError, CONST IN DWORD dwErrCode)
 {
 	/* Check if the error is already set before setting it. */
-	if (NtCurrentTeb()->LastErrorValue != dwErrCode) NtCurrentTeb()->LastErrorValue = dwErrCode;
+	if (NtCurrentTeb()->LastErrorValue != dwErrCode)
+	{
+		NtCurrentTeb()->LastErrorValue = dwErrCode;
+	}
 }
 
-DECL_EXTERN_API(DWORD, ErrorGetDosError, VOID)
+DECL_EXTERN_API(DWORD, ErrorGetDosError)
 {
 	/* Return the current value */
 	return NtCurrentTeb()->LastErrorValue;
 }
-DECL_EXTERN_API(DWORD, ErrorSetNtStatus, IN NTSTATUS Status)
+DECL_EXTERN_API(DWORD, ErrorSetNtStatus, CONST IN NTSTATUS Status)
 {
 	DWORD dwErrCode;
 	PTEB Teb = NtCurrentTeb();