June 2017 - Wine-Commits - list.winehq.org

Owen Rudge : wsdapi: Implement IWSDUdpAddress_SetTransportAddress.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 4f1dca9db07dc98223aedf479b1465612a88c9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1dca9db07dc98223aedf479… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:54 2017 +0100 wsdapi: Implement IWSDUdpAddress_SetTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/address.c | 30 ++++++++++++++++++++++++++++-- dlls/wsdapi/tests/address.c | 10 +++++----- dlls/wsdapi/tests/msgparams.c | 4 ++-- 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 0f28ce5..5c95351 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = wsdapi.dll IMPORTLIB = wsdapi -IMPORTS = user32 +IMPORTS = user32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 7efcac2..587d090 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -22,6 +22,8 @@ #define COBJMACROS +#include "winsock2.h" +#include "ws2tcpip.h" #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -32,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); typedef struct IWSDUdpAddressImpl { IWSDUdpAddress IWSDUdpAddress_iface; LONG ref; + SOCKADDR_STORAGE sockAddr; } IWSDUdpAddressImpl; static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) @@ -132,8 +135,31 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *T static HRESULT WINAPI IWSDUdpAddressImpl_SetTransportAddress(IWSDUdpAddress *This, LPCWSTR pszAddress) { - FIXME("(%p, %s)\n", This, debugstr_w(pszAddress)); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + ADDRINFOW *addrInfo = NULL; + ADDRINFOW hints; + int ret; + + TRACE("(%p, %s)\n", impl, debugstr_w(pszAddress)); + + if (pszAddress == NULL) + return E_INVALIDARG; + + ZeroMemory(&hints, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + + ret = GetAddrInfoW(pszAddress, NULL, &hints, &addrInfo); + + if (ret == 0) + { + ZeroMemory(&impl->sockAddr, sizeof(SOCKADDR_STORAGE)); + memcpy(&impl->sockAddr, addrInfo->ai_addr, addrInfo->ai_addrlen); + } + + if (addrInfo != NULL) + FreeAddrInfoW(addrInfo); + + return HRESULT_FROM_WIN32(ret); } static HRESULT WINAPI IWSDUdpAddressImpl_SetSockaddr(IWSDUdpAddress *This, const SOCKADDR_STORAGE *pSockAddr) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index fefc253..8861d2f 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -98,15 +98,15 @@ static void GetSetTransportAddress_udp_tests(void) /* Try setting a null address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, NULL); - todo_wine ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); /* Try setting an invalid address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, invalidAddress); - todo_wine ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); + ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); /* Try setting an IPv4 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4Address); - todo_wine ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); todo_wine ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); @@ -118,7 +118,7 @@ static void GetSetTransportAddress_udp_tests(void) /* Try setting an IPv6 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); - todo_wine ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); @@ -264,7 +264,7 @@ static void GetSetSockaddr_udp_tests(void) /* Try setting a transport address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, expectedIpv6TransportAddr); - todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); /* A socket address should be returned */ rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 0621950..9322ce1 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -96,7 +96,7 @@ static void LocalAddress_tests(void) ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, address); - todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_SetLocalAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); @@ -154,7 +154,7 @@ static void RemoteAddress_tests(void) ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, address); - todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc);

1 0

