February 2015 - Wine-Commits

Mark Harmstone : include: Add IMediaObject interfaces.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: e82f73bf9e104a89e16ebe8e841a942a13ef3f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82f73bf9e104a89e16ebe8e8… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 27 00:18:35 2015 +0000 include: Add IMediaObject interfaces. --- include/mediaobj.idl | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 176 insertions(+), 3 deletions(-) diff --git a/include/mediaobj.idl b/include/mediaobj.idl index cf7bb7a..04c82e8 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -19,12 +19,10 @@ import "unknwn.idl"; import "objidl.idl"; +import "strmif.idl"; interface IDMOQualityControl; interface IDMOVideoOutputOptimizations; -interface IMediaBuffer; -interface IMediaObject; -interface IMediaObjectInPlace; typedef struct _DMOMediaType { @@ -67,3 +65,178 @@ interface IEnumDMO : IUnknown [out] IEnumDMO **ppEnum ); } + +/***************************************************************************** + * IMediaBuffer interface + */ +[ + object, + uuid(59eff8b9-938c-4a26-82f2-95cb84cdc837), + local +] +interface IMediaBuffer : IUnknown +{ + HRESULT SetLength( + DWORD cbLength + ); + + HRESULT GetMaxLength( + [out] DWORD *pcbMaxLength + ); + + HRESULT GetBufferAndLength( + [out] BYTE **ppBuffer, + [out] DWORD *pcbLength + ); +} + +typedef struct _DMO_OUTPUT_DATA_BUFFER { + IMediaBuffer *pBuffer; + DWORD dwStatus; + REFERENCE_TIME rtTimestamp; + REFERENCE_TIME rtTimelength; +} DMO_OUTPUT_DATA_BUFFER, *PDMO_OUTPUT_DATA_BUFFER; + +enum _DMO_INPLACE_PROCESS_FLAGS { + DMO_INPLACE_NORMAL = 0x00000000, + DMO_INPLACE_ZERO = 0x00000001 +}; + +/***************************************************************************** + * IMediaObject interface + */ +[ + object, + uuid(d8ad0f58-5494-4102-97c5-ec798e59bcf4), + local +] +interface IMediaObject : IUnknown +{ + HRESULT GetStreamCount( + [out] DWORD *pcInputStreams, + [out] DWORD *pcOutputStreams + ); + + HRESULT GetInputStreamInfo( + DWORD dwInputStreamIndex, + [out] DWORD *pdwFlags + ); + + HRESULT GetOutputStreamInfo( + DWORD dwOutputStreamIndex, + [out] DWORD *pdwFlags + ); + + HRESULT GetInputType( + DWORD dwInputStreamIndex, + DWORD dwTypeIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetOutputType( + DWORD dwOutputStreamIndex, + DWORD dwTypeIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT SetInputType( + DWORD dwInputStreamIndex, + [in] const DMO_MEDIA_TYPE *pmt, + DWORD dwFlags + ); + + HRESULT SetOutputType( + DWORD dwOutputStreamIndex, + [in] const DMO_MEDIA_TYPE *pmt, + DWORD dwFlags + ); + + HRESULT GetInputCurrentType( + DWORD dwInputStreamIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetOutputCurrentType( + DWORD dwOutputStreamIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetInputSizeInfo( + DWORD dwInputStreamIndex, + [out] DWORD *pcbSize, + [out] DWORD *pcbMaxLookahead, + [out] DWORD *pcbAlignment + ); + + HRESULT GetOutputSizeInfo( + DWORD dwOutputStreamIndex, + [out] DWORD *pcbSize, + [out] DWORD *pcbAlignment + ); + + HRESULT GetInputMaxLatency( + DWORD dwInputStreamIndex, + [out] REFERENCE_TIME *prtMaxLatency + ); + + HRESULT SetInputMaxLatency( + DWORD dwInputStreamIndex, + REFERENCE_TIME rtMaxLatency + ); + + HRESULT Flush(); + + HRESULT Discontinuity(DWORD dwInputStreamIndex); + + HRESULT AllocateStreamingResources(); + + HRESULT FreeStreamingResources(); + + HRESULT GetInputStatus( + DWORD dwInputStreamIndex, + [out] DWORD *dwFlags + ); + + HRESULT ProcessInput( + DWORD dwInputStreamIndex, + IMediaBuffer *pBuffer, + DWORD dwFlags, + REFERENCE_TIME rtTimestamp, + REFERENCE_TIME rtTimelength + ); + + HRESULT ProcessOutput( + DWORD dwFlags, + DWORD cOutputBufferCount, + [in,out] DMO_OUTPUT_DATA_BUFFER *pOutputBuffers, + [out] DWORD *pdwStatus + ); + + HRESULT Lock(LONG bLock); +}; + +/***************************************************************************** + * IMediaObjectInPlace interface + */ + +[ + object, + uuid(651b9ad0-0fc7-4aa9-9538-d89931010741), + local +] +interface IMediaObjectInPlace : IUnknown { + HRESULT Process( + [in] ULONG ulSize, + [in,out] BYTE* pData, + [in] REFERENCE_TIME refTimeStart, + [in] DWORD dwFlags + ); + + HRESULT Clone( + [out] IMediaObjectInPlace **ppMediaObject + ); + + HRESULT GetLatency( + [out] REFERENCE_TIME *pLatencyTime + ); +}

1 0

Sebastian Lackner : ntdll: Try to handle write-watches while we' re on the signal stack.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 6bec132c7ac6d21bb7da45b93d67bfad47ef8b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bec132c7ac6d21bb7da45b93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 10 14:54:25 2015 +0100 ntdll: Try to handle write-watches while we're on the signal stack. --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 11 ++++++++++- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/virtual.c | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 92e5baf..674fcbc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -169,7 +169,7 @@ extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_ extern void virtual_clear_thread_stack(void) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e3ae7bd..53a2663 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -443,7 +443,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; } break; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8c8f7af..ccbdf4c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -326,7 +326,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; } break; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 1a69bc0..5c3aa819 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1907,7 +1907,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->ExceptionInformation[1] == 0xffffffff && check_invalid_gs( context )) goto done; if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; if (rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) @@ -2046,6 +2046,15 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ucontext_t *context = sigcontext; void *stack = init_handler( sigcontext, &fs, &gs ); + /* check for exceptions on the signal stack caused by write watches */ + if (get_trap_code(context) == TRAP_x86_PAGEFLT && + (char *)stack >= (char *)get_signal_stack() && + (char *)stack < (char *)get_signal_stack() + signal_stack_size && + !virtual_handle_fault( siginfo->si_addr, (get_error_code(context) >> 1) & 0x09, TRUE )) + { + return; + } + /* check for page fault inside the thread stack */ if (get_trap_code(context) == TRAP_x86_PAGEFLT && (char *)siginfo->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 0fca342..886da86 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -678,7 +678,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; /* FIXME ? */ rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0]))) + if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0], FALSE))) goto done; break; default: @@ -701,7 +701,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; /* FIXME ? */ rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0]))) + if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0], FALSE))) goto done; break; #endif diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c71069d..551687f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2286,7 +2286,7 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) set_cpu_context( context ); } break; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9f82204..dc5db00 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1521,7 +1521,7 @@ void virtual_clear_thread_stack(void) /*********************************************************************** * virtual_handle_fault */ -NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) +NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) { struct file_view *view; NTSTATUS ret = STATUS_ACCESS_VIOLATION; @@ -1542,7 +1542,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) /* ignore fault if page is writable now */ if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS; } - if (*vprot & VPROT_GUARD) + if (!on_signal_stack && (*vprot & VPROT_GUARD)) { VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); ret = STATUS_GUARD_PAGE_VIOLATION;

