January 2009 - Wine-commits

Michael Stefaniuc : include: Change twain.h to use LONG/ ULONG for Win64 compatibility.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 54b6a42a0a55b96048d34b1891e6d00e0ebf8f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b6a42a0a55b96048d34b189… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 6 00:09:48 2009 +0100 include: Change twain.h to use LONG/ULONG for Win64 compatibility. Also fix the compiler warnings introduced by this change. --- dlls/gphoto2.ds/capability.c | 6 +++--- dlls/gphoto2.ds/gphoto2_main.c | 6 +++--- dlls/sane.ds/sane_main.c | 2 +- dlls/twain_32/twain32_main.c | 6 +++--- include/twain.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index 754e58d..378ef2a 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -195,7 +195,7 @@ static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 valu { pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); - TRACE("-> %ld\n", value); + TRACE("-> %d\n", value); if (pCapability->hContainer) { @@ -258,7 +258,7 @@ static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, T *nrofvalues = pVal->NumItems; *values = HeapAlloc( GetProcessHeap(), 0, sizeof(TW_UINT16)*pVal->NumItems); memcpy (*values, pVal->ItemList, sizeof(TW_UINT16)*(*nrofvalues)); - FIXME("Current Index %ld, Default Index %ld\n", pVal->CurrentIndex, pVal->DefaultIndex); + FIXME("Current Index %d, Default Index %d\n", pVal->CurrentIndex, pVal->DefaultIndex); GlobalUnlock (pCapability->hContainer); return TRUE; } @@ -310,7 +310,7 @@ static TW_UINT16 GPHOTO2_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 act if (!GPHOTO2_OneValueGet32 (pCapability, &xfermechtemp)) return TWCC_LOWMEMORY; activeDS.capXferMech = xfermechtemp; - TRACE("xfermech is %ld\n", xfermechtemp); + TRACE("xfermech is %d\n", xfermechtemp); return TWCC_SUCCESS; } else if (pCapability->ConType == TWON_ENUMERATION) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 8cf1f9d..311abb8 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -343,7 +343,7 @@ static TW_UINT16 GPHOTO2_PendingXfersEndXfer (pTW_IDENTITY pOrigin, if (file->download) count++; } - TRACE("count = %ld\n", count); + TRACE("count = %d\n", count); pPendingXfers->Count = count; if (pPendingXfers->Count != 0) { activeDS.currentState = 6; @@ -379,7 +379,7 @@ static TW_UINT16 GPHOTO2_PendingXfersGet (pTW_IDENTITY pOrigin, if (file->download) count++; } - TRACE("count = %ld\n", count); + TRACE("count = %d\n", count); pPendingXfers->Count = count; activeDS.twCC = TWCC_SUCCESS; return TWRC_SUCCESS; @@ -1002,7 +1002,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); switch (DG) { diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index ea1af0e..468df3b 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -543,7 +543,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); switch (DG) { diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index 3239ec5..9eb2754 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -159,7 +159,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); if (pDest) { @@ -172,7 +172,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } DSM_twCC = TWCC_SUCCESS; - TRACE("Forwarding %ld/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); + TRACE("Forwarding %d/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); twRC = pSource->dsEntry(pOrigin, DG, DAT, MSG, pData); TRACE("return value is %d\n", twRC); return twRC; @@ -183,7 +183,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, twRC = TWAIN_SourceManagerHandler (pOrigin, DAT, MSG, pData); break; default: - FIXME("The DSM does not handle DG %ld\n", DG); + FIXME("The DSM does not handle DG %d\n", DG); DSM_twCC = TWCC_BADPROTOCOL; twRC = TWRC_FAILURE; } diff --git a/include/twain.h b/include/twain.h index 13bc406..a7ff0f0 100644 --- a/include/twain.h +++ b/include/twain.h @@ -127,10 +127,10 @@ typedef char TW_STR255[256], FAR *pTW_STR255; /* Numeric types. */ typedef char TW_INT8, FAR *pTW_INT8; typedef short TW_INT16, FAR *pTW_INT16; -typedef long TW_INT32, FAR *pTW_INT32; +typedef LONG TW_INT32, FAR *pTW_INT32; typedef unsigned char TW_UINT8, FAR *pTW_UINT8; typedef unsigned short TW_UINT16, FAR *pTW_UINT16; -typedef unsigned long TW_UINT32, FAR *pTW_UINT32; +typedef ULONG TW_UINT32, FAR *pTW_UINT32; typedef unsigned short TW_BOOL, FAR *pTW_BOOL; /* Fixed point structure type. */

1 0

