March 2018 - Wine-commits - list.winehq.org

Alex Henrie : mmsystem.dll16: Pass through MCI_LIST, MCI_SETAUDIO, and MCI_SETVIDEO.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: f2d0ddaf5fe14dfab2bc119bfb7d9ee96f0a038f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d0ddaf5fe14dfab2bc119b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 23:03:35 2017 -0700 mmsystem.dll16: Pass through MCI_LIST, MCI_SETAUDIO, and MCI_SETVIDEO. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d052ff0f3785b9beb744ebb19761808199dd2e1d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmsystem.dll16/mci16.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index b356a44..d7a356d 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -134,8 +134,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l if (*lParam == 0) return MMSYSTEM_MAP_OK; /* FIXME: to add also (with seg/linear modifications to do): - * MCI_LIST, MCI_LOAD, MCI_QUALITY, MCI_RESERVE, MCI_RESTORE, MCI_SAVE - * MCI_SETAUDIO, MCI_SETTUNER, MCI_SETVIDEO + * MCI_LOAD, MCI_QUALITY, MCI_RESERVE, MCI_RESTORE, MCI_SAVE, MCI_SETTUNER */ switch (wMsg) { /* case MCI_CAPTURE */ @@ -148,6 +147,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_DELETE: case MCI_GETDEVCAPS: /* case MCI_INDEX: */ + case MCI_LIST: /* case MCI_MARK: */ /* case MCI_MONITOR: */ case MCI_PASTE: @@ -158,6 +158,8 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_RESUME: case MCI_SEEK: case MCI_SET: + case MCI_SETAUDIO: + case MCI_SETVIDEO: /* case MCI_SETTIMECODE:*/ /* case MCI_SIGNAL:*/ case MCI_SPIN:

1 0

Piotr Caban : msvcp90: Use correct locale in basic_ios:: narrow and basic_ios::widen.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 9c332d3299330b04d04461861c99ed178c415aac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c332d3299330b04d0446186… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 19:13:43 2017 +0100 msvcp90: Use correct locale in basic_ios::narrow and basic_ios::widen. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 53bab55d303dd8ee8ce696b94c47718feb7bc3d4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/tests/ios.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 84a6bf2c..5d80443 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5832,7 +5832,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_narrow, 12) char __thiscall basic_ios_char_narrow(basic_ios_char *this, char ch, char def) { TRACE("(%p %c %c)\n", this, ch, def); - return ctype_char_narrow_ch(ctype_char_use_facet(IOS_LOCALE(this->strbuf)), ch, def); + return ctype_char_narrow_ch(ctype_char_use_facet(IOS_LOCALE(&this->base)), ch, def); } /* ?rdbuf@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEPAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PAV32@@Z */ @@ -5905,7 +5905,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_widen, 8) char __thiscall basic_ios_char_widen(basic_ios_char *this, char ch) { TRACE("(%p %c)\n", this, ch); - return ctype_char_widen_ch(ctype_char_use_facet(IOS_LOCALE(this->strbuf)), ch); + return ctype_char_widen_ch(ctype_char_use_facet(IOS_LOCALE(&this->base)), ch); } /* ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z */ @@ -6113,7 +6113,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_narrow, 12) char __thiscall basic_ios_wchar_narrow(basic_ios_wchar *this, wchar_t ch, char def) { TRACE("(%p %c %c)\n", this, ch, def); - return ctype_wchar_narrow_ch(ctype_wchar_use_facet(IOS_LOCALE(this->strbuf)), ch, def); + return ctype_wchar_narrow_ch(ctype_wchar_use_facet(IOS_LOCALE(&this->base)), ch, def); } /* ?rdbuf@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@2(a)PAV32@@Z */ @@ -6200,7 +6200,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_widen, 8) wchar_t __thiscall basic_ios_wchar_widen(basic_ios_wchar *this, char ch) { TRACE("(%p %c)\n", this, ch); - return ctype_wchar_widen_ch(ctype_wchar_use_facet(IOS_LOCALE(this->strbuf)), ch); + return ctype_wchar_widen_ch(ctype_wchar_use_facet(IOS_LOCALE(&this->base)), ch); } /* ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z */ diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 91c546e..2117df4 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -496,10 +496,14 @@ static basic_ostream_wchar* (*__thiscall p_basic_ostream_short_print_ushort)(bas /* basic_ios */ static locale* (*__thiscall p_basic_ios_char_imbue)(basic_ios_char*, locale*, const locale*); +static basic_ios_char* (*__thiscall p_basic_ios_char_ctor)(basic_ios_char*); +static char (*__thiscall p_basic_ios_char_widen)(basic_ios_char*, char); +static void (*__thiscall p_basic_ios_char_dtor)(basic_ios_char*); static locale* (*__thiscall p_basic_ios_wchar_imbue)(basic_ios_wchar*, locale*, const locale*); /* ios_base */ +static void (*__thiscall p_ios_base__Init)(ios_base*); static IOSB_iostate (*__thiscall p_ios_base_rdstate)(const ios_base*); static IOSB_fmtflags (*__thiscall p_ios_base_setf_mask)(ios_base*, IOSB_fmtflags, IOSB_fmtflags); static void (*__thiscall p_ios_base_unsetf)(ios_base*, IOSB_fmtflags); @@ -737,6 +741,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IEAAXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QEBAHXZ"); SET(p_ios_base_setf_mask, @@ -748,6 +754,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IEAA(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEBADD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z"); @@ -869,6 +881,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IAAXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QBAHXZ"); SET(p_ios_base_setf_mask, @@ -880,6 +894,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAA?AVlocale(a)2@ABV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAA(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QBADD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAA(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAA?AVlocale(a)2@ABV32@@Z"); @@ -1000,6 +1020,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IAEXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QBEHXZ"); SET(p_ios_base_setf_mask, @@ -1011,6 +1033,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAE(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QBEDD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z"); @@ -2344,6 +2372,20 @@ static void test_istream_read_complex_double(void) } } +static void test_basic_ios(void) +{ + basic_ios_char bi; + char c; + + call_func1(p_basic_ios_char_ctor, &bi); + call_func1(p_ios_base__Init, &bi.base); + + c = (UINT_PTR)call_func2(p_basic_ios_char_widen, &bi, 'a'); + ok(c == 'a', "basic_ios::widen('a') returned %x\n", c); + + call_func1(p_basic_ios_char_dtor, &bi); +} + START_TEST(ios) { if(!init()) @@ -2369,6 +2411,7 @@ START_TEST(ios) test_ostream_print_complex_double(); test_ostream_print_complex_ldouble(); test_istream_read_complex_double(); + test_basic_ios(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Alex Henrie : libport: Move rint fallback implementations from msvcrt to libport.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 59f4b9e527f5915aabd9df257cb259269f5c1aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f4b9e527f5915aabd9df25… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 6 21:01:13 2017 -0500 libport: Move rint fallback implementations from msvcrt to libport. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 06d9c7e25e4ff71731c81f172269c8cd81b0c68a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound_convert.c | 1 + dlls/msvcrt/math.c | 24 ---------------- include/wine/port.h | 24 ++++++++++++++++ libs/port/Makefile.in | 1 + libs/port/rint.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 0c9a34b..ad0442e 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -35,6 +35,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <math.h> diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f2d41c8..e56fdaa 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2477,11 +2477,7 @@ LDOUBLE CDECL MSVCR120_log2l(LDOUBLE x) */ double CDECL MSVCR120_rint(double x) { -#ifdef HAVE_RINT return rint(x); -#else - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -#endif } /********************************************************************* @@ -2489,11 +2485,7 @@ double CDECL MSVCR120_rint(double x) */ float CDECL MSVCR120_rintf(float x) { -#ifdef HAVE_RINTF return rintf(x); -#else - return MSVCR120_rint(x); -#endif } /********************************************************************* @@ -2509,11 +2501,7 @@ LDOUBLE CDECL MSVCR120_rintl(LDOUBLE x) */ MSVCRT_long CDECL MSVCR120_lrint(double x) { -#ifdef HAVE_LRINT return lrint(x); -#else - return MSVCR120_rint(x); -#endif } /********************************************************************* @@ -2521,11 +2509,7 @@ MSVCRT_long CDECL MSVCR120_lrint(double x) */ MSVCRT_long CDECL MSVCR120_lrintf(float x) { -#ifdef HAVE_LRINTF return lrintf(x); -#else - return MSVCR120_lrint(x); -#endif } /********************************************************************* @@ -2541,11 +2525,7 @@ MSVCRT_long CDECL MSVCR120_lrintl(LDOUBLE x) */ MSVCRT_longlong CDECL MSVCR120_llrint(double x) { -#ifdef HAVE_LLRINT return llrint(x); -#else - return MSVCR120_rint(x); -#endif } /********************************************************************* @@ -2553,11 +2533,7 @@ MSVCRT_longlong CDECL MSVCR120_llrint(double x) */ MSVCRT_longlong CDECL MSVCR120_llrintf(float x) { -#ifdef HAVE_LLRINTF return llrintf(x); -#else - return MSVCR120_llrint(x); -#endif } /********************************************************************* diff --git a/include/wine/port.h b/include/wine/port.h index 2989b39..addece0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -272,6 +272,22 @@ int isinf(double x); int isnan(double x); #endif +#ifndef HAVE_LLRINT +__int64 llrint(double x); +#endif + +#ifndef HAVE_LLRINTF +__int64 llrintf(float x); +#endif + +#ifndef HAVE_LRINT +long lrint(double x); +#endif + +#ifndef HAVE_LRINTF +long lrintf(float x); +#endif + #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ @@ -308,6 +324,14 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ +#ifndef HAVE_RINT +double rint(double x); +#endif + +#ifndef HAVE_RINTF +float rintf(float x); +#endif + #ifndef HAVE_STATVFS int statvfs( const char *path, struct statvfs *buf ); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 9d7e44f..7fefda1 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -96,6 +96,7 @@ C_SRCS = \ pread.c \ pwrite.c \ readlink.c \ + rint.c \ spawn.c \ statvfs.c \ strcasecmp.c \ diff --git a/libs/port/rint.c b/libs/port/rint.c new file mode 100644 index 0000000..a99c00b --- /dev/null +++ b/libs/port/rint.c @@ -0,0 +1,66 @@ +/* + * rint family + * + * Copyright 2017 Alex Henrie + * + * 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 "config.h" +#include "wine/port.h" + +#include <math.h> + +#ifndef HAVE_RINT +double rint(double x) +{ + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif + +#ifndef HAVE_RINTF +float rintf(float x) +{ + return rintf(x); +} +#endif + +#ifndef HAVE_LRINT +long lrint(double x) +{ + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif + +#ifndef HAVE_LRINTF +long lrintf(float x) +{ + return lrint(x); +} +#endif + +#ifndef HAVE_LLRINT +__int64 llrint(double x) +{ + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif + +#ifndef HAVE_LLRINTF +__int64 llrintf(float x) +{ + return llrint(x); +} +#endif

1 0

Lucian Poston : shell32: Stub GetRedirectionCapabilities with S_OK.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 27bb92df21c12666f349c35fd2605aa5988074e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27bb92df21c12666f349c35f… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Wed Nov 22 12:20:46 2017 -0800 shell32: Stub GetRedirectionCapabilities with S_OK. Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 349064216a606c9c16be05da71ab5923a63d7c79) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shellpath.c | 6 ++++-- dlls/shell32/tests/shellpath.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9230623..e35eb09 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5396,8 +5396,10 @@ static HRESULT WINAPI knownfolder_GetRedirectionCapabilities( IKnownFolder *iface, KF_REDIRECTION_CAPABILITIES *pCapabilities) { - FIXME("%p\n", pCapabilities); - return E_NOTIMPL; + FIXME("%p stub\n", pCapabilities); + if(!pCapabilities) return E_INVALIDARG; + *pCapabilities = KF_REDIRECTION_CAPABILITIES_DENY_ALL; + return S_OK; } static HRESULT WINAPI knownfolder_GetFolderDefinition( diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3c757ec..bb550aa 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2121,7 +2121,6 @@ static void test_knownFolders(void) CoTaskMemFree(folderPath); hr = IKnownFolder_GetRedirectionCapabilities(folder, &redirectionCapabilities); - todo_wine ok(hr == S_OK, "failed to get redirection capabilities: 0x%08x\n", hr); todo_wine ok(redirectionCapabilities==0, "invalid redirection capabilities returned: %d\n", redirectionCapabilities);

1 0

Andrew Eikum : xaudio2: Ignore buffers returned from OpenAL after Stop.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: f65b7f886f9fc7df027f5eee1d30e2531142b8b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65b7f886f9fc7df027f5eee… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 30 08:01:53 2017 -0600 xaudio2: Ignore buffers returned from OpenAL after Stop. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2c73fc394bace00c4463b6fcb6dfe9dc64084bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 78 ++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 79 +++++++++++++++++++++++++---------------- dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 128 insertions(+), 31 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 54176ea..ff402f8 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -841,6 +841,82 @@ static void test_submix(IXAudio2 *xa) IXAudio2MasteringVoice_DestroyVoice(master); } +static void test_flush(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src; + WAVEFORMATEX fmt; + XAUDIO2_BUFFER buf; + XAUDIO2_VOICE_STATE state; + + XA2CALL_0V(StopEngine); + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 32; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; + fmt.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + memset(&buf, 0, sizeof(buf)); + buf.AudioBytes = 22050 * fmt.nBlockAlign; + buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); + fill_buf((float*)buf.pAudioData, &fmt, 440, 22050); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + XA2CALL_0(StartEngine); + ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + + while(1){ + if(xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); + else + IXAudio2SourceVoice_GetState(src, &state, 0); + if(state.SamplesPlayed >= 2205) + break; + Sleep(10); + } + + hr = IXAudio2SourceVoice_Stop(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_FlushSourceBuffers(src); + ok(hr == S_OK, "FlushSourceBuffers failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + Sleep(100); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + }else{ + IXAudio2SourceVoice_DestroyVoice(src); + } + IXAudio2MasteringVoice_DestroyVoice(master); + + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); +} + static UINT32 test_DeviceDetails(IXAudio27 *xa) { HRESULT hr; @@ -1136,6 +1212,7 @@ START_TEST(xaudio2) test_buffer_callbacks((IXAudio2*)xa27); test_looping((IXAudio2*)xa27); test_submix((IXAudio2*)xa27); + test_flush((IXAudio2*)xa27); }else skip("No audio devices available\n"); @@ -1159,6 +1236,7 @@ START_TEST(xaudio2) test_buffer_callbacks(xa); test_looping(xa); test_submix(xa); + test_flush(xa); }else skip("No audio devices available\n"); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index f3a749c..c2d2ee2 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -414,6 +414,7 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) This->nbufs = 0; This->first_buf = 0; This->cur_buf = 0; + This->abandoned_albufs = 0; LeaveCriticalSection(&This->lock); } @@ -438,11 +439,18 @@ static HRESULT WINAPI XA2SRC_Stop(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALint bufs; TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); + alGetSourcei(This->al_src, AL_BUFFERS_QUEUED, &bufs); + + This->abandoned_albufs = bufs; + This->running = FALSE; LeaveCriticalSection(&This->lock); @@ -2264,44 +2272,53 @@ static void update_source_state(XA2SourceImpl *src) ALuint al_buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; alSourceUnqueueBuffers(src->al_src, processed, al_buffers); + src->first_al_buf += processed; src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; src->al_bufs_used -= processed; - for(i = 0; i < processed; ++i){ - ALint bufsize; - - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + if(processed > src->abandoned_albufs){ + for(i = src->abandoned_albufs; i < processed; ++i){ + ALint bufsize; - src->in_al_bytes -= bufsize; - src->played_frames += bufsize / src->submit_blocksize; + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ - DWORD old_buf = src->first_buf; + src->in_al_bytes -= bufsize; + src->played_frames += bufsize / src->submit_blocksize; - src->first_buf++; - src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->nbufs--; + if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ + DWORD old_buf = src->first_buf; - TRACE("%p: done with buffer %u\n", src, old_buf); + src->first_buf++; + src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; + src->nbufs--; - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - src->played_frames = 0; + TRACE("%p: done with buffer %u\n", src, old_buf); - if(src->cb){ - IXAudio2VoiceCallback_OnBufferEnd(src->cb, - src->buffers[old_buf].xa2buffer.pContext); if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - IXAudio2VoiceCallback_OnStreamEnd(src->cb); - - if(src->nbufs > 0) - IXAudio2VoiceCallback_OnBufferStart(src->cb, - src->buffers[src->first_buf].xa2buffer.pContext); + src->played_frames = 0; + + if(src->cb){ + IXAudio2VoiceCallback_OnBufferEnd(src->cb, + src->buffers[old_buf].xa2buffer.pContext); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + IXAudio2VoiceCallback_OnStreamEnd(src->cb); + + if(src->nbufs > 0) + IXAudio2VoiceCallback_OnBufferStart(src->cb, + src->buffers[src->first_buf].xa2buffer.pContext); + } } } - } + + src->abandoned_albufs = 0; + }else + src->abandoned_albufs -= processed; } + if(!src->running) + return; + alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); /* maintain IN_AL_PERIODS periods in AL */ @@ -2375,12 +2392,12 @@ static void do_engine_tick(IXAudio2Impl *This) EnterCriticalSection(&src->lock); - if(!src->in_use || !src->running){ + if(!src->in_use){ LeaveCriticalSection(&src->lock); continue; } - if(src->cb){ + if(src->cb && This->running){ #if XAUDIO2_VER == 0 IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); #else @@ -2394,12 +2411,14 @@ static void do_engine_tick(IXAudio2Impl *This) update_source_state(src); - alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); - if(st != AL_PLAYING) - alSourcePlay(src->al_src); + if(This->running){ + alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); + if(st != AL_PLAYING) + alSourcePlay(src->al_src); - if(src->cb) - IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); + if(src->cb) + IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); + } LeaveCriticalSection(&src->lock); } diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index f28a0ae..1a4aa08 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -81,7 +81,7 @@ typedef struct _XA2SourceImpl { /* most cases will only need about 4 AL buffers, but some corner cases * could require up to MAX_QUEUED_BUFFERS */ ALuint al_bufs[XAUDIO2_MAX_QUEUED_BUFFERS]; - DWORD first_al_buf, al_bufs_used; + DWORD first_al_buf, al_bufs_used, abandoned_albufs; struct list entry; } XA2SourceImpl;

1 0

Andrew Eikum : xaudio2: Account for abandoned buffer bytes.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0d57e76476393a0b13e3ad1142a0cf931776411d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d57e76476393a0b13e3ad11… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 11 10:41:35 2017 -0600 xaudio2: Account for abandoned buffer bytes. This should fix bug 44148, a regression caused by e2c73fc394ba. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f57246e5e55a6ea65a35458a7256c8547ccc5462) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index c2d2ee2..f641046 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2277,13 +2277,14 @@ static void update_source_state(XA2SourceImpl *src) src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; src->al_bufs_used -= processed; - if(processed > src->abandoned_albufs){ - for(i = src->abandoned_albufs; i < processed; ++i){ - ALint bufsize; + for(i = 0; i < processed; ++i){ + ALint bufsize; - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - src->in_al_bytes -= bufsize; + src->in_al_bytes -= bufsize; + + if(src->abandoned_albufs == 0){ src->played_frames += bufsize / src->submit_blocksize; if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ @@ -2309,11 +2310,10 @@ static void update_source_state(XA2SourceImpl *src) src->buffers[src->first_buf].xa2buffer.pContext); } } + }else{ + src->abandoned_albufs--; } - - src->abandoned_albufs = 0; - }else - src->abandoned_albufs -= processed; + } } if(!src->running)

