October 2020 - Wine-Commits

Hans Leidekker : dssenh: Access the hash value directly in CPSignHash and CPVerifySignature.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 554e315bcfd7aa58ffc38ce69bfe4cba04c26de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=554e315bcfd7aa58ffc38ce6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:14 2020 +0200 dssenh: Access the hash value directly in CPSignHash and CPVerifySignature. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 2d9569672a5..a2e5a72148d 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -860,8 +860,7 @@ BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const { struct container *container = (struct container *)hprov; struct hash *hash = (struct hash *)hhash; - UCHAR hashval[MAX_HASH_LEN]; - ULONG len, hashlen = sizeof(hashval); + ULONG len; TRACE( "%p, %p, %u, %s, %08x, %p, %p\n", (void *)hprov, (void *)hhash, keyspec, debugstr_w(desc), flags, sig, siglen ); @@ -870,14 +869,13 @@ BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const if (hash->magic != MAGIC_HASH) return FALSE; if (!(len = get_signature_length( container->sign_key->algid ))) return FALSE; - if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; if (*siglen < len) { *siglen = len; return TRUE; } - return !BCryptSignHash( container->sign_key->handle, NULL, hashval, hashlen, sig, *siglen, siglen, 0 ); + return !BCryptSignHash( container->sign_key->handle, NULL, hash->value, hash->len, sig, *siglen, siglen, 0 ); } BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, @@ -885,8 +883,6 @@ BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *s { struct hash *hash = (struct hash *)hhash; struct key *key = (struct key *)hpubkey; - UCHAR hashval[MAX_HASH_LEN]; - ULONG hashlen = sizeof(hashval); TRACE( "%p, %p, %p, %u %p, %s, %08x\n", (void *)hprov, (void *)hhash, sig, siglen, (void *)hpubkey, debugstr_w(desc), flags ); @@ -898,9 +894,7 @@ BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *s return FALSE; } - if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; - - return !BCryptVerifySignature( key->handle, NULL, hashval, hashlen, (UCHAR *)sig, siglen, 0 ); + return !BCryptVerifySignature( key->handle, NULL, hash->value, hash->len, (UCHAR *)sig, siglen, 0 ); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Hans Leidekker : dssenh: Implement CPGetUserKey.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 248d27ea2d47d26f9c328adaa8d94fec026d2476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=248d27ea2d47d26f9c328ada… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:13 2020 +0200 dssenh: Implement CPGetUserKey. 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 | 29 +++++++++++++++++++++++++++++ dlls/dssenh/tests/dssenh.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index eb9ef06337a..473bd08205f 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -13,7 +13,7 @@ @ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam @ stdcall CPGetProvParam(ptr long ptr ptr long) -@ stub CPGetUserKey +@ stdcall CPGetUserKey(ptr long ptr) @ stdcall CPHashData(ptr ptr ptr long long) @ stub CPHashSessionKey @ stdcall CPImportKey(ptr ptr long ptr long ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 4867fef2f59..2d9569672a5 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -615,6 +615,35 @@ BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, D return TRUE; } +BOOL WINAPI CPGetUserKey( HCRYPTPROV hprov, DWORD keyspec, HCRYPTKEY *ret_key ) +{ + struct container *container = (struct container *)hprov; + BOOL ret = FALSE; + + TRACE( "%p, %08x, %p\n", (void *)hprov, keyspec, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + + switch (keyspec) + { + case AT_KEYEXCHANGE: + if (!container->exch_key) SetLastError( NTE_NO_KEY ); + else if ((*ret_key = (HCRYPTKEY)duplicate_key( container->exch_key ))) ret = TRUE; + break; + + case AT_SIGNATURE: + if (!container->sign_key) SetLastError( NTE_NO_KEY ); + else if ((*ret_key = (HCRYPTKEY)duplicate_key( container->sign_key ))) ret = TRUE; + break; + + default: + SetLastError( NTE_NO_KEY ); + return FALSE; + } + + return ret; +} + BOOL WINAPI CPGenRandom( HCRYPTPROV hprov, DWORD len, BYTE *buffer ) { struct container *container = (struct container *)hprov; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 4f401254f52..d3f3172230e 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1470,6 +1470,50 @@ static void test_duplicate_hash(void) ok(result, "got %08x\n", GetLastError()); } +static void test_userkey(void) +{ + HCRYPTPROV hprov; + HCRYPTKEY hkey; + BOOL result; + + CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_DELETEKEYSET); + result = CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_NEWKEYSET); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_KEYEXCHANGE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_SIGNATURE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + result = CryptGenKey(hprov, AT_SIGNATURE, 1024 << 16, &hkey); + ok(result, "got %08x\n", GetLastError()); + result = CryptDestroyKey(hkey); + ok(result, "got %08x\n", GetLastError()); + + result = CryptGetUserKey(hprov, AT_SIGNATURE, &hkey); + ok(result, "got %08x\n", GetLastError()); + result = CryptDestroyKey(hkey); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_KEYEXCHANGE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + result = CryptReleaseContext(hprov, 0); + ok(result, "got %08x\n", GetLastError()); + + hprov = 0xdeadbeef; + result = CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_DELETEKEYSET); + ok(result, "got %08x\n", GetLastError()); + ok(!hprov, "got %08x\n", (DWORD)hprov); +} + START_TEST(dssenh) { test_acquire_context(); @@ -1480,4 +1524,5 @@ START_TEST(dssenh) test_verify_signature(); test_key_exchange(); test_duplicate_hash(); + test_userkey(); }