Michael Stefaniuc : include: Change mapi. h to use ULONG for Win64 compatibility.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: ba01d15b1fd1ab58345e4feccfb96f9e47c8fa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba01d15b1fd1ab58345e4fecc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 6 00:09:23 2009 +0100 include: Change mapi.h to use ULONG for Win64 compatibility. --- dlls/mapi32/sendmail.c | 2 +- include/mapi.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 4103117..7b8de66 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -71,7 +71,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, HRESULT res; DWORD size; - TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08x)\n", session, uiparam, + TRACE( "(0x%08x 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, message, flags, reserved ); if (!message) return MAPI_E_FAILURE; diff --git a/include/mapi.h b/include/mapi.h index f8695f3..2d335ea 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -27,15 +27,15 @@ extern "C" { #ifndef __LHANDLE #define __LHANDLE -typedef unsigned long LHANDLE, *LPLHANDLE; +typedef ULONG LHANDLE, *LPLHANDLE; #endif #define lhSessionNull ((LHANDLE)0) #ifndef WINE_FLAGS_DEFINED #define WINE_FLAGS_DEFINED -typedef unsigned long FLAGS; +typedef ULONG FLAGS; #endif -typedef unsigned long* LPULONG; +typedef ULONG *LPULONG; typedef struct {

1 0

Dylan Smith : richedit: Use 32-bit rather than 16-bit trackbar value for scrolling.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: f36191051416977796e4ec2a7990e36d9a73df23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36191051416977796e4ec2a7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 6 00:34:28 2009 -0500 richedit: Use 32-bit rather than 16-bit trackbar value for scrolling. --- dlls/riched20/editor.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index abb9078..c7b8f40 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4004,8 +4004,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, break; case SB_THUMBTRACK: case SB_THUMBPOSITION: - ME_ScrollAbs(editor,HIWORD(wParam)); + { + SCROLLINFO sbi; + sbi.cbSize = sizeof(sbi); + sbi.fMask = SIF_TRACKPOS; + /* Try to get 32-bit track position value. */ + if (!GetScrollInfo(editor->hWnd, SB_VERT, &sbi)) + /* GetScrollInfo failed, settle for 16-bit value in wParam. */ + sbi.nTrackPos = HIWORD(wParam); + + ME_ScrollAbs(editor, sbi.nTrackPos); break; + } } if (msg == EM_SCROLL) return 0x00010000 | (((ME_GetYScrollPos(editor) - origNPos)/lineHeight) & 0xffff);

1 0

Hans Leidekker : sfc: Add missing exports.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: c8513986f2571958531b67750ab34a8e8ce1ac74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8513986f2571958531b67750… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 08:33:52 2009 +0100 sfc: Add missing exports. --- dlls/sfc/sfc.spec | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 8afb515..2db3cb3 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -1,3 +1,15 @@ +1 stub @ +2 stub @ +3 stub @ +4 stub @ +5 stub @ +6 stub @ +7 stub @ +8 stub @ +9 stub @ @ stub SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected +@ stub SfcWLEventLogoff +@ stub SfcWLEventLogon +@ stub SfpVerifyFile

1 0

Michael Stefaniuc : include: Use ULONG instead of unsigned long in ipexport .h.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 92892873beefd075de8adf918f35da23a619313e URL: http://source.winehq.org/git/wine.git/?a=commit;h=92892873beefd075de8adf918… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 6 00:05:25 2009 +0100 include: Use ULONG instead of unsigned long in ipexport.h. Fix also the compiler warnings introduced by this change. --- dlls/iphlpapi/icmp.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- include/ipexport.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index b868603..ca965fb 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -492,7 +492,7 @@ DWORD WINAPI IcmpSendEcho2( DWORD Timeout ) { - TRACE("(%p, %p, %p, %p, %08lx, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, + TRACE("(%p, %p, %p, %p, %08x, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, Event, ApcRoutine, ApcContext, DestinationAddress, RequestData, RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c7a4a3f..f580ca8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1550,7 +1550,7 @@ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterIn */ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHops, PULONG RTT) { - FIXME("(DestIpAddress 0x%08lx, HopCount %p, MaxHops %d, RTT %p): stub\n", + FIXME("(DestIpAddress 0x%08x, HopCount %p, MaxHops %d, RTT %p): stub\n", DestIpAddress, HopCount, MaxHops, RTT); return FALSE; } @@ -1880,7 +1880,7 @@ DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped) */ DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAddrLen) { - FIXME("(DestIP 0x%08lx, SrcIP 0x%08lx, pMacAddr %p, PhyAddrLen %p): stub\n", + FIXME("(DestIP 0x%08x, SrcIP 0x%08x, pMacAddr %p, PhyAddrLen %p): stub\n", DestIP, SrcIP, pMacAddr, PhyAddrLen); return ERROR_NOT_SUPPORTED; } diff --git a/include/ipexport.h b/include/ipexport.h index 9a02e00..71a44ba 100644 --- a/include/ipexport.h +++ b/include/ipexport.h @@ -21,9 +21,9 @@ #ifndef __WINE_IPEXPORT_H #define __WINE_IPEXPORT_H -typedef unsigned long IPAddr; -typedef unsigned long IPMask; -typedef unsigned long IP_STATUS; +typedef ULONG IPAddr; +typedef ULONG IPMask; +typedef ULONG IP_STATUS; struct ip_option_information { @@ -51,8 +51,8 @@ struct ip_option_information struct icmp_echo_reply { IPAddr Address; - unsigned long Status; - unsigned long RoundTripTime; + ULONG Status; + ULONG RoundTripTime; unsigned short DataSize; unsigned short Reserved; void* Data;

