wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Hans Leidekker : include: Add OCSP definitions.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 39d6ac0d9cd38eff5eea1f0b7577e4264378385c URL: https://source.winehq.org/git/wine.git/?a=commit;h=39d6ac0d9cd38eff5eea1f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 4 13:57:14 2022 +0100 include: Add OCSP definitions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index 456f2f14446..f5f05c1f8d0 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -608,6 +608,97 @@ typedef struct _CERT_SIGNED_CONTENT_INFO { CRYPT_BIT_BLOB Signature; } CERT_SIGNED_CONTENT_INFO, *PCERT_SIGNED_CONTENT_INFO; +typedef struct _OCSP_SIGNATURE_INFO { + CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; + CRYPT_BIT_BLOB Signature; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; +} OCSP_SIGNATURE_INFO, *POCSP_SIGNATURE_INFO; + +typedef struct _OCSP_SIGNED_REQUEST_INFO { + CRYPT_DER_BLOB ToBeSigned; + POCSP_SIGNATURE_INFO pOptionalSignatureInfo; +} OCSP_SIGNED_REQUEST_INFO, *POCSP_SIGNED_REQUEST_INFO; + +typedef struct _OCSP_CERT_ID { + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + CRYPT_HASH_BLOB IssuerNameHash; + CRYPT_HASH_BLOB IssuerKeyHash; + CRYPT_INTEGER_BLOB SerialNumber; +} OCSP_CERT_ID, *POCSP_CERT_ID; + +typedef struct _OCSP_REQUEST_ENTRY { + OCSP_CERT_ID CertId; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_REQUEST_ENTRY, *POCSP_REQUEST_ENTRY; + +#define OCSP_REQUEST_V1 0 + +typedef struct _OCSP_REQUEST_INFO { + DWORD dwVersion; + PCERT_ALT_NAME_ENTRY pRequestorName; + DWORD cRequestEntry; + POCSP_REQUEST_ENTRY rgRequestEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_REQUEST_INFO, *POCSP_REQUEST_INFO; + +#define OCSP_SUCCESSFUL_RESPONSE 0 +#define OCSP_MALFORMED_REQUEST_RESPONSE 1 +#define OCSP_INTERNAL_ERROR_RESPONSE 2 +#define OCSP_TRY_LATER_RESPONSE 3 +#define OCSP_SIG_REQUIRED_RESPONSE 5 +#define OCSP_UNAUTHORIZED_RESPONSE 6 + +#define szOID_PKIX_OCSP_BASIC_SIGNED_RESPONSE "1.3.6.1.5.5.7.48.1.1" + +typedef struct _OCSP_RESPONSE_INFO { + DWORD dwStatus; + LPSTR pszObjId; + CRYPT_OBJID_BLOB Value; +} OCSP_RESPONSE_INFO, *POCSP_RESPONSE_INFO; + +typedef struct _OCSP_BASIC_SIGNED_RESPONSE_INFO { + CRYPT_DER_BLOB ToBeSigned; + OCSP_SIGNATURE_INFO SignatureInfo; +} OCSP_BASIC_SIGNED_RESPONSE_INFO, *POCSP_BASIC_SIGNED_RESPONSE_INFO; + +typedef struct _OCSP_BASIC_REVOKED_INFO { + FILETIME RevocationDate; + DWORD dwCrlReasonCode; +} OCSP_BASIC_REVOKED_INFO, *POCSP_BASIC_REVOKED_INFO; + +typedef struct _OCSP_BASIC_RESPONSE_ENTRY { + OCSP_CERT_ID CertId; + DWORD dwCertStatus; + union { + POCSP_BASIC_REVOKED_INFO pRevokedInfo; + } DUMMYUNIONNAME; + FILETIME ThisUpdate; + FILETIME NextUpdate; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_BASIC_RESPONSE_ENTRY, *POCSP_BASIC_RESPONSE_ENTRY; + +#define OCSP_BASIC_RESPONSE_V1 0 +#define OCSP_BASIC_BY_NAME_RESPONDER_ID 1 +#define OCSP_BASIC_BY_KEY_RESPONDER_ID 2 + +typedef struct _OCSP_BASIC_RESPONSE_INFO { + DWORD dwVersion; + DWORD dwResponderIdChoice; + union { + CERT_NAME_BLOB ByNameResponderId; + CRYPT_HASH_BLOB ByKeyResponderId; + } DUMMYUNIONNAME; + FILETIME ProducedAt; + DWORD cResponseEntry; + POCSP_BASIC_RESPONSE_ENTRY rgResponseEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_BASIC_RESPONSE_INFO, *POCSP_BASIC_RESPONSE_INFO; + typedef struct _CRL_CONTEXT { DWORD dwCertEncodingType; BYTE *pbCrlEncoded; @@ -3179,6 +3270,11 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define OCSP_SIGNED_REQUEST ((LPCSTR)65) +#define OCSP_REQUEST ((LPCSTR)66) +#define OCSP_RESPONSE ((LPCSTR)67) +#define OCSP_BASIC_SIGNED_RESPONSE ((LPCSTR)68) +#define OCSP_BASIC_RESPONSE ((LPCSTR)69) #define CNG_RSA_PUBLIC_KEY_BLOB ((LPCSTR)72) #define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500)

