November 2020 - Wine-commits

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_CloseDecoder function.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 652693083dd835d1821eb1bdb1a58a9904503284 URL: https://source.winehq.org/git/wine.git/?a=commit;h=652693083dd835d1821eb1bd… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:43:50 2020 +0200 msasn1: Add stub for ASN1_CloseDecoder function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bf81247849ea77721d60a8bb155eb61b5cca985) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 5 +++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 435dd0e2e11..c96be7d07d6 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -185,3 +185,8 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod return ASN1_SUCCESS; } + +void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) +{ + FIXME("(%p): Stub!\n", decoder); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index 5ec3f08d52a..f98a4a62d7a 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -216,7 +216,7 @@ @ stub ASN1PEREncUnsignedShort @ stub ASN1PEREncZero @ stub ASN1PERFreeSeqOf -@ stub ASN1_CloseDecoder +@ stdcall ASN1_CloseDecoder(ptr) @ stub ASN1_CloseEncoder2 @ stdcall ASN1_CloseEncoder(ptr) @ stdcall ASN1_CloseModule(ptr) diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 017124d2297..6bd95352edf 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -261,6 +261,7 @@ static void test_CreateDecoder(void) ok(!decoder->pos,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == ASN1DECODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -276,6 +277,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER), "Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -291,6 +293,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -306,14 +309,17 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); @@ -331,6 +337,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(!!decoder,"Decoder creation failed.\n"); @@ -345,14 +352,17 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); }

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_Decode function.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 3bfbe29cc65b44d576a8931d87d9349bbc47d78b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bfbe29cc65b44d576a8931d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun May 31 10:44:23 2020 +0200 msasn1: Add stub for ASN1_Decode function. ASN1decoding_t and ASN1encoding_t are implemented as linked lists. Current implementation does not properly emulate the linked list, as we need to identify where the next link pointers are stored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2f3f3aaa831fa9c5b14dac82427283365da8f8f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 18 ++++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index c96be7d07d6..d1513629057 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -190,3 +190,21 @@ void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) { FIXME("(%p): Stub!\n", decoder); } + +ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t decoder, void **outdata, ASN1uint32_t pdunum, + ASN1uint32_t flags, ASN1octet_t *buf, ASN1uint32_t bufsize) +{ + FIXME("(%p %p %u %08x %p %u): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); + + if (!decoder) + return ASN1_ERR_BADARGS; + + if (!buf || !bufsize) + { + decoder->err = ASN1_ERR_BADARGS; + return ASN1_ERR_BADARGS; + } + + decoder->err = ASN1_ERR_BADPDU; + return ASN1_ERR_BADPDU; +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index f98a4a62d7a..ab823b03c31 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -224,7 +224,7 @@ @ stub ASN1_CreateDecoderEx @ stdcall ASN1_CreateEncoder(ptr ptr ptr long ptr) @ stdcall ASN1_CreateModule(long long long long ptr ptr ptr ptr long) -@ stub ASN1_Decode +@ stdcall ASN1_Decode(ptr ptr long long ptr long) @ stub ASN1_Encode @ stub ASN1_FreeDecoded @ stub ASN1_FreeEncoded

1 0

Alexandre Julliard : crypt32: List allowed characters instead of relying on wctype properties.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: d202e02f792901038888c35efaaaa147a7413dea URL: https://source.winehq.org/git/wine.git/?a=commit;h=d202e02f792901038888c35e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 9 11:44:20 2020 +0100 crypt32: List allowed characters instead of relying on wctype properties. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 2e3f976bded..46f4b8f25e7 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2074,9 +2074,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, static inline BOOL isprintableW(WCHAR wc) { - return iswalnum(wc) || iswspace(wc) || wc == '\'' || wc == '(' || - wc == ')' || wc == '+' || wc == ',' || wc == '-' || wc == '.' || - wc == '/' || wc == ':' || wc == '=' || wc == '?'; + return wc && wcschr( L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 '()+,-./:=?", wc ); } static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value,

1 0

Nikolay Sivov : gdi32: Merge in Uniscribe functionality.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: b9178da5865f42b6192ecc02bd7afff8d4c90a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9178da5865f42b6192ecc02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 13:04:04 2020 +0300 gdi32: Merge in Uniscribe functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- dlls/gdi32/Makefile.in | 15 +- dlls/gdi32/gdi32.spec | 38 ++ dlls/{usp10 => gdi32/uniscribe}/bidi.c | 0 dlls/{usp10 => gdi32/uniscribe}/bracket.c | 0 dlls/{usp10 => gdi32/uniscribe}/breaking.c | 0 dlls/gdi32/{ => uniscribe}/direction.c | 0 dlls/{usp10 => gdi32/uniscribe}/indic.c | 0 dlls/{usp10 => gdi32/uniscribe}/indicsyllable.c | 0 dlls/{usp10 => gdi32/uniscribe}/linebreak.c | 0 dlls/{usp10 => gdi32/uniscribe}/mirror.c | 0 dlls/{usp10 => gdi32/uniscribe}/opentype.c | 0 dlls/{usp10 => gdi32/uniscribe}/shape.c | 0 dlls/{usp10 => gdi32/uniscribe}/shaping.c | 0 dlls/{usp10 => gdi32/uniscribe}/usp10.c | 21 +- dlls/{usp10 => gdi32/uniscribe}/usp10_internal.h | 0 dlls/usp10/Makefile.in | 17 - dlls/usp10/direction.c | 426 ----------------------- dlls/usp10/usp10.spec | 76 ++-- tools/make_specfiles | 1 + tools/make_unicode | 13 +- 21 files changed, 114 insertions(+), 495 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9178da5865f42b6192e…

1 0

Alistair Leslie-Hughes : include: Add interface IGetDataSource.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: da8079b3da16541c1a206798396df786ea16f2e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da8079b3da16541c1a206798… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 12 18:33:40 2020 +1100 include: Add interface IGetDataSource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 13 +++++++++++++ include/Makefile.in | 1 + include/getdts.idl | 34 ++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 49 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 43e3aaeaa1a..2fe4e60b68b 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1576,3 +1576,16 @@ HRESULT __RPC_STUB IColumnsInfo_MapColumnIDs_Stub(IColumnsInfo* This, DBORDINAL FIXME("(%p)->(%lu %p %p %p): stub\n", This, column_ids, dbids, columns, error); return E_NOTIMPL; } + +HRESULT CALLBACK IGetDataSource_GetDataSource_Proxy(IGetDataSource* This, REFIID riid, IUnknown **datasource) +{ + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), datasource); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFIID riid, IUnknown **datasource, + IErrorInfo **error) +{ + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), datasource, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index b2c8ba7f987..ea021a4b80a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -307,6 +307,7 @@ SOURCES = \ gdiplusmetaheader.h \ gdipluspixelformats.h \ gdiplustypes.h \ + getdts.idl \ guiddef.h \ hidusage.h \ highlevelmonitorconfigurationapi.h \ diff --git a/include/getdts.idl b/include/getdts.idl new file mode 100644 index 00000000000..40991070cc1 --- /dev/null +++ b/include/getdts.idl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a75-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IGetDataSource : IUnknown +{ + [local] + HRESULT GetDataSource([in] REFIID riid, [out, iid_is(riid)] IUnknown **datasource); + + [call_as(GetDataSource)] + HRESULT RemoteGetDataSource([in] REFIID riid, [out, iid_is(riid)] IUnknown **datasource, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 537bb211cc5..1ffbefa9ffd 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -69,6 +69,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "binres.idl" #include "crtrow.idl" #include "errrec.idl" +#include "getdts.idl" cpp_quote("#include <accctrl.h>")

1 0

Brendan Shanks : winecoreaudio.drv: Only read 'length' bytes from received MIDIPackets.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 1fc8a8f234e5f46f0d37c173719a8727f0822a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc8a8f234e5f46f0d37c173… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 28 17:29:13 2020 -0700 winecoreaudio.drv: Only read 'length' bytes from received MIDIPackets. The Core MIDI MIDIPacket struct is declared with a 256-byte data array, but this is just for convenience. There may be only one accessible byte, or there may be more than 256. Only read 'length' bytes from the packet, and correctly handle a length > 256. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 7 ++----- dlls/winecoreaudio.drv/coremidi.h | 8 +------- dlls/winecoreaudio.drv/midi.c | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5ec564603a9..94761b05c4f 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -57,15 +57,12 @@ void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size) void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { unsigned int i; - MIDIMessage msg; MIDIPacket *packet = (MIDIPacket *)pktlist->packet; for (i = 0; i < pktlist->numPackets; ++i) { - msg.devID = *((UInt16 *)connRefCon); - msg.length = packet->length; - memcpy(msg.data, packet->data, sizeof(packet->data)); + UInt16 devID = *((UInt16 *)connRefCon); - MIDIIn_SendMessage(msg); + MIDIIn_SendMessage(devID, packet->data, packet->length); packet = MIDIPacketNext(packet); } diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index c93edc6c31d..3433a1d4342 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -65,12 +65,6 @@ extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); #endif -typedef struct { - UInt16 devID; - UInt16 length; - Byte data[256]; -} MIDIMessage; - /* coremidi.c */ extern MIDIClientRef CoreMIDI_CreateClient(CFStringRef name); extern void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size); @@ -79,6 +73,6 @@ extern void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *c extern void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length); /* midi.c */ -void MIDIIn_SendMessage(MIDIMessage msg); +void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length); #endif diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index edaf1283124..c299d116f12 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -78,6 +78,12 @@ typedef struct tagMIDISource { DWORD startTime; } MIDISource; +typedef struct { + UInt16 devID; + UInt16 length; + Byte data[]; +} MIDIMessage; + static CRITICAL_SECTION midiInLock; /* Critical section for MIDI In */ static CFStringRef MIDIInThreadPortName = NULL; @@ -797,16 +803,22 @@ static DWORD MIDIIn_Reset(WORD wDevID) * Call from CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. */ -void MIDIIn_SendMessage(MIDIMessage msg) +void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length) { - CFDataRef data; + MIDIMessage msg; + CFMutableDataRef data; CFMessagePortRef messagePort; messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MIDIInThreadPortName); - data = CFDataCreate(kCFAllocatorDefault, (UInt8 *) &msg, sizeof(msg)); + msg.devID = devID; + msg.length = length; + + data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + length); if (data) { + CFDataAppendBytes(data, (UInt8 *) &msg, sizeof(msg)); + CFDataAppendBytes(data, buffer, length); CFMessagePortSendRequest(messagePort, 0, data, 0.0, 0.0, NULL, NULL); CFRelease(data); }

1 0

Kevin Puetz : ole32/tests: Fix flaky test in cowait_unmarshal_thread.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 54f04370ebd11abfd305fbc23ca0200cc329d278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f04370ebd11abfd305fbc2… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Nov 5 17:09:11 2020 -0600 ole32/tests: Fix flaky test in cowait_unmarshal_thread. When run with runtest -q (WINETEST_DEBUG=0) it passed within the first 50ms, but with any verbose logging it sometimes failed. Use CoWaitForMultipleHandles (which keeps pumping the STA) since cowait_unmarshal_thread only releases its marshaled unk at the end, so it needs to be able to call back in order to exit cleanly. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5ed3f9638b1..0d7f3d8adee 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2772,8 +2772,9 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); hr = CoWaitForMultipleHandles(0, 50, 1, &event, &index); ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - index = WaitForSingleObject(thread, 200); - ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + hr = CoWaitForMultipleHandles(0, 200, 1, &thread, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish"); CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL);

1 0

Damjan Jovanovic : ntdll: Implement get_thread_times() on FreeBSD.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: a563f584f544cd75b86738c1aa061dd47851684f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a563f584f544cd75b86738c1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 7 09:21:20 2020 +0200 ntdll: Implement get_thread_times() on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/thread.c | 54 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index f39ffb42c6f..02eb5f1d871 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -3,7 +3,7 @@ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) +EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \ diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index a161c5d1c90..8c91f49690b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -43,6 +43,21 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#ifdef HAVE_SYS_QUEUE_H +#include <sys/queue.h> +#endif +#ifdef HAVE_SYS_USER_H +#include <sys/user.h> +#endif +#ifdef HAVE_LIBPROCSTAT_H +#include <libprocstat.h> +#endif #define NONAMELESSUNION #include "ntstatus.h" @@ -790,9 +805,9 @@ static void wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from ) #endif /* __x86_64__ */ -#ifdef linux BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) { +#ifdef linux unsigned long clocks_per_sec = sysconf( _SC_CLK_TCK ); unsigned long usr, sys; const char *pos; @@ -837,15 +852,44 @@ BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LA ERR("Failed to parse %s\n", debugstr_a(buf)); return FALSE; -} +#elif defined(HAVE_LIBPROCSTAT) + struct procstat *pstat; + struct kinfo_proc *kip; + unsigned int proc_count; + BOOL ret = FALSE; + + pstat = procstat_open_sysctl(); + if (!pstat) + return FALSE; + if (unix_tid == -1) + kip = procstat_getprocs(pstat, KERN_PROC_PID, unix_pid, &proc_count); + else + kip = procstat_getprocs(pstat, KERN_PROC_PID | KERN_PROC_INC_THREAD, unix_pid, &proc_count); + if (kip) + { + unsigned int i; + for (i = 0; i < proc_count; i++) + { + if (unix_tid == -1 || kip[i].ki_tid == unix_tid) + { + kernel_time->QuadPart = 10000000 * (ULONGLONG)kip[i].ki_rusage.ru_stime.tv_sec + + 10 * (ULONGLONG)kip[i].ki_rusage.ru_stime.tv_usec; + user_time->QuadPart = 10000000 * (ULONGLONG)kip[i].ki_rusage.ru_utime.tv_sec + + 10 * (ULONGLONG)kip[i].ki_rusage.ru_utime.tv_usec; + ret = TRUE; + break; + } + } + procstat_freeprocs(pstat, kip); + } + procstat_close(pstat); + return ret; #else -BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) -{ static int once; if (!once++) FIXME("not implemented on this platform\n"); return FALSE; -} #endif +} /****************************************************************************** * NtQueryInformationThread (NTDLL.@)

