June 2019 - Wine-commits - list.winehq.org

Zebediah Figura : ntdll: Remove no longer used interlocked_dec_if_nonzero( ).
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: d741296676b7e8dde847f3ba917b77e7f122a4f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d741296676b7e8dde847f3ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 11:07:52 2019 -0400 ntdll: Remove no longer used interlocked_dec_if_nonzero(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index edf081a..9c62f8e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -69,18 +69,6 @@ static const LARGE_INTEGER zero_timeout; #define TICKSPERSEC 10000000 -static inline int interlocked_dec_if_nonzero( int *dest ) -{ - int val, tmp; - for (val = *dest;; val = tmp) - { - if (!val || (tmp = interlocked_cmpxchg( dest, val - 1, val )) == val) - break; - } - return val; -} - - #ifdef __linux__ static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/

1 0

Zebediah Figura : ntdll: Add a futex-based implementation of SRW locks.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: e2411ebecb13b1005c4d0a528056c9b8a1719049 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2411ebecb13b1005c4d0a52… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 11:07:53 2019 -0400 ntdll: Add a futex-based implementation of SRW locks. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 303 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e2411ebecb13b1005c4d…

1 0

Zebediah Figura : ntdll: Try to avoid an unnecessary syscall in fast_release_srw_exclusive().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 07e86d3c9df23ea18166ff89503d1dc02d1bda36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07e86d3c9df23ea18166ff89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 11:07:54 2019 -0400 ntdll: Try to avoid an unnecessary syscall in fast_release_srw_exclusive(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c7a96b6..35b89df 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1667,7 +1667,10 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu * 30-16 - Number of exclusive waiters. Unlike the fallback implementation, * this does not include the thread owning the lock, or shared threads * waiting on the lock. - * 15-0 - Number of shared owners. Unlike the fallback implementation, this + * 15 - Does this lock have any shared waiters? We use this as an + * optimization to avoid unnecessary FUTEX_WAKE_BITSET calls when + * releasing an exclusive lock. + * 14-0 - Number of shared owners. Unlike the fallback implementation, this * does not include the number of shared threads waiting on the lock. * Thus the state [1, x, >=1] will never occur. */ @@ -1675,7 +1678,8 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu #define SRWLOCK_FUTEX_EXCLUSIVE_LOCK_BIT 0x80000000 #define SRWLOCK_FUTEX_EXCLUSIVE_WAITERS_MASK 0x7fff0000 #define SRWLOCK_FUTEX_EXCLUSIVE_WAITERS_INC 0x00010000 -#define SRWLOCK_FUTEX_SHARED_OWNERS_MASK 0x0000ffff +#define SRWLOCK_FUTEX_SHARED_WAITERS_BIT 0x00008000 +#define SRWLOCK_FUTEX_SHARED_OWNERS_MASK 0x00007fff #define SRWLOCK_FUTEX_SHARED_OWNERS_INC 0x00000001 /* Futex bitmasks; these are independent from the bits in the lock itself. */ @@ -1810,7 +1814,7 @@ static NTSTATUS fast_acquire_srw_shared( RTL_SRWLOCK *lock ) } else { - new = old; + new = old | SRWLOCK_FUTEX_SHARED_WAITERS_BIT; wait = TRUE; } } while (interlocked_cmpxchg( (int *)lock, new, old ) != old); @@ -1841,11 +1845,14 @@ static NTSTATUS fast_release_srw_exclusive( RTL_SRWLOCK *lock ) } new = old & ~SRWLOCK_FUTEX_EXCLUSIVE_LOCK_BIT; + + if (!(new & SRWLOCK_FUTEX_EXCLUSIVE_WAITERS_MASK)) + new &= ~SRWLOCK_FUTEX_SHARED_WAITERS_BIT; } while (interlocked_cmpxchg( (int *)lock, new, old ) != old); if (new & SRWLOCK_FUTEX_EXCLUSIVE_WAITERS_MASK) futex_wake_bitset( (int *)lock, 1, SRWLOCK_FUTEX_BITSET_EXCLUSIVE ); - else + else if (old & SRWLOCK_FUTEX_SHARED_WAITERS_BIT) futex_wake_bitset( (int *)lock, INT_MAX, SRWLOCK_FUTEX_BITSET_SHARED ); return STATUS_SUCCESS;

1 0

Zebediah Figura : qedit/samplegrabber: Use BaseFilterImpl_QueryVendorInfo( ).
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 3b474993af5baaf824b2af68aa05641aa6acaa45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b474993af5baaf824b2af68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 10:42:12 2019 -0400 qedit/samplegrabber: Use BaseFilterImpl_QueryVendorInfo(). Native does not implement QueryVendorInfo(); we have no reason to do so ourselves. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 517c7fe..b53d4d8 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); -static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 }; @@ -420,19 +419,6 @@ SampleGrabber_IBaseFilter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *grap return S_OK; } -/* IBaseFilter */ -static HRESULT WINAPI -SampleGrabber_IBaseFilter_QueryVendorInfo(IBaseFilter *iface, LPWSTR *vendor) -{ - TRACE("(%p)\n", vendor); - if (!vendor) - return E_POINTER; - *vendor = CoTaskMemAlloc(sizeof(vendor_name)); - CopyMemory(*vendor, vendor_name, sizeof(vendor_name)); - return S_OK; -} - - /* SampleGrabber implementation of ISampleGrabber interface */ /* IUnknown */ @@ -1061,7 +1047,7 @@ static const IBaseFilterVtbl IBaseFilter_VTable = BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, SampleGrabber_IBaseFilter_JoinFilterGraph, - SampleGrabber_IBaseFilter_QueryVendorInfo, + BaseFilterImpl_QueryVendorInfo, }; static const ISampleGrabberVtbl ISampleGrabber_VTable =