1 0

Brendan Shanks : ntdll: Ensure CONTEXT_EX on exception stack is initialized.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: a906f13f774ca9fb575cd8cabb48fcb5ac4bf788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a906f13f774ca9fb575cd8ca… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Mar 3 10:24:22 2022 -0800 ntdll: Ensure CONTEXT_EX on exception stack is initialized. On non-AVX CPUs, CONTEXT_EX is not being initialized. In WOW64 mode, this results in invalid exception records when dispatch_wow_exception() uses RtlCopyContext(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 23 +++++++++++++++++++---- dlls/ntdll/unix/signal_x86_64.c | 23 +++++++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..e2a6148d609 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -581,12 +581,23 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) xctx->Legacy.Length = sizeof(CONTEXT); xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); - xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + if (xstate_buffer) + { + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + context->ContextFlags |= CONTEXT_XSTATE; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + } + else + { + xctx->XState.Length = 25; + xctx->XState.Offset = 0; + + xctx->All.Length = sizeof(CONTEXT) + 24; /* sizeof(CONTEXT_EX) minus 8 alignment bytes on x64. */ + } - xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; xctx->All.Offset = -(LONG)sizeof(CONTEXT); - context->ContextFlags |= CONTEXT_XSTATE; } @@ -1456,6 +1467,10 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); } } + else + { + context_init_xstate( &stack->context, NULL ); + } stack->rec_ptr = &stack->rec; stack->context_ptr = &stack->context; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 68855dccacf..34334f72ff0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -411,12 +411,23 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) xctx->Legacy.Length = sizeof(CONTEXT); xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); - xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + if (xstate_buffer) + { + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + context->ContextFlags |= CONTEXT_XSTATE; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + } + else + { + xctx->XState.Length = 25; + xctx->XState.Offset = 0; + + xctx->All.Length = sizeof(CONTEXT) + 24; /* sizeof(CONTEXT_EX) minus 8 alignment bytes on x64. */ + } - xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; xctx->All.Offset = -(LONG)sizeof(CONTEXT); - context->ContextFlags |= CONTEXT_XSTATE; } static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ @@ -2195,6 +2206,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); } } + else + { + context_init_xstate( &stack->context, NULL ); + } CS_sig(sigcontext) = cs64_sel; RIP_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher;

1 0

