- Wine-Devel - list.winehq.org

[PATCH 1/5] riched20: Pass run ptrs to the font and colour table writer function.
by Huw Davies Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/writer.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index bdbf022a405..4a6fd908fda 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -311,33 +311,32 @@ static BOOL find_color_in_colortbl( ME_OutStream *stream, COLORREF color, unsign return i < stream->nFontTblLen; } -static BOOL -ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, - ME_DisplayItem *pLastRun) +static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *first, ME_Run *last ) { - ME_DisplayItem *item = pFirstRun; + ME_Run *run = first; ME_FontTableItem *table = pStream->fonttbl; unsigned int i; ME_DisplayItem *pCell = NULL; ME_Paragraph *prev_para = NULL; - do { - CHARFORMAT2W *fmt = &item->member.run.style->fmt; + do + { + CHARFORMAT2W *fmt = &run->style->fmt; - add_font_to_fonttbl( pStream, item->member.run.style ); + add_font_to_fonttbl( pStream, run->style ); if (fmt->dwMask & CFM_COLOR && !(fmt->dwEffects & CFE_AUTOCOLOR)) add_color_to_colortbl( pStream, fmt->crTextColor ); if (fmt->dwMask & CFM_BACKCOLOR && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) add_color_to_colortbl( pStream, fmt->crBackColor ); - if (item->member.run.para != prev_para) + if (run->para != prev_para) { /* check for any para numbering text */ - if (item->member.run.para->fmt.wNumbering) - add_font_to_fonttbl( pStream, item->member.run.para->para_num.style ); + if (run->para->fmt.wNumbering) + add_font_to_fonttbl( pStream, run->para->para_num.style ); - if ((pCell = item->member.run.para->pCell)) + if ((pCell = run->para->pCell)) { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left, @@ -348,13 +347,12 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, add_color_to_colortbl( pStream, borders[i]->colorRef ); } - prev_para = item->member.run.para; + prev_para = run->para; } - if (item == pLastRun) - break; - item = ME_FindItemFwd(item, diRun); - } while (item); + if (run == last) break; + run = run_next_all_paras( run ); + } while (run); if (!ME_StreamOutPrint(pStream, "{\\fonttbl")) return FALSE; @@ -1007,7 +1005,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutRTFHeader(pStream, dwFormat)) return FALSE; - if (!ME_StreamOutRTFFontAndColorTbl(pStream, cursor.pRun, endCur.pRun)) + if (!stream_out_font_and_colour_tbls( pStream, &cursor.pRun->member.run, &endCur.pRun->member.run )) return FALSE; /* TODO: stylesheet table */ -- 2.23.0

1 0

[PATCH] ntdll/actctx: Handle empty <dependency> element.
by Nikolay Sivov Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Showed up at https://bugs.winehq.org/show_bug.cgi?id=50030. dlls/kernel32/tests/actctx.c | 19 +++++++++++++++++++ dlls/ntdll/actctx.c | 2 ++ 2 files changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 4a9adc15748..4a6a22680e2 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -290,6 +290,13 @@ static const char manifest10[] = "</asmv2:trustInfo>" "</assembly>"; +/* Empty <dependency> element */ +static const char manifest11[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" xmlns:asmv2=\"urn:schemas-microsoft-com:asm.v2\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +"<dependency />" +"</assembly>"; + static const char testdep_manifest1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\"/>" @@ -2240,6 +2247,18 @@ static void test_actctx(void) else skip("Could not create manifest file 10\n"); + if (create_manifest_file("test11.manifest", manifest11, -1, NULL, NULL)) + { + handle = test_create("test11.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "Failed to create activation context for %s, error %u\n", + "manifest11", GetLastError()); + DeleteFileA("test11.manifest"); + if (handle != INVALID_HANDLE_VALUE) + ReleaseActCtx(handle); + } + else + skip("Could not create manifest file 11\n"); + trace("manifest4\n"); if(!create_manifest_file("test4.manifest", manifest4, -1, NULL, NULL)) { diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 7e18544cda8..b99d1655d22 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2307,6 +2307,8 @@ static void parse_dependency_elem( xmlbuf_t *xmlbuf, struct actctx_loader *acl, } } + if (end) return; + while (next_xml_elem(xmlbuf, &elem, parent)) { if (xml_elem_cmp(&elem, dependentAssemblyW, asmv1W)) -- 2.28.0

