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

Owen Rudge : oledb32/tests: Add conversion tests to DBTYPE_I1.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: b4b5ad5980059d5608100cfb5379e13b70ebb5c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b5ad5980059d5608100cfb… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 30 09:53:47 2019 +0100 oledb32/tests: Add conversion tests to DBTYPE_I1. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 312 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b5ad5980059d560810…

1 0

Dmitry Timoshkov : mshtml.idl: Add forward declaration for IHTMLWindow flavours.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: c92fddae8661233e7699e1914987f0cc4caa8217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c92fddae8661233e7699e191… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 4 00:03:04 2019 +0800 mshtml.idl: Add forward declaration for IHTMLWindow flavours. This helps to make sure that getComputedStyle() gets picked up before GetComputedStyle(), and correct tlb is generated as a result. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index de15c6c..f7ebd9e 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -407,6 +407,12 @@ interface IHTMLFrameBase; interface IHTMLStorage; interface IHTMLStyleSheetsCollection; interface IHTMLTableSection; +interface IHTMLWindow2; +interface IHTMLWindow3; +interface IHTMLWindow4; +interface IHTMLWindow5; +interface IHTMLWindow6; +interface IHTMLWindow7; interface IDOMEvent; interface IDisplayPointer; interface IDisplayServices;

1 0

Alexandre Julliard : dmloader: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: a420853848a8bbe083c9caeef3bd38eef226227b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a420853848a8bbe083c9caee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:29:43 2019 +0200 dmloader: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/Makefile.in | 2 ++ dlls/dmloader/container.c | 2 +- dlls/dmloader/debug.c | 2 -- dlls/dmloader/dmloader_private.h | 1 - dlls/dmloader/loader.c | 50 ++++++++++++++++++++-------------------- 5 files changed, 28 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a420853848a8bbe083c9…

1 0

Alexandre Julliard : dmsynth: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 51994cb64d09c4bcfbc59a814e2db293d804586c URL: https://source.winehq.org/git/wine.git/?a=commit;h=51994cb64d09c4bcfbc59a81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:30:44 2019 +0200 dmsynth: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/Makefile.in | 2 ++ dlls/dmsynth/dmsynth_main.c | 2 -- dlls/dmsynth/dmsynth_private.h | 1 - dlls/dmsynth/synth.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in index 276597d..7547148 100644 --- a/dlls/dmsynth/Makefile.in +++ b/dlls/dmsynth/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmsynth.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmsynth_main.c \ synth.c \ diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 9568cb6..d6718a2 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index db61e46..bcc866e 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -32,7 +32,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h" diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index afeebda..ebc92af 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -600,7 +600,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->pCaps.dwMaxVoices = 1000; obj->pCaps.dwMaxAudioChannels = 2; obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - strcpyW(obj->pCaps.wszDescription, descrW); + lstrcpyW(obj->pCaps.wszDescription, descrW); DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj);

1 0

Alexandre Julliard : ntdll: Fix off-by-one allocation error.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: d96fd000d3e71fed67c5182d06dc9ce3aa091973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d96fd000d3e71fed67c5182d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:28:29 2019 +0200 ntdll: Fix off-by-one allocation error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47311 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1660667..b5bf219 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2313,7 +2313,7 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, len = strlenW( name ); if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) maxlen = max( maxlen, strlen(path) ); + for (i = 0; (path = wine_dll_enum_load_path( i )); i++) maxlen = max( maxlen, strlen(path)+1 ); maxlen += len + sizeof(".so"); if (!(file = RtlAllocateHeap( GetProcessHeap(), 0, maxlen ))) return STATUS_NO_MEMORY;

1 0

Alexandre Julliard : dmscript: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: c3dde5d548e89ab0749a4d9db2f21a90b0c6f7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3dde5d548e89ab0749a4d9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:30:14 2019 +0200 dmscript: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/Makefile.in | 2 ++ dlls/dmscript/dmscript_main.c | 2 -- dlls/dmscript/dmscript_private.h | 1 - dlls/dmscript/script.c | 8 ++------ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in index 55107e1..c5dc1a2 100644 --- a/dlls/dmscript/Makefile.in +++ b/dlls/dmscript/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmscript.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmobject.c \ dmscript_main.c \ diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index ec9026b..7a96679 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 00b469f..1ff88a9 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h" diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 2a10fb2..94fd282 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -18,12 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif +#include <stdio.h> #include "dmscript_private.h" #include "dmobject.h" @@ -313,7 +309,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS WideCharToMultiByte(CP_ACP, 0, This->pwzSource, -1, str, count, NULL, NULL); str[count-1] = '\n'; TRACE("source:\n"); - write( 2, str, count ); + fwrite( str, 1, count, stderr ); HeapFree(GetProcessHeap(), 0, str); } break;