Eric Pouech : setupapi/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: b73e3102009cc7151ab58321800aeded24c1307f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73e3102009cc7151ab58321… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:26:12 2022 +0100 setupapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 1 - dlls/setupapi/tests/devinst.c | 1140 ++++++++++++++++++------------------- dlls/setupapi/tests/dialog.c | 12 +- dlls/setupapi/tests/diskspace.c | 80 +-- dlls/setupapi/tests/install.c | 428 +++++++------- dlls/setupapi/tests/misc.c | 162 +++--- dlls/setupapi/tests/parser.c | 76 +-- dlls/setupapi/tests/query.c | 36 +- dlls/setupapi/tests/setupcab.c | 44 +- dlls/setupapi/tests/stringtable.c | 48 +- 10 files changed, 1013 insertions(+), 1014 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b73e3102009cc7151ab5…

1 0

Eric Pouech : setupapi/tests: Use correct integral type.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 0e4c108490db8d1c7b3c5d016979ace327d2c8ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4c108490db8d1c7b3c5d01… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:26:06 2022 +0100 setupapi/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/parser.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index c18063fbe38..17251fc923b 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -268,9 +268,8 @@ static void test_enum_sections(void) static const char *contents = STD_HEADER "[s1]\nfoo=bar\n[s2]\nbar=foo\n[s3]\n[strings]\na=b\n"; BOOL ret; - DWORD len; HINF hinf; - UINT err, index; + UINT err, index, len; char buffer[256]; if (!pSetupEnumInfSectionsA)

1 0

Eric Pouech : serialui/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 2add24bd7dfe1aea00c2852f3dfef5a406787275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2add24bd7dfe1aea00c2852f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:59 2022 +0100 serialui/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/tests/Makefile.in | 1 - dlls/serialui/tests/confdlg.c | 64 ++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2add24bd7dfe1aea00c2…

1 0

Eric Pouech : secur32/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: a92db992c98776ddeb4b3e25327ef2481d3180f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a92db992c98776ddeb4b3e25… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:53 2022 +0100 secur32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/Makefile.in | 1 - dlls/secur32/tests/main.c | 12 +- dlls/secur32/tests/negotiate.c | 46 +++---- dlls/secur32/tests/ntlm.c | 46 +++---- dlls/secur32/tests/schannel.c | 286 ++++++++++++++++++++--------------------- dlls/secur32/tests/secur32.c | 86 ++++++------- 6 files changed, 238 insertions(+), 239 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a92db992c98776ddeb4b…

1 0

Eric Pouech : scrobj/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: ff63f8165add4d9e72eede6de98fd3d9def410b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff63f8165add4d9e72eede6d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:47 2022 +0100 scrobj/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/tests/Makefile.in | 1 - dlls/scrobj/tests/scrobj.c | 106 +++++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff63f8165add4d9e72ee…

1 0

Eric Pouech : schedsvc/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: bb14e7b79fcfb59385051cfb1c34a8d22d15fd9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb14e7b79fcfb59385051cfb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:40 2022 +0100 schedsvc/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/Makefile.in | 1 - dlls/schedsvc/tests/atsvcapi.c | 44 ++++----- dlls/schedsvc/tests/rpcapi.c | 210 ++++++++++++++++++++-------------------- 3 files changed, 127 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb14e7b79fcfb5938505…

1 0

