[PATCH] ntdll: Make the version checks in parse_assembly_elem consistent with those in lookup_manifest_file.
Robert Shearman
rob at codeweavers.com
Tue Nov 6 10:15:50 CST 2007
---
dlls/ntdll/actctx.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 15f87e7..b4b5197 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -1391,7 +1391,11 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl,
{
/* FIXME: more tests */
if (assembly->type == ASSEMBLY_MANIFEST &&
- memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version)))
+ (assembly->id.version.major != expected_ai->version.major ||
+ assembly->id.version.minor != expected_ai->version.minor ||
+ assembly->id.version.build < expected_ai->version.build ||
+ (assembly->id.version.build == expected_ai->version.build &&
+ assembly->id.version.revision < expected_ai->version.revision)))
{
FIXME("wrong version\n");
return FALSE;
--
1.5.0
--------------090702080603030805080702--
More information about the wine-devel
mailing list