December 2017 - Wine-Devel - list.winehq.org

[PATCH v2 1/3] ole32: Add in-process user marshalling for bitmaps.
by Zebediah Figura Dec. 8, 2017

Dec. 8, 2017

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ole32/tests/usrmarshal.c | 34 +++++++++++++++++++++++++++++ dlls/ole32/usrmarshal.c | 51 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 529ad757c6..aaf3556abd 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -1190,6 +1190,39 @@ static void test_marshal_HBRUSH(void) DeleteObject(hBrush); } +static void test_marshal_HBITMAP(void) +{ + static BYTE bmp_bits[1024]; + MIDL_STUB_MESSAGE stub_msg; + HBITMAP hBitmap, hBitmap2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer, *buffer_end; + ULONG size; + + hBitmap = CreateBitmap(16, 16, 1, 1, bmp_bits); + ok(hBitmap != 0, "CreateBitmap failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); + size = HBITMAP_UserSize(&umcb.Flags, 1, &hBitmap); + ok(size == 0xc, "Wrong size %d\n", size); + buffer = HeapAlloc(GetProcessHeap(), 0, size + 4); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC); + buffer_end = HBITMAP_UserMarshal(&umcb.Flags, buffer + 1, &hBitmap); + ok(buffer_end == buffer + 0xc, "HBITMAP_UserMarshal() returned wrong size %d\n", (LONG)(buffer_end - buffer)); + ok(*(ULONG *)(buffer + 0x4) == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", *(ULONG *)(buffer + 0x4)); + ok(*(ULONG *)(buffer + 0x8) == (ULONG)(ULONG_PTR)hBitmap, "wirestgm + 0x4 should be bitmap handle instead of 0x%08x\n", *(ULONG *)(buffer + 0x8)); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC); + HBITMAP_UserUnmarshal(&umcb.Flags, buffer + 1, &hBitmap2); + ok(hBitmap2 != NULL, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); + HBITMAP_UserFree(&umcb.Flags, &hBitmap2); + DeleteObject(hBitmap); +} + struct obj { IDataObject IDataObject_iface; @@ -1353,6 +1386,7 @@ START_TEST(usrmarshal) test_marshal_HDC(); test_marshal_HICON(); test_marshal_HBRUSH(); + test_marshal_HBITMAP(); test_GetDataHere_Proxy(); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 89d0675f48..696b243043 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -584,10 +584,17 @@ void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) * the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -ULONG __RPC_USER HBITMAP_UserSize(ULONG *pFlags, ULONG StartingSize, HBITMAP *phBmp) +ULONG __RPC_USER HBITMAP_UserSize(ULONG *flags, ULONG size, HBITMAP *bmp) { - FIXME(":stub\n"); - return StartingSize; + TRACE("(%s, %d, %p)\n", debugstr_user_flags(flags), size, *bmp); + + ALIGN_LENGTH(size, 3); + + size += sizeof(ULONG); + if (LOWORD(*flags) == MSHCTX_INPROC) + size += sizeof(ULONG); + + return size; } /****************************************************************************** @@ -609,10 +616,20 @@ ULONG __RPC_USER HBITMAP_UserSize(ULONG *pFlags, ULONG StartingSize, HBITMAP *ph * the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HBITMAP *phBmp) +unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *flags, unsigned char *buffer, HBITMAP *bmp) { - FIXME(":stub\n"); - return pBuffer; + TRACE("(%s, %p, %p)\n", debugstr_user_flags(flags), buffer, *bmp); + + ALIGN_POINTER(buffer, 3); + + if (LOWORD(*flags) == MSHCTX_INPROC) + { + *(ULONG *)buffer = WDT_INPROC_CALL; + buffer += sizeof(ULONG); + *(ULONG *)buffer = (ULONG)(ULONG_PTR)*bmp; + buffer += sizeof(ULONG); + } + return buffer; } /****************************************************************************** @@ -634,10 +651,26 @@ unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *pFlags, unsigned char *pBu * the first parameter is an ULONG. * This function is only intended to be called by the RPC runtime. */ -unsigned char * __RPC_USER HBITMAP_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HBITMAP *phBmp) +unsigned char * __RPC_USER HBITMAP_UserUnmarshal(ULONG *flags, unsigned char *buffer, HBITMAP *bmp) { - FIXME(":stub\n"); - return pBuffer; + ULONG context; + + TRACE("(%s, %p, %p)\n", debugstr_user_flags(flags), buffer, bmp); + + ALIGN_POINTER(buffer, 3); + + context = *(ULONG *)buffer; + buffer += sizeof(ULONG); + + if (context == WDT_INPROC_CALL) + { + *bmp = *(HBITMAP *)buffer; + buffer += sizeof(*bmp); + } + else + RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); + + return buffer; } /****************************************************************************** -- 2.15.1

2 5

[PATCH 1/5] ole32: Refactor OLE's data cache Save implementation.
by Sergio Gómez Del Real Dec. 8, 2017

Dec. 8, 2017

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 239 ++++++++++++++++++++++++------------------------- 1 file changed, 119 insertions(+), 120 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index c550c75cd3..f46f71215d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -775,16 +775,118 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry) return hr; } -static HRESULT DataCacheEntry_CreateStream(DataCacheEntry *cache_entry, - IStorage *storage, IStream **stream) +static void init_stream_header(DataCacheEntry *entry, PresentationDataHeader *header) { - WCHAR wszName[] = {2,'O','l','e','P','r','e','s', + if (entry->fmtetc.ptd) + FIXME("ptd not serialized\n"); + header->tdSize = sizeof(header->tdSize); + header->dvAspect = entry->fmtetc.dwAspect; + header->lindex = entry->fmtetc.lindex; + header->advf = entry->advise_flags; + header->unknown7 = 0; + header->dwObjectExtentX = 0; + header->dwObjectExtentY = 0; + header->dwSize = 0; +} + +static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) +{ + HRESULT hr = S_OK; + int data_size = GlobalSize(entry->stgmedium.u.hGlobal); + BITMAPINFO *bmi = GlobalLock(entry->stgmedium.u.hGlobal); + + if (!contents) + { + PresentationDataHeader header; + + init_stream_header(entry, &header); + hr = write_clipformat(stream, entry->fmtetc.cfFormat); + if (FAILED(hr)) goto end; + if (data_size) + { + header.dwSize = data_size; + /* Size in units of 0.01mm (ie. MM_HIMETRIC) */ + if (bmi->bmiHeader.biXPelsPerMeter != 0 && bmi->bmiHeader.biYPelsPerMeter != 0) + { + header.dwObjectExtentX = MulDiv(bmi->bmiHeader.biWidth, 100000, bmi->bmiHeader.biXPelsPerMeter); + header.dwObjectExtentY = MulDiv(bmi->bmiHeader.biHeight, 100000, bmi->bmiHeader.biYPelsPerMeter); + } + else + { + HDC hdc = GetDC(0); + header.dwObjectExtentX = MulDiv(bmi->bmiHeader.biWidth, 2540, GetDeviceCaps(hdc, LOGPIXELSX)); + header.dwObjectExtentY = MulDiv(bmi->bmiHeader.biHeight, 2540, GetDeviceCaps(hdc, LOGPIXELSY)); + ReleaseDC(0, hdc); + } + } + hr = IStream_Write(stream, &header, sizeof(PresentationDataHeader), NULL); + if (hr == S_OK && data_size) + hr = IStream_Write(stream, bmi, data_size, NULL); + } + +end: + if (bmi) GlobalUnlock(entry->stgmedium.u.hGlobal); + return hr; +} + +static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream) +{ + HRESULT hr = S_OK; + int data_size = 0; + void *data = NULL; + METAFILEPICT *mfpict = NULL; + + if (!contents) + { + PresentationDataHeader header; + + init_stream_header(entry, &header); + hr = write_clipformat(stream, entry->fmtetc.cfFormat); + if (FAILED(hr)) return hr; + if (entry->stgmedium.tymed != TYMED_NULL) + { + mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); + if (!mfpict) + return DV_E_STGMEDIUM; + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + header.dwObjectExtentX = mfpict->xExt; + header.dwObjectExtentY = mfpict->yExt; + header.dwSize = data_size; + data = HeapAlloc(GetProcessHeap(), 0, header.dwSize); + if (!data) + { + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + return E_OUTOFMEMORY; + } + GetMetaFileBitsEx(mfpict->hMF, header.dwSize, data); + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + } + hr = IStream_Write(stream, &header, sizeof(PresentationDataHeader), NULL); + if (hr == S_OK && data_size) + hr = IStream_Write(stream, data, data_size, NULL); + HeapFree(GetProcessHeap(), 0, data); + } + + return hr; +} + +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; + +static HRESULT create_stream(DataCacheEntry *cache_entry, IStorage *storage, + BOOL contents, IStream **stream) +{ + WCHAR pres[] = {2,'O','l','e','P','r','e','s', '0' + (cache_entry->stream_number / 100) % 10, '0' + (cache_entry->stream_number / 10) % 10, '0' + cache_entry->stream_number % 10, 0}; + const WCHAR *name; - /* FIXME: cache the created stream in This? */ - return IStorage_CreateStream(storage, wszName, + if (contents) + name = CONTENTS; + else + name = pres; + + return IStorage_CreateStream(storage, name, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, stream); } @@ -792,130 +894,29 @@ static HRESULT DataCacheEntry_CreateStream(DataCacheEntry *cache_entry, static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storage, BOOL same_as_load) { - PresentationDataHeader header; HRESULT hr; - IStream *pres_stream; - void *data = NULL; + IStream *stream; + BOOL contents = (cache_entry->id == 1); TRACE("stream_number = %d, fmtetc = %s\n", cache_entry->stream_number, debugstr_formatetc(&cache_entry->fmtetc)); - hr = DataCacheEntry_CreateStream(cache_entry, storage, &pres_stream); + hr = create_stream(cache_entry, storage, contents, &stream); if (FAILED(hr)) return hr; - hr = write_clipformat(pres_stream, cache_entry->fmtetc.cfFormat); - if (FAILED(hr)) - return hr; - - if (cache_entry->fmtetc.ptd) - FIXME("ptd not serialized\n"); - header.tdSize = sizeof(header.tdSize); - header.dvAspect = cache_entry->fmtetc.dwAspect; - header.lindex = cache_entry->fmtetc.lindex; - header.advf = cache_entry->advise_flags; - header.unknown7 = 0; - header.dwObjectExtentX = 0; - header.dwObjectExtentY = 0; - header.dwSize = 0; - - /* size the data */ - switch (cache_entry->fmtetc.cfFormat) - { - case CF_METAFILEPICT: - { - if (cache_entry->stgmedium.tymed != TYMED_NULL) - { - const METAFILEPICT *mfpict = GlobalLock(cache_entry->stgmedium.u.hMetaFilePict); - if (!mfpict) - { - IStream_Release(pres_stream); - return DV_E_STGMEDIUM; - } - header.dwObjectExtentX = mfpict->xExt; - header.dwObjectExtentY = mfpict->yExt; - header.dwSize = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); - GlobalUnlock(cache_entry->stgmedium.u.hMetaFilePict); - } - break; - } - case CF_DIB: - { - header.dwSize = GlobalSize(cache_entry->stgmedium.u.hGlobal); - if (header.dwSize) - { - const BITMAPINFO *bmi = GlobalLock(cache_entry->stgmedium.u.hGlobal); - /* Size in units of 0.01mm (ie. MM_HIMETRIC) */ - if (bmi->bmiHeader.biXPelsPerMeter != 0 && bmi->bmiHeader.biYPelsPerMeter != 0) - { - header.dwObjectExtentX = MulDiv( bmi->bmiHeader.biWidth, 100000, bmi->bmiHeader.biXPelsPerMeter ); - header.dwObjectExtentY = MulDiv( bmi->bmiHeader.biHeight, 100000, bmi->bmiHeader.biYPelsPerMeter ); - } - else - { - HDC hdc = GetDC(0); - header.dwObjectExtentX = MulDiv( bmi->bmiHeader.biWidth, 2540, GetDeviceCaps(hdc, LOGPIXELSX) ); - header.dwObjectExtentY = MulDiv( bmi->bmiHeader.biHeight, 2540, GetDeviceCaps(hdc, LOGPIXELSY) ); - ReleaseDC(0, hdc); - } - GlobalUnlock(cache_entry->stgmedium.u.hGlobal); - } - break; - } - default: - break; - } - - /* - * Write the header. - */ - hr = IStream_Write(pres_stream, &header, sizeof(PresentationDataHeader), - NULL); - if (FAILED(hr)) - { - IStream_Release(pres_stream); - return hr; - } - - /* get the data */ switch (cache_entry->fmtetc.cfFormat) { - case CF_METAFILEPICT: - { - if (cache_entry->stgmedium.tymed != TYMED_NULL) - { - const METAFILEPICT *mfpict = GlobalLock(cache_entry->stgmedium.u.hMetaFilePict); - if (!mfpict) - { - IStream_Release(pres_stream); - return DV_E_STGMEDIUM; - } - if (header.dwSize) - { - data = HeapAlloc(GetProcessHeap(), 0, header.dwSize); - GetMetaFileBitsEx(mfpict->hMF, header.dwSize, data); - GlobalUnlock(cache_entry->stgmedium.u.hMetaFilePict); - if (data) - { - hr = IStream_Write(pres_stream, data, header.dwSize, NULL); - HeapFree(GetProcessHeap(), 0, data); - } - } - } - break; - } - case CF_DIB: - { - data = GlobalLock(cache_entry->stgmedium.u.hGlobal); - if (header.dwSize) - hr = IStream_Write(pres_stream, data, header.dwSize, NULL); - GlobalUnlock(cache_entry->stgmedium.u.hGlobal); - break; - } - default: - break; + case CF_DIB: + hr = save_dib(cache_entry, contents, stream); + break; + case CF_METAFILEPICT: + hr = save_mfpict(cache_entry, contents, stream); + break; + default: + FIXME("got unsupported clipboard format %x\n", cache_entry->fmtetc.cfFormat); } - IStream_Release(pres_stream); + IStream_Release(stream); return hr; } @@ -1651,8 +1652,6 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s return add_cache_entry( This, fmt, 0, stm, contents_stream ); } -static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; - /************************************************************************ * DataCache_Load (IPersistStorage) * -- 2.14.1

2 9

[PATCH] bcrypt: Add support for AES encryption on macOS.
by Hans Leidekker Dec. 8, 2017

Dec. 8, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 2 +- dlls/bcrypt/bcrypt_main.c | 139 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 125 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 5d0f4cb6fe..fce97f85d3 100644 --- a/configure.ac +++ b/configure.ac @@ -397,7 +397,7 @@ AC_CHECK_HEADERS(\ AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ - CommonCrypto/CommonDigest.h \ + CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 931db2be99..765f7589be 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -21,9 +21,8 @@ #include "wine/port.h" #include <stdarg.h> -#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H -#include <CommonCrypto/CommonDigest.h> -#include <CommonCrypto/CommonHMAC.h> +#ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H +#include <CommonCrypto/CommonCryptor.h> #elif defined(SONAME_LIBGNUTLS) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> @@ -46,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); static HINSTANCE instance; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgnutls_handle; @@ -121,7 +120,7 @@ static void gnutls_uninitialize(void) wine_dlclose( libgnutls_handle, NULL, 0 ); libgnutls_handle = NULL; } -#endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ +#endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONCRYPTOR_H */ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) @@ -731,7 +730,16 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +static ULONG get_block_size( enum alg_id alg ) +{ + ULONG ret = 0, size = sizeof(ret); + get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); + return ret; +} +#endif + +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) struct key { struct object hdr; @@ -742,13 +750,6 @@ struct key ULONG secret_len; }; -static ULONG get_block_size( enum alg_id alg ) -{ - ULONG ret = 0, size = sizeof(ret); - get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); - return ret; -} - static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -858,6 +859,114 @@ static NTSTATUS key_destroy( struct key *key ) HeapFree( GetProcessHeap(), 0, key ); return STATUS_SUCCESS; } +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +struct key +{ + struct object hdr; + enum alg_id alg_id; + ULONG block_size; + CCCryptorRef ref_encrypt; + CCCryptorRef ref_decrypt; + UCHAR *secret; + ULONG secret_len; +}; + +static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) +{ + UCHAR *buffer; + + switch (id) + { + case ALG_ID_AES: + break; + + default: + FIXME( "algorithm %u not supported\n", id ); + return STATUS_NOT_SUPPORTED; + } + + if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, secret, secret_len ); + + key->alg_id = id; + key->ref_encrypt = NULL; /* initialized on first use */ + key->ref_decrypt = NULL; + key->secret = buffer; + key->secret_len = secret_len; + + return STATUS_SUCCESS; +} + +static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +{ + CCCryptorStatus status; + + if (key->ref_encrypt) + { + CCCryptorRelease( key->ref_encrypt ); + key->ref_encrypt = NULL; + } + if (key->ref_decrypt) + { + CCCryptorRelease( key->ref_decrypt ); + key->ref_decrypt = NULL; + } + + if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) + { + WARN( "CCCryptorCreateWithMode failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) + { + WARN( "CCCryptorCreateWithMode failed %d\n", status ); + CCCryptorRelease( key->ref_encrypt ); + key->ref_encrypt = NULL; + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) +{ + CCCryptorStatus status; + + if ((status = CCCryptorUpdate( key->ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + { + WARN( "CCCryptorUpdate failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) +{ + CCCryptorStatus status; + + if ((status = CCCryptorUpdate( key->ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + { + WARN( "CCCryptorUpdate failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_destroy( struct key *key ) +{ + if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); + if (key->ref_decrypt) CCCryptorRelease( key->ref_decrypt ); + HeapFree( GetProcessHeap(), 0, key->secret ); + HeapFree( GetProcessHeap(), 0, key ); + return STATUS_SUCCESS; +} #else struct key { @@ -1066,14 +1175,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst ); -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) gnutls_initialize(); #endif break; case DLL_PROCESS_DETACH: if (reserved) break; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) gnutls_uninitialize(); #endif break; -- 2.11.0

