unsigned int is_array:1;
unsigned int is_ptr:1;
unsigned int is_struct:1; // split for args
+ unsigned int is_retreg:1; // register to return
};
struct parsed_proto_arg {
unsigned int is_fptr:1;
unsigned int is_noreturn:1;
unsigned int is_unresolved:1;
+ unsigned int is_userstack:1;
unsigned int is_arg:1; // decl in func arg
unsigned int has_structarg:1;
+ unsigned int has_retreg:1;
};
static const char *hdrfn;
return -1;
}
-static int get_regparm(char *dst, size_t dlen, char *p)
+static int get_regparm(char *dst, size_t dlen, char *p, int *retreg)
{
- int i, o;
+ int i = 0, o;
+
+ *retreg = 0;
if (*p != '<')
return 0;
- for (o = 0, i = 1; o < dlen; i++) {
+ i++;
+ if (p[i] == '*') {
+ *retreg = 1;
+ i++;
+ }
+
+ for (o = 0; o < dlen; i++) {
if (p[i] == 0)
return 0;
if (p[i] == '>')
static const char *known_ptr_types[] = {
"FARPROC",
"WNDPROC",
+ "LINECALLBACK",
"HACCEL",
"HANDLE",
"HBITMAP",
+ "HCALL",
"HCURSOR",
"HDC",
"HFONT",
"HGLOBAL",
"HICON",
"HINSTANCE",
- //"HIMC", // DWORD
+ "HIMC", // DWORD in mingw, ptr in wine..
+ "HLINE",
+ "HLINEAPP",
+ "HLOCAL",
"HMODULE",
"HPALETTE",
"HRGN",
"HRSRC",
"HKEY",
"HMENU",
+ "HWAVEOUT",
"HWND",
"PBYTE",
"PCRITICAL_SECTION",
"PDWORD",
"PFILETIME",
+ "PLARGE_INTEGER",
"PHKEY",
"PLONG",
"PMEMORY_BASIC_INFORMATION",
char regparm[16];
char buf[256];
char cconv[32];
+ int is_retreg;
int xarg = 0;
char *p, *p1;
int i, l;
pp->is_stdcall = 1; // IDA
else if (IS(cconv, "__usercall"))
pp->is_stdcall = 0; // IDA
+ else if (IS(cconv, "__userstack")) {
+ pp->is_stdcall = 0; // custom
+ pp->is_userstack = 1;
+ }
else if (IS(cconv, "WINAPI"))
pp->is_stdcall = 1;
else {
}
strcpy(pp->name, buf);
- ret = get_regparm(regparm, sizeof(regparm), p);
+ ret = get_regparm(regparm, sizeof(regparm), p, &is_retreg);
if (ret > 0) {
if (!IS(regparm, "eax") && !IS(regparm, "ax")
&& !IS(regparm, "al") && !IS(regparm, "edx:eax"))
#endif
arg->reg = NULL;
- ret = get_regparm(regparm, sizeof(regparm), p);
+ ret = get_regparm(regparm, sizeof(regparm), p, &is_retreg);
if (ret > 0) {
p += ret;
p = sskip(p);
arg->reg = strdup(map_reg(regparm));
+ arg->type.is_retreg = is_retreg;
+ pp->has_retreg |= is_retreg;
}
if (strstr(arg->type.name, "int64")
{
const struct parsed_proto *pp_ret;
struct parsed_proto pp_search;
+ char *p;
if (pp_cache == NULL)
build_pp_cache(fhdr);
sym++;
strcpy(pp_search.name, sym);
+ p = strchr(pp_search.name, '@');
+ if (p != NULL)
+ *p = 0;
+
pp_ret = bsearch(&pp_search, pp_cache, pp_cache_size,
sizeof(pp_cache[0]), pp_name_cmp);
if (pp_ret == NULL && !quiet)
return pp;
}
+
+static inline int pp_cmp_func(const struct parsed_proto *pp1,
+ const struct parsed_proto *pp2)
+{
+ int i;
+
+ if (pp1->argc != pp2->argc || pp1->argc_reg != pp2->argc_reg)
+ return 1;
+ else {
+ for (i = 0; i < pp1->argc; i++) {
+ if ((pp1->arg[i].reg != NULL) != (pp2->arg[i].reg != NULL))
+ return 1;
+
+ if ((pp1->arg[i].reg != NULL)
+ && !IS(pp1->arg[i].reg, pp2->arg[i].reg))
+ {
+ return 1;
+ }
+ }
+ }
+
+ return 0;
+}
+
static inline void pp_print(char *buf, size_t buf_size,
const struct parsed_proto *pp)
{