1 0

Nikolay Sivov : user32/tests: Added some tests for WM_GETTEXTLENGTH/ WM_GETTEXT after EM_GETHANDLE was used.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: aa0ead79d36e032382f8c85df0750b64ba67e17a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa0ead79d36e032382f8c85d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 21:31:35 2017 +0300 user32/tests: Added some tests for WM_GETTEXTLENGTH/WM_GETTEXT after EM_GETHANDLE was used. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 71eac4a70b56ce5a8b20a0e10bacc7dcf7638627) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/edit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b9aa1c9..d745023 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2722,6 +2722,7 @@ static void test_EM_GETHANDLE(void) { static const char str0[] = "untouched"; static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; static const char str2[] = "2222-2222-2222-2222#"; static const char str3[] = "3333*3333*3333*3333*3333#"; CHAR current[42]; @@ -2770,6 +2771,33 @@ static void test_EM_GETHANDLE(void) "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); LocalUnlock(hmem); + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc);

1 0

Nikolay Sivov : user32/edit: Allow buffer access after EM_GETHANDLE.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 8de00682805109b886417fd16e7f12e8e1648657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de00682805109b886417fd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 15:09:03 2017 +0300 user32/edit: Allow buffer access after EM_GETHANDLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f62d8dc58fb3fb5f11a8ab55620ab9b2fbdaf967) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/edit.c | 8 ++------ dlls/user32/tests/edit.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 78d78ea..7746c1b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1263,8 +1263,6 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { - if (es->hlocapp) return; - if (!es->text) { if(!es->hloc32W) return; @@ -1305,8 +1303,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { - if (es->hlocapp) return; - /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) { @@ -1322,7 +1318,6 @@ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) ERR("es->text == 0 ... please report\n"); return; } - if (force || (es->lock_count == 1)) { if (es->hloc32W) { UINT countA = 0; @@ -5202,7 +5197,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B break; } - if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) + EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d745023..031d875 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2773,12 +2773,10 @@ static void test_EM_GETHANDLE(void) /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); @@ -2789,15 +2787,28 @@ todo_wine LocalUnlock(hmem); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine - ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc);