1 0

Michael Stefaniuc : rpcss: Use wide-char string literals.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: d1be006f16d490e7c92112e66363a3ec1367605a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1be006f16d490e7c92112e6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:30 2020 +0200 rpcss: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index e3859e4c3c9..7df859155e2 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static WCHAR rpcssW[] = {'R','p','c','S','s',0}; +static WCHAR rpcssW[] = L"RpcSs"; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; @@ -149,10 +149,10 @@ static RPC_STATUS RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; static unsigned short irot_endpoint[] = IROT_ENDPOINT; - static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; - static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; - static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; - static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq[] = L"ncacn_np"; + static unsigned short epm_endpoint[] = L"\\pipe\\epmapper"; + static unsigned short epm_protseq_lrpc[] = L"ncalrpc"; + static unsigned short epm_endpoint_lrpc[] = L"epmapper"; static unsigned short irpcss_protseq[] = IRPCSS_PROTSEQ; static unsigned short irpcss_endpoint[] = IRPCSS_ENDPOINT; static const struct protseq_map

1 0

Michael Stefaniuc : taskmgr: Shell32 is imported, no need to load it again.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 9764b6fe37d04177f9c5cb9da2601ba97ba9b5e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9764b6fe37d04177f9c5cb9d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:29 2020 +0200 taskmgr: Shell32 is imported, no need to load it again. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/run.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c index 6d24f1c745c..177c737bb07 100644 --- a/programs/taskmgr/run.c +++ b/programs/taskmgr/run.c @@ -48,13 +48,10 @@ UINT uFlags); void TaskManager_OnFileNew(void) { - HMODULE hShell32; RUNFILEDLG RunFileDlg; OSVERSIONINFOW versionInfo; - static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; - hShell32 = LoadLibraryW(wszShell32); - RunFileDlg = (void *)GetProcAddress(hShell32, (LPCSTR)61); + RunFileDlg = (void *)GetProcAddress(GetModuleHandleW(L"shell32.dll"), (LPCSTR)61); /* Show "Run..." dialog */ if (RunFileDlg) @@ -76,6 +73,4 @@ void TaskManager_OnFileNew(void) RunFileDlg(hMainWnd, hIcon, NULL, szTitle, NULL, RFF_CALCDIRECTORY); } } - - FreeLibrary(hShell32); }

1 0

