int argc_reg;
unsigned int is_func:1;
unsigned int is_stdcall:1;
+ unsigned int is_fastcall:1;
unsigned int is_vararg:1;
unsigned int is_fptr:1;
unsigned int is_noreturn:1;
+ unsigned int is_unresolved:1;
unsigned int has_structarg:1;
};
};
static const char *known_ptr_types[] = {
+ "FARPROC",
"HACCEL",
"HANDLE",
"HBITMAP",
"HFONT",
"HGDIOBJ",
"HGLOBAL",
+ "HICON",
"HINSTANCE",
- "HIMC",
+ //"HIMC", // DWORD
"HMODULE",
+ "HPALETTE",
"HRGN",
"HRSRC",
"HKEY",
}
p = sskip(p + ret);
+ if (!strncmp(p, "noreturn ", 9)) {
+ pp->is_noreturn = 1;
+ p = sskip(p + 9);
+ }
+
if (!strchr(p, ')')) {
p = next_idt(buf, sizeof(buf), p);
p = sskip(p);
pp->is_stdcall = 0;
else if (IS(cconv, "__stdcall"))
pp->is_stdcall = 1;
- else if (IS(cconv, "__fastcall"))
- pp->is_stdcall = 1;
+ else if (IS(cconv, "__fastcall")) {
+ pp->is_fastcall = 1;
+ pp->is_stdcall = 1; // sort of..
+ }
else if (IS(cconv, "__thiscall"))
pp->is_stdcall = 1;
else if (IS(cconv, "__userpurge"))
pp->arg[1].reg = strdup("edx");
}
- if (pp->is_vararg && pp->is_stdcall) {
- printf("%s:%d: vararg stdcall?\n", hdrfn, hdrfline);
- return -1;
- }
-
pp->argc = xarg;
for (i = 0; i < pp->argc; i++) {
pp->argc_reg++;
}
+ if (pp->argc == 1 && pp->arg[0].reg != NULL
+ && IS(pp->arg[0].reg, "ecx"))
+ {
+ pp->is_fastcall = 1;
+ }
+ else if (pp->argc_reg == 2
+ && pp->arg[0].reg != NULL && IS(pp->arg[0].reg, "ecx")
+ && pp->arg[1].reg != NULL && IS(pp->arg[1].reg, "edx"))
+ {
+ pp->is_fastcall = 1;
+ }
+
+ if (pp->is_vararg && (pp->is_stdcall || pp->is_fastcall)) {
+ printf("%s:%d: vararg %s?\n", hdrfn, hdrfline, cconv);
+ return -1;
+ }
+
return p - protostr;
}
static void build_pp_cache(FILE *fhdr)
{
+ long pos;
int ret;
+ pos = ftell(fhdr);
rewind(fhdr);
ret = do_protostrs(fhdr, hdrfn);
exit(1);
qsort(pp_cache, pp_cache_size, sizeof(pp_cache[0]), pp_name_cmp);
+ fseek(fhdr, pos, SEEK_SET);
}
static const struct parsed_proto *proto_parse(FILE *fhdr, const char *sym,