May 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : inetcomm: Fixed buffer leak on error path (Coverity).
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: dcc545be219290df91c9b7ab9bb41d918541223c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc545be219290df91c9b7ab9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:42:13 2017 +0300 inetcomm: Fixed buffer leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index c77cf26..b7b01d4 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -495,8 +495,10 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH binding->url[url.mhtml_len] = 0; hres = CreateURLMoniker(NULL, binding->url, &mon); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(binding); return hres; + } binding->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; binding->ref = 1;

1 0

Michael Müller : ntdll/tests: Add tests for LdrEnumerateLoadedModules.
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: e5ad8ae12348e174bf57a8c7c1bb5e8f77fed73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ad8ae12348e174bf57a8c7c… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Apr 28 17:59:22 2017 +0200 ntdll/tests: Add tests for LdrEnumerateLoadedModules. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index b18cccf..92b7213 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -98,6 +98,7 @@ static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHA static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); +static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -151,6 +152,7 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLocked = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLocked"); pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); + pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -2153,6 +2155,60 @@ static void test_RtlLeaveCriticalSection(void) ok(!status, "RtlDeleteCriticalSection failed: %x\n", status); } +struct ldr_enum_context +{ + BOOL abort; + BOOL found; + int count; +}; + +static void WINAPI ldr_enum_callback(LDR_MODULE *module, void *context, BOOLEAN *stop) +{ + static const WCHAR ntdllW[] = {'n','t','d','l','l','.','d','l','l',0}; + struct ldr_enum_context *ctx = context; + + if (!lstrcmpiW(module->BaseDllName.Buffer, ntdllW)) + ctx->found = TRUE; + + ctx->count++; + *stop = ctx->abort; +} + +static void test_LdrEnumerateLoadedModules(void) +{ + struct ldr_enum_context ctx; + NTSTATUS status; + + if (!pLdrEnumerateLoadedModules) + { + skip("LdrEnumerateLoadedModules not available\n"); + return; + } + + ctx.abort = FALSE; + ctx.found = FALSE; + ctx.count = 0; + status = pLdrEnumerateLoadedModules(NULL, ldr_enum_callback, &ctx); + ok(status == STATUS_SUCCESS, "LdrEnumerateLoadedModules failed with %08x\n", status); + ok(ctx.count > 1, "Expected more than one module, got %d\n", ctx.count); + ok(ctx.found, "Could not find ntdll in list of modules\n"); + + ctx.abort = TRUE; + ctx.count = 0; + status = pLdrEnumerateLoadedModules(NULL, ldr_enum_callback, &ctx); + ok(status == STATUS_SUCCESS, "LdrEnumerateLoadedModules failed with %08x\n", status); + ok(ctx.count == 1, "Expected exactly one module, got %d\n", ctx.count); + + status = pLdrEnumerateLoadedModules((void *)0x1, ldr_enum_callback, (void *)0xdeadbeef); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); + + status = pLdrEnumerateLoadedModules((void *)0xdeadbeef, ldr_enum_callback, (void *)0xdeadbeef); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); + + status = pLdrEnumerateLoadedModules(NULL, NULL, (void *)0xdeadbeef); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -2185,4 +2241,5 @@ START_TEST(rtl) test_RtlIsCriticalSectionLocked(); test_RtlInitializeCriticalSectionEx(); test_RtlLeaveCriticalSection(); + test_LdrEnumerateLoadedModules(); }

1 0