Michael Stefaniuc : explorer: Use the WCHAR string version of LoadLibrary.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 27431b0f3a0383559d5dd2cc6de4f1a3770ca714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27431b0f3a0383559d5dd2cc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:28 2020 +0200 explorer: Use the WCHAR string version of LoadLibrary. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 2 +- programs/explorer/startmenu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 6f1ff54c143..f525c23d819 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1041,7 +1041,7 @@ void manage_desktop( WCHAR *arg ) initialize_systray( graphics_driver, using_root, enable_shell ); if (!using_root) initialize_launchers( hwnd ); - if ((shell32 = LoadLibraryA( "shell32.dll" )) && + if ((shell32 = LoadLibraryW( L"shell32.dll" )) && (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) { pShellDDEInit( TRUE ); diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index f5f50bb3e72..3173ae21fc6 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -375,7 +375,7 @@ static void run_dialog(void) LPCSTR lpszTitle, LPCSTR lpszDesc, DWORD dwFlags); HMODULE hShell32; - hShell32 = LoadLibraryA("shell32"); + hShell32 = LoadLibraryW(L"shell32"); pRunFileDlg = (void*)GetProcAddress(hShell32, (LPCSTR)61); pRunFileDlg(NULL, NULL, NULL, NULL, NULL, 0);

1 0

Zebediah Figura : wintrust: Stub CryptCATPutAttrInfo().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 8161d2924fdff58e4897f7deb4c46f502fff7889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8161d2924fdff58e4897f7de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:13 2020 -0500 wintrust: Stub CryptCATPutAttrInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 10 ++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index de2e95b4593..96a2ab1965b 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -848,6 +848,19 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info return TRUE; } +/*********************************************************************** + * CryptCATPutAttrInfo (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, + WCHAR *name, DWORD flags, DWORD size, BYTE *data) +{ + FIXME("catalog %p, member %p, name %s, flags %#x, size %u, data %p, stub!\n", + catalog, member, debugstr_w(name), flags, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATPutMemberInfo (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 2f369c169ce..025241a808c 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -35,7 +35,7 @@ @ stub CryptCATHandleFromStore @ stdcall CryptCATOpen(wstr long long long long) @ stdcall CryptCATPersistStore(ptr) -@ stub CryptCATPutAttrInfo +@ stdcall CryptCATPutAttrInfo(ptr ptr wstr long long ptr) @ stub CryptCATPutCatAttrInfo @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle diff --git a/include/mscat.h b/include/mscat.h index d3e9a7e560d..79b92b213ab 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -28,6 +28,15 @@ typedef HANDLE HCATINFO; extern "C" { #endif +#define CRYPTCAT_ATTR_NAMEASCII 0x00000001 +#define CRYPTCAT_ATTR_NAMEOBJID 0x00000002 +#define CRYPTCAT_ATTR_DATAASCII 0x00010000 +#define CRYPTCAT_ATTR_DATAOBJID 0x00020000 +#define CRYPTCAT_ATTR_DATAREPLACE 0x00040000 +#define CRYPTCAT_ATTR_NO_AUTO_COMPAT_ENTRY 0x01000000 +#define CRYPTCAT_ATTR_AUTHENTICATED 0x10000000 +#define CRYPTCAT_ATTR_UNAUTHENTICATED 0x20000000 + #define CRYPTCAT_OPEN_CREATENEW 0x00000001 #define CRYPTCAT_OPEN_ALWAYS 0x00000002 #define CRYPTCAT_OPEN_EXISTING 0x00000004 @@ -132,6 +141,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); BOOL WINAPI CryptCATPersistStore(HANDLE catalog); +CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, WCHAR *name, DWORD flags, DWORD size, BYTE *data); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : wintrust: Stub CryptCATPutCatAttrInfo().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 3ea7b3d3b96b29a86a3ce70e9bc763a1318ec79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ea7b3d3b96b29a86a3ce70e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:14 2020 -0500 wintrust: Stub CryptCATPutCatAttrInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 96a2ab1965b..be869ad8277 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -861,6 +861,19 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *m return NULL; } +/*********************************************************************** + * CryptCATPutCatAttrInfo (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATPutCatAttrInfo(HANDLE catalog, + WCHAR *name, DWORD flags, DWORD size, BYTE *data) +{ + FIXME("catalog %p, name %s, flags %#x, size %u, data %p, stub!\n", + catalog, debugstr_w(name), flags, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATPutMemberInfo (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 025241a808c..8226c80c05f 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -36,7 +36,7 @@ @ stdcall CryptCATOpen(wstr long long long long) @ stdcall CryptCATPersistStore(ptr) @ stdcall CryptCATPutAttrInfo(ptr ptr wstr long long ptr) -@ stub CryptCATPutCatAttrInfo +@ stdcall CryptCATPutCatAttrInfo(ptr wstr long long ptr) @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember diff --git a/include/mscat.h b/include/mscat.h index 79b92b213ab..366dbbb0d1e 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -142,6 +142,7 @@ CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); BOOL WINAPI CryptCATPersistStore(HANDLE catalog); CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, WCHAR *name, DWORD flags, DWORD size, BYTE *data); +CRYPTCATATTRIBUTE * WINAPI CryptCATPutCatAttrInfo(HANDLE catalog, WCHAR *name, DWORD flags, DWORD size, BYTE *data); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : wintrust: Stub CryptCATPersistStore().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: de22b7b334057d59b68468c8ffde382bc200eb87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de22b7b334057d59b68468c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:12 2020 -0500 wintrust: Stub CryptCATPersistStore(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 11 +++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 15b21a299f3..de2e95b4593 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -861,6 +861,17 @@ CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, return NULL; } +/*********************************************************************** + * CryptCATPersistStore (WINTRUST.@) + */ +BOOL WINAPI CryptCATPersistStore(HANDLE catalog) +{ + FIXME("catalog %p, stub!\n", catalog); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /*********************************************************************** * CryptCATOpen (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index a01d1dd93c9..2f369c169ce 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -34,7 +34,7 @@ @ stdcall CryptCATGetMemberInfo(ptr wstr) @ stub CryptCATHandleFromStore @ stdcall CryptCATOpen(wstr long long long long) -@ stub CryptCATPersistStore +@ stdcall CryptCATPersistStore(ptr) @ stub CryptCATPutAttrInfo @ stub CryptCATPutCatAttrInfo @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) diff --git a/include/mscat.h b/include/mscat.h index 3931b71596c..d3e9a7e560d 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -131,6 +131,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE, CRYPTCATMEMBER *, LPWSTR) CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +BOOL WINAPI CryptCATPersistStore(HANDLE catalog); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : mssign32: Stub SignerSign().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 5e9df0bb15a897bb2404f5e78a31d29c17517a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e9df0bb15a897bb2404f5e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:15 2020 -0500 mssign32: Stub SignerSign(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/mssign32.spec | 2 +- dlls/mssign32/mssign32_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec index f25e23e9169..d4ea5a25caf 100644 --- a/dlls/mssign32/mssign32.spec +++ b/dlls/mssign32/mssign32.spec @@ -23,7 +23,7 @@ @ stub SignerAddTimeStampResponseEx @ stub SignerCreateTimeStampRequest @ stdcall SignerFreeSignerContext(ptr) -@ stub SignerSign +@ stdcall SignerSign(ptr ptr ptr ptr wstr ptr ptr) @ stdcall SignerSignEx(long ptr ptr ptr ptr wstr ptr ptr ptr) @ stub SignerTimeStamp @ stub SignerTimeStampEx diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index da7551e6d1b..416f836fc40 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -74,6 +74,13 @@ void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD d debugstr_w(pwszTmpContainer)); } +HRESULT WINAPI SignerSign(SIGNER_SUBJECT_INFO *subject, SIGNER_CERT *cert, SIGNER_SIGNATURE_INFO *signature, + SIGNER_PROVIDER_INFO *provider, const WCHAR *timestamp, CRYPT_ATTRIBUTES *attrs, void *sip_data) +{ + FIXME("%p %p %p %p %s %p %p stub\n", subject, cert, signature, provider, debugstr_w(timestamp), attrs, sip_data); + return E_NOTIMPL; +} + HRESULT WINAPI SignerSignEx(DWORD flags, SIGNER_SUBJECT_INFO *subject_info, SIGNER_CERT *signer_cert, SIGNER_SIGNATURE_INFO *signature_info, SIGNER_PROVIDER_INFO *provider_info, const WCHAR *http_time_stamp, CRYPT_ATTRIBUTES *request, void *sip_data,

1 0

Michael Stefaniuc : dsound: Use wide-char string literals.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 716cfcb163a5fe670023155a751fcfd83cc3b28f URL: https://source.winehq.org/git/wine.git/?a=commit;h=716cfcb163a5fe670023155a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:26 2020 +0200 dsound: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_main.c | 10 +++------- dlls/dsound/propset.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 3acee554ad9..ca33ba48046 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -88,7 +88,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; +const WCHAR wine_vxd_drv[] = L"winemm.vxd"; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; @@ -454,10 +454,6 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, BOOL keep_going; HRESULT hr, init_hr; - static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ', - 'S','o','u','n','d',' ','D','r','i','v','e','r',0}; - static const WCHAR empty_drv[] = {0}; - init_hr = get_mmdevenum(&devenum); if(!devenum) return init_hr; @@ -484,8 +480,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, return DS_OK; } - TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc)); - keep_going = cb(NULL, primary_desc, empty_drv, user); + TRACE("Calling back with NULL (Primary Sound Driver)\n"); + keep_going = cb(NULL, L"Primary Sound Driver", L"", user); /* always send the default device first */ if(keep_going){ diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index dcb2b871783..f1f71bef135 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); -static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 }; +static WCHAR wInterface[] = L"Interface"; typedef struct IKsPrivatePropertySetImpl {

1 0

Louis Lenders : dwmapi: Quiet noisy fixme.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 0c361793c3347caa06561eb3a3c6e2519e87bcec URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c361793c3347caa06561eb3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Oct 19 10:31:29 2020 +0200 dwmapi: Quiet noisy fixme. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index eb11ecb6b7f..45c33c2169a 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -103,7 +103,9 @@ HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) */ HRESULT WINAPI DwmFlush(void) { - FIXME("() stub\n"); + static BOOL once; + + if (!once++) FIXME("() stub\n"); return E_NOTIMPL; }

1 0

Esme Povirk : windowscodecs: Start loading PNG in unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 6aa8e179759ddba104b5682984048a61922f85f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa8e179759ddba104b56829… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:17 2020 -0500 windowscodecs: Start loading PNG in unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 159 ++++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 19 ++++ dlls/windowscodecs/pngformat.c | 21 ++++- dlls/windowscodecs/unix_iface.c | 14 ++- dlls/windowscodecs/unix_lib.c | 15 ++++ dlls/windowscodecs/wincodecs_common.h | 5 ++ dlls/windowscodecs/wincodecs_private.h | 20 +++++ 7 files changed, 247 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aa8e179759ddba104b5…

1 0

Esme Povirk : windowscodecs: Get PNG frame information from unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 8b849e814bcf28368324620c8742bad888ac55d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b849e814bcf28368324620c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:18 2020 -0500 windowscodecs: Get PNG frame information from unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 201 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 96 ++-------------- dlls/windowscodecs/unix_iface.c | 7 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 5 + dlls/windowscodecs/wincodecs_private.h | 13 +++ 6 files changed, 238 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b849e814bcf28368324…

1 0

Esme Povirk : windowscodecs: Move PNG CopyPixels to unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 53ce545e69e1cf88bd0949fb8981ff70a2f264b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ce545e69e1cf88bd0949fb… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:19 2020 -0500 windowscodecs: Move PNG CopyPixels to unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 54 ++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 65 ------------------------------- dlls/windowscodecs/pngformat.c | 3 +- dlls/windowscodecs/unix_iface.c | 8 ++++ dlls/windowscodecs/unix_lib.c | 3 ++ dlls/windowscodecs/wincodecs_common.h | 71 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 6 +++ 7 files changed, 143 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53ce545e69e1cf88bd09…

1 0

Esme Povirk : windowscodecs: Use the unix library to find PNG metadata.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 70ea6485e8b4d46c59e9675807055d1e641f0b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ea6485e8b4d46c59e96758… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:20 2020 -0500 windowscodecs: Use the unix library to find PNG metadata. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 77 ++++++++++++++++++ dlls/windowscodecs/main.c | 1 + dlls/windowscodecs/pngformat.c | 143 +++++---------------------------- dlls/windowscodecs/unix_iface.c | 8 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 51 ++++++++++++ dlls/windowscodecs/wincodecs_private.h | 15 ++++ 7 files changed, 174 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70ea6485e8b4d46c59e9…

1 0

Hans Leidekker : bcrypt: Copy all fields in key_duplicate.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 437d93280926dc85bd9c04f1e634bb56cd755913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=437d93280926dc85bd9c04f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:11 2020 +0200 bcrypt: Copy all fields in key_duplicate. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b0ea7fce191..4eb1fc29e94 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1476,8 +1476,11 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) if (!(buffer = heap_alloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY; memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len ); + key_copy->u.a.bitlen = key_orig->u.a.bitlen; + key_copy->u.a.flags = key_orig->u.a.flags; key_copy->u.a.pubkey = buffer; key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; + key_copy->u.a.dss_seed = key_orig->u.a.dss_seed; if ((status = key_funcs->key_asymmetric_duplicate( key_orig, key_copy ))) return status; }

