From 9ceddd8d8e446f05d3e364468decce99268ea148 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Tue, 1 Mar 2022 08:33:43 +0100 Subject: [PATCH] msasn1/tests: Enable compilation with long types. Signed-off-by: Eric Pouech Signed-off-by: Alexandre Julliard --- dlls/msasn1/tests/Makefile.in | 1 - dlls/msasn1/tests/asn1.c | 190 +++++++++++++++++----------------- 2 files changed, 95 insertions(+), 96 deletions(-) diff --git a/dlls/msasn1/tests/Makefile.in b/dlls/msasn1/tests/Makefile.in index bbab55b525b..395ef933c0d 100644 --- a/dlls/msasn1/tests/Makefile.in +++ b/dlls/msasn1/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msasn1.dll IMPORTS = msasn1 diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 6bd95352edf..798a4a3727e 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -47,10 +47,10 @@ static void test_CreateModule(void) mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); ok(!!mod, "Failed to create module.\n"); - ok(mod->nModuleName==0, "Got Module name = %d.\n",mod->nModuleName); + ok(mod->nModuleName==0, "Got Module name = %ld.\n",mod->nModuleName); ok(mod->eRule==0, "Got eRule = %08x.\n",mod->eRule); - ok(mod->dwFlags==0, "Got Flags = %08x.\n",mod->dwFlags); - ok(mod->cPDUs==0, "Got PDUs = %08x.\n",mod->cPDUs); + ok(mod->dwFlags==0, "Got Flags = %08lx.\n",mod->dwFlags); + ok(mod->cPDUs==0, "Got PDUs = %08lx.\n",mod->cPDUs); ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(!mod->PER.apfnEncoder, "Encoder function should not be set.\n"); @@ -59,10 +59,10 @@ static void test_CreateModule(void) mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); - ok(mod->nModuleName==name, "Got Module name = %d.\n",mod->nModuleName); + ok(mod->nModuleName==name, "Got Module name = %ld.\n",mod->nModuleName); ok(mod->eRule==ASN1_BER_RULE_DER, "Got eRule = %08x.\n",mod->eRule); - ok(mod->cPDUs==1, "Got PDUs = %08x.\n",mod->cPDUs); - ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x.\n",mod->dwFlags); + ok(mod->cPDUs==1, "Got PDUs = %08lx.\n",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08lx.\n",mod->dwFlags); ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); @@ -71,10 +71,10 @@ static void test_CreateModule(void) mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); - ok(mod->nModuleName==name, "Got Module name = %d.\n",mod->nModuleName); + ok(mod->nModuleName==name, "Got Module name = %ld.\n",mod->nModuleName); ok(mod->eRule==ASN1_PER_RULE_ALIGNED, "Got eRule = %08x.\n",mod->eRule); - ok(mod->cPDUs==1, "Got PDUs = %08x.\n",mod->cPDUs); - ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x.\n",mod->dwFlags); + ok(mod->cPDUs==1, "Got PDUs = %08lx.\n",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08lx.\n",mod->dwFlags); ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(mod->PER.apfnEncoder==(ASN1PerEncFun_t *)encfn /* WINXP & WIN2008 */ || @@ -106,79 +106,79 @@ static void test_CreateEncoder(void) ret = ASN1_CreateEncoder(mod, &encoder, NULL, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(!encoder->buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(!encoder->size,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(!encoder->size,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(!encoder->pos,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(!encoder->buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(!encoder->size,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(!encoder->size,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(!encoder->pos,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(encoder->buf==buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(encoder->size==2,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(encoder->size==2,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(encoder->pos==buf,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(encoder->buf==buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(encoder->size==4,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(encoder->size==4,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(encoder->pos==buf,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); - ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); - ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); @@ -186,44 +186,44 @@ static void test_CreateEncoder(void) ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(!encoder->buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(!encoder->size,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(!encoder->size,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(!encoder->pos,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(encoder->buf==buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(encoder->size==4,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(encoder->size==4,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(encoder->pos==buf,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); - ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); - ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); } @@ -250,75 +250,75 @@ static void test_CreateDecoder(void) ret = ASN1_CreateDecoder(mod, &decoder, NULL, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(!decoder->buf,"Got incorrect buf = %p.\n",decoder->buf); - ok(!decoder->size,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(!decoder->size,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(!decoder->pos,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == ASN1DECODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_NOASSERT,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %s.\n",decoder->buf); - ok(!decoder->size,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(!decoder->size,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER), "Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER), "Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %p.\n",decoder->buf); - ok(decoder->size==2,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(decoder->size==2,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %p.\n",decoder->buf); - ok(decoder->size==4,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(decoder->size==4,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); - ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); - ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); @@ -326,42 +326,42 @@ static void test_CreateDecoder(void) ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %s.\n",decoder->buf); - ok(!decoder->size,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(!decoder->size,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %p.\n",decoder->buf); - ok(decoder->size==4,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(decoder->size==4,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); - ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); - ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); }