Owen Rudge : wsdapi: Implement Get/SetLocalAddress.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 9ce9d73414198e91da261092c584f709c9365c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce9d73414198e91da261092c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:41 2017 +0100 wsdapi: Implement Get/SetLocalAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/msgparams.c | 48 ++++++++++++++++++++++++++++++++++++++----- dlls/wsdapi/tests/msgparams.c | 12 +++++------ 2 files changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index a7a2f0a..2c59e3a 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); typedef struct IWSDMessageParametersImpl { IWSDMessageParameters IWSDMessageParameters_iface; LONG ref; + IWSDAddress *localAddress; } IWSDMessageParametersImpl; typedef struct IWSDUdpMessageParametersImpl { @@ -68,6 +69,11 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa if (ref == 0) { + if (This->localAddress != NULL) + { + IWSDAddress_Release(This->localAddress); + } + HeapFree(GetProcessHeap(), 0, This); } @@ -76,14 +82,46 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa static HRESULT WINAPI IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) { - FIXME("(%p, %p)\n", This, ppAddress); - return E_NOTIMPL; + IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); + + TRACE("(%p, %p)\n", impl, ppAddress); + + if (ppAddress == NULL) + { + return E_POINTER; + } + + if (impl->localAddress == NULL) + { + return E_ABORT; + } + + *ppAddress = impl->localAddress; + IWSDAddress_AddRef(*ppAddress); + + return S_OK; } static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) { - FIXME("(%p, %p)\n", This, pAddress); - return E_NOTIMPL; + IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); + + TRACE("(%p, %p)\n", impl, pAddress); + + if (pAddress == NULL) + { + return E_POINTER; + } + + if (impl->localAddress != NULL) + { + IWSDAddress_Release(impl->localAddress); + } + + impl->localAddress = pAddress; + IWSDAddress_AddRef(pAddress); + + return S_OK; } static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) @@ -215,7 +253,7 @@ HRESULT WINAPI WSDCreateUdpMessageParameters(IWSDUdpMessageParameters **ppTxPara *ppTxParams = NULL; - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); if (!obj) return E_OUTOFMEMORY; obj->base.IWSDMessageParameters_iface.lpVtbl = (IWSDMessageParametersVtbl *)&udpMsgParamsVtbl; diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 246cfd6..a8f905d 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -84,11 +84,11 @@ static void LocalAddress_tests(void) ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, NULL); - todo_wine ok(rc == E_POINTER, "GetLocalAddress failed: %08x\n", rc); + ok(rc == E_POINTER, "GetLocalAddress failed: %08x\n", rc); ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); - todo_wine ok(rc == E_ABORT, "GetLocalAddress failed: %08x\n", rc); + ok(rc == E_ABORT, "GetLocalAddress failed: %08x\n", rc); ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); rc = WSDCreateUdpAddress(&origUdpAddress); @@ -99,14 +99,14 @@ static void LocalAddress_tests(void) todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_SetLocalAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); - todo_wine ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); - todo_wine ok(rc == S_OK, "GetLocalAddress failed: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); + ok(rc == S_OK, "GetLocalAddress failed: %08x\n", rc); + ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); /* Check if GetLocalAddress returns the same object */ - todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); + ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); ret = IWSDUdpMessageParameters_Release(udpMessageParams); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret);

1 0

Jacek Caban : rsaenh: Use bcrypt for SHA384 hashes.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 78a5d660037a14dfb7d45764955ded0235f6fb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a5d660037a14dfb7d457649… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 28 18:22:26 2017 +0200 rsaenh: Use bcrypt for SHA384 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 10 +- dlls/rsaenh/implglue.h | 1 - dlls/rsaenh/sha2.c | 414 ------------------------------------------------- dlls/rsaenh/sha2.h | 19 --- 4 files changed, 1 insertion(+), 443 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78a5d660037a14dfb7d45…

1 0

Nikolay Sivov : regedit: Use notification message to clean up item data.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: b84f228805f3cf121ee2e91b155ef077b092520f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84f228805f3cf121ee2e91b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 28 15:49:54 2017 +0300 regedit: Use notification message to clean up item data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index b758564..4be7c94 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -411,6 +411,14 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR HeapFree(GetProcessHeap(), 0, oldName); return 0; } + case LVN_DELETEITEM: { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + LINE_INFO *info = (LINE_INFO *)nmlv->lParam; + + HeapFree(GetProcessHeap(), 0, info->name); + HeapFree(GetProcessHeap(), 0, info); + } + break; case NM_RETURN: { int cnt = SendMessageW(hWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); if (cnt != -1) @@ -515,7 +523,6 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli BYTE* valBuf = 0; HKEY hKey = 0; LONG errCode; - INT count, i; LVITEMW item; if (!hwndLV) return FALSE; @@ -525,16 +532,8 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ, &hKey); if (errCode != ERROR_SUCCESS) goto done; - count = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); - for (i = 0; i < count; i++) { - item.mask = LVIF_PARAM; - item.iItem = i; - SendMessageW( hwndLV, LVM_GETITEMW, 0, (LPARAM)&item ); - HeapFree(GetProcessHeap(), 0, ((LINE_INFO*)item.lParam)->name); - HeapFree(GetProcessHeap(), 0, (void*)item.lParam); - } g_columnToSort = ~0U; - SendMessageW( hwndLV, LVM_DELETEALLITEMS, 0, 0L ); + SendMessageW(hwndLV, LVM_DELETEALLITEMS, 0, 0); /* get size information and resize the buffers if necessary */ errCode = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, &max_sub_key_len, NULL,