1 0

Nikolay Sivov : advapi32: Forward to CreateServiceWOW64W() when appropriate.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: daf0af431310f647d1849cb15f4f237f22cc9cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0af431310f647d1849cb15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:20:48 2015 +0300 advapi32: Forward to CreateServiceWOW64W() when appropriate. --- dlls/advapi32/service.c | 21 ++++++++++++++++----- programs/services/rpc.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 8e4dda8..f9b370b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1057,11 +1057,22 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, __TRY { - err = svcctl_CreateServiceW(hSCManager, lpServiceName, - lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, - multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, - (SC_RPC_HANDLE *)&handle); + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (is_wow64) + err = svcctl_CreateServiceWOW64W(hSCManager, lpServiceName, + lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, + (SC_RPC_HANDLE *)&handle); + else + err = svcctl_CreateServiceW(hSCManager, lpServiceName, + lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, + (SC_RPC_HANDLE *)&handle); } __EXCEPT(rpc_filter) { diff --git a/programs/services/rpc.c b/programs/services/rpc.c index d8ae117..43eb3cd 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -463,7 +463,7 @@ static DWORD parse_dependencies(const WCHAR *dependencies, struct service_entry return ERROR_SUCCESS; } -DWORD __cdecl svcctl_CreateServiceW( +static DWORD create_serviceW( SC_RPC_HANDLE hSCManager, LPCWSTR lpServiceName, LPCWSTR lpDisplayName, @@ -479,7 +479,8 @@ DWORD __cdecl svcctl_CreateServiceW( LPCWSTR lpServiceStartName, const BYTE *lpPassword, DWORD dwPasswordSize, - SC_RPC_HANDLE *phService) + SC_RPC_HANDLE *phService, + BOOL is_wow64) { struct service_entry *entry, *found; struct sc_manager_handle *manager; @@ -562,6 +563,30 @@ DWORD __cdecl svcctl_CreateServiceW( return create_handle_for_service(entry, dwDesiredAccess, phService); } +DWORD __cdecl svcctl_CreateServiceW( + SC_RPC_HANDLE hSCManager, + LPCWSTR lpServiceName, + LPCWSTR lpDisplayName, + DWORD dwDesiredAccess, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, + LPCWSTR lpBinaryPathName, + LPCWSTR lpLoadOrderGroup, + DWORD *lpdwTagId, + const BYTE *lpDependencies, + DWORD dwDependenciesSize, + LPCWSTR lpServiceStartName, + const BYTE *lpPassword, + DWORD dwPasswordSize, + SC_RPC_HANDLE *phService) +{ + WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); + return create_serviceW(hSCManager, lpServiceName, lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, + dwErrorControl, lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, lpDependencies, dwDependenciesSize, lpServiceStartName, + lpPassword, dwPasswordSize, phService, FALSE); +} + DWORD __cdecl svcctl_DeleteService( SC_RPC_HANDLE hService) { @@ -1521,8 +1546,9 @@ DWORD __cdecl svcctl_CreateServiceWOW64W( DWORD password_size, SC_RPC_HANDLE *service) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(servicename), wine_dbgstr_w(displayname), accessmask, wine_dbgstr_w(imagepath)); + return create_serviceW(scmanager, servicename, displayname, accessmask, service_type, start_type, error_control, imagepath, + loadordergroup, tagid, dependencies, depend_size, start_name, password, password_size, service, TRUE); } DWORD __cdecl svcctl_unknown46(void)

1 0

Nikolay Sivov : services: Make RPC interface compatible with native.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 0f80d4b61966af776365486c139c3e6238b984d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f80d4b61966af776365486c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:16:40 2015 +0300 services: Make RPC interface compatible with native. --- dlls/advapi32/service.c | 66 +++++- include/wine/svcctl.idl | 544 +++++++++++++++++++++++++++++++++++++++++------- programs/services/rpc.c | 318 ++++++++++++++++++++++++++-- 3 files changed, 821 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f80d4b61966af7763654…

1 0

Vincent Povirk : crypt32: Implement PKCS_RSA_PRIVATE_KEY decoding.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 7fb8ee199521241d637f82ebf1f662de819b1e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb8ee199521241d637f82ebf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 26 14:48:05 2015 -0600 crypt32: Implement PKCS_RSA_PRIVATE_KEY decoding. --- dlls/crypt32/decode.c | 144 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 4 +- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index e5f8baf..90d8cdf 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3936,6 +3936,147 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, return ret; } +#define RSA2_MAGIC 0x32415352 + +struct DECODED_RSA_PRIV_KEY +{ + DWORD version; + DWORD pubexp; + CRYPT_INTEGER_BLOB modulus; + CRYPT_INTEGER_BLOB privexp; + CRYPT_INTEGER_BLOB prime1; + CRYPT_INTEGER_BLOB prime2; + CRYPT_INTEGER_BLOB exponent1; + CRYPT_INTEGER_BLOB exponent2; + CRYPT_INTEGER_BLOB coefficient; +}; + +static BOOL WINAPI CRYPT_AsnDecodeRsaPrivKey(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + DWORD halflen; + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, version), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, modulus), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, modulus.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, pubexp), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, privexp), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, privexp.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, prime1), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, prime1.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, prime2), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, prime2.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, exponent1), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, exponent1.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, exponent2), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, exponent2.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, coefficient), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, coefficient.pbData), + 0 }, + }; + struct DECODED_RSA_PRIV_KEY *decodedKey = NULL; + DWORD size = 0; + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &decodedKey, + &size, NULL, NULL); + if (ret) + { + halflen = decodedKey->modulus.cbData / 2; + if ((decodedKey->modulus.cbData != halflen * 2) || + (decodedKey->prime1.cbData != halflen) || + (decodedKey->prime2.cbData != halflen) || + (decodedKey->exponent1.cbData != halflen) || + (decodedKey->exponent2.cbData != halflen) || + (decodedKey->coefficient.cbData != halflen) || + (decodedKey->privexp.cbData != halflen * 2)) + { + ret = FALSE; + SetLastError(CRYPT_E_BAD_ENCODE); + } + + if (ret) + { + DWORD bytesNeeded = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (halflen * 9); + + if (!pvStructInfo) + { + *pcbStructInfo = bytesNeeded; + ret = TRUE; + } + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + BLOBHEADER *hdr; + RSAPUBKEY *rsaPubKey; + BYTE *vardata; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + hdr = pvStructInfo; + hdr->bType = PRIVATEKEYBLOB; + hdr->bVersion = CUR_BLOB_VERSION; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_RSA_KEYX; + + rsaPubKey = (RSAPUBKEY *)((BYTE *)pvStructInfo + + sizeof(BLOBHEADER)); + rsaPubKey->magic = RSA2_MAGIC; + rsaPubKey->pubexp = decodedKey->pubexp; + rsaPubKey->bitlen = halflen * 16; + + vardata = (BYTE*)(rsaPubKey + 1); + memcpy(vardata, + decodedKey->modulus.pbData, halflen * 2); + memcpy(vardata + halflen * 2, + decodedKey->prime1.pbData, halflen); + memcpy(vardata + halflen * 3, + decodedKey->prime2.pbData, halflen); + memcpy(vardata + halflen * 4, + decodedKey->exponent1.pbData, halflen); + memcpy(vardata + halflen * 5, + decodedKey->exponent2.pbData, halflen); + memcpy(vardata + halflen * 6, + decodedKey->coefficient.pbData, halflen); + memcpy(vardata + halflen * 7, + decodedKey->privexp.pbData, halflen * 2); + } + } + + LocalFree(decodedKey); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5798,6 +5939,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(RSA_CSP_PUBLICKEYBLOB): decodeFunc = CRYPT_AsnDecodeRsaPubKey; break; + case LOWORD(PKCS_RSA_PRIVATE_KEY): + decodeFunc = CRYPT_AsnDecodeRsaPrivKey; + break; case LOWORD(X509_UNICODE_NAME): decodeFunc = CRYPT_AsnDecodeUnicodeName; break; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3240a84..b45b5f2 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8101,7 +8101,7 @@ static void test_decodeRsaPrivateKey(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, rsaPrivKeyDer, sizeof(rsaPrivKeyDer)-10, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD), + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD), "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); @@ -8110,7 +8110,7 @@ static void test_decodeRsaPrivateKey(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, rsaPrivKeyDer, sizeof(rsaPrivKeyDer), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Vincent Povirk : crypt32: Add test for PKCS_RSA_PRIVATE_KEY decoding.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 0c7ebefd679d00812e85576412c9f2a402537ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7ebefd679d00812e8557641… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 26 13:44:52 2015 -0600 crypt32: Add test for PKCS_RSA_PRIVATE_KEY decoding. --- dlls/crypt32/tests/encode.c | 283 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c7ebefd679d00812e855…

