X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fprotoparse.h;h=897171e86197b0c7e236e4fd75dd4e3a9785780a;hb=2c31fb4cf1427f5a24c4eed0a08dbd3f3a2dacce;hp=469c12f869e3b737b92734ff5e1128a2eae559a6;hpb=93b5bd181600ddf5097d133c52cdc7b1d4a2c7c8;p=ia32rtools.git

diff --git a/tools/protoparse.h b/tools/protoparse.h
index 469c12f..897171e 100644
--- a/tools/protoparse.h
+++ b/tools/protoparse.h
@@ -15,6 +15,7 @@ struct parsed_type {
 	unsigned int is_struct:1; // split for args
 	unsigned int is_retreg:1; // register to return to caller
 	unsigned int is_va_list:1;
+	unsigned int is_64bit:1;
 };
 
 struct parsed_proto_arg {
@@ -22,6 +23,7 @@ struct parsed_proto_arg {
 	struct parsed_type type;
 	struct parsed_proto *pp; // fptr or struct
 	void *datap;
+	unsigned int is_saved:1; // not set here, for tool use
 };
 
 struct parsed_proto {
@@ -191,12 +193,14 @@ static const char *known_ptr_types[] = {
 	"HACCEL",
 	"HANDLE",
 	"HBITMAP",
+	"HBRUSH",
 	"HCALL",
 	"HCURSOR",
 	"HDC",
 	"HFONT",
 	"HGDIOBJ",
 	"HGLOBAL",
+	"HHOOK",
 	"HICON",
 	"HINSTANCE",
 	"HIMC", // DWORD in mingw, ptr in wine..
@@ -216,13 +220,19 @@ static const char *known_ptr_types[] = {
 	"PDWORD",
 	"PFILETIME",
 	"PLARGE_INTEGER",
+	"PHANDLE",
 	"PHKEY",
 	"PLONG",
 	"PMEMORY_BASIC_INFORMATION",
 	"PUINT",
+	"PULARGE_INTEGER",
+	"PULONG_PTR",
 	"PVOID",
 	"PCVOID",
 	"PWORD",
+	"REFCLSID",
+	"REFIID",
+	"HOOKPROC",
 	"DLGPROC",
 	"TIMERPROC",
 	"WNDENUMPROC",
@@ -511,7 +521,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 		pp->is_stdcall = 0; // custom
 		pp->is_userstack = 1;
 	}
-	else if (IS(cconv, "WINAPI"))
+	else if (IS(cconv, "WINAPI") || IS(cconv, "PASCAL"))
 		pp->is_stdcall = 1;
 	else {
 		printf("%s:%d:%zd: unhandled cconv: '%s'\n",
@@ -658,14 +668,16 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 			pp->has_retreg |= is_retreg;
 		}
 
-		if (strstr(arg->type.name, "int64")
-		    || IS(arg->type.name, "double"))
+		if (!arg->type.is_ptr && (strstr(arg->type.name, "int64")
+		      || IS(arg->type.name, "double")))
 		{
+			arg->type.is_64bit = 1;
 			// hack..
-			free(arg->type.name);
-			arg->type.name = strdup("int");
 			pp_copy_arg(&pp->arg[xarg], arg);
+			arg = &pp->arg[xarg];
 			xarg++;
+			free(arg->type.name);
+			arg->type.name = strdup("dummy");
 		}
 
 		ret = check_struct_arg(arg);
@@ -860,7 +872,8 @@ static const struct parsed_proto *proto_parse(FILE *fhdr, const char *sym,
 	if (pp_cache == NULL)
 		build_caches(fhdr);
 
-	if (sym[0] == '_') // && strncmp(fname, "stdc", 4) == 0)
+	// ugh...
+	if (sym[0] == '_' && !IS_START(sym, "__W"))
 		sym++;
 
 	strcpy(pp_search.name, sym);