2 1

[PATCH] msado15: Implement _Connection Open
by Alistair Leslie-Hughes Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/Makefile.in | 2 +- dlls/msado15/connection.c | 135 ++++++++++++++++++++++++++++++++++- dlls/msado15/tests/msado15.c | 6 +- 3 files changed, 137 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 9852e0863dd..e64da605473 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -1,5 +1,5 @@ MODULE = msado15.dll -IMPORTS = oleaut32 +IMPORTS = oleaut32 ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 2773850236d..3eb17d8e8be 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ocidl.h" #include "objbase.h" +#include "msdasc.h" #include "olectl.h" #include "msado15_backcompat.h" @@ -33,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + struct connection; struct connection_point @@ -54,8 +57,10 @@ struct connection LONG timeout; WCHAR *datasource; WCHAR *provider; + WCHAR *dsn; ConnectModeEnum mode; CursorLocationEnum location; + IUnknown *session; struct connection_point cp_connev; }; @@ -98,8 +103,10 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (connection->cp_connev.sinks[i]) IUnknown_Release( connection->cp_connev.sinks[i] ); } + if (connection->session) IUnknown_Release(connection->session); heap_free( connection->cp_connev.sinks ); heap_free( connection->provider ); + heap_free( connection->dsn ); heap_free( connection->datasource ); heap_free( connection ); } @@ -240,6 +247,12 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (connection->session) + { + IUnknown_Release(connection->session); + connection->session = NULL; + } + connection->state = adStateClosed; return S_OK; } @@ -269,17 +282,133 @@ static HRESULT WINAPI connection_RollbackTrans( _Connection *iface ) return E_NOTIMPL; } +static void parse_connection_string(struct connection *connection, BSTR connect_str) +{ + WCHAR *temp, *save; + + temp = wcstok_s(connect_str, L";", &save); + while(temp) + { + if (!wcsncmp(temp, L"Provider=", 9)) + { + heap_free( connection->provider ); + connection->provider = SysAllocString(temp+9); + + TRACE("Provider: %s\n", debugstr_w(connection->provider)); + } + else if (!wcsncmp(temp, L"Data Source=", 12)) + { + heap_free( connection->dsn ); + connection->dsn = SysAllocString(temp+12); + + TRACE("Data Source: %s\n", debugstr_w(connection->dsn)); + } + else if (!wcsncmp(temp, L"Persist Security Info=", 22)) + { + FIXME("Persist Security not handled yet.\n"); + } + else + FIXME("%s unsupport option\n", debugstr_w(temp)); + + temp = wcstok_s(NULL, L";", &save); + } +} + static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BSTR userid, BSTR password, LONG options ) { struct connection *connection = impl_from_Connection( iface ); - FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), + IDBProperties *props; + IDBInitialize *dbinit; + IDBCreateSession *session = NULL; + HRESULT hr; + int i; + DBPROP dbprop[2]; + DBPROPSET propset; + GUID provider; + + TRACE( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options ); if (connection->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + if (!connect_str) + return E_FAIL; + + parse_connection_string(connection, connect_str); + if (FAILED(CLSIDFromProgID(connection->provider, &provider))) + return E_FAIL; + + hr = CoCreateInstance(&provider, NULL, CLSCTX_INPROC_SERVER, &IID_IDBInitialize,(void**)&dbinit); + if (FAILED(hr)) + return E_FAIL; + + hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); + if (FAILED(hr)) + goto done; + + /* TODO - Update username/password if required. */ + if ((userid && userid[0] != NULL) || (password && password[0] != NULL)) + FIXME("Username/password parameters currently not supported\n"); + + for (i = 0 ; i < ARRAY_SIZE(dbprop); i++) + { + VariantInit(&dbprop[i].vValue); + dbprop[i].dwOptions = DBPROPOPTIONS_REQUIRED; + } + + dbprop[0].dwPropertyID = DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO; + V_VT(&(dbprop[0].vValue)) = VT_BOOL; + V_BOOL(&(dbprop[0].vValue)) = VARIANT_TRUE; + + dbprop[1].dwPropertyID = DBPROP_INIT_DATASOURCE; + V_VT(&(dbprop[1].vValue)) = VT_BSTR; + V_BSTR(&(dbprop[1].vValue)) = SysAllocString(connection->dsn); + + propset.rgProperties = dbprop; + propset.cProperties = 2; + propset.guidPropertySet = DBPROPSET_DBINIT; + + hr = IDBProperties_SetProperties(props, 1, &propset); + if (FAILED(hr)) + goto done; + + for (i = 0 ; i < ARRAY_SIZE(dbprop) ; i++) + VariantClear(&dbprop[i].vValue); + + hr = IDBInitialize_Initialize(dbinit); + if (FAILED(hr)) + goto done; + + hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBCreateSession, (void**)&session); + if (FAILED(hr)) + goto done; + + hr = IDBCreateSession_CreateSession(session, NULL, &IID_IUnknown, &connection->session); + if (FAILED(hr)) + goto done; + + /* TODO ISessionProperties_SetProperties(...) */ + connection->state = adStateOpen; - return S_OK; + hr = S_OK; + +done: + if (FAILED(hr) && connection->session) + { + IUnknown_Release(connection->session); + connection->session = NULL; + } + + if (session) IDBCreateSession_Release(session); + + if (dbinit) { + IDBInitialize_Uninitialize(dbinit); + IDBInitialize_Release(dbinit); + } + + TRACE("ret 0x%08x\n", hr); + return hr; } static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) @@ -681,9 +810,11 @@ HRESULT Connection_create( void **obj ) connection->state = adStateClosed; connection->timeout = 30; connection->datasource = NULL; + connection->dsn = NULL; connection->provider = SysAllocString(L"MSDASQL"); connection->mode = adModeUnknown; connection->location = adUseServer; + connection->session = NULL; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 378c2eb918c..bf8a8e4ea61 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -808,12 +808,12 @@ if (0) /* Crashes on windows */ ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); hr = _Connection_Open(connection, NULL, NULL, NULL, 0); - todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); /* Open adds trailing ; if it's missing */ str3 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test;"); hr = _Connection_Open(connection, NULL, NULL, NULL, adConnectUnspecified); - todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); str2 = NULL; hr = _Connection_get_ConnectionString(connection, &str2); @@ -821,7 +821,7 @@ if (0) /* Crashes on windows */ todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2)); hr = _Connection_Open(connection, str, NULL, NULL, adConnectUnspecified); - todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); SysFreeString(str); str2 = NULL; -- 2.28.0