1 0

Michael Stefaniuc : include: sspi.h: Use the Win types as per MSDN.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 57ab0cd9a646ad16c28756d23aa997e904182a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ab0cd9a646ad16c28756d23… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 6 00:06:04 2009 +0100 include: sspi.h: Use the Win types as per MSDN. This improves the Win64 compatibility. --- dlls/rpcrt4/rpc_message.c | 2 +- dlls/schannel/tests/main.c | 8 ++-- dlls/secur32/ntlm.c | 2 +- dlls/secur32/schannel.c | 6 +- dlls/secur32/tests/ntlm.c | 14 +++--- dlls/secur32/tests/secur32.c | 4 +- include/sspi.h | 94 +++++++++++++++++++++--------------------- 7 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57ab0cd9a646ad16c2875…

1 0

Michael Stefaniuc : include: Change the rest of sspi.h to use LONG/ ULONG for Win64 compatibility.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 230fb06d2e3746d4518f181dd4da382d8474f847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230fb06d2e3746d4518f181dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 6 00:09:12 2009 +0100 include: Change the rest of sspi.h to use LONG/ULONG for Win64 compatibility. --- dlls/secur32/tests/schannel.c | 2 +- include/sspi.h | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index a6032be..154ba97 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -249,7 +249,7 @@ static void testAcquireSecurityContext(void) NULL, NULL, NULL, NULL, &cred, &exp); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); /* expriy is indeterminate in win2k3 */ - trace("expiry: %08lx%08lx\n", exp.HighPart, exp.LowPart); + trace("expiry: %08x%08x\n", exp.HighPart, exp.LowPart); pFreeCredentialsHandle(&cred); /* Bad version in SCHANNEL_CRED */ diff --git a/include/sspi.h b/include/sspi.h index 9a7134f..f8a71bd 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -71,8 +71,8 @@ typedef PSecHandle PCtxtHandle; typedef struct _SECURITY_INTEGER { - unsigned long LowPart; - long HighPart; + ULONG LowPart; + LONG HighPart; } SECURITY_INTEGER, *PSECURITY_INTEGER; typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; @@ -171,7 +171,7 @@ typedef struct _SecBufferDesc #define SECBUFFER_VERSION 0 typedef void (SEC_ENTRY *SEC_GET_KEY_FN)(void *Arg, void *Principal, - unsigned long KeyVer, void **Key, SECURITY_STATUS *Status); + ULONG KeyVer, void **Key, SECURITY_STATUS *Status); SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesA(PULONG pcPackages, PSecPkgInfoA *ppPackageInfo); @@ -532,7 +532,7 @@ typedef struct _SecPkgContext_PasswordExpiry typedef struct _SecPkgContext_SessionKey { - unsigned long SessionKeyLength; + ULONG SessionKeyLength; unsigned char *SessionKey; } SecPkgContext_SessionKey, *PSecPkgContext_SessionKey; @@ -551,24 +551,24 @@ typedef struct _SecPkgContext_PackageInfoW typedef struct _SecPkgContext_Flags { - unsigned long Flags; + ULONG Flags; } SecPkgContext_Flags, *PSecPkgContext_Flags; typedef struct _SecPkgContext_UserFlags { - unsigned long UserFlags; + ULONG UserFlags; } SecPkgContext_UserFlags, *PSecPkgContext_UserFlags; typedef struct _SecPkgContext_NegotiationInfoA { - PSecPkgInfoA PackageInfo; - unsigned long NegotiationState; + PSecPkgInfoA PackageInfo; + ULONG NegotiationState; } SecPkgContext_NegotiationInfoA, *PSecPkgContext_NegotiationInfoA; typedef struct _SecPkgContext_NegotiationInfoW { - PSecPkgInfoW PackageInfo; - unsigned long NegotiationState; + PSecPkgInfoW PackageInfo; + ULONG NegotiationState; } SecPkgContext_NegotiationInfoW, *PSecPkgContext_NegotiationInfoW; #define SecPkgContext_NegotiationInfo WINELIB_NAME_AW(SecPkgContext_NegotiationInfo) @@ -598,14 +598,14 @@ typedef struct _SecPkgContext_NativeNamesW typedef struct _SecPkgContext_CredentialNameA { - unsigned long CredentialType; - SEC_CHAR *sCredentialName; + ULONG CredentialType; + SEC_CHAR *sCredentialName; } SecPkgContext_CredentialNameA, *PSecPkgContext_CredentialNameA; typedef struct _SecPkgContext_CredentialNameW { - unsigned long CredentialType; - SEC_WCHAR *sCredentialName; + ULONG CredentialType; + SEC_WCHAR *sCredentialName; } SecPkgContext_CredentialNameW, *PSecPkgContext_CredentialNameW; #define SecPkgContext_CredentialName WINELIB_NAME_AW(SecPkgContext_CredentialName) @@ -618,20 +618,20 @@ typedef struct _SecPkgContext_AccessToken typedef struct _SecPkgContext_TargetInformation { - unsigned long MarshalledTargetInfoLength; + ULONG MarshalledTargetInfoLength; unsigned char *MarshalledTargetInfo; } SecPkgContext_TargetInformation, *PSecPkgContext_TargetInformation; typedef struct _SecPkgContext_AuthzID { - unsigned long AuthzIDLength; - char *AuthzID; + ULONG AuthzIDLength; + char *AuthzID; } SecPkgContext_AuthzID, *PSecPkgContext_AuthzID; typedef struct _SecPkgContext_Target { - unsigned long TargetLength; - char *Target; + ULONG TargetLength; + char *Target; } SecPkgContext_Target, *PSecPkgContext_Target; SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext);

