February 2017 - Wine-Commits

Józef Kucia : wined3d: Pass wined3d_caps_gl_ctx to driver quirk match() function.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: 0d6b6ec33d14fceeaf0403897ac279846341747a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6b6ec33d14fceeaf0403897… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 27 13:41:59 2017 +0100 wined3d: Pass wined3d_caps_gl_ctx to driver quirk match() function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 92 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d6b6ec33d14fceeaf040…

1 0

Henri Verbeet : wined3d: Send swapchain context destruction through the command stream.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: cf4de1c498ae0b1a3b1a4ad233e307595797286f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4de1c498ae0b1a3b1a4ad23… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:12:02 2017 +0100 wined3d: Send swapchain context destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3a3fc6d..1f31352 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -27,6 +27,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); +static void wined3d_swapchain_destroy_object(void *object) +{ + swapchain_destroy_contexts(object); +} + static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { HRESULT hr; @@ -60,11 +65,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) swapchain->back_buffers = NULL; } - for (i = 0; i < swapchain->num_contexts; ++i) - { - context_destroy(swapchain->device, swapchain->context[i]); - } - HeapFree(GetProcessHeap(), 0, swapchain->context); + wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); /* Restore the screen resolution if we rendered in fullscreen. * This will restore the screen resolution to what it was before creating @@ -925,7 +926,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 hr = E_OUTOFMEMORY; goto err; } - swapchain->num_contexts = 1; /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. * You are able to add a depth + stencil surface at a later stage when you need it. @@ -953,6 +953,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 hr = WINED3DERR_NOTAVAILABLE; goto err; } + swapchain->num_contexts = 1; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (!desc->enable_auto_depth_stencil @@ -1051,15 +1052,7 @@ err: HeapFree(GetProcessHeap(), 0, swapchain->back_buffers); } - if (swapchain->context) - { - if (swapchain->context[0]) - { - context_destroy(device, swapchain->context[0]); - swapchain->num_contexts = 0; - } - HeapFree(GetProcessHeap(), 0, swapchain->context); - } + wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); if (swapchain->front_buffer) {

1 0

Piotr Caban : msvcr110: Add _Lock_shared_ptr_spin_lock implementation.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

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

Austin English : tools: Remove wineinstall.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

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

Henri Verbeet : wined3d: Get rid of an unneeded context_release() in swapchain_init().
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: df0f07bfc5c6d352917099a0c037d4636f7dd1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0f07bfc5c6d352917099a0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:12:01 2017 +0100 wined3d: Get rid of an unneeded context_release() in swapchain_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8a62119..3a3fc6d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1055,7 +1055,6 @@ err: { if (swapchain->context[0]) { - context_release(swapchain->context[0]); context_destroy(device, swapchain->context[0]); swapchain->num_contexts = 0; }

1 0

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

Feb. 28, 2017

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 : tapi32: Fix phoneInitializeExW spec file entry.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

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

Alexandre Julliard : Wine release 1.8.7
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: website Branch: master Commit: fee3815d62547d53549211ece404701e33ea3983 URL: http://source.winehq.org/git/website.git/?a=commit;h=fee3815d62547d53549211… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 10:46:05 2017 +0100 Wine release 1.8.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017022801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2017022801.xml b/news/en/2017022801.xml new file mode 100644 index 0000000..1aaacaf --- /dev/null +++ b/news/en/2017022801.xml @@ -0,0 +1,14 @@ +<news> +<date>February 28, 2017</date> +<title>Wine 1.8.7 Released</title> +<body> + The Wine maintenance release 1.8.7 is now available. This is the final release in the 1.8.x series. + <a href="{$root}/announce/1.8.7">What's new</a> in this release: +<ul> + <li>Various bug fixes.</li> + <li>A few more cards added to the GPU description table.</li> + <li>Turkish translation updates.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.7.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.8.7 : Alexandre Julliard : Release 1.8.7
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: refs/tags/wine-1.8.7 Tag: 5c026ecb04c80a7ab470ffbd5718c14ee4a634ef URL: http://source.winehq.org/git/wine.git/?a=tag;h=5c026ecb04c80a7ab470ffbd5718… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 10:43:41 2017 +0100 Release 1.8.7

1 0

Michael Stefaniuc : Release 1.8.7.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 67cad5f02ff072fffb74a4191a317a35e59f72da URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cad5f02ff072fffb74a4191… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 15 23:02:45 2017 +0100 Release 1.8.7. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 297 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 169 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67cad5f02ff072fffb74a…

1 0