wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Huw Davies : dsound: Allow enough space for multi-channel frames.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 2233fb371825bf65cb0aa9711bb8c8bc6129be88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2233fb371825bf65cb0aa9711… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 28 13:37:53 2017 +0000 dsound: Allow enough space for multi-channel frames. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b10ba02..87b7e8e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -240,7 +240,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, /* reallocate emulated primary buffer */ if (forcewave || !mixfloat) { if (!forcewave) - new_buflen = frames * sizeof(float); + new_buflen = frames * wfx->nChannels * sizeof(float); if (device->buffer) newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen);

1 0

Alex Henrie : d3dx9/tests: Fix a copy-paste error in test_D3DXSHMultiply3.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 1370449db8cfd0bb06bbc2f3f85ff8b00378fa45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1370449db8cfd0bb06bbc2f3f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Feb 26 23:52:26 2017 -0700 d3dx9/tests: Fix a copy-paste error in test_D3DXSHMultiply3. 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> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index dddd806..fbb6e27 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3137,7 +3137,7 @@ static void test_D3DXSHMultiply3(void) D3DXSHMultiply3(c, c, b); for (i = 0; i < 20; i++) ok(relative_error(c[i], expected_aliased[i]) < admitted_error, - "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + "Expected[%d] = %f, received = %f\n", i, expected_aliased[i], c[i]); } static void test_D3DXSHMultiply4(void)

1 0

André Hentschel : d3dx9: Fix some spec file entries.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: de9c3f7d03e8cd75983800f16162544657ac76c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9c3f7d03e8cd75983800f16… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:10 2017 +0100 d3dx9: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 4 ++-- dlls/d3dx9_25/d3dx9_25.spec | 4 ++-- dlls/d3dx9_26/d3dx9_26.spec | 4 ++-- dlls/d3dx9_27/d3dx9_27.spec | 4 ++-- dlls/d3dx9_28/d3dx9_28.spec | 4 ++-- dlls/d3dx9_29/d3dx9_29.spec | 4 ++-- dlls/d3dx9_30/d3dx9_30.spec | 4 ++-- dlls/d3dx9_31/d3dx9_31.spec | 4 ++-- dlls/d3dx9_32/d3dx9_32.spec | 4 ++-- dlls/d3dx9_33/d3dx9_33.spec | 4 ++-- dlls/d3dx9_34/d3dx9_34.spec | 4 ++-- dlls/d3dx9_35/d3dx9_35.spec | 4 ++-- dlls/d3dx9_37/d3dx9_37.spec | 4 ++-- dlls/d3dx9_38/d3dx9_38.spec | 4 ++-- dlls/d3dx9_39/d3dx9_39.spec | 4 ++-- dlls/d3dx9_40/d3dx9_40.spec | 4 ++-- dlls/d3dx9_41/d3dx9_41.spec | 4 ++-- dlls/d3dx9_42/d3dx9_42.spec | 4 ++-- dlls/d3dx9_43/d3dx9_43.spec | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de9c3f7d03e8cd7598380…

1 0

Thomas Faber : ole32: Zero STGMEDIUM before calling IDataObject::GetData.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 87dba2bbd057a9b4004d85854ed562112c99a904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87dba2bbd057a9b4004d85854… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Feb 23 17:55:00 2017 +0100 ole32: Zero STGMEDIUM before calling IDataObject::GetData. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 10 ++++++++-- dlls/ole32/tests/clipboard.c | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index faec553..d48ea79 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -741,7 +741,7 @@ static HRESULT get_data_from_storage(IDataObject *data, FORMATETC *fmt, HGLOBAL hr = IDataObject_GetDataHere(data, &stg_fmt, &med); if(FAILED(hr)) { - med.u.pstg = NULL; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &stg_fmt, &med); if(FAILED(hr)) goto end; @@ -789,7 +789,7 @@ static HRESULT get_data_from_stream(IDataObject *data, FORMATETC *fmt, HGLOBAL * LARGE_INTEGER offs; ULARGE_INTEGER pos; - med.u.pstm = NULL; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &stm_fmt, &med); if(FAILED(hr)) goto error; @@ -826,6 +826,7 @@ static HRESULT get_data_from_global(IDataObject *data, FORMATETC *fmt, HGLOBAL * mem_fmt = *fmt; mem_fmt.tymed = TYMED_HGLOBAL; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; @@ -853,6 +854,7 @@ static HRESULT get_data_from_enhmetafile(IDataObject *data, FORMATETC *fmt, HGLO mem_fmt = *fmt; mem_fmt.tymed = TYMED_ENHMF; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; @@ -880,6 +882,7 @@ static HRESULT get_data_from_metafilepict(IDataObject *data, FORMATETC *fmt, HGL mem_fmt = *fmt; mem_fmt.tymed = TYMED_MFPICT; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; @@ -909,6 +912,7 @@ static HRESULT get_data_from_bitmap(IDataObject *data, FORMATETC *fmt, HBITMAP * mem_fmt = *fmt; mem_fmt.tymed = TYMED_GDI; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; @@ -1394,6 +1398,8 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, if ( !fmt || !med ) return E_INVALIDARG; + memset(med, 0, sizeof(*med)); + if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN; if(!This->data) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index a30796c..1c8923e 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -246,6 +246,10 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor DataObjectImpl_GetData_calls++; + ok(pmedium->tymed == 0, "pmedium->tymed = %u\n", pmedium->tymed); + ok(U(*pmedium).hGlobal == NULL, "pmedium->hGlobal = %p\n", U(*pmedium).hGlobal); + ok(pmedium->pUnkForRelease == NULL, "pmedium->pUnkForRelease = %p\n", pmedium->pUnkForRelease); + if(pformatetc->lindex != -1) return DV_E_FORMATETC;

1 0

Piotr Caban : msvcr100: Use InterlockedDecrement in SpinWait::_SpinOnce.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: a6bfecd4019ec9869d51d296c48e9250ebbed3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bfecd4019ec9869d51d296c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:34 2017 +0100 msvcr100: Use InterlockedDecrement in SpinWait::_SpinOnce. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 3153ae1..f4c44170 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -265,13 +265,7 @@ MSVCRT_bool __thiscall SpinWait__SpinOnce(SpinWait *this) SpinWait__Reset(this); /* fall through */ case SPINWAIT_SPIN: -#ifdef __i386__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif - - this->spin--; + InterlockedDecrement((LONG*)&this->spin); if(!this->spin) this->state = this->unknown ? SPINWAIT_YIELD : SPINWAIT_DONE; return TRUE;

1 0

Piotr Caban : msvcr110: Add _Lock_shared_ptr_spin_lock implementation.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 26d30c63154c5fb3258fd6d24959c12052999c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d30c63154c5fb3258fd6d24… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:12 2017 +0100 msvcr110: Add _Lock_shared_ptr_spin_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcrt/lock.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index aba0919..4897d79 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -854,7 +854,7 @@ @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE @ cdecl _IsExceptionObjectToBeDestroyed(ptr) -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ stub -arch=i386 _NLG_Dispatch2 @ stub -arch=arm,win64 __NLG_Dispatch2 @ stub -arch=i386 _NLG_Return @@ -863,7 +863,7 @@ @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 7e14ef9..3153ae1 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -1018,6 +1018,27 @@ MSVCRT_bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock } #endif +#if _MSVCR_VER == 110 +static LONG shared_ptr_lock; + +void __cdecl _Lock_shared_ptr_spin_lock(void) +{ + LONG l = 0; + + while(InterlockedCompareExchange(&shared_ptr_lock, 1, 0) != 0) { + if(l++ == 1000) { + Sleep(0); + l = 0; + } + } +} + +void __cdecl _Unlock_shared_ptr_spin_lock(void) +{ + shared_ptr_lock = 0; +} +#endif + /********************************************************************** * msvcrt_free_locks (internal) *

1 0

Piotr Caban : msvcp110: Add _Lock_shared_ptr_spin_lock implementation.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 3b9e9dd06a1c3b89c90d565e82f92eba1bea821e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9e9dd06a1c3b89c90d565e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:00 2017 +0100 msvcp110: Add _Lock_shared_ptr_spin_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/misc.c | 21 +++++++++++++++++++++ 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b09a1d4..a7c3297 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3815,7 +3815,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) @@ -3874,7 +3874,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 863ead9..61d4b32 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3760,7 +3760,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) @@ -3821,7 +3821,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 438cddb..f649bbc 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3760,7 +3760,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero msvcp120._LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() msvcp120._Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) msvcp120._Mbrtowc @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) msvcp120._Mtx_current_owns @@ -3821,7 +3821,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() msvcp120._Unlock_shared_ptr_spin_lock @ cdecl _Wcrtomb(ptr long ptr ptr) msvcp120._Wcrtomb @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) msvcp120._Wcscoll @ stub _Wcsxfrm diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 9a3052d..ee31c77 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3668,7 +3668,7 @@ @ extern _LSnan _LSnan @ stub _Last_write_time @ stub _Link -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ stub _Lstat @ stub _Make_dir @ cdecl _Mbrtowc(ptr ptr long ptr ptr) _Mbrtowc @@ -3738,7 +3738,7 @@ @ cdecl _Towlower(long ptr) _Towlower @ cdecl _Towupper(long ptr) _Towupper @ stub _Unlink -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ stub _WStod @ stub _WStodx @ stub _WStof diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ce9a4e2..703ed9f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1339,3 +1339,24 @@ void __cdecl threads__Mtx_unlock(void *mtx) { LeaveCriticalSection(mtx); } + +#if _MSVCP_VER >= 110 +static LONG shared_ptr_lock; + +void __cdecl _Lock_shared_ptr_spin_lock(void) +{ + LONG l = 0; + + while(InterlockedCompareExchange(&shared_ptr_lock, 1, 0) != 0) { + if(l++ == 1000) { + Sleep(0); + l = 0; + } + } +} + +void __cdecl _Unlock_shared_ptr_spin_lock(void) +{ + shared_ptr_lock = 0; +} +#endif

