October 2020 - Wine-commits

Michael Stefaniuc : iexplore: Use wide-char string literals.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 845d04a8d39caf0a64c60c1d7cc5cf762684e07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=845d04a8d39caf0a64c60c1d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 23:17:48 2020 +0200 iexplore: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/main.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 01ad9d02f5..ade9f8c522 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -35,28 +35,18 @@ static BOOL check_native_ie(void) void* buf; BOOL ret = TRUE; LPWORD translation; - - static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; - static const WCHAR wineW[] = {'W','i','n','e',0}; - static const WCHAR translationW[] = - {'\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n',0}; - static const WCHAR file_desc_fmtW[] = - {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x', - '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; WCHAR file_desc_strW[48]; - size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + size = GetFileVersionInfoSizeW(L"browseui.dll", &handle); if(!size) return TRUE; buf = HeapAlloc(GetProcessHeap(), 0, size); - GetFileVersionInfoW(browseui_dllW, 0, size,buf); - if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) + GetFileVersionInfoW(L"browseui.dll", 0, size,buf); + if (VerQueryValueW(buf, L"\\VarFileInfo\\Translation", (void **)&translation, &bytes)) { - wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, wineW); + wsprintfW(file_desc_strW, L"\\StringFileInfo\\%04x%04x\\FileDescription", translation[0], translation[1]); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, L"Wine"); } HeapFree(GetProcessHeap(), 0, buf); @@ -78,13 +68,10 @@ static DWORD register_iexplore(BOOL doregister) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) { - static const WCHAR regserverW[] = {'r','e','g','s','e','r','v','e','r',0}; - static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; - if(*cmdline == '-' || *cmdline == '/') { - if(!wcsicmp(cmdline+1, regserverW)) + if(!wcsicmp(cmdline+1, L"regserver")) return register_iexplore(TRUE); - if(!wcsicmp(cmdline+1, unregserverW)) + if(!wcsicmp(cmdline+1, L"unregserver")) return register_iexplore(FALSE); }

1 0

Michael Stefaniuc : opcservices: Use wide-char string literals.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 43301cc14b6c20e8837865e486d9b8a23c697614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43301cc14b6c20e8837865e4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 23:17:49 2020 +0200 opcservices: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 3 +-- dlls/opcservices/package.c | 54 ++++++++++++++++------------------------------ dlls/opcservices/uri.c | 7 +++--- 3 files changed, 22 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43301cc14b6c20e88378…

1 0

Paul Gofman : ntdll: Always align stack in call_user_apc_dispatcher() on x86_64.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 53f7cb3c0888c852e0b4fdc9366c6ce53a54f433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53f7cb3c0888c852e0b4fdc9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 13 02:52:18 2020 +0300 ntdll: Always align stack in call_user_apc_dispatcher() on x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49860 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e11b2c70b5..00b07c4270 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2011,6 +2011,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "jrcxz 1f\n\t" "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ + "andq $~15,%rsp\n\t" "jmp 2f\n" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ "leaq -0x4d0(%rax),%rsp\n\t"

1 0

Jacek Caban : wineconsole: Reimplement as AllocConsole wrapper.
by Alexandre Julliard 12 Oct '20

12 Oct '20

1 0

Brendan Shanks : winemac: Remove unused GetCurrentProcess() call.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 863683342ded500d3939f7ff66d2d9c1a4134caf URL: https://source.winehq.org/git/wine.git/?a=commit;h=863683342ded500d3939f7ff… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 6 15:52:18 2020 -0700 winemac: Remove unused GetCurrentProcess() call. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b4dcbfff47..e296d4b4af 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -19,7 +19,6 @@ */ #import <Carbon/Carbon.h> -#include <dlfcn.h> #import "cocoa_app.h" #import "cocoa_event.h" @@ -1332,8 +1331,6 @@ static NSString* WineLocalizedString(unsigned int stringID) - (BOOL) installEventTap { - ProcessSerialNumber psn; - OSErr err; CGEventMask mask = CGEventMaskBit(kCGEventLeftMouseDown) | CGEventMaskBit(kCGEventLeftMouseUp) | CGEventMaskBit(kCGEventRightMouseDown) | @@ -1346,31 +1343,10 @@ static NSString* WineLocalizedString(unsigned int stringID) CGEventMaskBit(kCGEventOtherMouseDragged) | CGEventMaskBit(kCGEventScrollWheel); CFRunLoopSourceRef source; - void* appServices; - OSErr (*pGetCurrentProcess)(ProcessSerialNumber* PSN); if (cursorClippingEventTap) return TRUE; - // We need to get the Mac GetCurrentProcess() from the ApplicationServices - // framework with dlsym() because the Win32 function of the same name - // obscures it. - appServices = dlopen("/System/Library/Frameworks/ApplicationServices.framework/ApplicationServices", RTLD_LAZY); - if (!appServices) - return FALSE; - - pGetCurrentProcess = dlsym(appServices, "GetCurrentProcess"); - if (!pGetCurrentProcess) - { - dlclose(appServices); - return FALSE; - } - - err = pGetCurrentProcess(&psn); - dlclose(appServices); - if (err != noErr) - return FALSE; - // We create an annotated session event tap rather than a process-specific // event tap because we need to programmatically move the cursor even when // mouse moves are directed to other processes. We disable our tap when

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs in InternalDeleteText().
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: a6d41a0391e61beb84c4998d595d36b2458e0281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d41a0391e61beb84c4998d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:09 2020 +0100 riched20: Use ME_Paragraph ptrs in InternalDeleteText(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index bd533f91ba..69963e6691 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -308,13 +308,13 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nOfs = ME_GetCursorOfs(start), text_len = ME_GetTextLength( editor ); int shift = 0; int totalChars = nChars; - ME_DisplayItem *start_para; + ME_Paragraph *start_para; BOOL delete_all = FALSE; /* Prevent deletion past last end of paragraph run. */ nChars = min(nChars, text_len - nOfs); if (nChars == text_len) delete_all = TRUE; - start_para = c.pPara; + start_para = &c.pPara->member.para; if (!bForce) { @@ -349,19 +349,19 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, run->nCharOfs); if (!editor->bEmulateVersion10) /* v4.1 */ { - ME_DisplayItem *next_para = ME_FindItemFwd(c.pRun, diParagraphOrEnd); - ME_DisplayItem *this_para = next_para->member.para.prev_para; + ME_Paragraph *this_para = run->para; + ME_Paragraph *next_para = para_next( this_para ); /* The end of paragraph before a table row is only deleted if there * is nothing else on the line before it. */ - if (this_para == start_para && - next_para->member.para.nFlags & MEPF_ROWSTART) + if (this_para == start_para && next_para->nFlags & MEPF_ROWSTART) { /* If the paragraph will be empty, then it should be deleted, however * it still might have text right now which would inherit the * MEPF_STARTROW property if we joined it right now. * Instead we will delete it after the preceding text is deleted. */ - if (nOfs > this_para->member.para.nCharOfs) { + if (nOfs > this_para->nCharOfs) + { /* Skip this end of line. */ nChars -= (eollen < nChars) ? eollen : nChars; continue; @@ -383,7 +383,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, c.nOffset -= nCharsToDelete; - para_mark_rewrap( editor, &ME_FindItemBack( c.pRun, diParagraph )->member.para ); + para_mark_rewrap( editor, c.pRun->member.run.para ); cursor = c; /* nChars is the number of characters that should be deleted from the @@ -447,7 +447,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, continue; } } - if (delete_all) ME_SetDefaultParaFormat( editor, &start_para->member.para.fmt ); + if (delete_all) ME_SetDefaultParaFormat( editor, &start_para->fmt ); return TRUE; }

1 0

Henri Verbeet : wined3d: Make adapter_vk_clear_uav() static.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 43dddbae7bf2806ce9202edcc3f9cb96ae657434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43dddbae7bf2806ce9202edc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 16:48:35 2020 +0330 wined3d: Make adapter_vk_clear_uav() static. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 6485094404..beda271c32 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1722,7 +1722,7 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, context_release(&context_vk->c); } -void adapter_vk_clear_uav(struct wined3d_context *context, +static void adapter_vk_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value));

1 0

Hans Leidekker : dssenh: Don't store the algorithm handle for hashes.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: b5e931d83c0518976c29ae7200250214e74ff02c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e931d83c0518976c29ae72… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:08 2020 +0200 dssenh: Don't store the algorithm handle for hashes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index f02e04585a..e9b676e735 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -59,7 +59,6 @@ struct container struct hash { DWORD magic; - BCRYPT_ALG_HANDLE alg_handle; BCRYPT_HASH_HANDLE handle; DWORD len; UCHAR value[64]; @@ -475,6 +474,7 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW static struct hash *create_hash( ALG_ID algid ) { struct hash *ret; + BCRYPT_ALG_HANDLE alg_handle; const WCHAR *alg; DWORD len; @@ -492,24 +492,26 @@ static struct hash *create_hash( ALG_ID algid ) default: FIXME( "unhandled algorithm %u\n", algid ); - return 0; + return NULL; } - if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return 0; + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; ret->magic = MAGIC_HASH; ret->len = len; - if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + if (BCryptOpenAlgorithmProvider( &alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) { heap_free( ret ); - return 0; + return NULL; } - if (BCryptCreateHash( ret->alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) + if (BCryptCreateHash( alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) { - BCryptCloseAlgorithmProvider( ret->alg_handle, 0 ); + BCryptCloseAlgorithmProvider( alg_handle, 0 ); heap_free( ret ); - return 0; + return NULL; } + + BCryptCloseAlgorithmProvider( alg_handle, 0 ); return ret; } @@ -537,6 +539,14 @@ BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD return TRUE; } +static void destroy_hash( struct hash *hash ) +{ + if (!hash) return; + BCryptDestroyHash( hash->handle ); + hash->magic = 0; + heap_free( hash ); +} + BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) { struct hash *hash = (struct hash *)hhash; @@ -549,11 +559,7 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) return FALSE; } - BCryptDestroyHash( hash->handle ); - BCryptCloseAlgorithmProvider( hash->alg_handle, 0 ); - - hash->magic = 0; - heap_free( hash ); + destroy_hash( hash ); return TRUE; }

1 0

Hans Leidekker : dssenh: Implement CPDuplicateHash.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: bf83b89dabbd7a2fc612529d26d5552a54a1b147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf83b89dabbd7a2fc612529d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:09 2020 +0200 dssenh: Implement CPDuplicateHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 31 +++++++++++++++++++++++++++ dlls/dssenh/tests/dssenh.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index 2d93a98796..a045a7e04e 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -4,7 +4,7 @@ @ stdcall CPDeriveKey(ptr long ptr long ptr) @ stdcall CPDestroyHash(ptr ptr) @ stdcall CPDestroyKey(ptr ptr) -@ stub CPDuplicateHash +@ stdcall CPDuplicateHash(ptr ptr ptr long ptr) @ stub CPDuplicateKey @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index e9b676e735..d40dedf41b 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -563,6 +563,37 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) return TRUE; } +static struct hash *duplicate_hash( const struct hash *hash ) +{ + struct hash *ret; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + + ret->magic = hash->magic; + ret->len = hash->len; + if (BCryptDuplicateHash( hash->handle, &ret->handle, NULL, 0, 0 )) + { + heap_free( ret ); + return NULL; + } + memcpy( ret->value, hash->value, sizeof(hash->value) ); + ret->finished = hash->finished; + return ret; +} + +BOOL WINAPI CPDuplicateHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD *reserved, DWORD flags, HCRYPTHASH *ret_hash ) +{ + struct hash *hash = (struct hash *)hhash, *ret; + + TRACE( "%p, %p, %p, %08x, %p\n", (void *)hprov, (void *)hhash, reserved, flags, ret_hash ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + if (!(ret = duplicate_hash( hash ))) return FALSE; + *ret_hash = (HCRYPTHASH)ret; + return TRUE; +} + BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) { struct hash *hash = (struct hash *)hhash; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d4a231562e..704b3685c3 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1413,6 +1413,58 @@ static void test_key_exchange(void) ok(result, "Failed to release CSP provider.\n"); } +static void test_duplicate_hash(void) +{ + static const char expected[] = + {0xb9,0x7b,0xed,0xd4,0x7b,0xd8,0xa0,0xcd,0x6c,0xba,0xce,0xe9,0xb1,0x36,0xbb,0x00,0x27,0xe3,0x95,0x21}; + HCRYPTPROV hprov; + HCRYPTHASH hhash, hhash2; + BYTE buf[20]; + DWORD len; + BOOL result; + + result = CryptAcquireContextA(&hprov, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); + ok(result, "got %08x\n", GetLastError()); + + result = CryptCreateHash(hprov, CALG_SHA, 0, 0, &hhash); + ok(result, "got %08x\n", GetLastError()); + + result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(result, "got %08x\n", GetLastError()); + + len = sizeof(buf); + result = CryptGetHashParam(hhash, HP_HASHVAL, buf, &len, 0); + ok(result, "got %08x\n", GetLastError()); + ok(!memcmp(buf, expected, sizeof(expected)), "wrong data\n"); + + SetLastError(0xdeadbeef); + result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(!result, "success\n"); + todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + + result = CryptDuplicateHash(hhash, NULL, 0, &hhash2); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptHashData(hhash2, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(!result, "success\n"); + todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + + len = sizeof(buf); + result = CryptGetHashParam(hhash2, HP_HASHVAL, buf, &len, 0); + ok(result, "got %08x\n", GetLastError()); + ok(!memcmp(buf, expected, sizeof(expected)), "wrong data\n"); + + result = CryptDestroyHash(hhash2); + ok(result, "got %08x\n", GetLastError()); + + result = CryptDestroyHash(hhash); + ok(result, "got %08x\n", GetLastError()); + + result = CryptReleaseContext(hprov, 0); + ok(result, "got %08x\n", GetLastError()); +} + START_TEST(dssenh) { test_acquire_context(); @@ -1422,4 +1474,5 @@ START_TEST(dssenh) test_cipher_modes(ciphermode_data, ARRAY_SIZE(ciphermode_data)); test_verify_signature(); test_key_exchange(); + test_duplicate_hash(); }

1 0

Hans Leidekker : dssenh: Implement CPDuplicateKey.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: e32b29a3fd2d611a1c978bfe9c7630a735e3f201 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32b29a3fd2d611a1c978bfe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:10 2020 +0200 dssenh: Implement CPDuplicateKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index a045a7e04e..e74650c9bb 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -5,7 +5,7 @@ @ stdcall CPDestroyHash(ptr ptr) @ stdcall CPDestroyKey(ptr ptr) @ stdcall CPDuplicateHash(ptr ptr ptr long ptr) -@ stub CPDuplicateKey +@ stdcall CPDuplicateKey(ptr ptr ptr long ptr) @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) @ stdcall CPGenKey(ptr long long ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index d40dedf41b..38ee325b8e 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -471,6 +471,33 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW return FALSE; } +static struct key *duplicate_key( const struct key *key ) +{ + struct key *ret; + + if (!(ret = create_key( key->algid, key->flags ))) return NULL; + + if (BCryptDuplicateKey( key->handle, &ret->handle, NULL, 0, 0 )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, DWORD flags, HCRYPTKEY *ret_key ) +{ + struct key *key = (struct key *)hkey, *ret; + + TRACE( "%p, %p, %p, %08x, %p\n", (void *)hprov, (void *)hkey, reserved, flags, ret_key ); + + if (key->magic != MAGIC_KEY) return FALSE; + + if (!(ret = duplicate_key( key ))) return FALSE; + *ret_key = (HCRYPTKEY)ret; + return TRUE; +} + static struct hash *create_hash( ALG_ID algid ) { struct hash *ret;

1 0