translate: fixes

[ia32rtools.git] / tools / protoparse.h

diff --git a/tools/protoparse.h b/tools/protoparse.h
index 897171e..b17f218 100644 (file)
--- a/tools/protoparse.h
+++ b/tools/protoparse.h
@@ -16,6 +16,7 @@ struct parsed_type {
        unsigned int is_retreg:1; // register to return to caller
        unsigned int is_va_list:1;
        unsigned int is_64bit:1;
+       unsigned int is_float:1;  // float, double
 };
 
 struct parsed_proto_arg {
@@ -32,7 +33,7 @@ struct parsed_proto {
                struct parsed_type ret_type;
                struct parsed_type type;
        };
-       struct parsed_proto_arg arg[16];
+       struct parsed_proto_arg arg[32];
        int argc;
        int argc_stack;
        int argc_reg;
@@ -41,8 +42,10 @@ struct parsed_proto {
        unsigned int is_fastcall:1;
        unsigned int is_vararg:1;     // vararg func
        unsigned int is_fptr:1;
+       unsigned int is_import:1;     // data import
        unsigned int is_noreturn:1;
        unsigned int is_unresolved:1;
+       unsigned int is_guessed:1;    // for extra checking
        unsigned int is_userstack:1;
        unsigned int is_include:1;    // not from top-level header
        unsigned int is_osinc:1;      // OS/system library func
@@ -213,10 +216,13 @@ static const char *known_ptr_types[] = {
        "HRSRC",
        "HKEY",
        "HMENU",
+       "HMONITOR",
        "HWAVEOUT",
        "HWND",
+       "PAPPBARDATA",
        "PBYTE",
        "PCRITICAL_SECTION",
+       "PDEVMODEA",
        "PDWORD",
        "PFILETIME",
        "PLARGE_INTEGER",
@@ -231,7 +237,10 @@ static const char *known_ptr_types[] = {
        "PCVOID",
        "PWORD",
        "REFCLSID",
+       "REFGUID",
        "REFIID",
+       "SC_HANDLE",
+       "SERVICE_STATUS_HANDLE",
        "HOOKPROC",
        "DLGPROC",
        "TIMERPROC",
@@ -398,6 +407,9 @@ static int parse_arg(char **p_, struct parsed_proto_arg *arg, int xarg)
        if (ret < 0)
                return -1;
 
+       if (IS_START(arg->pp->name, "guess"))
+               arg->pp->is_guessed = 1;
+
        // we don't use actual names right now...
        snprintf(arg->pp->name, sizeof(arg->pp->name), "a%d", xarg);
 
@@ -458,6 +470,11 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                        p = sskip(p + l + 1);
        }
 
+       if (IS_START(p, "DECL_IMPORT ")) {
+               pp->is_import = 1;
+               p = sskip(p + 12);
+       }
+
        ret = check_type(p, &pp->ret_type);
        if (ret <= 0) {
                printf("%s:%d:%zd: unhandled return in '%s'\n",
@@ -624,6 +641,12 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                        return -1;
                }
 
+               if (xarg >= ARRAY_SIZE(pp->arg)) {
+                       printf("%s:%d:%zd: too many args\n",
+                               hdrfn, hdrfline, (p - protostr) + 1);
+                       return -1;
+               }
+
                arg = &pp->arg[xarg];
                xarg++;
 
@@ -668,6 +691,12 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                        pp->has_retreg |= is_retreg;
                }
 
+               if (IS(arg->type.name, "float")
+                     || IS(arg->type.name, "double"))
+               {
+                       arg->type.is_float = 1;
+               }
+
                if (!arg->type.is_ptr && (strstr(arg->type.name, "int64")
                      || IS(arg->type.name, "double")))
                {