2 1

[PATCH 1/2] dplaysvr: add stub program
by Austin English Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + programs/dplaysvr/Makefile.in | 8 ++++++++ programs/dplaysvr/main.c | 33 +++++++++++++++++++++++++++++++++ programs/dplaysvr/version.rc | 26 ++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 programs/dplaysvr/Makefile.in create mode 100644 programs/dplaysvr/main.c create mode 100644 programs/dplaysvr/version.rc diff --git a/configure.ac b/configure.ac index a57697a0ddf..bd7acca29c6 100644 --- a/configure.ac +++ b/configure.ac @@ -3965,6 +3965,7 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) diff --git a/programs/dplaysvr/Makefile.in b/programs/dplaysvr/Makefile.in new file mode 100644 index 00000000000..9c8eda44513 --- /dev/null +++ b/programs/dplaysvr/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dplaysvr.exe + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/programs/dplaysvr/main.c b/programs/dplaysvr/main.c new file mode 100644 index 00000000000..1de98684760 --- /dev/null +++ b/programs/dplaysvr/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplaysvr); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/dplaysvr/version.rc b/programs/dplaysvr/version.rc new file mode 100644 index 00000000000..4a84f681116 --- /dev/null +++ b/programs/dplaysvr/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dplaysvr" +#define WINE_FILENAME_STR "dplaysvr.exe" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.28.0

1 1

[PATCH 5/5] dssenh: No longer prefer native.
by Hans Leidekker Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index fb9c5be9328..82822e4daec 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -1038,8 +1038,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); -- 2.28.0

1 0