1 0

Austin English : tools: Remove wineinstall.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: a33f4646cd8f3ac3b120871261c843d2f878ebef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33f4646cd8f3ac3b12087126… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 28 00:19:10 2017 -0600 tools: Remove wineinstall. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 13 ++-- tools/wineinstall | 190 ------------------------------------------------------ 2 files changed, 7 insertions(+), 196 deletions(-) diff --git a/README b/README index 1627081..b1ca54f 100644 --- a/README +++ b/README @@ -13,11 +13,11 @@ LICENSE for the details. 2. QUICK START -Whenever you compile from source, it is recommended to use the Wine -Installer to build and install Wine. From the top-level directory -of the Wine source (which contains this file), run: +From the top-level directory of the Wine source (which contains this file), +run: -./tools/wineinstall +./configure +make Run programs as "wine program". For more information and problem resolution, read the rest of this file, the Wine man page, and @@ -84,8 +84,7 @@ Optional support libraries: 4. COMPILATION -In case you chose to not use wineinstall, run the following commands -to build Wine: +To build Wine, do: ./configure make @@ -97,6 +96,8 @@ Windows source code under Unix. To see compile configuration options, do ./configure --help. +For more information, see https://wiki.winehq.org/Building_Wine + 5. SETUP Once Wine has been built correctly, you can do "make install"; this diff --git a/tools/wineinstall b/tools/wineinstall deleted file mode 100755 index e8e22bf..0000000 --- a/tools/wineinstall +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/sh -# WINE Installation script -# Can do almost everything from compiling to configuring... -# -# Copyright 1999 Ove Kåven -# -# 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 -# - -#--- defaults (change these if you are a packager) -CONFARGS="" # configure args, e.g. --prefix=/usr - -std_sleep() { - sleep 1 -} - -conf_yesno_answer() { - unset ANSWER - while [ "$ANSWER" != 'yes' ] && [ "$ANSWER" != 'no' ] - do { - echo -n "$1" - read ANSWER - } - done -} - -# startup... - -echo "Wine Installer v1.0" -echo - -if [ ! -f configure ] -then - if [ -f ../configure ] - then { - cd .. - } - else { - echo "You're running this from the wrong directory." - echo "Change to the Wine source's main directory and try again." - exit 1 - } - fi -fi - -if [ -w / ] -then - echo "You are running wineinstall as root, this is not advisable. Please rerun as a user." - echo "Aborting." - exit 1 -fi - -if [ ! -w . ] -then - echo "The source directory is not writable. You probably extracted the sources as root." - echo "You should remove the source tree and extract it again as a normal user." - exit 1 -fi - -# check whether RPM installed, and if it is, remove any old wine rpm. -if [ -x `which rpm 2>/dev/null` ]; then - if [ -n "`rpm -qi wine 2>/dev/null|grep "^Name"`" ]; then - echo "Warning: Old Wine RPM install detected. Do you want to remove it first?" - conf_yesno_answer "(yes/no) " - if [ "$ANSWER" = 'yes' ]; then - echo "We need to remove the rpm as root, please enter your root password" - echo - echo Starting wine rpm removal... - su -c "rpm -e wine; RET=$?" - if [ $RET -eq 0 ]; then - echo Done. - else - echo "FAILED. Probably you aren't installing as root." - echo "Expect problems (library conflicts with existing install etc.)." - fi - else - echo "Sorry, I won't install Wine when an rpm version is still installed." - echo "(Wine support suffered from way too many conflicts between RPM" - echo "and source installs)" - echo "Have a nice day !" - exit 1 - fi - fi -fi - -# check whether wine binary still available -if [ -x `which wine 2>/dev/null` ] && [ -n "`wine --version 2>/dev/null`" ] -then - echo "Warning !! wine binary (still) found, which may indicate" - echo "a (conflicting) previous installation." - echo "You might want to abort and uninstall Wine first." - echo "(If you previously tried to install from source manually, " - echo "run 'make uninstall' from the wine root directory)" - std_sleep -fi - -# Ask the user if they want to build and install Wine: -echo -echo "We need to install Wine as the root user. Do you want us to build Wine," -echo "'su root' and install Wine? Enter 'no' to build Wine without installing:" -conf_yesno_answer "(yes/no) " -ROOTINSTALL="$ANSWER" - -if [ "$ROOTINSTALL" = "yes" ] -then sucommand="make install" -fi - -# run the configure script, if necessary - -if [ -f Makefile ] -then - echo "I see that Wine has already been configured, so I'll skip that." - std_sleep -else - echo "Running configure..." - echo - if ! ./configure $CONFARGS - then { - echo - echo "Configure failed, aborting install." - exit 1 - } - fi -fi - -# Now do the compilation and (optionally) installation - -echo -echo "Compiling Wine. Grab a lunch or two, rent a video, or whatever," -echo "in the meantime..." -echo -std_sleep - -# try to just make wine, if this fails 'make depend' and try to remake -if ! { make; } -then - if ! { make depend && make; } - then - echo - echo "Compilation failed, aborting install." - exit 1 - fi -fi - -if [ "$ROOTINSTALL" = "no" ] -then - exit 0 -fi - -echo -echo "Performing 'make install' as root to install binaries, enter root password" - -if ! su root -c "$sucommand" -then - echo - echo "Incorrect root password. If you are running Ubuntu or a similar distribution," - echo "'make install' needs to be run via the sudo wrapper, so trying that one now" - if ! sudo su root -c "$sucommand" - then - echo - echo "Either you entered an incorrect password or we failed to" - echo "run '$sucommand' correctly." - echo "If you didn't enter an incorrect password then please" - echo "report this error and any steps to possibly reproduce it to" - echo "http://bugs.winehq.org/" - echo - echo "Installation failed, aborting." - exit 1 - fi -fi - -# it's a wrap -echo -echo "Installation complete." -echo "If you have problems with Wine, please read the documentation first," -echo "as many kinds of potential problems are explained there." - -exit 0