Michael Müller : ntdll: Implement LdrEnumerateLoadedModules.
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 5a96399b66224a31d426084b3a57c121c1611382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a96399b66224a31d426084b3… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Apr 28 17:59:41 2017 +0200 ntdll: Implement LdrEnumerateLoadedModules. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/rtl.c | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cf75850..518a99f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -62,6 +62,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID ((ULONG_PTR)2) typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); +typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ @@ -1394,6 +1395,34 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) } /****************************************************************** + * LdrEnumerateLoadedModules (NTDLL.@) + */ +NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, void *context ) +{ + LIST_ENTRY *mark, *entry; + LDR_MODULE *mod; + BOOLEAN stop = FALSE; + + TRACE( "(%p, %p, %p)\n", unknown, callback, context ); + + if (unknown || !callback) + return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &loader_section ); + + mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) + { + mod = CONTAINING_RECORD( entry, LDR_MODULE, InMemoryOrderModuleList ); + callback( mod, context, &stop ); + if (stop) break; + } + + RtlLeaveCriticalSection( &loader_section ); + return STATUS_SUCCESS; +} + +/****************************************************************** * LdrLockLoaderLock (NTDLL.@) * * Note: some flags are not implemented. diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 66618fc..07944ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -62,7 +62,7 @@ # @ stub LdrDestroyOutOfProcessImage @ stdcall LdrDisableThreadCalloutsForDll(long) @ stub LdrEnumResources -# @ stub LdrEnumerateLoadedModules +@ stdcall LdrEnumerateLoadedModules(ptr ptr ptr) # @ stub LdrFindCreateProcessManifest @ stdcall LdrFindEntryForAddress(ptr ptr) @ stdcall LdrFindResourceDirectory_U(long ptr long ptr) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 92b7213..7176e44 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -2181,7 +2181,7 @@ static void test_LdrEnumerateLoadedModules(void) if (!pLdrEnumerateLoadedModules) { - skip("LdrEnumerateLoadedModules not available\n"); + win_skip("LdrEnumerateLoadedModules not available\n"); return; }

1 0

Nikolay Sivov : dpnet/tests: Fix free buffer access (Coverity).
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 25de063ec0a3ac94f90c2c8a2d5722444e591452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25de063ec0a3ac94f90c2c8a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:25:52 2017 +0300 dpnet/tests: Fix free buffer access (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/client.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index e11bfe3..431203b 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -210,13 +210,13 @@ static void test_enum_service_providers(void) trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); - /* Invalid GUID */ items = 88; hr = IDirectPlay8Client_EnumServiceProviders(client, &appguid, NULL, serv_prov_info, &size, &items, 0); ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); } static void test_enum_hosts(void) @@ -613,14 +613,11 @@ static void test_enum_service_providers_peer(void) for (i=0;i<items;i++) { - trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); - trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); - - serv_prov_info++; + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - serv_prov_info -= items; /* set pointer back */ - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + HeapFree(GetProcessHeap(), 0, serv_prov_info); size = 0; items = 0; @@ -638,20 +635,17 @@ static void test_enum_service_providers_peer(void) for (i=0;i<items;i++) { - trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); - trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); - - serv_prov_info++; + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - serv_prov_info -= items; /* set pointer back */ - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); - /* Invalid GUID */ items = 88; hr = IDirectPlay8Peer_EnumServiceProviders(peer, &appguid, NULL, serv_prov_info, &size, &items, 0); ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); } static void test_enum_hosts_peer(void)

1 0

Nikolay Sivov : dpnet/tests: Added missing break (Coverity).
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 9e186fcf09b3e873a661c20fd75ece84d61e6bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e186fcf09b3e873a661c20fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:35:45 2017 +0300 dpnet/tests: Added missing break (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index 78515f8..d7295ac 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -44,6 +44,7 @@ static HRESULT WINAPI DirectPlayThreadHandler(void *context, DWORD message_id, v cnt_complete++; if(cnt_complete >= 2) SetEvent(enumevent); + break; default: trace("DirectPlayThreadHandler: 0x%08x\n", message_id); }

1 0

Nikolay Sivov : mshtml/tests: Fix BSTR double-free (Coverity).
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 5587efe51b4de167a91f2044d332c51807100d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5587efe51b4de167a91f2044d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 23:07:12 2017 +0300 mshtml/tests: Fix BSTR double-free (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 41aaa3e..322314b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3118,7 +3118,6 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, }else { src = FindResourceW(NULL, *path == '/' ? path+1 : path, (const WCHAR*)RT_HTML); ok(src != NULL, "Could not find resource for path %s\n", wine_dbgstr_w(path)); - SysFreeString(path); if(src) { This->size = SizeofResource(NULL, src); This->data = LoadResource(NULL, src);

1 0

Hugh McMaster : regedit: Add a missing 'break' statement (Coverity).
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 85e34436cde08ddfb07f21d395c0cef82633c6c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e34436cde08ddfb07f21d39… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 1 09:30:21 2017 +0000 regedit: Add a missing 'break' statement (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 6ee0cdb..b20ff9a 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -381,6 +381,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); } + break; } case WM_KEYDOWN:

1 0

Hugh McMaster : regedit: Pass RegQueryValueEx() the actual buffer size ( Coverity).
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 8b5291bca61322ddc74b2df04804fe3253efe71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b5291bca61322ddc74b2df04… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 1 09:30:31 2017 +0000 regedit: Pass RegQueryValueEx() the actual buffer size (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index fc234d4..11147a7 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -550,6 +550,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli if (!valBuf) goto done; + valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, !highlightValue); }

1 0