1 0

Nikolay Sivov : include: Fix packing of DWM_BLURBEHIND.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 1fcc75299f3e640ec60ef3caade9d14fa2e1299a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcc75299f3e640ec60ef3caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 18:15:17 2015 +0300 include: Fix packing of DWM_BLURBEHIND. Spotted by Christoph von Wittich. --- include/dwmapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index db13b5f..3c5ed8f 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -95,8 +95,6 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; -#include <poppack.h> - #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -109,6 +107,8 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +#include <poppack.h> + DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT);

1 0

Henri Verbeet : d3d10core: Implement d3d10_pixel_shader_SetPrivateData().
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: cae40a165361e2fc57eb7891cc4c463fc501ff4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae40a165361e2fc57eb7891c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:43 2015 +0100 d3d10core: Implement d3d10_pixel_shader_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 8526cf2..1756afc 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -229,6 +229,7 @@ struct d3d10_pixel_shader ID3D10PixelShader ID3D10PixelShader_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; ID3D10Device1 *device; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index dbd6132..cdd0608 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -560,10 +560,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelSh static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelShader *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D10PixelShader *iface, @@ -589,6 +591,9 @@ static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = static void STDMETHODCALLTYPE d3d10_pixel_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_pixel_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -608,12 +613,14 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ shader->ID3D10PixelShader_iface.lpVtbl = &d3d10_pixel_shader_vtbl; shader->refcount = 1; + wined3d_private_store_init(&shader->private_store); shader_info.input_signature = &input_signature; shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { ERR("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return hr; } @@ -629,6 +636,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ if (FAILED(hr)) { WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return E_INVALIDARG; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_geometry_shader_GetPrivateData( ).
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 6cd05c38a8018658083b6df3432c86b3a6d9d214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd05c38a8018658083b6df34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:42 2015 +0100 d3d10core: Implement d3d10_geometry_shader_GetPrivateData(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index ee47001..dbd6132 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -368,10 +368,12 @@ static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShad static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10GeometryShader *iface,

1 0

Austin English : include: Add more entries to msasn1.h.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: e9cab9b38144a720c291609fc0f3010614f4f75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cab9b38144a720c291609fc… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 26 17:13:29 2015 -0600 include: Add more entries to msasn1.h. --- include/msasn1.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index 8172849..32ace3e 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -30,6 +30,9 @@ typedef signed short ASN1int16_t; typedef ULONG ASN1uint32_t; typedef LONG ASN1int32_t; +typedef ASN1uint16_t ASN1char16_t; +typedef ASN1uint32_t ASN1char32_t; + typedef ASN1char_t *ASN1ztcharstring_t; typedef ASN1char16_t *ASN1ztchar16string_t; typedef ASN1char32_t *ASN1ztchar32string_t; @@ -40,6 +43,46 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +typedef void (WINAPI *ASN1FreeFun_t)(void *data); +typedef void (WINAPI *ASN1GenericFun_t)(void); + +typedef struct ASN1encoding_s *ASN1encoding_t; +typedef struct ASN1decoding_s *ASN1decoding_t; +typedef ASN1int32_t (WINAPI *ASN1PerEncFun_t)(ASN1encoding_t enc,void *data); +typedef ASN1int32_t (WINAPI *ASN1PerDecFun_t)(ASN1decoding_t enc,void *data); + +typedef struct tagASN1PerFunArr_t { + const ASN1PerEncFun_t *apfnEncoder; + const ASN1PerDecFun_t *apfnDecoder; +} ASN1PerFunArr_t; + +typedef ASN1int32_t (WINAPI *ASN1BerEncFun_t)(ASN1encoding_t enc,ASN1uint32_t tag,void *data); +typedef ASN1int32_t (WINAPI *ASN1BerDecFun_t)(ASN1decoding_t enc,ASN1uint32_t tag,void *data); + +typedef struct tagASN1BerFunArr_t { + const ASN1BerEncFun_t *apfnEncoder; + const ASN1BerDecFun_t *apfnDecoder; +} ASN1BerFunArr_t; + +typedef enum { + ASN1_PER_RULE_ALIGNED = 0x0001,ASN1_PER_RULE_UNALIGNED = 0x0002,ASN1_PER_RULE = ASN1_PER_RULE_ALIGNED | ASN1_PER_RULE_UNALIGNED, + ASN1_BER_RULE_BER = 0x0100,ASN1_BER_RULE_CER = 0x0200,ASN1_BER_RULE_DER = 0x0400, + ASN1_BER_RULE = ASN1_BER_RULE_BER | ASN1_BER_RULE_CER | ASN1_BER_RULE_DER +} ASN1encodingrule_e; + +typedef struct tagASN1module_t { + ASN1magic_t nModuleName; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; + ASN1uint32_t cPDUs; + const ASN1FreeFun_t *apfnFreeMemory; + const ASN1uint32_t *acbStructSize; + union { + ASN1PerFunArr_t PER; + ASN1BerFunArr_t BER; + }; +} *ASN1module_t; + #ifdef __cplusplus } #endif

1 0