1 0

Juan Lang : crypt32: Use specified inner content type for signed messages when it's given.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: f2df415ac15862cb78e8c2eab7b4e7367da32bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2df415ac15862cb78e8c2eab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 5 14:33:22 2009 -0800 crypt32: Use specified inner content type for signed messages when it's given. --- dlls/crypt32/msg.c | 59 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 874f393..b04af9e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1169,6 +1169,7 @@ static BOOL CSignedMsgData_Update(CSignedMsgData *msg_data, typedef struct _CSignedEncodeMsg { CryptMsgBase base; + LPSTR innerOID; CRYPT_DATA_BLOB data; CSignedMsgData msg_data; } CSignedEncodeMsg; @@ -1178,6 +1179,7 @@ static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) CSignedEncodeMsg *msg = (CSignedEncodeMsg *)hCryptMsg; DWORD i; + CryptMemFree(msg->innerOID); CryptMemFree(msg->data.pbData); CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCertEncoded); CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCrlEncoded); @@ -1227,32 +1229,46 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, case CMSG_BARE_CONTENT_PARAM: { CRYPT_SIGNED_INFO info; - char oid_rsa_data[] = szOID_RSA_data; + BOOL freeContent = FALSE; info = *msg->msg_data.info; - /* Quirk: OID is only encoded messages if an update has happened */ - if (msg->base.state != MsgStateInit) - info.content.pszObjId = oid_rsa_data; - else - info.content.pszObjId = NULL; - if (msg->data.cbData) + if (!msg->innerOID || !strcmp(msg->innerOID, szOID_RSA_data)) { - CRYPT_DATA_BLOB blob = { msg->data.cbData, msg->data.pbData }; + char oid_rsa_data[] = szOID_RSA_data; + + /* Quirk: OID is only encoded messages if an update has happened */ + if (msg->base.state != MsgStateInit) + info.content.pszObjId = oid_rsa_data; + else + info.content.pszObjId = NULL; + if (msg->data.cbData) + { + CRYPT_DATA_BLOB blob = { msg->data.cbData, msg->data.pbData }; - ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, - &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, - &info.content.Content.pbData, &info.content.Content.cbData); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, + &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, + &info.content.Content.pbData, &info.content.Content.cbData); + freeContent = TRUE; + } + else + { + info.content.Content.cbData = 0; + info.content.Content.pbData = NULL; + ret = TRUE; + } } else { - info.content.Content.cbData = 0; - info.content.Content.pbData = NULL; + info.content.pszObjId = msg->innerOID; + info.content.Content.cbData = msg->data.cbData; + info.content.Content.pbData = msg->data.pbData; ret = TRUE; } if (ret) { ret = CRYPT_AsnEncodeCMSSignedInfo(&info, pvData, pcbData); - LocalFree(info.content.Content.pbData); + if (freeContent) + LocalFree(info.content.Content.pbData); } break; } @@ -1357,9 +1373,22 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, CSignedEncodeMsg_Close, CSignedEncodeMsg_GetParam, CSignedEncodeMsg_Update, CRYPT_DefaultMsgControl); + if (pszInnerContentObjID) + { + msg->innerOID = CryptMemAlloc(strlen(pszInnerContentObjID) + 1); + if (msg->innerOID) + strcpy(msg->innerOID, pszInnerContentObjID); + else + ret = FALSE; + } + else + msg->innerOID = NULL; msg->data.cbData = 0; msg->data.pbData = NULL; - msg->msg_data.info = CryptMemAlloc(sizeof(CRYPT_SIGNED_INFO)); + if (ret) + msg->msg_data.info = CryptMemAlloc(sizeof(CRYPT_SIGNED_INFO)); + else + msg->msg_data.info = NULL; if (msg->msg_data.info) { memset(msg->msg_data.info, 0, sizeof(CRYPT_SIGNED_INFO));

1 0

Juan Lang : crypt32: Implement CryptMsgSignCTL.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 3eb3033deb082d041a37711435921e45c59574c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb3033deb082d041a3771143… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 5 13:34:57 2009 -0800 crypt32: Implement CryptMsgSignCTL. --- dlls/crypt32/msg.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 14140c2..874f393 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2927,7 +2927,29 @@ BOOL WINAPI CryptMsgSignCTL(DWORD dwMsgEncodingType, BYTE *pbCtlContent, DWORD cbCtlContent, PCMSG_SIGNED_ENCODE_INFO pSignInfo, DWORD dwFlags, BYTE *pbEncoded, DWORD *pcbEncoded) { - FIXME("(%08x, %p, %d, %p, %08x, %p, %p): stub\n", dwMsgEncodingType, + static char oid_ctl[] = szOID_CTL; + BOOL ret; + HCRYPTMSG msg; + + TRACE("(%08x, %p, %d, %p, %08x, %p, %p)\n", dwMsgEncodingType, pbCtlContent, cbCtlContent, pSignInfo, dwFlags, pbEncoded, pcbEncoded); - return FALSE; + + if (dwFlags) + { + FIXME("unimplemented for flags %08x\n", dwFlags); + return FALSE; + } + msg = CryptMsgOpenToEncode(dwMsgEncodingType, 0, CMSG_SIGNED, pSignInfo, + oid_ctl, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, pbCtlContent, cbCtlContent, TRUE); + if (ret) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbEncoded, + pcbEncoded); + CryptMsgClose(msg); + } + else + ret = FALSE; + return ret; }