1 0

Jacek Caban : rsaenh: Use bcrypt for SHA265 hashes.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 524c632a82b58c5b505cdfdf361d019234686e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524c632a82b58c5b505cdfdf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 28 18:22:53 2017 +0200 rsaenh: Use bcrypt for SHA265 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 3 +- dlls/rsaenh/implglue.c | 10 +- dlls/rsaenh/implglue.h | 2 - dlls/rsaenh/sha2.c | 518 ------------------------------------------------ dlls/rsaenh/sha2.h | 64 ------ 5 files changed, 2 insertions(+), 595 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=524c632a82b58c5b505cd…

1 0

Jacek Caban : rsaenh: Use bcrypt for SHA512 hashes.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 6aa5fdf9527620c46220050ccb2d6fe0e9c113ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa5fdf9527620c46220050cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 28 18:22:12 2017 +0200 rsaenh: Use bcrypt for SHA512 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 2 +- dlls/rsaenh/implglue.c | 32 +++++++++++++--------- dlls/rsaenh/implglue.h | 5 +++- dlls/rsaenh/rsaenh.c | 1 - dlls/rsaenh/sha2.c | 71 ------------------------------------------------- dlls/rsaenh/sha2.h | 6 ----- 6 files changed, 24 insertions(+), 93 deletions(-) diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index 5b6e2fe..0fdae10 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -1,6 +1,6 @@ MODULE = rsaenh.dll IMPORTLIB = rsaenh -IMPORTS = crypt32 advapi32 +IMPORTS = bcrypt crypt32 advapi32 C_SRCS = \ aes.c \ diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 77a0085..20ebddc 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -50,6 +50,8 @@ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) { + const WCHAR *algid = NULL; + switch (aiAlgid) { case CALG_MD2: @@ -77,10 +79,22 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) break; case CALG_SHA_512: - SHA512_Init(&pHashContext->sha512); + algid = BCRYPT_SHA512_ALGORITHM; break; } + if (algid) + { + BCRYPT_ALG_HANDLE provider; + NTSTATUS status; + + status = BCryptOpenAlgorithmProvider(&provider, algid, MS_PRIMITIVE_PROVIDER, 0); + if (status) return FALSE; + + status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + BCryptCloseAlgorithmProvider(provider, 0); + if (status) return FALSE; + } return TRUE; } @@ -113,13 +127,8 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb SHA384_Update(&pHashContext->sha384, pbData, dwDataLen); break; - case CALG_SHA_512: - SHA512_Update(&pHashContext->sha512, pbData, dwDataLen); - break; - default: - SetLastError(NTE_BAD_ALGID); - return FALSE; + BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); } return TRUE; @@ -155,13 +164,10 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash SHA384_Final(pbHashValue, &pHashContext->sha384); break; - case CALG_SHA_512: - SHA512_Final(pbHashValue, &pHashContext->sha512); - break; - default: - SetLastError(NTE_BAD_ALGID); - return FALSE; + BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(pHashContext->bcrypt_hash); + break; } return TRUE; diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 3ac7eef..4f53101 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -24,9 +24,12 @@ #ifndef __WINE_IMPLGLUE_H #define __WINE_IMPLGLUE_H +#include "bcrypt.h" #include "tomcrypt.h" #include "sha2.h" +#define RSAENH_MAX_HASH_SIZE 104 + /* Next typedef copied from dlls/advapi32/crypt_md4.c */ typedef struct tagMD4_CTX { unsigned int buf[4]; @@ -60,7 +63,7 @@ typedef union tagHASH_CONTEXT { SHA_CTX sha; SHA256_CTX sha256; SHA384_CTX sha384; - SHA512_CTX sha512; + BCRYPT_HASH_HANDLE bcrypt_hash; } HASH_CONTEXT; typedef union tagKEY_CONTEXT { diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 9af770d..98bba16 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -48,7 +48,6 @@ static HINSTANCE instance; * CRYPTHASH - hash objects */ #define RSAENH_MAGIC_HASH 0x85938417u -#define RSAENH_MAX_HASH_SIZE 104 #define RSAENH_HASHSTATE_HASHING 1 #define RSAENH_HASHSTATE_FINISHED 2 typedef struct _RSAENH_TLS1PRF_PARAMS diff --git a/dlls/rsaenh/sha2.c b/dlls/rsaenh/sha2.c index 76e7184..67933ce 100644 --- a/dlls/rsaenh/sha2.c +++ b/dlls/rsaenh/sha2.c @@ -599,16 +599,6 @@ char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_S } -/*** SHA-512: *********************************************************/ -void SHA512_Init(SHA512_CTX* context) { - if (context == NULL) { - return; - } - MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH); - MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH); - context->bitcount[0] = context->bitcount[1] = 0; -} - #ifdef SHA2_UNROLL_TRANSFORM /* Unrolled SHA-512 round macros: */ @@ -867,67 +857,6 @@ void SHA512_Last(SHA512_CTX* context) { SHA512_Transform(context, (sha2_word64*)context->buffer); } -void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { - sha2_word64 *d = (sha2_word64*)digest; - - /* Sanity check: */ - assert(context != NULL); - - /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != NULL) { - SHA512_Last(context); - - /* Save the hash data for output: */ -#ifndef WORDS_BIGENDIAN - { - /* Convert TO host byte order */ - int j; - for (j = 0; j < 8; j++) { - REVERSE64(context->state[j],context->state[j]); - *d++ = context->state[j]; - } - } -#else - MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH); -#endif - } - - /* Zero out state data */ - MEMSET_BZERO(context, sizeof(*context)); -} - -char *SHA512_End(SHA512_CTX* context, char buffer[]) { - sha2_byte digest[SHA512_DIGEST_LENGTH], *d = digest; - int i; - - /* Sanity check: */ - assert(context != NULL); - - if (buffer != NULL) { - SHA512_Final(digest, context); - - for (i = 0; i < SHA512_DIGEST_LENGTH; i++) { - *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4]; - *buffer++ = sha2_hex_digits[*d & 0x0f]; - d++; - } - *buffer = 0; - } else { - MEMSET_BZERO(context, sizeof(*context)); - } - MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH); - return buffer; -} - -char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) { - SHA512_CTX context; - - SHA512_Init(&context); - SHA512_Update(&context, data, len); - return SHA512_End(&context, digest); -} - - /*** SHA-384: *********************************************************/ void SHA384_Init(SHA384_CTX* context) { if (context == NULL) { diff --git a/dlls/rsaenh/sha2.h b/dlls/rsaenh/sha2.h index 2dda412..342e838 100644 --- a/dlls/rsaenh/sha2.h +++ b/dlls/rsaenh/sha2.h @@ -80,10 +80,4 @@ void SHA384_Final(sha2_byte[SHA384_DIGEST_LENGTH], SHA384_CTX*); char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); char* SHA384_Data(const sha2_byte*, size_t, char[SHA384_DIGEST_STRING_LENGTH]); -void SHA512_Init(SHA512_CTX*); -void SHA512_Update(SHA512_CTX*, const sha2_byte*, size_t); -void SHA512_Final(sha2_byte[SHA512_DIGEST_LENGTH], SHA512_CTX*); -char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); -char* SHA512_Data(const sha2_byte*, size_t, char[SHA512_DIGEST_STRING_LENGTH]); - #endif /* __SHA2_H__ */