[PATCH 4/5] dssenh: Implement CRYPT_MACHINE_KEYSET.
by Hans Leidekker Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 2d39884a21a..fb9c5be9328 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -285,10 +285,12 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags switch (flags) { case 0: + case 0 | CRYPT_MACHINE_KEYSET: ret = read_key_container( name, flags ); break; case CRYPT_NEWKEYSET: + case CRYPT_NEWKEYSET | CRYPT_MACHINE_KEYSET: if ((ret = read_key_container( name, flags ))) { heap_free( ret ); @@ -299,10 +301,12 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags break; case CRYPT_VERIFYCONTEXT: + case CRYPT_VERIFYCONTEXT | CRYPT_MACHINE_KEYSET: ret = create_key_container( "", flags ); break; case CRYPT_DELETEKEYSET: + case CRYPT_DELETEKEYSET | CRYPT_MACHINE_KEYSET: delete_key_container( name, flags ); *ret_prov = 0; return TRUE; -- 2.28.0

1 0

[PATCH 3/5] dssenh: Add support for importing version 3 public keys.
by Hans Leidekker Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 147 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 121 insertions(+), 26 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index ffd1db92da4..2d39884a21a 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -485,35 +485,18 @@ BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) #define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) #define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) +#define MAGIC_DSS3 ('D' | ('S' << 8) | ('S' << 16) | ('3' << 24)) -BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, - HCRYPTKEY *ret_key ) +static BOOL import_key_dss2( struct container *container, ALG_ID algid, const BYTE *data, DWORD len, DWORD flags, + HCRYPTKEY *ret_key ) { - struct container *container = (struct container *)hprov; - struct key *key, *exch_key, *sign_key; - BLOBHEADER *hdr; - DSSPUBKEY *pubkey; + const BLOBHEADER *hdr = (const BLOBHEADER *)data; + const DSSPUBKEY *pubkey = (const DSSPUBKEY *)(hdr + 1); const WCHAR *type; + struct key *key, *exch_key, *sign_key; NTSTATUS status; - TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key ); - - if (container->magic != MAGIC_CONTAINER) return FALSE; - if (len < sizeof(*hdr)) return FALSE; - - hdr = (BLOBHEADER *)data; - if ((hdr->bType != PRIVATEKEYBLOB && hdr->bType != PUBLICKEYBLOB) || hdr->bVersion != 2 || - hdr->aiKeyAlg != CALG_DSS_SIGN) - { - FIXME( "bType %u\n", hdr->bType ); - FIXME( "bVersion %u\n", hdr->bVersion ); - FIXME( "reserved %u\n", hdr->reserved ); - FIXME( "aiKeyAlg %08x\n", hdr->aiKeyAlg ); - return FALSE; - } - if (len < sizeof(*hdr) + sizeof(*pubkey)) return FALSE; - pubkey = (DSSPUBKEY *)(hdr + 1); switch (pubkey->magic) { @@ -530,7 +513,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE return FALSE; } - if (!(key = create_key( hdr->aiKeyAlg, flags ))) return FALSE; + if (!(key = create_key( CALG_DSS_SIGN, flags ))) return FALSE; if ((status = BCryptImportKeyPair( key->alg_handle, NULL, type, &key->handle, (UCHAR *)data, len, 0 ))) { @@ -541,7 +524,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE if (!wcscmp(type, LEGACY_DSA_V2_PRIVATE_BLOB)) { - switch (hdr->aiKeyAlg) + switch (algid) { case AT_KEYEXCHANGE: case CALG_DH_SF: @@ -566,7 +549,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE break; default: - FIXME( "unhandled key algorithm %u\n", hdr->aiKeyAlg ); + FIXME( "unhandled key algorithm %u\n", algid ); destroy_key( key ); return FALSE; } @@ -578,6 +561,118 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE return TRUE; } +static BOOL import_key_dss3( struct container *container, ALG_ID algid, const BYTE *data, DWORD len, DWORD flags, + HCRYPTKEY *ret_key ) +{ + const BLOBHEADER *hdr = (const BLOBHEADER *)data; + const DSSPUBKEY_VER3 *pubkey = (const DSSPUBKEY_VER3 *)(hdr + 1); + BCRYPT_DSA_KEY_BLOB *blob; + struct key *key; + BYTE *src, *dst; + ULONG i, size, size_q; + NTSTATUS status; + + if (len < sizeof(*hdr) + sizeof(*pubkey)) return FALSE; + + switch (pubkey->magic) + { + case MAGIC_DSS3: + break; + + default: + FIXME( "unsupported key magic %08x\n", pubkey->magic ); + return FALSE; + } + + if ((size_q = pubkey->bitlenQ / 8) > sizeof(blob->q)) + { + FIXME( "q too large\n" ); + return FALSE; + } + + if (!(key = create_key( CALG_DSS_SIGN, flags ))) return FALSE; + + size = sizeof(*blob) + (pubkey->bitlenP / 8) * 3; + if (!(blob = heap_alloc_zero( size ))) + { + destroy_key( key ); + return FALSE; + } + blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC; + blob->cbKey = pubkey->bitlenP / 8; + memcpy( blob->Count, &pubkey->DSSSeed.counter, sizeof(blob->Count) ); + memcpy( blob->Seed, pubkey->DSSSeed.seed, sizeof(blob->Seed) ); + + /* q */ + src = (BYTE *)(pubkey + 1) + blob->cbKey; + for (i = 0; i < size_q; i++) blob->q[i] = src[size_q - i - 1]; + + /* p */ + src -= blob->cbKey; + dst = (BYTE *)(blob + 1); + for (i = 0; i < blob->cbKey; i++) dst[i] = src[blob->cbKey - i - 1]; + + /* g */ + src += blob->cbKey + size_q; + dst += blob->cbKey; + for (i = 0; i < blob->cbKey; i++) dst[i] = src[blob->cbKey - i - 1]; + + /* y */ + src += blob->cbKey + pubkey->bitlenJ / 8; + dst += blob->cbKey; + for (i = 0; i < blob->cbKey; i++) dst[i] = src[blob->cbKey - i - 1]; + + if ((status = BCryptImportKeyPair( key->alg_handle, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key->handle, (UCHAR *)blob, + size, 0 ))) + { + WARN( "failed to import key %08x\n", status ); + destroy_key( key ); + heap_free( blob ); + return FALSE; + } + + heap_free( blob ); + *ret_key = (HCRYPTKEY)key; + return TRUE; +} + +BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, + HCRYPTKEY *ret_key ) +{ + struct container *container = (struct container *)hprov; + const BLOBHEADER *hdr; + BOOL ret; + + TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + if (len < sizeof(*hdr)) return FALSE; + + hdr = (const BLOBHEADER *)data; + if ((hdr->bType != PRIVATEKEYBLOB && hdr->bType != PUBLICKEYBLOB) || hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "bType %u aiKeyAlg %08x not supported\n", hdr->bType, hdr->aiKeyAlg ); + return FALSE; + } + + switch (hdr->bVersion) + { + case 2: + ret = import_key_dss2( container, hdr->aiKeyAlg, data, len, flags, ret_key ); + break; + + case 3: + ret = import_key_dss3( container, hdr->aiKeyAlg, data, len, flags, ret_key ); + break; + + default: + FIXME( "version %u not supported\n", hdr->bVersion ); + return FALSE; + } + + return ret; +} + BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, BYTE *data, DWORD *len ) { -- 2.28.0

1 0

[PATCH 2/5] dssenh: Always duplicate container keys.
by Hans Leidekker Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index e3771dc6f06..ffd1db92da4 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -433,11 +433,7 @@ static BOOL generate_key( struct container *container, ALG_ID algid, DWORD bitle return FALSE; } - if (!store_key_container_keys( container )) - { - destroy_key( key ); - return FALSE; - } + if (!store_key_container_keys( container )) return FALSE; *ret_key = (HCRYPTKEY)key; return TRUE; @@ -494,7 +490,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE HCRYPTKEY *ret_key ) { struct container *container = (struct container *)hprov; - struct key *key; + struct key *key, *exch_key, *sign_key; BLOBHEADER *hdr; DSSPUBKEY *pubkey; const WCHAR *type; @@ -549,12 +545,24 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE { case AT_KEYEXCHANGE: case CALG_DH_SF: - container->exch_key = key; + if (!(exch_key = duplicate_key( key ))) + { + destroy_key( key ); + return FALSE; + } + destroy_key( container->exch_key ); + container->exch_key = exch_key; break; case AT_SIGNATURE: case CALG_DSS_SIGN: - container->sign_key = key; + if (!(sign_key = duplicate_key( key ))) + { + destroy_key( key ); + return FALSE; + } + destroy_key( container->sign_key ); + container->sign_key = sign_key; break; default: @@ -563,11 +571,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE return FALSE; } - if (!store_key_container_keys( container )) - { - destroy_key( key ); - return FALSE; - } + if (!store_key_container_keys( container )) return FALSE; } *ret_key = (HCRYPTKEY)key; -- 2.28.0