Eric Pouech : schannel/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: f953caf314614b3ee6f8547a879edeaa43a0ab39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f953caf314614b3ee6f8547a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:34 2022 +0100 schannel/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/tests/Makefile.in | 1 - dlls/schannel/tests/main.c | 48 ++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/schannel/tests/Makefile.in b/dlls/schannel/tests/Makefile.in index ee755457e98..ca82dccfd9b 100644 --- a/dlls/schannel/tests/Makefile.in +++ b/dlls/schannel/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = schannel.dll C_SRCS = \ diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 4b4b7b4f388..f876d934f3d 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -77,27 +77,27 @@ static void testInitialize(void) /* SpLsaModeInitialize does not care about the LSA version. */ status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables2 != NULL,"pTables: %p\n", pTables2); /* We can call it as many times we want. */ status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); /* It will always return the same pointer. */ ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); @@ -106,32 +106,32 @@ static void testInitialize(void) cUserTables = 0xdead; pUserTables = NULL; status = pSpUserModeInitialize(0, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_INVALID_PARAMETER, "status: 0x%x\n", status); - ok(Version == 0xdead, "Version: 0x%x\n", Version); - ok(cUserTables == 0xdead, "cTables: %d\n", cUserTables); + ok(status == STATUS_INVALID_PARAMETER, "status: 0x%lx\n", status); + ok(Version == 0xdead, "Version: 0x%lx\n", Version); + ok(cUserTables == 0xdead, "cTables: %ld\n", cUserTables); ok(pUserTables == NULL, "pUserTables: %p\n", pUserTables); status = pSpUserModeInitialize(0x20000, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_INVALID_PARAMETER, "status: 0x%x\n", status); - ok(Version == 0xdead, "Version: 0x%x\n", Version); - ok(cUserTables == 0xdead, "cTables: %d\n", cUserTables); + ok(status == STATUS_INVALID_PARAMETER, "status: 0x%lx\n", status); + ok(Version == 0xdead, "Version: 0x%lx\n", Version); + ok(cUserTables == 0xdead, "cTables: %ld\n", cUserTables); ok(pUserTables == NULL, "pUserTables: %p\n", pUserTables); /* Good version to SpUserModeInitialize */ status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%x\n", Version); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); + ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%lx\n", Version); ok(cUserTables == 2 || broken(cUserTables == 4), /* Win2k */ - "cUserTables: %d\n", cUserTables); + "cUserTables: %ld\n", cUserTables); ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables); /* Initializing user again */ status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &Version, &pUserTables2, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(pUserTables == pUserTables2, "pUserTables: %p, pUserTables2: %p\n", pUserTables, pUserTables2); } @@ -161,7 +161,7 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, else if (Version == SECPKG_INTERFACE_VERSION_8) size = SECPKG_FUNCTION_TABLE_SIZE_8; else { - ok(FALSE, "Unknown package version 0x%x\n", Version); + ok(FALSE, "Unknown package version 0x%lx\n", Version); return NULL; } @@ -217,21 +217,21 @@ static void testGetInfo(void) /* Get the dispatch table */ status = pSpLsaModeInitialize(0, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); /* Passing NULL into ->GetInfo causes a crash. */ /* First package: Unified */ status = pTables->GetInfo(&PackageInfo); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), - "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); + "fCapabilities: 0x%lx\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || PackageInfo.cbMaxToken == 0x6000, /* Vista */ - "cbMaxToken: 0x%x\n", + "cbMaxToken: 0x%lx\n", PackageInfo.cbMaxToken); /* Second package */ @@ -251,18 +251,18 @@ static void testGetInfo(void) status = pTables->GetInfo(&PackageInfo); ok(SUCCEEDED(status) || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ - "status: 0x%x\n", status); + "status: 0x%lx\n", status); if (SUCCEEDED(status)) { ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), - "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); + "fCapabilities: 0x%lx\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || PackageInfo.cbMaxToken == 0x6000, /* Win7 */ - "cbMaxToken: 0x%x\n", + "cbMaxToken: 0x%lx\n", PackageInfo.cbMaxToken); } }

1 0

Eric Pouech : sapi/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 0b3c158cb8cdb2cc4f7a3b5095ce72522cac86f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3c158cb8cdb2cc4f7a3b50… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:28 2022 +0100 sapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/Makefile.in | 1 - dlls/sapi/tests/automation.c | 10 ++--- dlls/sapi/tests/resource.c | 8 ++-- dlls/sapi/tests/stream.c | 8 ++-- dlls/sapi/tests/token.c | 100 +++++++++++++++++++++---------------------- dlls/sapi/tests/tts.c | 16 +++---- 6 files changed, 71 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b3c158cb8cdb2cc4f7a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022