1 0

Juan Lang : crypt32: Add stub for CryptMsgSignCTL.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 1efe0bc39bb8af7efc7084e15d69f28f7faab02f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efe0bc39bb8af7efc7084e15… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 5 13:33:45 2009 -0800 crypt32: Add stub for CryptMsgSignCTL. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 8d431b4..3f9ac98 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -153,7 +153,7 @@ @ stdcall CryptMsgGetParam(ptr long long ptr ptr) @ stdcall CryptMsgOpenToDecode(long long long long ptr ptr) @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) -@ stub CryptMsgSignCTL +@ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr) @ stdcall CryptMsgUpdate(ptr ptr long long) @ stub CryptMsgVerifyCountersignatureEncoded @ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 949717f..cbbbffe 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2905,3 +2905,12 @@ BOOL WINAPI CryptMsgEncodeAndSignCTL(DWORD dwMsgEncodingType, pSignInfo, dwFlags, pbEncoded, pcbEncoded); return FALSE; } + +BOOL WINAPI CryptMsgSignCTL(DWORD dwMsgEncodingType, BYTE *pbCtlContent, + DWORD cbCtlContent, PCMSG_SIGNED_ENCODE_INFO pSignInfo, DWORD dwFlags, + BYTE *pbEncoded, DWORD *pcbEncoded) +{ + FIXME("(%08x, %p, %d, %p, %08x, %p, %p): stub\n", dwMsgEncodingType, + pbCtlContent, cbCtlContent, pSignInfo, dwFlags, pbEncoded, pcbEncoded); + return FALSE; +}

1 0