1 0

[PATCH 1/5] dssenh/tests: Add tests for CryptDuplicateKey.
by Hans Leidekker Oct. 20, 2020

Oct. 20, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/tests/dssenh.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d3f3172230e..e9c62cb99de 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1514,6 +1514,36 @@ static void test_userkey(void) ok(!hprov, "got %08x\n", (DWORD)hprov); } +static void test_duplicate_key(void) +{ + HCRYPTPROV hprov; + HCRYPTKEY hkey, hkey2; + DWORD len; + BOOL result; + BYTE buf[512]; + + result = CryptAcquireContextA(&hprov, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); + ok(result, "got %08x\n", GetLastError()); + + result = CryptImportKey(hprov, DSS_SIGN_PrivateKey, sizeof(DSS_SIGN_PrivateKey), 0, CRYPT_EXPORTABLE, &hkey); + ok(result, "got %08x\n", GetLastError()); + + result = CryptDuplicateKey(hkey, NULL, 0, &hkey2); + ok(result, "got %08x\n", GetLastError()); + + len = sizeof(buf); + result = CryptExportKey(hkey2, 0, PRIVATEKEYBLOB, 0, buf, &len); + ok(result, "got %08x\n", GetLastError()); + ok(len == sizeof(DSS_SIGN_PrivateKey), "got %u\n", len); + ok(!memcmp(buf, DSS_SIGN_PrivateKey, sizeof(DSS_SIGN_PrivateKey)), "wrong data\n"); + + result = CryptDestroyKey(hkey2); + ok(result, "got %08x\n", GetLastError()); + + result = CryptDestroyKey(hkey); + ok(result, "got %08x\n", GetLastError()); +} + START_TEST(dssenh) { test_acquire_context(); @@ -1525,4 +1555,5 @@ START_TEST(dssenh) test_key_exchange(); test_duplicate_hash(); test_userkey(); + test_duplicate_key(); } -- 2.28.0