Zebediah Figura : kernel32: Use the full path as an argument to winevdm.exe.
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 5155afd882d09c840d27a5f13681d3b09f564b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5155afd882d09c840d27a5f13… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 27 15:14:37 2017 -0500 kernel32: Use the full path as an argument to winevdm.exe. When starting a 16-bit process using CreateProcess() which resides in a subdirectory, the directory is changed but winevdm.exe still attempts to look for the whole path. Thus attempting to start "install\setup.exe" will cause winevdm.exe to look for "install\install\setup.exe", which fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5b8a3d3..4810965 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2186,15 +2186,21 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L static const WCHAR argsW[] = {'%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; BOOL ret; - LPWSTR new_cmd_line = HeapAlloc( GetProcessHeap(), 0, - (strlenW(filename) + strlenW(cmd_line) + 30) * sizeof(WCHAR) ); + WCHAR buffer[MAX_PATH]; + LPWSTR new_cmd_line; + + if (!(ret = GetFullPathNameW(filename, MAX_PATH, buffer, NULL))) + return FALSE; + + new_cmd_line = HeapAlloc(GetProcessHeap(), 0, + (strlenW(buffer) + strlenW(cmd_line) + 30) * sizeof(WCHAR)); if (!new_cmd_line) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - sprintfW( new_cmd_line, argsW, winevdmW, filename, cmd_line ); + sprintfW(new_cmd_line, argsW, winevdmW, buffer, cmd_line); ret = create_process( 0, winevdmW, new_cmd_line, env, cur_dir, psa, tsa, inherit, flags, startup, info, unixdir, binary_info, exec_only ); HeapFree( GetProcessHeap(), 0, new_cmd_line );

1 0

Akihiro Sagawa : rsaenh/tests: Add CryptImportKey tests with a public key.
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: b6ca68259f1d43d92c41e81fa88edfd736b9df6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ca68259f1d43d92c41e81fa… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Apr 30 22:30:40 2017 +0900 rsaenh/tests: Add CryptImportKey tests with a public key. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 80 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 9 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4286db0..839527b 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -110,23 +110,21 @@ static void printBytes(const char *heading, const BYTE *pb, size_t cb) static BOOL (WINAPI *pCryptDuplicateHash) (HCRYPTHASH, DWORD*, DWORD, HCRYPTHASH*); -/* static void trace_hex(BYTE *pbData, DWORD dwLen) { char szTemp[256]; DWORD i, j; for (i = 0; i < dwLen-7; i+=8) { - sprintf(szTemp, "0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x,\n", - pbData[i], pbData[i+1], pbData[i+2], pbData[i+3], pbData[i+4], pbData[i+5], - pbData[i+6], pbData[i+7]); - trace(szTemp); + trace("0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x,\n", + pbData[i], pbData[i+1], pbData[i+2], pbData[i+3], pbData[i+4], pbData[i+5], + pbData[i+6], pbData[i+7]); } for (j=0; i<dwLen; j++,i++) { - sprintf(szTemp+6*j, "0x%02x,\n", pbData[i]); + sprintf(szTemp+6*j, "0x%02x, ", pbData[i]); } - trace(szTemp); + if (j) + trace("%s\n", szTemp); } -*/ static BOOL init_base_environment(const char *provider, DWORD dwKeyFlags) { @@ -2377,7 +2375,7 @@ static void test_import_export(void) HCRYPTKEY hPublicKey, hPrivKey; BOOL result; ALG_ID algID; - BYTE emptyKey[2048], *exported_key; + BYTE emptyKey[2048], *exported_key, *exported_key2; static BYTE abPlainPublicKey[84] = { 0x06, 0x02, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x52, 0x53, 0x41, 0x31, 0x00, 0x02, 0x00, 0x00, @@ -2571,6 +2569,7 @@ static void test_import_export(void) CryptDestroyKey(hPublicKey); + /* imports into AT_SIGNATURE key container */ result = CryptImportKey(hProv, priv_key_with_high_bit, sizeof(priv_key_with_high_bit), 0, CRYPT_EXPORTABLE, &hPrivKey); ok(result, "CryptImportKey failed: %08x\n", GetLastError()); @@ -2590,6 +2589,69 @@ static void test_import_export(void) HeapFree(GetProcessHeap(), 0, exported_key); CryptDestroyKey(hPrivKey); + + /* imports into AT_KEYEXCHANGE key container */ + result = CryptImportKey(hProv, abPlainPrivateKey, + sizeof(abPlainPrivateKey), 0, 0, &hPrivKey); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); + + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + /* getting the public key from AT_KEYEXCHANGE, and compare it */ + result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hPrivKey); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key2 = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key2, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + result = !memcmp(exported_key, exported_key2, dwDataLen); + ok(result, "unexpected value\n"); + if (!result && winetest_debug > 1) { + trace("Expected public key (%u):\n", dwDataLen); + trace_hex(exported_key, dwDataLen); + trace("AT_KEYEXCHANGE public key (%u):\n", dwDataLen); + trace_hex(exported_key2, dwDataLen); + } + HeapFree(GetProcessHeap(), 0, exported_key2); + + /* importing a public key doesn't update key container at all */ + result = CryptImportKey(hProv, abPlainPublicKey, + sizeof(abPlainPublicKey), 0, 0, &hPublicKey); + ok(result, "failed to import the public key\n"); + CryptDestroyKey(hPublicKey); + + /* getting the public key again, and compare it */ + result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hPrivKey); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key2 = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key2, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + result = !memcmp(exported_key, exported_key2, dwDataLen); + todo_wine ok(result, "unexpected value\n"); + if (!result && winetest_debug > 1) { + trace("Expected public key (%u):\n", dwDataLen); + trace_hex(exported_key, dwDataLen); + trace("AT_KEYEXCHANGE public key (%u):\n", dwDataLen); + trace_hex(exported_key2, dwDataLen); + } + + HeapFree(GetProcessHeap(), 0, exported_key); + HeapFree(GetProcessHeap(), 0, exported_key2); } static void test_import_hmac(void)

1 0