1 0

Alexandre Julliard : mf: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: c7d06a084b5c70e9325d85ac264639d90cafb34b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7d06a084b5c70e9325d85ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:23:31 2019 +0200 mf: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 ++ dlls/mf/main.c | 6 ++---- dlls/mf/session.c | 1 - dlls/mf/topology.c | 4 +--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index bdf5887..d23349c 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -2,6 +2,8 @@ MODULE = mf.dll IMPORTLIB = mf IMPORTS = mfplat ole32 uuid mfuuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ samplegrabber.c \ diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 6db13f1..2e6dc78 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> @@ -39,7 +38,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -705,7 +703,7 @@ static WCHAR *heap_strdupW(const WCHAR *str) { unsigned int size; - size = (strlenW(str) + 1) * sizeof(WCHAR); + size = (lstrlenW(str) + 1) * sizeof(WCHAR); ret = heap_alloc(size); if (ret) memcpy(ret, str, size); @@ -930,7 +928,7 @@ static HRESULT WINAPI file_scheme_handler_callback_Invoke(IMFAsyncCallback *ifac /* Strip from scheme, MFCreateFile() won't be expecting it. */ url = context->url; - if (!strncmpiW(context->url, schemeW, ARRAY_SIZE(schemeW))) + if (!wcsnicmp(context->url, schemeW, ARRAY_SIZE(schemeW))) url += ARRAY_SIZE(schemeW); hr = MFCreateFile(context->flags & MF_RESOLUTION_WRITE ? MF_ACCESSMODE_READWRITE : MF_ACCESSMODE_READ, diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 3fce937..c43e6d2 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -15,7 +15,6 @@ * 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 "config.h" #include <stdarg.h> diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 81fd175..e48792e 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> @@ -806,7 +804,7 @@ static TOPOID topology_generate_id(void) { old = next_topology_id; } - while (interlocked_cmpxchg64((LONG64 *)&next_topology_id, old + 1, old) != old); + while (InterlockedCompareExchange64((LONG64 *)&next_topology_id, old + 1, old) != old); return next_topology_id; }

1 0

Alexandre Julliard : mfplat: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 7844b363d9f3692ac241ac88773351775a0da40b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7844b363d9f3692ac241ac88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:25:47 2019 +0200 mfplat: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 2 ++ dlls/mfplat/main.c | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index eb9b26f..f3484fa 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -2,6 +2,8 @@ MODULE = mfplat.dll IMPORTLIB = mfplat IMPORTS = advapi32 ole32 mfuuid propsys +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ main.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4082f9e..c0866f7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -33,7 +33,6 @@ #include "propsys.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "mfplat_private.h" @@ -127,7 +126,7 @@ static const BYTE guid_conv_table[256] = static WCHAR* GUIDToString(WCHAR *str, REFGUID guid) { - sprintfW(str, szGUIDFmt, guid->Data1, guid->Data2, + swprintf(str, 39, szGUIDFmt, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); @@ -216,14 +215,14 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 UINT8 *blob; GUIDToString(buffer, clsid); - sprintfW(str, reg_format, transform_keyW, buffer); + swprintf(str, ARRAY_SIZE(str), reg_format, transform_keyW, buffer); if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) hr = HRESULT_FROM_WIN32(ret); if (SUCCEEDED(hr)) { - size = (strlenW(name) + 1) * sizeof(WCHAR); + size = (lstrlenW(name) + 1) * sizeof(WCHAR); if ((ret = RegSetValueExW(hclsid, NULL, 0, REG_SZ, (BYTE *)name, size))) hr = HRESULT_FROM_WIN32(ret); } @@ -280,7 +279,7 @@ static HRESULT register_category(CLSID *clsid, GUID *category) GUIDToString(guid1, category); GUIDToString(guid2, clsid); - sprintfW(str, reg_format, categories_keyW, guid1, guid2); + swprintf(str, ARRAY_SIZE(str), reg_format, categories_keyW, guid1, guid2); if (RegCreateKeyW(HKEY_CLASSES_ROOT, str, &htmp1)) return E_FAIL; @@ -1342,7 +1341,7 @@ HRESULT attributes_GetStringLength(struct attributes *attributes, REFGUID key, U if (attribute) { if (attribute->value.vt == MF_ATTRIBUTE_STRING) - *length = strlenW(attribute->value.u.pwszVal); + *length = lstrlenW(attribute->value.u.pwszVal); else hr = MF_E_INVALIDTYPE; } @@ -1367,7 +1366,7 @@ HRESULT attributes_GetString(struct attributes *attributes, REFGUID key, WCHAR * { if (attribute->value.vt == MF_ATTRIBUTE_STRING) { - int len = strlenW(attribute->value.u.pwszVal); + int len = lstrlenW(attribute->value.u.pwszVal); if (length) *length = len; @@ -2252,7 +2251,7 @@ HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, U data = value.u.puuid; break; case MF_ATTRIBUTE_STRING: - item.u.subheader.size = (strlenW(value.u.pwszVal) + 1) * sizeof(WCHAR); + item.u.subheader.size = (lstrlenW(value.u.pwszVal) + 1) * sizeof(WCHAR); data = value.u.pwszVal; break; case MF_ATTRIBUTE_BLOB: @@ -5037,7 +5036,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA } /* Extension */ - url_ext = url ? strrchrW(url, '.') : NULL; + url_ext = url ? wcsrchr(url, '.') : NULL; if (!url_ext && !mimeW) { @@ -5126,7 +5125,7 @@ static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSch /* RFC 3986: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) */ while (*ptr) { - WCHAR ch = tolowerW(*ptr); + WCHAR ch = towlower(*ptr); if (*ptr == '*' && ptr == url) { @@ -7162,7 +7161,7 @@ static WCHAR *heap_strdupW(const WCHAR *str) { unsigned int size; - size = (strlenW(str) + 1) * sizeof(WCHAR); + size = (lstrlenW(str) + 1) * sizeof(WCHAR); ret = heap_alloc(size); if (ret) memcpy(ret, str, size);

1 0

Alexandre Julliard : mfplay: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 85f96e49671c6ccbb4f1f0c0fff7c86a5c76b26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f96e49671c6ccbb4f1f0c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:25:58 2019 +0200 mfplay: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 1ecf743..401c0c7 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,4 +1,6 @@ MODULE = mfplay.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ player.c

1 0

Alexandre Julliard : mfreadwrite: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 3db44e9940ddaac72a4542cb824a6e7d625fb8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3db44e9940ddaac72a4542cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:26:09 2019 +0200 mfreadwrite: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 2 ++ dlls/mfreadwrite/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index ce8a4d4..ce63ad5 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -2,6 +2,8 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite IMPORTS = mfuuid uuid mfplat ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 5ec5c91..dd92337 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -16,7 +16,6 @@ * 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 "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : mgmtapi: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 1eafc6dbe5fb08551f149daa78b34b70eb215ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eafc6dbe5fb08551f149daa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:26:18 2019 +0200 mgmtapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mgmtapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mgmtapi/Makefile.in b/dlls/mgmtapi/Makefile.in index 2af1626..0093f74 100644 --- a/dlls/mgmtapi/Makefile.in +++ b/dlls/mgmtapi/Makefile.in @@ -1,3 +1,5 @@ MODULE = mgmtapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = mgmtapi.c

1 0

Alexandre Julliard : midimap: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: d86b02958d70557f489b49a53335a389f8c3a0b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86b02958d70557f489b49a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:26:30 2019 +0200 midimap: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/Makefile.in | 2 ++ dlls/midimap/midimap.c | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in index c0e66f4..d36c408 100644 --- a/dlls/midimap/Makefile.in +++ b/dlls/midimap/Makefile.in @@ -1,5 +1,7 @@ MODULE = midimap.dll IMPORTS = winmm user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ midimap.c diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 540dac3..d15e3d7 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "mmddk.h" #include "winreg.h" -#include "wine/unicode.h" #include "wine/debug.h" /* @@ -113,7 +112,7 @@ static BOOL MIDIMAP_FindPort(const WCHAR* name, unsigned* dev) for (*dev = 0; *dev < numMidiOutPorts; (*dev)++) { TRACE("%s\n", wine_dbgstr_w(midiOutPorts[*dev].name)); - if (strcmpW(midiOutPorts[*dev].name, name) == 0) + if (lstrcmpW(midiOutPorts[*dev].name, name) == 0) return TRUE; } /* try the form #nnn */ @@ -568,14 +567,14 @@ static LRESULT MIDIMAP_drvOpen(void) { if (midiOutGetDevCapsW(dev, &moc, sizeof(moc)) == 0L) { - strcpyW(midiOutPorts[dev].name, moc.szPname); + lstrcpyW(midiOutPorts[dev].name, moc.szPname); midiOutPorts[dev].loaded = 0; midiOutPorts[dev].hMidi = 0; midiOutPorts[dev].uDevID = dev; midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; - if (strncmpW(midiOutPorts[dev].name, throughportW, strlenW(throughportW)) != 0) + if (wcsncmp(midiOutPorts[dev].name, throughportW, lstrlenW(throughportW)) != 0) found_valid_port = TRUE; } else

1 0