1 0

[PATCH] testbot: Minor cosmetic tweaks to the installation guide.
by Francois Gouget Dec. 8, 2017

Dec. 8, 2017

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/INSTALL.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 99471506..15b2b91b 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -42,7 +42,7 @@ General setup for the web site: cd var touch log mkdir jobs latest patches socket staging - sudo chown WWWRUN:winehq staging + sudo chown wwwrun:winehq staging chmod g+w * - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. @@ -120,7 +120,7 @@ Dependencies: - Create a Linux VM and set it up so it can generate PE executables with MinGW. For instance on Debian you should install autoconf, bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to - have 64bit VMs then make sure MinGW can generate 64bit PE executables. + have 64 bit VMs then make sure MinGW can generate 64 bit PE executables. - You may also want to install ccache. - You will also need genisoimage. - Create a new user, 'testbot' for instance, and log in as that user. -- 2.15.0

1 0

[PATCH] testbot/testagentd: Detach from the console if given the --detach option.
by Francois Gouget Dec. 8, 2017

Dec. 8, 2017

This makes it possible to close the console without killing testagentd, and to start the tests from a non-minimized window. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch is already in use on about half of the TestBot's VMs to avoid focus issues with some of the Direct3D tests. testbot/src/testagentd/platform.h | 3 +++ testbot/src/testagentd/platform_unix.c | 15 +++++++++++++++ testbot/src/testagentd/platform_windows.c | 5 +++++ testbot/src/testagentd/testagentd.c | 11 ++++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index ea807fb6..84ab4917 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -58,6 +58,9 @@ typedef int SOCKET; int platform_init(void); +/* Detach from the console so closing it won't kill testagentd. */ +void platform_detach_console(void); + enum run_flags_t { RUN_DNT = 1, RUN_DNTRUNC_OUT = 2, diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index b27c0165..dcd4d69b 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -328,6 +328,21 @@ void ta_freeaddrinfo(struct addrinfo *addresses) return freeaddrinfo(addresses); } +void platform_detach_console(void) +{ + pid_t pid; + + pid = fork(); + if (pid != 0) + exit(0); + + /* Daemonize */ + signal(SIGHUP, SIG_IGN); + pid = fork(); + if (pid != 0) + exit(0); +} + int platform_init(void) { struct sigaction sa, osa; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 70272a65..1efac1c7 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -450,6 +450,11 @@ void ta_freeaddrinfo(struct addrinfo *addresses) } } +void platform_detach_console(void) +{ + FreeConsole(); +} + int platform_init(void) { HMODULE hdll; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index fce28b27..5f0f54ca 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1218,6 +1218,7 @@ int main(int argc, char** argv) { const char* p; char** arg; + int opt_detach = 0; char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; @@ -1242,6 +1243,10 @@ int main(int argc, char** argv) { opt_debug = 1; } + else if (strcmp(*arg, "--detach") == 0) + { + opt_detach = 1; + } else if (strcmp(*arg, "--help") == 0) { opt_usage = 1; @@ -1313,7 +1318,7 @@ int main(int argc, char** argv) } if (opt_usage) { - printf("Usage: %s [--debug] [--help] PORT [SRCHOST]\n", name0); + printf("Usage: %s [--debug] [--detach] [--help] PORT [SRCHOST]\n", name0); printf("\n"); printf("Provides a simple way to send/receive files and to run scripts on this host.\n"); printf("\n"); @@ -1321,9 +1326,13 @@ int main(int argc, char** argv) printf(" PORT The port to listen on for connections.\n"); printf(" SRCHOST If specified, only connections from this host will be accepted.\n"); printf(" --debug Prints detailed information about what happens.\n"); + printf(" --detach Detach from the console / terminal. Note that on Windows you should\n"); + printf(" combine this with start: start %s --detach ...\n", name0); printf(" --help Shows this usage message.\n"); exit(0); } + if (opt_detach) + platform_detach_console(); /* Bind to the host in a protocol neutral way */ #ifdef SOCK_CLOEXEC -- 2.15.0

1 0

[PATCH] testbot: Assorted wording fixes.
by Francois Gouget Dec. 8, 2017

Dec. 8, 2017

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/ObjectModel/Collection.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2e239765..62024d97 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -394,7 +394,7 @@ EOF { # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine - # so all any failure it reported not caused by this patch. + # so any failure it reported is not caused by this patch. $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log", $BaseName, $StepTask->CmdLineArg); } diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1b29ec16..f31a7133 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -521,7 +521,7 @@ sub KeyChanged($$$) if (defined($self->{Items}{$NewKey})) { - die "Cant change key, new key $NewKey already exists"; + die "Could not change key, new key $NewKey already exists"; } $FullKey = $self->GetFullKey($NewKey); $ScopeItems->{$FullKey} = $Item if (defined $FullKey); diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 2139b6d5..7b18df97 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -190,7 +190,7 @@ From: $RobotEMail To: $Recipient Subject: winetestbot account request -password reset request for your account $UserName was received via the website. +A password reset request for your account $UserName was received via the website. You can pick a new password by going to: $URL EOF -- 2.15.0

1 0

[PATCH] testbot: Document Collection::DeleteItem().
by Francois Gouget Dec. 8, 2017

Dec. 8, 2017

In particular note that it cascades to other tables that have foreign keys to the row being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index f31a7133..d4418603 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -550,6 +550,20 @@ sub GetMasterCols($) return ($self->{MasterColNames}, $self->{MasterColValues}); } +=pod +=over 12 + +=item C<DeleteItem()> + +Deletes the specified Item from the Collection and the database backing it. + +Note that if there are other tables with a foreign key referencing this item +the corresponding rows will be deleted too. So for instance deleting a Job +will also delete the Steps and Tasks it is composed of. + +=back +=cut + sub DeleteItem($$) { my ($self, $Item) = @_; -- 2.15.0

1 0

[PATCH v3 1/8] include: Add dhtmled.idl and dhtmldid.h
by Alex Henrie Dec. 7, 2017

Dec. 7, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: Added default, source, and id attributes --- include/Makefile.in | 2 + include/dhtmldid.h | 67 +++++ include/dhtmled.idl | 716 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 785 insertions(+) create mode 100644 include/dhtmldid.h create mode 100644 include/dhtmled.idl diff --git a/include/Makefile.in b/include/Makefile.in index fa1e42738b..430c4733af 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -58,6 +58,7 @@ IDL_SRCS = \ ddstream.idl \ devenum.idl \ devicetopology.idl \ + dhtmled.idl \ dimm.idl \ dispex.idl \ docobj.idl \ @@ -342,6 +343,7 @@ HEADER_SRCS = \ devpkey.h \ devpropdef.h \ dhcpcsdk.h \ + dhtmldid.h \ difxapi.h \ digitalv.h \ dinput.h \ diff --git a/include/dhtmldid.h b/include/dhtmldid.h new file mode 100644 index 0000000000..85c286a102 --- /dev/null +++ b/include/dhtmldid.h @@ -0,0 +1,67 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define DISPID_LOADDOCUMENT 1 +#define DISPID_EXECCOMMAND 2 +#define DISPID_QUERYSTATUS 3 +#define DISPID_SAVEDOCUMENT 4 +#define DISPID_SETCONTEXTMENU 5 +#define DISPID_DOCUMENT 6 +#define DISPID_ACTIVATEAPPLETS 7 +#define DISPID_ACTIVATEACTIVEXCONTROLS 8 +#define DISPID_ACTIVATEDTCS 9 +#define DISPID_SHOWDETAILS 11 +#define DISPID_SHOWBORDERS 12 +#define DISPID_DHTMLEDITAPPEARANCE 13 +#define DISPID_DHTMLEDITSCROLLBARS 14 +#define DISPID_SCROLLBARAPPEARANCE 15 +#define DISPID_SOURCECODEPRESERVATION 16 +#define DISPID_DOCUMENTHTML 17 +#define DISPID_ABSOLUTEDROPMODE 18 +#define DISPID_SNAPTOGRIDX 19 +#define DISPID_SNAPTOGRIDY 20 +#define DISPID_SNAPTOGRID 21 +#define DISPID_ISDIRTY 22 +#define DISPID_CURRENTDOCUMENTPATH 23 +#define DISPID_BASEURL 24 +#define DISPID_DOCUMENTTITLE 25 +#define DISPID_BROWSEMODE 26 +#define DISPID_NEWDOCUMENT 27 +#define DISPID_PRINT 28 +#define DISPID_LOADURL 29 +#define DISPID_USEDIVONCR 30 +#define DISPID_FILTERSRCCODE 31 +#define DISPID_REFRESHDOC 32 +#define DISPID_BUSY 33 + +#define DISPID_DOCUMENTCOMPLETE 1 +#define DISPID_DISPLAYCHANGED 2 +#define DISPID_SHOWCONTEXTMENU 3 +#define DISPID_CONTEXTMENUACTION 4 +#define DISPID_ONMOUSEDOWN 5 +#define DISPID_ONMOUSEMOVE 6 +#define DISPID_ONMOUSEUP 7 +#define DISPID_ONMOUSEOUT 8 +#define DISPID_ONMOUSEOVER 9 +#define DISPID_ONCLICK 10 +#define DISPID_ONDBLCLICK 11 +#define DISPID_ONKEYDOWN 12 +#define DISPID_ONKEYPRESS 13 +#define DISPID_ONKEYUP 14 +#define DISPID_ONBLUR 15 +#define DISPID_ONREADYSTATECHANGE 16 diff --git a/include/dhtmled.idl b/include/dhtmled.idl new file mode 100644 index 0000000000..25f3ea9432 --- /dev/null +++ b/include/dhtmled.idl @@ -0,0 +1,716 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "docobj.idl"; +import "mshtml.idl"; + +#include "dhtmldid.h" + +[ + uuid(683364a1-b37d-11d1-adc5-006008a5848c), + version(1.0) +] +library DHTMLEDLib +{ + importlib("stdole2.tlb"); + + typedef + [ + uuid(7179FC44-B2E4-11d1-ADC5-006008A5848C) + ] + enum DHTMLEDITAPPEARANCE { + DEAPPEARANCE_FLAT, + DEAPPEARANCE_3D + } DHTMLEDITAPPEARANCE; + + typedef + [ + uuid(bf82426a-b961-11d1-adc5-006008a5848c) + ] + enum DHTMLEDITCMDF { + DECMDF_NOTSUPPORTED = 0, + DECMDF_DISABLED = 1, + DECMDF_ENABLED = 3, + DECMDF_LATCHED = 7, + DECMDF_NINCHED = 11 + } DHTMLEDITCMDF; + + typedef enum DHTMLEDITCMDID { + DECMD_BOLD = 5000, + DECMD_COPY = 5002, + DECMD_CUT, + DECMD_DELETE, + DECMD_DELETECELLS, + DECMD_DELETECOLS, + DECMD_DELETEROWS, + DECMD_FINDTEXT, + DECMD_FONT, + DECMD_GETBACKCOLOR, + DECMD_GETBLOCKFMT, + DECMD_GETBLOCKFMTNAMES, + DECMD_GETFONTNAME, + DECMD_GETFONTSIZE, + DECMD_GETFORECOLOR, + DECMD_HYPERLINK, + DECMD_IMAGE, + DECMD_INDENT, + DECMD_INSERTCELL, + DECMD_INSERTCOL, + DECMD_INSERTROW, + DECMD_INSERTTABLE, + DECMD_ITALIC, + DECMD_JUSTIFYCENTER, + DECMD_JUSTIFYLEFT, + DECMD_JUSTIFYRIGHT, + DECMD_LOCK_ELEMENT, + DECMD_MAKE_ABSOLUTE, + DECMD_MERGECELLS, + DECMD_ORDERLIST, + DECMD_OUTDENT, + DECMD_PASTE, + DECMD_REDO, + DECMD_REMOVEFORMAT, + DECMD_SELECTALL, + DECMD_SEND_BACKWARD, + DECMD_BRING_FORWARD, + DECMD_SEND_BELOW_TEXT, + DECMD_BRING_ABOVE_TEXT, + DECMD_SEND_TO_BACK, + DECMD_BRING_TO_FRONT, + DECMD_SETBACKCOLOR, + DECMD_SETBLOCKFMT, + DECMD_SETFONTNAME, + DECMD_SETFONTSIZE, + DECMD_SETFORECOLOR, + DECMD_SPLITCELL, + DECMD_UNDERLINE, + DECMD_UNDO, + DECMD_UNLINK, + DECMD_UNORDERLIST, + DECMD_PROPERTIES + } DHTMLEDITCMDID; + + [ + object, + uuid(ce04b590-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLSafe : IDispatch + { + [ + id(DISPID_EXECCOMMAND) + ] + HRESULT ExecCommand( + [in] DHTMLEDITCMDID cmd_id, + [in, defaultvalue(OLECMDEXECOPT_DODEFAULT)] OLECMDEXECOPT options, + [in, optional] VARIANT *code_in, + [out, retval] VARIANT *code_out + ); + + [ + id(DISPID_QUERYSTATUS) + ] + HRESULT QueryStatus( + [in] DHTMLEDITCMDID cmd_id, + [out, retval] DHTMLEDITCMDF *status + ); + + [ + id(DISPID_SETCONTEXTMENU) + ] + HRESULT SetContextMenu( + [in] VARIANT *strings, + [in] VARIANT *states + ); + + [ + id(DISPID_NEWDOCUMENT) + ] + HRESULT NewDocument(); + + [ + id(DISPID_LOADURL) + ] + HRESULT LoadURL( + [in] BSTR url + ); + + [ + id(DISPID_FILTERSRCCODE) + ] + HRESULT FilterSourceCode( + [in] BSTR in, + [out, retval] BSTR *out + ); + + [ + id(DISPID_REFRESHDOC) + ] + HRESULT Refresh(); + + [ + propget, + id(DISPID_DOCUMENT) + ] + HRESULT DOM( + [out, retval] IHTMLDocument2 **value + ); + + [ + propget, + id(DISPID_DOCUMENTHTML) + ] + HRESULT DocumentHTML( + [out, retval] BSTR *value + ); + + [ + propput, + id(DISPID_DOCUMENTHTML) + ] + HRESULT DocumentHTML( + [in] BSTR html + ); + + [ + propget, + id(DISPID_ACTIVATEAPPLETS) + ] + HRESULT ActivateApplets( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEAPPLETS) + ] + HRESULT ActivateApplets( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ACTIVATEACTIVEXCONTROLS) + ] + HRESULT ActivateActiveXControls( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEACTIVEXCONTROLS) + ] + HRESULT ActivateActiveXControls( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ACTIVATEDTCS) + ] + HRESULT ActivateDTCs( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEDTCS) + ] + HRESULT ActivateDTCs( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SHOWDETAILS) + ] + HRESULT ShowDetails( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SHOWDETAILS) + ] + HRESULT ShowDetails( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SHOWBORDERS) + ] + HRESULT ShowBorders( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SHOWBORDERS) + ] + HRESULT ShowBorders( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_DHTMLEDITAPPEARANCE) + ] + HRESULT Appearance( + [out, retval] DHTMLEDITAPPEARANCE *value + ); + + [ + propput, + id(DISPID_DHTMLEDITAPPEARANCE) + ] + HRESULT Appearance( + [in] DHTMLEDITAPPEARANCE value + ); + + [ + propget, + id(DISPID_DHTMLEDITSCROLLBARS) + ] + HRESULT Scrollbars( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_DHTMLEDITSCROLLBARS) + ] + HRESULT Scrollbars( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SCROLLBARAPPEARANCE) + ] + HRESULT ScrollbarAppearance( + [out, retval] DHTMLEDITAPPEARANCE *value + ); + + [ + propput, + id(DISPID_SCROLLBARAPPEARANCE) + ] + HRESULT ScrollbarAppearance( + [in] DHTMLEDITAPPEARANCE value + ); + + [ + propget, + id(DISPID_SOURCECODEPRESERVATION) + ] + HRESULT SourceCodePreservation( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SOURCECODEPRESERVATION) + ] + HRESULT SourceCodePreservation( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ABSOLUTEDROPMODE) + ] + HRESULT AbsoluteDropMode( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ABSOLUTEDROPMODE) + ] + HRESULT AbsoluteDropMode( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SNAPTOGRIDX) + ] + HRESULT SnapToGridX( + [out, retval] long *value + ); + + [ + propput, + id(DISPID_SNAPTOGRIDX) + ] + HRESULT SnapToGridX( + [in] long value + ); + + [ + propget, + id(DISPID_SNAPTOGRIDY) + ] + HRESULT SnapToGridY( + [out, retval] long *value + ); + + [ + propput, + id(DISPID_SNAPTOGRIDY) + ] + HRESULT SnapToGridY( + [in] long value + ); + + [ + propget, + id(DISPID_SNAPTOGRID) + ] + HRESULT SnapToGrid( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SNAPTOGRID) + ] + HRESULT SnapToGrid( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ISDIRTY) + ] + HRESULT IsDirty( + [out, retval] VARIANT_BOOL *value + ); + + [ + propget, + id(DISPID_CURRENTDOCUMENTPATH) + ] + HRESULT CurrentDocumentPath( + [out, retval] BSTR *value + ); + + [ + propget, + id(DISPID_BASEURL) + ] + HRESULT BaseURL( + [out, retval] BSTR *value + ); + + [ + propput, + id(DISPID_BASEURL) + ] + HRESULT BaseURL( + [in] BSTR value + ); + + [ + propget, + id(DISPID_DOCUMENTTITLE) + ] + HRESULT DocumentTitle( + [out, retval] BSTR *value + ); + + [ + propget, + id(DISPID_USEDIVONCR) + ] + HRESULT UseDivOnCarriageReturn( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_USEDIVONCR) + ] + HRESULT UseDivOnCarriageReturn( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_BUSY) + ] + HRESULT Busy( + [out, retval] VARIANT_BOOL *value + ); + }; + + [ + uuid(d1fc78e8-b380-11d1-adc5-006008a5848c) + ] + dispinterface _DHTMLSafeEvents + { + properties: + methods: + [ + id(DISPID_DOCUMENTCOMPLETE) + ] + void DocumentComplete(); + + [ + id(DISPID_DISPLAYCHANGED) + ] + void DisplayChanged(); + + [ + id(DISPID_SHOWCONTEXTMENU) + ] + void ShowContextMenu( + [in] long x, + [in] long y + ); + + [ + id(DISPID_CONTEXTMENUACTION) + ] + void ContextMenuAction( + [in] long index + ); + + [ + id(DISPID_ONMOUSEDOWN) + ] + void onmousedown(); + + [ + id(DISPID_ONMOUSEMOVE) + ] + void onmousemove(); + + [ + id(DISPID_ONMOUSEUP) + ] + void onmouseup(); + + [ + id(DISPID_ONMOUSEOUT) + ] + void onmouseout(); + + [ + id(DISPID_ONMOUSEOVER) + ] + void onmouseover(); + + [ + id(DISPID_ONCLICK) + ] + void onclick(); + + [ + id(DISPID_ONDBLCLICK) + ] + void ondblclick(); + + [ + id(DISPID_ONKEYDOWN) + ] + void onkeydown(); + + [ + id(DISPID_ONKEYPRESS) + ] + void onkeypress(); + + [ + id(DISPID_ONKEYUP) + ] + void onkeyup(); + + [ + id(DISPID_ONBLUR) + ] + void onblur(); + + [ + id(DISPID_ONREADYSTATECHANGE) + ] + void onreadystatechange(); + }; + + [ + uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a) + ] + coclass DHTMLSafe + { + [default] interface IDHTMLSafe; + [default, source] interface _DHTMLSafeEvents; + }; + + [ + uuid(ce04b591-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLEdit : IDHTMLSafe + { + [ + id(DISPID_LOADDOCUMENT) + ] + HRESULT LoadDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + [ + id(DISPID_SAVEDOCUMENT) + ] + HRESULT SaveDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + [ + id(DISPID_PRINT) + ] + HRESULT PrintDocument( + [in, optional] VARIANT *prompt + ); + + [ + propget, + id(DISPID_BROWSEMODE) + ] + HRESULT BrowseMode( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_BROWSEMODE) + ] + HRESULT BrowseMode( + [in] VARIANT_BOOL value + ); + }; + + [ + uuid(588d5040-cf28-11d1-8cd3-00a0c959bc0a) + ] + dispinterface _DHTMLEditEvents + { + properties: + methods: + [ + id(DISPID_DOCUMENTCOMPLETE) + ] + void DocumentComplete(); + + [ + id(DISPID_DISPLAYCHANGED) + ] + void DisplayChanged(); + + [ + id(DISPID_SHOWCONTEXTMENU) + ] + void ShowContextMenu( + [in] long x, + [in] long y + ); + + [ + id(DISPID_CONTEXTMENUACTION) + ] + void ContextMenuAction( + [in] long index + ); + + [ + id(DISPID_ONMOUSEDOWN) + ] + void onmousedown(); + + [ + id(DISPID_ONMOUSEMOVE) + ] + void onmousemove(); + + [ + id(DISPID_ONMOUSEUP) + ] + void onmouseup(); + + [ + id(DISPID_ONMOUSEOUT) + ] + void onmouseout(); + + [ + id(DISPID_ONMOUSEOVER) + ] + void onmouseover(); + + [ + id(DISPID_ONCLICK) + ] + void onclick(); + + [ + id(DISPID_ONDBLCLICK) + ] + void ondblclick(); + + [ + id(DISPID_ONKEYDOWN) + ] + void onkeydown(); + + [ + id(DISPID_ONKEYPRESS) + ] + void onkeypress(); + + [ + id(DISPID_ONKEYUP) + ] + void onkeyup(); + + [ + id(DISPID_ONBLUR) + ] + void onblur(); + + [ + id(DISPID_ONREADYSTATECHANGE) + ] + void onreadystatechange(); + }; + + [ + uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a) + ] + coclass DHTMLEdit + { + [default] interface IDHTMLEdit; + [default, source] interface _DHTMLEditEvents; + }; +} -- 2.15.1

2 1

[PATCH v2 1/8] include: Add dhtmled.idl
by Alex Henrie Dec. 7, 2017

Dec. 7, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Added argument attributes --- include/Makefile.in | 1 + include/dhtmled.idl | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 331 insertions(+) create mode 100644 include/dhtmled.idl diff --git a/include/Makefile.in b/include/Makefile.in index fa1e42738b..a08c8084c1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -58,6 +58,7 @@ IDL_SRCS = \ ddstream.idl \ devenum.idl \ devicetopology.idl \ + dhtmled.idl \ dimm.idl \ dispex.idl \ docobj.idl \ diff --git a/include/dhtmled.idl b/include/dhtmled.idl new file mode 100644 index 0000000000..0c3e38c08e --- /dev/null +++ b/include/dhtmled.idl @@ -0,0 +1,330 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "docobj.idl"; +import "mshtml.idl"; + +[ + uuid(683364a1-b37d-11d1-adc5-006008a5848c), + version(1.0) +] +library DHTMLEDLib +{ + importlib("stdole2.tlb"); + + typedef + [ + uuid(7179FC44-B2E4-11d1-ADC5-006008A5848C) + ] + enum DHTMLEDITAPPEARANCE { + DEAPPEARANCE_FLAT, + DEAPPEARANCE_3D + } DHTMLEDITAPPEARANCE; + + typedef + [ + uuid(bf82426a-b961-11d1-adc5-006008a5848c) + ] + enum DHTMLEDITCMDF { + DECMDF_NOTSUPPORTED = 0, + DECMDF_DISABLED = 1, + DECMDF_ENABLED = 3, + DECMDF_LATCHED = 7, + DECMDF_NINCHED = 11 + } DHTMLEDITCMDF; + + typedef enum DHTMLEDITCMDID { + DECMD_BOLD = 5000, + DECMD_COPY = 5002, + DECMD_CUT, + DECMD_DELETE, + DECMD_DELETECELLS, + DECMD_DELETECOLS, + DECMD_DELETEROWS, + DECMD_FINDTEXT, + DECMD_FONT, + DECMD_GETBACKCOLOR, + DECMD_GETBLOCKFMT, + DECMD_GETBLOCKFMTNAMES, + DECMD_GETFONTNAME, + DECMD_GETFONTSIZE, + DECMD_GETFORECOLOR, + DECMD_HYPERLINK, + DECMD_IMAGE, + DECMD_INDENT, + DECMD_INSERTCELL, + DECMD_INSERTCOL, + DECMD_INSERTROW, + DECMD_INSERTTABLE, + DECMD_ITALIC, + DECMD_JUSTIFYCENTER, + DECMD_JUSTIFYLEFT, + DECMD_JUSTIFYRIGHT, + DECMD_LOCK_ELEMENT, + DECMD_MAKE_ABSOLUTE, + DECMD_MERGECELLS, + DECMD_ORDERLIST, + DECMD_OUTDENT, + DECMD_PASTE, + DECMD_REDO, + DECMD_REMOVEFORMAT, + DECMD_SELECTALL, + DECMD_SEND_BACKWARD, + DECMD_BRING_FORWARD, + DECMD_SEND_BELOW_TEXT, + DECMD_BRING_ABOVE_TEXT, + DECMD_SEND_TO_BACK, + DECMD_BRING_TO_FRONT, + DECMD_SETBACKCOLOR, + DECMD_SETBLOCKFMT, + DECMD_SETFONTNAME, + DECMD_SETFONTSIZE, + DECMD_SETFORECOLOR, + DECMD_SPLITCELL, + DECMD_UNDERLINE, + DECMD_UNDO, + DECMD_UNLINK, + DECMD_UNORDERLIST, + DECMD_PROPERTIES + } DHTMLEDITCMDID; + + [ + object, + uuid(ce04b590-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLSafe : IDispatch + { + HRESULT ExecCommand( + [in] DHTMLEDITCMDID cmd_id, + [in, defaultvalue(OLECMDEXECOPT_DODEFAULT)] OLECMDEXECOPT options, + [in, optional] VARIANT *code_in, + [out, retval] VARIANT *code_out + ); + + HRESULT QueryStatus( + [in] DHTMLEDITCMDID cmd_id, + [out, retval] DHTMLEDITCMDF *status + ); + + HRESULT SetContextMenu( + [in] VARIANT *strings, + [in] VARIANT *states + ); + + HRESULT NewDocument(); + + HRESULT LoadURL([in] BSTR url); + + HRESULT FilterSourceCode( + [in] BSTR in, + [out, retval] BSTR *out + ); + + HRESULT Refresh(); + + [propget] HRESULT DOM([out, retval] IHTMLDocument2 **value); + + [propget] HRESULT DocumentHTML([out, retval] BSTR *value); + [propput] HRESULT DocumentHTML([in] BSTR html); + + [propget] HRESULT ActivateApplets([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ActivateApplets([in] VARIANT_BOOL value); + + [propget] HRESULT ActivateActiveXControls([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ActivateActiveXControls([in] VARIANT_BOOL value); + + [propget] HRESULT ActivateDTCs([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ActivateDTCs([in] VARIANT_BOOL value); + + [propget] HRESULT ShowDetails([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ShowDetails([in] VARIANT_BOOL value); + + [propget] HRESULT ShowBorders([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ShowBorders([in] VARIANT_BOOL value); + + [propget] HRESULT Appearance([out, retval] DHTMLEDITAPPEARANCE *value); + [propput] HRESULT Appearance([in] DHTMLEDITAPPEARANCE value); + + [propget] HRESULT Scrollbars([out, retval] VARIANT_BOOL *value); + [propput] HRESULT Scrollbars([in] VARIANT_BOOL value); + + [propget] HRESULT ScrollbarAppearance([out, retval] DHTMLEDITAPPEARANCE *value); + [propput] HRESULT ScrollbarAppearance([in] DHTMLEDITAPPEARANCE value); + + [propget] HRESULT SourceCodePreservation([out, retval] VARIANT_BOOL *value); + [propput] HRESULT SourceCodePreservation([in] VARIANT_BOOL value); + + [propget] HRESULT AbsoluteDropMode([out, retval] VARIANT_BOOL *value); + [propput] HRESULT AbsoluteDropMode([in] VARIANT_BOOL value); + + [propget] HRESULT SnapToGridX([out, retval] long *value); + [propput] HRESULT SnapToGridX([in] long value); + + [propget] HRESULT SnapToGridY([out, retval] long *value); + [propput] HRESULT SnapToGridY([in] long value); + + [propget] HRESULT SnapToGrid([out, retval] VARIANT_BOOL *value); + [propput] HRESULT SnapToGrid([in] VARIANT_BOOL value); + + [propget] HRESULT IsDirty([out, retval] VARIANT_BOOL *value); + + [propget] HRESULT CurrentDocumentPath([out, retval] BSTR *value); + + [propget] HRESULT BaseURL([out, retval] BSTR *value); + [propput] HRESULT BaseURL([in] BSTR value); + + [propget] HRESULT DocumentTitle([out, retval] BSTR *value); + + [propget] HRESULT UseDivOnCarriageReturn([out, retval] VARIANT_BOOL *value); + [propput] HRESULT UseDivOnCarriageReturn([in] VARIANT_BOOL value); + + [propget] HRESULT Busy([out, retval] VARIANT_BOOL *value); + }; + + [ + uuid(d1fc78e8-b380-11d1-adc5-006008a5848c) + ] + dispinterface _DHTMLSafeEvents + { + properties: + methods: + void DocumentComplete(); + + void DisplayChanged(); + + void ShowContextMenu( + [in] long x, + [in] long y + ); + + void ContextMenuAction([in] long index); + + void onmousedown(); + + void onmousemove(); + + void onmouseup(); + + void onmouseout(); + + void onmouseover(); + + void onclick(); + + void ondblclick(); + + void onkeydown(); + + void onkeypress(); + + void onkeyup(); + + void onblur(); + + void onreadystatechange(); + }; + + [ + uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a) + ] + coclass DHTMLSafe + { + interface IDHTMLSafe; + interface _DHTMLSafeEvents; + }; + + [ + uuid(ce04b591-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLEdit : IDHTMLSafe + { + HRESULT LoadDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + HRESULT SaveDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + HRESULT PrintDocument([in, optional] VARIANT *prompt); + + [propget] HRESULT BrowseMode([out, retval] VARIANT_BOOL *value); + + [propput] HRESULT BrowseMode([in] VARIANT_BOOL value); + }; + + [ + uuid(588d5040-cf28-11d1-8cd3-00a0c959bc0a) + ] + dispinterface _DHTMLEditEvents + { + properties: + methods: + void DocumentComplete(); + + void DisplayChanged(); + + void ShowContextMenu( + [in] long x, + [in] long y + ); + + void ContextMenuAction([in] long index); + + void onmousedown(); + + void onmousemove(); + + void onmouseup(); + + void onmouseout(); + + void onmouseover(); + + void onclick(); + + void ondblclick(); + + void onkeydown(); + + void onkeypress(); + + void onkeyup(); + + void onblur(); + + void onreadystatechange(); + }; + + [ + uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a) + ] + coclass DHTMLEdit + { + interface IDHTMLEdit; + interface _DHTMLEditEvents; + }; +} -- 2.15.1

2 14

[PATCH 8/8] rsaenh: Removed no longer needed ALG_ID argument from helper functions.
by Jacek Caban Dec. 7, 2017

Dec. 7, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 8 +++----- dlls/rsaenh/implglue.h | 6 +++--- dlls/rsaenh/rsaenh.c | 21 +++++++++------------ 3 files changed, 15 insertions(+), 20 deletions(-)

1 0