1 0

Esme Povirk : windowscodecs: Do not call png_read_end.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: cd778e0b7f54cbbb9b7faae0dd6d25f826f54d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd778e0b7f54cbbb9b7faae0… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:22 2020 -0500 windowscodecs: Do not call png_read_end. This isn't necessary because we do not use libpng to read metadata or verify checksums. If this happens to be the last thing we do, it will fail the pngformat tests which do not expect us to return with the stream seeked to the end of the file. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index f7042c86a64..201f5c700d3 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -61,7 +61,6 @@ MAKE_FUNCPTR(png_get_io_ptr); MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); -MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); MAKE_FUNCPTR(png_set_bgr); @@ -111,7 +110,6 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); - LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); LOAD_FUNCPTR(png_set_bgr); @@ -183,7 +181,6 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; png_infop info_ptr; - png_infop end_info; jmp_buf jmpbuf; HRESULT hr = E_FAIL; int color_type, bit_depth; @@ -216,13 +213,6 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str return E_FAIL; } - end_info = ppng_create_info_struct(png_ptr); - if (!end_info) - { - ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return E_FAIL; - } - /* set up setjmp/longjmp error handling */ if (setjmp(jmpbuf)) { @@ -443,7 +433,7 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str free(row_pointers); row_pointers = NULL; - ppng_read_end(png_ptr, end_info); + /* png_read_end intentionally not called to not seek to the end of the file */ st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | WICBitmapDecoderCapabilityCanDecodeSomeImages | @@ -455,7 +445,7 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str hr = S_OK; end: - ppng_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); free(row_pointers); if (FAILED(hr)) {