1 0

Alistair Leslie-Hughes : include: Add mftransform.idl.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 2164a4da3f472c6613119fd6af00b0198b4a02a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2164a4da3f472c6613119fd6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 05:45:34 2017 +0000 include: Add mftransform.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/mfidl.idl | 1 + include/mftransform.idl | 113 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d00defd..1dd6aaf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -92,6 +92,7 @@ IDL_SRCS = \ mfidl.idl \ mfobjects.idl \ mfreadwrite.idl \ + mftransform.idl \ mimeinfo.idl \ mimeole.idl \ mlang.idl \ diff --git a/include/mfidl.idl b/include/mfidl.idl index 45b4957..3c33806 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -17,6 +17,7 @@ */ import "mfobjects.idl"; +import "mftransform.idl"; typedef unsigned __int64 TOPOID; typedef LONGLONG MFTIME; diff --git a/include/mftransform.idl b/include/mftransform.idl new file mode 100644 index 0000000..165cad4 --- /dev/null +++ b/include/mftransform.idl @@ -0,0 +1,113 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * 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 "mfobjects.idl"; + +typedef struct _MFT_INPUT_STREAM_INFO +{ + LONGLONG hnsMaxLatency; + DWORD dwFlags; + DWORD cbSize; + DWORD cbMaxLookahead; + DWORD cbAlignment; +} MFT_INPUT_STREAM_INFO; + +typedef struct _MFT_OUTPUT_STREAM_INFO +{ + DWORD dwFlags; + DWORD cbSize; + DWORD cbAlignment; +} MFT_OUTPUT_STREAM_INFO; + +typedef struct _MFT_OUTPUT_DATA_BUFFER +{ + DWORD dwStreamID; + IMFSample *pSample; + DWORD dwStatus; + IMFCollection *pEvents; +} MFT_OUTPUT_DATA_BUFFER, *PMFT_OUTPUT_DATA_BUFFER; + +typedef enum _MFT_MESSAGE_TYPE +{ + MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, + MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, + MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, + MFT_MESSAGE_DROP_SAMPLES = 0x00000003, + MFT_MESSAGE_COMMAND_TICK = 0x00000004, + MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, + MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, + MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, + MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, + MFT_MESSAGE_COMMAND_MARKER = 0x20000000 +} MFT_MESSAGE_TYPE; + +[ + object, + uuid(bf94c121-5b05-4e6f-8000-ba598961414d) +] +interface IMFTransform : IUnknown +{ + HRESULT GetStreamLimits([out] DWORD *input_minimum, [out] DWORD *input_maximum, [out] DWORD *output_minimum, + [out] DWORD *output_maximum); + + HRESULT GetStreamCount([out] DWORD *inputs, [out] DWORD *outputs); + + HRESULT GetStreamIDs([in] DWORD input_size, [out,size_is(input_size)] DWORD *inputs, + [in] DWORD output_size, [out,size_is(output_size)] DWORD *outputs); + + HRESULT GetInputStreamInfo([in] DWORD id, [out] MFT_INPUT_STREAM_INFO *info); + + HRESULT GetOutputStreamInfo([in] DWORD id, [out] MFT_OUTPUT_STREAM_INFO *info); + + HRESULT GetAttributes([out] IMFAttributes **attributes); + + HRESULT GetInputStreamAttributes([in] DWORD id, [out] IMFAttributes **attributes); + + HRESULT GetOutputStreamAttributes([in] DWORD id, [out] IMFAttributes **attributes); + + HRESULT DeleteInputStream([in] DWORD id); + + HRESULT AddInputStreams([in] DWORD streams, [in] DWORD *ids); + + HRESULT GetInputAvailableType([in] DWORD id, [in] DWORD index, [out] IMFMediaType **type); + + HRESULT GetOutputAvailableType([in] DWORD id, [in] DWORD index, [out] IMFMediaType **type); + + HRESULT SetInputType(DWORD id, [in] IMFMediaType *type, [in] DWORD flags); + + HRESULT SetOutputType(DWORD id, [in] IMFMediaType *type, [in] DWORD flags); + + HRESULT GetInputCurrentType([in] DWORD id, [out] IMFMediaType **type); + + HRESULT GetOutputCurrentType([in] DWORD id, [out] IMFMediaType **type); + + HRESULT GetInputStatus([in] DWORD id, [out] DWORD *flags); + + HRESULT GetOutputStatus([out] DWORD *flags); + + HRESULT SetOutputBounds([in] LONGLONG lower, [in] LONGLONG upper); + + HRESULT ProcessEvent([in] DWORD id, [in] IMFMediaEvent *event); + + HRESULT ProcessMessage([in] MFT_MESSAGE_TYPE message, [in] ULONG_PTR param); + + [local] HRESULT ProcessInput([in] DWORD id, [in] IMFSample *sample, [in] DWORD flags); + + [local] HRESULT ProcessOutput([in] DWORD flags, [in] DWORD count, [in,out,size_is(count)] MFT_OUTPUT_DATA_BUFFER *samples, + [out] DWORD *status); +};