1 0

[PATCH 2/2] taskmgr: Use two kernel32 functions directly
by Michael Stefaniuc Oct. 19, 2020

Oct. 19, 2020

The yougest one, IsWow64Proces, is available since WinXP SP2 / Vista. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/perfdata.c | 12 ++---------- programs/taskmgr/perfdata.h | 3 --- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index a152415357e..bbd3327ab58 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -30,8 +30,6 @@ #include "taskmgr.h" #include "perfdata.h" -static PROCGPIC pGetProcessIoCounters = NULL; -static PROCISW64 pIsWow64Process = NULL; static CRITICAL_SECTION PerfDataCriticalSection; static PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ static PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ @@ -57,11 +55,7 @@ static size_t size_diff(size_t x, size_t y) BOOL PerfDataInitialize(void) { LONG status; - static const WCHAR wszKernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters"); - pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process"); - InitializeCriticalSection(&PerfDataCriticalSection); /* @@ -291,10 +285,8 @@ void PerfDataRefresh(void) } pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); - if (pGetProcessIoCounters) - pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); - if (pIsWow64Process) - pIsWow64Process(hProcess, &pPerfData[Idx].Wow64Process); + GetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); + IsWow64Process(hProcess, &pPerfData[Idx].Wow64Process); CloseHandle(hProcess); } pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 0b06965d52e..615e7db2a64 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -66,9 +66,6 @@ struct _SYSTEM_PAGEFILE_INFORMATION #define GR_GDIOBJECTS 0 /* Count of GDI objects */ #define GR_USEROBJECTS 1 /* Count of USER objects */ -typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS); -typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL); - BOOL PerfDataInitialize(void); void PerfDataRefresh(void); -- 2.26.2

1 0