1 0

Hans Leidekker : bcrypt/tests: Fix a key handle leak.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: f1e11804a02a2bf8c490484400e5d9251c18c4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e11804a02a2bf8c4904844… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:10 2020 +0200 bcrypt/tests: Fix a key handle leak. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d499ce65a65..0ae4b5dad53 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2603,6 +2603,9 @@ static void test_DSA(void) ok(!memcmp(dssKey, buf, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(!ret, "got %08x\n", ret); }

1 0

Zebediah Figura : ws2_32/tests: Fix an intermittent test failure on w10pro64.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: a0d386a310f78385cf7a74abf3172219bdbd2db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0d386a310f78385cf7a74ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 23:22:04 2020 -0500 ws2_32/tests: Fix an intermittent test failure on w10pro64. Much like 2aebe0b628. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5fb85bfaa60..fb580b6c8d6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3610,28 +3610,31 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); - - /* When a connection is attempted to a non-listening socket it will get to the except descriptor */ ret = closesocket(fdWrite); ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(address); - fdWrite = setup_connector_socket(&address, len, TRUE); - FD_ZERO_ALL(); - FD_SET(fdWrite, &writefds); - FD_SET(fdWrite, &exceptfds); - select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ - ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - ok(ret == 1, "expected 1, got %d\n", ret); - len = sizeof(id); - id = 0xdeadbeef; - ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); - ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); - ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); - closesocket(fdWrite); + + /* w10pro64 sometimes takes over 2 seconds for an error to be reported. */ + if (winetest_interactive) + { + len = sizeof(address); + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET(fdWrite, &writefds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 10; + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); + closesocket(fdWrite); + } /* Try select() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite);

1 0

Hans Leidekker : dssenh: Implement CRYPT_DELETEKEYSET.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 320b9eb47451eb8c167b211282f2ea49fcfbbab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=320b9eb47451eb8c167b2112… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:12 2020 +0200 dssenh: Implement CRYPT_DELETEKEYSET. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 5ad0ef1505d..4867fef2f59 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -247,6 +247,23 @@ static struct container *read_key_container( const char *name, DWORD flags ) return ret; } +static void delete_key_container( const char *name, DWORD flags ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, name ); + + if (flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + RegDeleteKeyExA( rootkey, path, 0, 0 ); +} + BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) { struct container *ret; @@ -285,6 +302,11 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags ret = create_key_container( "", flags ); break; + case CRYPT_DELETEKEYSET: + delete_key_container( name, flags ); + *ret_prov = 0; + return TRUE; + default: FIXME( "unsupported flags %08x\n", flags ); return FALSE;

1 0

Esme Povirk : windowscodecs: Add a general wrapper around the decoder interface.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 1b37ac14a3e4a014c8440e691e9a2bbad9ba6575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b37ac14a3e4a014c8440e69… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:23 2020 -0500 windowscodecs: Add a general wrapper around the decoder interface. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/decoder.c | 745 ++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 809 +-------------------------------- dlls/windowscodecs/wincodecs_private.h | 3 + 4 files changed, 763 insertions(+), 795 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b37ac14a3e4a014c844…

1 0

Esme Povirk : windowscodecs: Add a unix library and start to use it for PNG.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 0f61ed18ef0c3676139ba927e0d53751ec0e4491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f61ed18ef0c3676139ba927… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:16 2020 -0500 windowscodecs: Add a unix library and start to use it for PNG. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 3 + dlls/windowscodecs/libpng.c | 97 +++++++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 5 ++ dlls/windowscodecs/pngformat.c | 20 ++++++- dlls/windowscodecs/unix_iface.c | 101 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/unix_lib.c | 65 +++++++++++++++++++++ dlls/windowscodecs/wincodecs_common.h | 22 +++++++ dlls/windowscodecs/wincodecs_private.h | 35 ++++++++++++ 8 files changed, 345 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f61ed18ef0c3676139b…

1 0

Esme Povirk : windowscodecs: Use unix lib to get PNG color contexts.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 980e6650db59a9afb3c300ff7a8c05e692863330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=980e6650db59a9afb3c300ff… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:21 2020 -0500 windowscodecs: Use unix lib to get PNG color contexts. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 45 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 35 ++++++++++++-------------- dlls/windowscodecs/unix_iface.c | 8 ++++++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 6 +++++ dlls/windowscodecs/wincodecs_private.h | 7 ++++++ 6 files changed, 83 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 2a4fbca7d61..f7042c86a64 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -54,6 +54,7 @@ MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_iCCP); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); @@ -105,6 +106,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_error_ptr); LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_iCCP); LOAD_FUNCPTR(png_get_io_ptr); LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); @@ -137,6 +139,8 @@ struct png_decoder struct decoder_frame decoder_frame; UINT stride; BYTE *image_bits; + BYTE *color_profile; + DWORD color_profile_len; }; static inline struct png_decoder *impl_from_decoder(struct decoder* iface) @@ -194,6 +198,10 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str int i; UINT image_size; png_bytep *row_pointers=NULL; + png_charp cp_name; + png_bytep cp_profile; + png_uint_32 cp_len; + int cp_compression; png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png_ptr) @@ -351,6 +359,22 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str This->decoder_frame.dpix = This->decoder_frame.dpiy = 96.0; } + ret = ppng_get_iCCP(png_ptr, info_ptr, &cp_name, &cp_compression, &cp_profile, &cp_len); + if (ret) + { + This->decoder_frame.num_color_contexts = 1; + This->color_profile_len = cp_len; + This->color_profile = malloc(cp_len); + if (!This->color_profile) + { + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(This->color_profile, cp_profile, cp_len); + } + else + This->decoder_frame.num_color_contexts = 0; + if (color_type == PNG_COLOR_TYPE_PALETTE) { ret = ppng_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); @@ -437,6 +461,8 @@ end: { free(This->image_bits); This->image_bits = NULL; + free(This->color_profile); + This->color_profile = NULL; } return hr; } @@ -531,11 +557,28 @@ end: return hr; } +HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, + BYTE **data, DWORD *datasize) +{ + struct png_decoder *This = impl_from_decoder(iface); + + *data = RtlAllocateHeap(GetProcessHeap(), 0, This->color_profile_len); + *datasize = This->color_profile_len; + + if (!*data) + return E_OUTOFMEMORY; + + memcpy(*data, This->color_profile, This->color_profile_len); + + return S_OK; +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); free(This->image_bits); + free(This->color_profile); RtlFreeHeap(GetProcessHeap(), 0, This); } @@ -544,6 +587,7 @@ static const struct decoder_funcs png_decoder_vtable = { png_decoder_get_frame_info, png_decoder_copy_pixels, png_decoder_get_metadata_blocks, + png_decoder_get_color_context, png_decoder_destroy }; @@ -566,6 +610,7 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res This->decoder.vtable = &png_decoder_vtable; This->image_bits = NULL; + This->color_profile = NULL; *result = &This->decoder; info->container_format = GUID_ContainerFormatPng; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1d696a4fe01..efd5f6ab2c1 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -976,37 +976,34 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_charp name; + HRESULT hr=S_OK; BYTE *profile; - png_uint_32 len; - int compression_type; - HRESULT hr; + DWORD profile_len; TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); if (!pcActualCount) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + *pcActualCount = This->decoder_frame.num_color_contexts; - if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, (void *)&profile, &len)) + if (This->decoder_frame.num_color_contexts && cCount && ppIColorContexts) { - if (cCount && ppIColorContexts) + EnterCriticalSection(&This->lock); + + hr = decoder_get_color_context(This->png_decoder, 0, 0, + &profile, &profile_len); + + LeaveCriticalSection(&This->lock); + + if (SUCCEEDED(hr)) { - hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); - if (FAILED(hr)) - { - LeaveCriticalSection(&This->lock); - return hr; - } + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, profile_len); + + HeapFree(GetProcessHeap(), 0, profile); } - *pcActualCount = 1; } - else - *pcActualCount = 0; - LeaveCriticalSection(&This->lock); - - return S_OK; + return hr; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index ee2e38c5770..e376ea45841 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -92,6 +92,13 @@ HRESULT CDECL decoder_wrapper_get_metadata_blocks(struct decoder* iface, return unix_funcs->decoder_get_metadata_blocks(This->unix_decoder, frame, count, blocks); } +HRESULT CDECL decoder_wrapper_get_color_context(struct decoder* iface, + UINT frame, UINT num, BYTE **data, DWORD *datasize) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_get_color_context(This->unix_decoder, frame, num, data, datasize); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -104,6 +111,7 @@ static const struct decoder_funcs decoder_wrapper_vtable = { decoder_wrapper_get_frame_info, decoder_wrapper_copy_pixels, decoder_wrapper_get_metadata_blocks, + decoder_wrapper_get_color_context, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 102cc505ca1..04cbe053a0e 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -71,6 +71,7 @@ static const struct unix_funcs unix_funcs = { decoder_get_frame_info, decoder_copy_pixels, decoder_get_metadata_blocks, + decoder_get_color_context, decoder_destroy }; diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index f041de7c3f2..07e6dcaf44a 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -37,6 +37,12 @@ HRESULT CDECL decoder_get_metadata_blocks(struct decoder *decoder, UINT frame, U return decoder->vtable->get_metadata_blocks(decoder, frame, count, blocks); } +HRESULT CDECL decoder_get_color_context(struct decoder *decoder, UINT frame, + UINT num, BYTE **data, DWORD *datasize) +{ + return decoder->vtable->get_color_context(decoder, frame, num, data, datasize); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index c52bead5914..0f6980f6aa6 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -275,6 +275,7 @@ struct decoder_frame UINT width, height; UINT bpp; double dpix, dpiy; + DWORD num_color_contexts; DWORD num_colors; WICColor palette[256]; }; @@ -299,6 +300,8 @@ struct decoder_funcs UINT stride, UINT buffersize, BYTE *buffer); HRESULT (CDECL *get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); + HRESULT (CDECL *get_color_context)(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void (CDECL *destroy)(struct decoder* This); }; @@ -318,6 +321,8 @@ HRESULT CDECL decoder_copy_pixels(struct decoder* This, UINT frame, const WICRec UINT stride, UINT buffersize, BYTE *buffer); HRESULT CDECL decoder_get_metadata_blocks(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); +HRESULT CDECL decoder_get_color_context(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -331,6 +336,8 @@ struct unix_funcs UINT stride, UINT buffersize, BYTE *buffer); HRESULT (CDECL *decoder_get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); + HRESULT (CDECL *decoder_get_color_context)(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void (CDECL *decoder_destroy)(struct decoder* This); };

1 0

Michael Stefaniuc : taskmgr: Use GetGuiResources() directly.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: d98cd9e82ae701e560befc44881476361ef5070a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98cd9e82ae701e560befc44… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:27 2020 +0200 taskmgr: Use GetGuiResources() directly. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/perfdata.c | 9 ++------- programs/taskmgr/perfdata.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index d81ab102482..67f0d934412 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -31,7 +31,6 @@ #include "perfdata.h" static PROCNTQSI pNtQuerySystemInformation = NULL; -static PROCGGR pGetGuiResources = NULL; static PROCGPIC pGetProcessIoCounters = NULL; static PROCISW64 pIsWow64Process = NULL; static CRITICAL_SECTION PerfDataCriticalSection; @@ -60,11 +59,9 @@ BOOL PerfDataInitialize(void) { LONG status; static const WCHAR wszNtdll[] = {'n','t','d','l','l','.','d','l','l',0}; - static const WCHAR wszUser32[] = {'u','s','e','r','3','2','.','d','l','l',0}; static const WCHAR wszKernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation"); - pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandleW(wszUser32), "GetGuiResources"); pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters"); pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process"); @@ -297,10 +294,8 @@ void PerfDataRefresh(void) RevertToSelf(); CloseHandle(hProcessToken); } - if (pGetGuiResources) { - pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS); - pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS); - } + pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); + pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); if (pGetProcessIoCounters) pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); if (pIsWow64Process) diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index d6a16028c4b..8b9fabbd910 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -67,7 +67,6 @@ struct _SYSTEM_PAGEFILE_INFORMATION #define GR_USEROBJECTS 1 /* Count of USER objects */ typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG); -typedef DWORD (WINAPI *PROCGGR)(HANDLE,DWORD); typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS); typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL);

1 0

Zebediah Figura : wintrust: Stub CryptCATPutMemberInfo().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 63523b55be712466023bdc1464724b9fcf4adfb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63523b55be712466023bdc14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:11 2020 -0500 wintrust: Stub CryptCATPutMemberInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 975d51f14fd..15b21a299f3 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -848,6 +848,19 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info return TRUE; } +/*********************************************************************** + * CryptCATPutMemberInfo (WINTRUST.@) + */ +CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, + WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data) +{ + FIXME("catalog %p, filename %s, member %s, subject %s, version %u, size %u, data %p, stub!\n", + catalog, debugstr_w(filename), debugstr_w(member), debugstr_guid(subject), version, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATOpen (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 7ebd53f0396..a01d1dd93c9 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -37,7 +37,7 @@ @ stub CryptCATPersistStore @ stub CryptCATPutAttrInfo @ stub CryptCATPutCatAttrInfo -@ stub CryptCATPutMemberInfo +@ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) diff --git a/include/mscat.h b/include/mscat.h index 4571a0b2647..3931b71596c 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -131,6 +131,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE, CRYPTCATMEMBER *, LPWSTR) CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus }

1 0