1 0

Alexandre Julliard : comctl32/imagelist: Use the correct allocation size for the image mask.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0518bbb166d72e6195acc672b20e9a22ff60d5c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0518bbb166d72e6195acc672… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 11 19:55:01 2017 +0100 comctl32/imagelist: Use the correct allocation size for the image mask. Reported by Petru Florin Mihancea. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5dd9a1f00e7cbc30b306b8290c18b781f27e6af2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 70457c7..71145ed 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -296,7 +296,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, mask_info->bmiHeader = info->bmiHeader; mask_info->bmiHeader.biBitCount = 1; mask_info->bmiHeader.biSizeImage = mask_width * height; - if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) + if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mask_info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; }

1 0

Alexandre Julliard : explorer: Fix parsing command line that contains spaces.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: b6c0b0aa9da6caaff6485746080f61b94c8c8825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c0b0aa9da6caaff6485746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 09:33:32 2017 +0100 explorer: Fix parsing command line that contains spaces. Reported by Alistair Leslie-Hughes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff53db7e6396337692ed2966ef3bf49a4737e3a6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 0116d53..76bbd03 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -620,7 +620,7 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) return folder; } -static int copy_path_string(LPWSTR target, LPWSTR source) +static WCHAR *copy_path_string(WCHAR *target, WCHAR *source) { INT i = 0; @@ -629,10 +629,9 @@ static int copy_path_string(LPWSTR target, LPWSTR source) if (*source == '\"') { source ++; - while (*source != '\"') target[i++] = *source++; + while (*source && *source != '\"') target[i++] = *source++; target[i] = 0; - source ++; - i+=2; + if (*source) source++; } else { @@ -640,7 +639,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) target[i] = 0; } PathRemoveBackslashW(target); - return i; + return source; } @@ -703,12 +702,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) { p += sizeof(arg_root)/sizeof(WCHAR); - p+=copy_path_string(parameters->root,p); + p = copy_path_string(parameters->root,p); } else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) { p += sizeof(arg_select)/sizeof(WCHAR); - p+=copy_path_string(parameters->selection,p); + p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection);

1 0