1 0

Nikolay Sivov : regedit: Remove explicit iIndent field initialization.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: f4e98d813fa483a7156a8c68237523b878ea8463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e98d813fa483a7156a8c682… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 28 15:49:55 2017 +0300 regedit: Remove explicit iIndent field initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4be7c94..c59d435 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -153,8 +153,8 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos) { + LVITEMW item = { 0 }; LINE_INFO* linfo; - LVITEMW item; int index; linfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount); @@ -173,8 +173,6 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; item.iItem = (pos == -1) ? SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0) : pos; - item.iSubItem = 0; - item.state = 0; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; @@ -192,10 +190,6 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR } item.lParam = (LPARAM)linfo; -#if (_WIN32_IE >= 0x0300) - item.iIndent = 0; -#endif - if ((index = ListView_InsertItemW(hwndLV, &item)) != -1) format_value_data(hwndLV, index, dwValType, ValBuf, dwCount); return index;

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateMediaType.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 69bb5dc7144f12e1a950cc1d744c551310218e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bb5dc7144f12e1a950cc1d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 01:46:28 2017 +0000 mfplat: Implement MFCreateMediaType. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 446 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 448 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69bb5dc7144f12e1a950c…

1 0

Owen Rudge : wsdapi: Implement Get/SetRemoteAddress.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 7b3024a25504857abc8295a637e6569790bf628c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3024a25504857abc8295a63… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:45 2017 +0100 wsdapi: Implement Get/SetRemoteAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/msgparams.c | 46 +++++++++++++++++++++++++++++++++++++++---- dlls/wsdapi/tests/msgparams.c | 12 +++++------ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index 2c59e3a..6675fa5 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -33,6 +33,7 @@ typedef struct IWSDMessageParametersImpl { IWSDMessageParameters IWSDMessageParameters_iface; LONG ref; IWSDAddress *localAddress; + IWSDAddress *remoteAddress; } IWSDMessageParametersImpl; typedef struct IWSDUdpMessageParametersImpl { @@ -74,6 +75,11 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa IWSDAddress_Release(This->localAddress); } + if (This->remoteAddress != NULL) + { + IWSDAddress_Release(This->remoteAddress); + } + HeapFree(GetProcessHeap(), 0, This); } @@ -126,14 +132,46 @@ static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParam static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) { - FIXME("(%p, %p)\n", This, ppAddress); - return E_NOTIMPL; + IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); + + TRACE("(%p, %p)\n", impl, ppAddress); + + if (ppAddress == NULL) + { + return E_POINTER; + } + + if (impl->remoteAddress == NULL) + { + return E_ABORT; + } + + *ppAddress = impl->remoteAddress; + IWSDAddress_AddRef(*ppAddress); + + return S_OK; } static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) { - FIXME("(%p, %p)\n", This, pAddress); - return E_NOTIMPL; + IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); + + TRACE("(%p, %p)\n", impl, pAddress); + + if (pAddress == NULL) + { + return E_POINTER; + } + + if (impl->remoteAddress != NULL) + { + IWSDAddress_Release(impl->remoteAddress); + } + + impl->remoteAddress = pAddress; + IWSDAddress_AddRef(pAddress); + + return S_OK; } static HRESULT WINAPI IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index a8f905d..55ca7f3 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -142,11 +142,11 @@ static void RemoteAddress_tests(void) ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, NULL); - todo_wine ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); - todo_wine ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); rc = WSDCreateUdpAddress(&origUdpAddress); @@ -157,14 +157,14 @@ static void RemoteAddress_tests(void) todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); - todo_wine ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); - todo_wine ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); + ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); + ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); /* Check if GetRemoteAddress returns the same object */ - todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); + ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); ret = IWSDUdpMessageParameters_Release(udpMessageParams); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret);

1 0