1 0

Bruno Jesus : ws2_32: Discard MSG_PARTIAL as it is supported only in message protocols.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 130452bb3de29b15e4c2c28a77dec2a9faa17bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=130452bb3de29b15e4c2c28a7… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Feb 28 03:19:07 2017 -0300 ws2_32: Discard MSG_PARTIAL as it is supported only in message protocols. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0e8f2a..97cb7db 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -624,6 +624,7 @@ static const int ws_flags_map[][2] = MAP_OPTION( MSG_PEEK ), MAP_OPTION( MSG_DONTROUTE ), MAP_OPTION( MSG_WAITALL ), + { WS_MSG_PARTIAL, 0 }, }; static const int ws_sock_map[][2] =

1 0

André Hentschel : tapi32: Fix phoneInitializeExW spec file entry.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: cb5c644c5a076d9980403179b3f9790f5cc8892a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5c644c5a076d9980403179b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 27 22:20:21 2017 +0100 tapi32: Fix phoneInitializeExW spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/tapi32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index c2aa868..62631ef 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -154,7 +154,7 @@ @ stdcall phoneGetVolume(long long ptr) @ stdcall phoneInitialize(ptr long ptr str ptr) @ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr) -@ stdcall phoneInitializeExW(ptr long ptr str ptr ptr ptr) +@ stdcall phoneInitializeExW(ptr long ptr wstr ptr ptr ptr) @ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr) @ stdcall phoneNegotiateExtVersion(long long long long long ptr) @ stdcall phoneOpen(long long ptr long long long long)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017