1 0

Alexandre Julliard : dmstyle: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 33ec6fd86f14801e8ab536b732669c8965e2abb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ec6fd86f14801e8ab536b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:30:30 2019 +0200 dmstyle: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/Makefile.in | 2 ++ dlls/dmstyle/dmstyle_private.h | 1 - dlls/dmstyle/dmutils.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in index a95a524..934cab6 100644 --- a/dlls/dmstyle/Makefile.in +++ b/dlls/dmstyle/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmstyle.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ auditiontrack.c \ chordtrack.c \ diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 978d75f..7d18e9c 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h" diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 23cddc0..0432e76 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "objbase.h" #include "dmusici.h"

1 0

Alexandre Julliard : dmusic: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 3a061006688f9bd0d73d5989d882947c0bb6e601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a061006688f9bd0d73d5989… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:31:02 2019 +0200 dmusic: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/Makefile.in | 2 ++ dlls/dmusic/collection.c | 2 +- dlls/dmusic/dmusic.c | 16 ++++++++-------- dlls/dmusic/dmusic_main.c | 2 -- dlls/dmusic/dmusic_private.h | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index a8955a2..8870032 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmusic.dll IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ clock.c \ diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index b7eb375..1fddab5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicColl IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument); IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, patch); if (name) { - length = min(strlenW(instrument->wszName), name_length - 1); + length = min(lstrlenW(instrument->wszName), name_length - 1); memcpy(name, instrument->wszName, length * sizeof(WCHAR)); name[length] = '\0'; } diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index fd450b8..94c0ff4 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW clock_info->ctType = 0; clock_info->guidClock = guid_system_clock; - strcpyW(clock_info->wszDescription, name_system_clock); + lstrcpyW(clock_info->wszDescription, name_system_clock); } else { @@ -233,7 +233,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW clock_info->ctType = 0; clock_info->guidClock = guid_dsound_clock; - strcpyW(clock_info->wszDescription, name_dsound_clock); + lstrcpyW(clock_info->wszDescription, name_dsound_clock); } return S_OK; @@ -418,8 +418,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = MIDI_MAPPER; port->create = midi_out_port_create; midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out)); - strcpyW(port->caps.wszDescription, caps_out.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_out.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_SHAREABLE; port->caps.dwClass = DMUS_PC_OUTPUTCLASS; port++; @@ -430,8 +430,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = i; port->create = midi_out_port_create; midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out)); - strcpyW(port->caps.wszDescription, caps_out.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_out.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_SHAREABLE | DMUS_PC_EXTERNAL; port->caps.dwClass = DMUS_PC_OUTPUTCLASS; port++; @@ -443,8 +443,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = i; port->create = midi_in_port_create; midiInGetDevCapsW(i, &caps_in, sizeof(caps_in)); - strcpyW(port->caps.wszDescription, caps_in.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_in.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_EXTERNAL; port->caps.dwClass = DMUS_PC_INPUTCLASS; port++; diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 3956dc2..295cd84 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h> diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index f9839ed..c59646d 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -36,7 +36,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h"

1 0

Alexandre Julliard : dmusic32: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 6f56059e6a510e8b1608e3345d22c93ef994f8ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f56059e6a510e8b1608e334… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:31:11 2019 +0200 dmusic32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic32/Makefile.in | 2 ++ dlls/dmusic32/dmusic32_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in index 0b0e250..796b4e7 100644 --- a/dlls/dmusic32/Makefile.in +++ b/dlls/dmusic32/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmusic32.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmusic32_main.c diff --git a/dlls/dmusic32/dmusic32_main.c b/dlls/dmusic32/dmusic32_main.c index 769d5c0..f0ef263 100644 --- a/dlls/dmusic32/dmusic32_main.c +++ b/dlls/dmusic32/dmusic32_main.c @@ -26,7 +26,6 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "objbase.h" #include "dmusici.h"

1 0

Alexandre Julliard : dplayx: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 5e5a48469c076761432cfec1885784e4c9a962ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e5a48469c076761432cfec1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:31:26 2019 +0200 dplayx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/Makefile.in | 2 ++ dlls/dplayx/dplay.c | 11 ++++------- dlls/dplayx/dplayx_global.c | 25 ++++++++++++------------- dlls/dplayx/name_server.c | 1 - 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 8d41fdb..63e8ba8 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -2,6 +2,8 @@ MODULE = dplayx.dll IMPORTLIB = dplayx IMPORTS = dxguid uuid winmm ole32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dpclassfactory.c \ dplay.c \ diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 65c7e4d..e7d6edc 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -18,8 +18,6 @@ */ #define COBJMACROS -#include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <string.h> @@ -32,7 +30,6 @@ #include "winnt.h" #include "winreg.h" #include "winnls.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dplayx_global.h" @@ -1440,14 +1437,14 @@ static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi if( lpSrc->u1.lpszShortNameA ) { lpDst->u1.lpszShortName = HeapAlloc( GetProcessHeap(), 0, - (strlenW(lpSrc->u1.lpszShortName)+1)*sizeof(WCHAR) ); - strcpyW( lpDst->u1.lpszShortName, lpSrc->u1.lpszShortName ); + (lstrlenW(lpSrc->u1.lpszShortName)+1)*sizeof(WCHAR) ); + lstrcpyW( lpDst->u1.lpszShortName, lpSrc->u1.lpszShortName ); } if( lpSrc->u2.lpszLongNameA ) { lpDst->u2.lpszLongName = HeapAlloc( GetProcessHeap(), 0, - (strlenW(lpSrc->u2.lpszLongName)+1)*sizeof(WCHAR) ); - strcpyW( lpDst->u2.lpszLongName, lpSrc->u2.lpszLongName ); + (lstrlenW(lpSrc->u2.lpszLongName)+1)*sizeof(WCHAR) ); + lstrcpyW( lpDst->u2.lpszLongName, lpSrc->u2.lpszLongName ); } } diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index bc087c8..a544cd2 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -38,7 +38,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/unicode.h" #include "wingdi.h" #include "winuser.h" @@ -624,18 +623,18 @@ static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *s /* Session names may or may not exist */ if( src->lpSessionDesc->u1.lpszSessionName ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionName ); + lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionName ); dest->lpSessionDesc->u1.lpszSessionName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 ); + ( lstrlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 ); } if( src->lpSessionDesc->u2.lpszPassword ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u2.lpszPassword ); + lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u2.lpszPassword ); dest->lpSessionDesc->u2.lpszPassword = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( dest->lpSessionDesc->u2.lpszPassword ) + 1 ); + ( lstrlenW( dest->lpSessionDesc->u2.lpszPassword ) + 1 ); } } @@ -648,18 +647,18 @@ static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *s if( src->lpPlayerName->u1.lpszShortName ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u1.lpszShortName ); + lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u1.lpszShortName ); dest->lpPlayerName->u1.lpszShortName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 ); + ( lstrlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 ); } if( src->lpPlayerName->u2.lpszLongName ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u2.lpszLongName ); + lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u2.lpszLongName ); dest->lpPlayerName->u2.lpszLongName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( dest->lpPlayerName->u2.lpszLongName ) + 1 ); + ( lstrlenW( dest->lpPlayerName->u2.lpszLongName ) + 1 ); } } @@ -739,13 +738,13 @@ static DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpConn ) if( lpConn->lpSessionDesc->u1.lpszSessionName ) { dwTotalSize += sizeof( WCHAR ) * - ( strlenW( lpConn->lpSessionDesc->u1.lpszSessionName ) + 1 ); + ( lstrlenW( lpConn->lpSessionDesc->u1.lpszSessionName ) + 1 ); } if( lpConn->lpSessionDesc->u2.lpszPassword ) { dwTotalSize += sizeof( WCHAR ) * - ( strlenW( lpConn->lpSessionDesc->u2.lpszPassword ) + 1 ); + ( lstrlenW( lpConn->lpSessionDesc->u2.lpszPassword ) + 1 ); } } @@ -756,13 +755,13 @@ static DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpConn ) if( lpConn->lpPlayerName->u1.lpszShortName ) { dwTotalSize += sizeof( WCHAR ) * - ( strlenW( lpConn->lpPlayerName->u1.lpszShortName ) + 1 ); + ( lstrlenW( lpConn->lpPlayerName->u1.lpszShortName ) + 1 ); } if( lpConn->lpPlayerName->u2.lpszLongName ) { dwTotalSize += sizeof( WCHAR ) * - ( strlenW( lpConn->lpPlayerName->u2.lpszLongName ) + 1 ); + ( lstrlenW( lpConn->lpPlayerName->u2.lpszLongName ) + 1 ); } } diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 7ca1500..f1ebc44 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "mmsystem.h"

1 0