1 0

Damjan Jovanovic : ntdll: Improve character device type detection on FreeBSD and macOS.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: bf8da00ee02ea33c4a7d0a9a5fc32c2a4e08866e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8da00ee02ea33c4a7d0a9a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Nov 9 03:47:21 2020 +0200 ntdll: Improve character device type detection on FreeBSD and macOS. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/ntdll/unix/file.c | 28 ++++++++++++++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 943d4c5d8f4..2d92f52b4c6 100755 --- a/configure +++ b/configure @@ -7589,7 +7589,7 @@ fi -for ac_header in sys/mount.h sys/statfs.h sys/user.h sys/vfs.h +for ac_header in sys/conf.h sys/mount.h sys/statfs.h sys/user.h sys/vfs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h> diff --git a/configure.ac b/configure.ac index 923d5e3b0f3..666219f5f36 100644 --- a/configure.ac +++ b/configure.ac @@ -540,7 +540,7 @@ AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** -AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, +AC_CHECK_HEADERS([sys/conf.h sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, [#include <sys/types.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d12a3ffb119..d6a7b0c1550 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -99,6 +99,9 @@ #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif +#ifdef HAVE_SYS_CONF_H +#include <sys/conf.h> +#endif #ifdef HAVE_SYS_MOUNT_H #include <sys/mount.h> #endif @@ -6065,6 +6068,31 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->DeviceType = FILE_DEVICE_TAPE; break; } +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) + { + int d_type; + if (ioctl(fd, FIODTYPE, &d_type) == 0) + { + switch(d_type) + { + case D_TAPE: + info->DeviceType = FILE_DEVICE_TAPE; + break; + case D_DISK: + info->DeviceType = FILE_DEVICE_DISK; + break; + case D_TTY: + info->DeviceType = FILE_DEVICE_SERIAL_PORT; + break; +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + case D_MEM: + info->DeviceType = FILE_DEVICE_NULL; + break; +#endif + } + /* no special d_type for parallel ports */ + } + } #endif } else if (S_ISBLK( st.st_mode )) diff --git a/include/config.h.in b/include/config.h.in index 4adb6325e14..9b52424ae85 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1001,6 +1001,9 @@ /* Define to 1 if you have the <sys/cdio.h> header file. */ #undef HAVE_SYS_CDIO_H +/* Define to 1 if you have the <sys/conf.h> header file. */ +#undef HAVE_SYS_CONF_H + /* Define to 1 if you have the <sys/epoll.h> header file. */ #undef HAVE_SYS_EPOLL_H

1 0

Francois Gouget : cryptnet: Fix the spelling of the x-pkcs7-certificates MIME type.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 44e76ea3c780a7b20be05dc4ae2cdbd79556e61b URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e76ea3c780a7b20be05dc4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 9 17:45:58 2020 +0100 cryptnet: Fix the spelling of the x-pkcs7-certificates MIME type. This may fix connections to some encrypted websites. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 5243481ff28..efcb3dc9ba2 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -888,7 +888,7 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, { L"application/x-x509-ca-cert", L"application/x-x509-email-cert", L"application/x-x509-server-cert", L"application/x-x509-user-cert", - L"application/x-pkcs7-certifcates", L"application/pkix-crl", + L"application/x-pkcs7-certificates", L"application/pkix-crl", L"application/x-pkcs7-crl", L"application/x-pkcs7-signature", L"application/x-pkcs7-mime", NULL };

1 0