ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Add parsing of the version in manifests (based on a patch by Jacek Caban).

Browse Source
This commit is contained in:
Alexandre Julliard 2007-07-19 17:47:33 +02:00
parent a5130f4e72
commit 5b0ab20787
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/ntdll/actctx.c
View File

@ -134,6 +134,7 @@ struct actctx_loader
#define MANIFESTVERSION_ATTR "manifestVersion" #define MANIFESTVERSION_ATTR "manifestVersion"
#define NAME_ATTR "name" #define NAME_ATTR "name"
#define TYPE_ATTR "type" #define TYPE_ATTR "type"
#define VERSION_ATTR "version"
#define PROCESSORARCHITECTURE_ATTR "processorArchitecture" #define PROCESSORARCHITECTURE_ATTR "processorArchitecture"
#define XMLNS_ATTR "xmlns" #define XMLNS_ATTR "xmlns"
@ -353,6 +354,38 @@ static BOOL parse_xml_header(xmlbuf_t* xmlbuf)
return FALSE; return FALSE;
} }
static BOOL parse_version(const xmlstr_t *str, struct version *version)
{
unsigned int ver[4];
unsigned int pos;
const char *curr;
/* major.minor.build.revision */
ver[0] = ver[1] = ver[2] = ver[3] = pos = 0;
for (curr = str->ptr; curr < str->ptr + str->len; curr++)
{
if (*curr >= '0' && *curr <= '9')
{
ver[pos] = ver[pos] * 10 + *curr - '0';
if (ver[pos] >= 0x10000) goto error;
}
else if (*curr == '.')
{
if (++pos >= 4) goto error;
}
else goto error;
}
version->major = ver[0];
version->minor = ver[1];
version->build = ver[2];
version->revision = ver[3];
return TRUE;
error:
FIXME( "Wrong version definition in manifest file (%s)\n", debugstr_xmlstr(str) );
return FALSE;
}
static BOOL parse_expect_elem(xmlbuf_t* xmlbuf, const char* name) static BOOL parse_expect_elem(xmlbuf_t* xmlbuf, const char* name)
{ {
xmlstr_t elem; xmlstr_t elem;
@ -404,6 +437,10 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a
} }
ai->type = TYPE_WIN32; ai->type = TYPE_WIN32;
} }
else if (xmlstr_cmp(&attr_name, VERSION_ATTR))
{
if (!parse_version(&attr_value, &ai->version)) return FALSE;
}
else if (xmlstr_cmp(&attr_name, PROCESSORARCHITECTURE_ATTR)) else if (xmlstr_cmp(&attr_name, PROCESSORARCHITECTURE_ATTR))
{ {
if (!(ai->arch = xmlstrdupW(&attr_value))) return FALSE; if (!(ai->arch = xmlstrdupW(&attr_value))) return FALSE;