upd

odzhan · odzhan · commit 509c8460574e · 2019-12-05T13:07:38.000Z
diff --git a/os/win/getapi/dynamic/get_gpa.c b/os/win/getapi/dynamic/get_gpa.c
@@ -32,6 +32,10 @@
 
 typedef BYTE UBYTE;
 
+#ifndef UNW_FLAG_CHAININFO
+#define UNW_FLAG_CHAININFO 4
+#endif
+
 typedef enum _UNWIND_OP_CODES {
     UWOP_PUSH_NONVOL = 0, /* info == register number */
     UWOP_ALLOC_LARGE,     /* no info, alloc size in next 2 slots */
@@ -92,7 +96,7 @@ LPVOID GetGPA(VOID) {
     PBYTE                         s1, e1, s2, e2;
     PUNWIND_INFO                  ui;
     
-    peb = (PPEB) __readgsqword(0x60);
+    peb = NtCurrentTeb()->ProcessEnvironmentBlock;
     ldr = (PPEB_LDR_DATA)peb->Ldr;
     
     for (dte=(PLDR_DATA_TABLE_ENTRY)ldr->InLoadOrderModuleList.Flink;
diff --git a/os/win/getapi/dynamic/get_gpa1.c b/os/win/getapi/dynamic/get_gpa1.c
@@ -27,7 +27,7 @@
   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-#include "getapi.h"
+#include "peb.h"
 
 LPVOID GetGPA(VOID) {
     PPEB                  peb;
@@ -41,7 +41,7 @@ LPVOID GetGPA(VOID) {
     DWORD                 i, j, h;
     PBYTE                 cs;
     
-    peb = (PPEB) __readfsdword(0x30);
+    peb = NtCurrentTeb()->ProcessEnvironmentBlock;
     ldr = (PPEB_LDR_DATA)peb->Ldr;
     
     // for each DLL loaded
@@ -86,15 +86,16 @@ LPVOID GetGPA(VOID) {
 }
 
 int main(void) {
-
+    LPVOID addr = GetGPA();
+    
     if (addr != NULL) {
       printf ("GetProcAddress: %p\n", addr);
       
       printf ("GetProcAddress: %p\n", 
-          GetProcAddress("kernelbase", "GetProcAddress"));
+          (LPVOID)GetProcAddress(GetModuleHandle("kernelbase"), "GetProcAddress"));
           
       printf ("GetProcAddressForCaller: %p\n", 
-          GetProcAddress("kernelbase", "GetProcAddressForCaller"));
+          (LPVOID)GetProcAddress(GetModuleHandle("kernelbase"), "GetProcAddressForCaller"));
     }
     return 0;
 }
diff --git a/os/win/getapi/dynamic/getapi.c b/os/win/getapi/dynamic/getapi.c
@@ -29,6 +29,9 @@
 
 #include "peb.h"
   
+LPVOID get_api(DWORD);
+LPVOID get_apix(DWORD);
+
 // converts string to lowercase
 uint32_t crc32c(const char *s) {
     int      i;
@@ -192,7 +195,7 @@ int main(int argc, char *argv[])
   
   h = dll_h + api_h;
   
-  p = get_api(h);
+  p = get_apix(h);
   // if not found
   if (p==NULL) {
     // load the module into memory
@@ -201,7 +204,7 @@ int main(int argc, char *argv[])
       return 0;
     }
     // then try again
-    p = get_api(h);
+    p = get_apix(h);
   }
   if (p==NULL) {
     printf ("\nUnable to locate API address \"%s\"", argv[2]);
diff --git a/os/win/getapi/dynamic/getapi.exe b/os/win/getapi/dynamic/getapi.exe
diff --git a/os/win/getapi/dynamic/peb.h b/os/win/getapi/dynamic/peb.h
@@ -33,6 +33,8 @@
 #define PEB_H
 
 #include <windows.h>
+#include <stdio.h>
+#include <stdint.h>
 
 #ifndef ROTR32
 #define ROTR32(v,n)(((v)>>(n))|((v)<<(32-(n))))
diff --git a/os/win/getapi/dynamic/winexec.c b/os/win/getapi/dynamic/winexec.c
