April 2017 - Wine-Commits - list.winehq.org

Julian Rüger : readme: Fix typo in German translation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 40b29f57b06e0dbfe5f31ed77c627d84ad4a0eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b29f57b06e0dbfe5f31ed77… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Mar 8 15:58:41 2017 +0100 readme: Fix typo in German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8082a634d9eaedda94e498fec3c971f30b5c31d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.de | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 4467e9f..9e65e97 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -97,8 +97,8 @@ Um Wine zu kompilieren, führen Sie aus: make Damit werden das Programm "wine" und diverse unterstützende Bibliotheken und -Binärdateienerschiedener erstellt. Das Programm "wine" lädt ausführbare -Windows-Dateien und führt diese aus. +Binärdateien erstellt. Das Programm "wine" lädt ausführbare Windows-Dateien +und führt diese aus. Die Bibliothek "libwine" ("Winelib") kann benutzt werden, um Windows-Quelltexte unter Unix zu kompilieren und zu verlinken.

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: da598486ae25a597aff342fc773a38e667d82e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da598486ae25a597aff342fc7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:43:57 2017 +0200 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9333f6e3300bb29a8012815433c0075ab1072bb2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.fi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 5e03199..4109090 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -12,11 +12,10 @@ lisenssistä on englanniksi tiedostossa LICENSE. 2. PIKAOPAS -Kun Wine käännetään lähdekoodeistaan, on suositeltavaa käyttää Winen omaa -asennusohjelmaa, joka ajetaan seuraavalla komennolla Winen lähdekoodin -juurihakemistosta: +Aja Winen lähdekoodin juurihakemistossa seuraavat komennot: -./tools/wineinstall +./configure +make Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä @@ -81,8 +80,7 @@ Valinnaisia tukikirjastoja: 4. KÄÄNTÄMINEN -Aiemmin mainitun wineinstall-skriptin sijaan Winen voi kääntää myös -seuraavilla komennoilla: +Winen voi kääntää seuraavilla komennoilla: ./configure make @@ -95,6 +93,8 @@ kääntämiseen Unixissa. Komento './configure --help' näyttää asetuksia ja valintoja, joita käännösprosessiin voi lisätä. +Lisätietoja on osoitteessa https://wiki.winehq.org/Building_Wine + 5. ASENNUS Kun Wine on käännetty, komento "make install" asentaa Winen sekä sen man-sivut

1 0

Zebediah Figura : ole2disp: Implement several IIDs.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 5ccfaa54b17d8fbd458baeeb91df83a27f74062c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccfaa54b17d8fbd458baeeb9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:12 2017 -0600 ole2disp: Implement several IIDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 77d99bbff3c26960aaa18a93f0e1156615a98648) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.dll16.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 4ee52e1..4b8af41 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -30,8 +30,8 @@ 30 stub DISPINVOKE 31 pascal CreateDispTypeInfo(ptr long ptr) CreateDispTypeInfo16 32 pascal CreateStdDispatch(ptr ptr ptr ptr) CreateStdDispatch16 -33 stub _IID_IDISPATCH -34 stub _IID_IENUMVARIANT +33 variable _IID_IDispatch(0x00020400 0x00000000 0x000000c0 0x46000000) +34 variable _IID_IEnumVARIANT(0x00020404 0x00000000 0x000000c0 0x46000000) 35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject16 36 stub REVOKEACTIVEOBJECT 37 stub GETACTIVEOBJECT @@ -110,9 +110,9 @@ 110 pascal SetErrorInfo(long ptr) SetErrorInfo16 111 stub GETERRORINFO 112 stub CREATEERRORINFO -113 stub _IID_IERRORINFO -114 stub _IID_ICREATEERRORINFO -115 stub _IID_ISUPPORTERRORINFO +113 variable _IID_IErrorInfo(0x1cf2b120 0x101b547d 0x0008658e 0x19d12b2b) +114 variable _IID_ICreateErrorInfo(0x22f03340 0x101b547d 0x0008658e 0x19d12b2b) +115 variable _IID_ISupportErrorInfo(0xdf0b3d60 0x101b548f 0x0008658e 0x19d12b2b) 116 stub VARUI1FROMI2 117 stub VARUI1FROMI4 118 stub VARUI1FROMR4

1 0

Alex Henrie : user32: Include space for ampersands when determining MessageBox size.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: da833ba30277586be38148612f2199f210d174ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=da833ba30277586be38148612… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 24 01:08:36 2017 -0700 user32: Include space for ampersands when determining MessageBox size. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0a2f9f54ebfef4adc3e0438ffcb9cf531ac1ba73) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/msgbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 2ba98c9..0839f97 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -261,8 +261,8 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Get the text size */ GetClientRect(GetDlgItem(hwnd, MSGBOX_IDTEXT), &rect); rect.top = rect.left = rect.bottom = 0; - DrawTextW( hdc, lpszText, -1, &rect, - DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT); + DrawTextW(hdc, lpszText, -1, &rect, + DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT | DT_NOPREFIX); /* Min text width corresponds to space for the buttons */ tleft = ileft; if (iwidth) tleft += ileft + iwidth;

1 0

Daniel Lehman : msvcrt: Implement nan.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 082394fa65a3d576afa1c6be2dff2b5f191d4eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=082394fa65a3d576afa1c6be2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 27 12:38:02 2017 +0100 msvcrt: Implement nan. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 09e4fc834dce082b4a69792b55a4b2418e2ac8d3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 6a31197..8ff4c58 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -288,9 +288,9 @@ @ cdecl lroundl(double) ucrtbase.lroundl @ cdecl modf(double ptr) ucrtbase.modf @ cdecl -arch=arm,x86_64 modff(float ptr) ucrtbase.modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) ucrtbase.nan +@ cdecl nanf(str) ucrtbase.nanf +@ cdecl nanl(str) ucrtbase.nanl @ cdecl nearbyint(double) ucrtbase.nearbyint @ cdecl nearbyintf(float) ucrtbase.nearbyintf @ cdecl nearbyintl(double) ucrtbase.nearbyintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c11993a..95e9d18 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2293,9 +2293,9 @@ @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) MSVCR120_nan +@ cdecl nanf(str) MSVCR120_nanf +@ cdecl nanl(str) MSVCR120_nan @ cdecl nearbyint(double) MSVCRT_nearbyint @ cdecl nearbyintf(float) MSVCRT_nearbyintf @ cdecl nearbyintl(double) MSVCRT_nearbyint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 15c1441..e71388b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1956,9 +1956,9 @@ @ cdecl memset(ptr long long) msvcr120.memset @ cdecl modf(double ptr) msvcr120.modf @ cdecl -arch=arm,x86_64 modff(float ptr) msvcr120.modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) msvcr120.nan +@ cdecl nanf(str) msvcr120.nanf +@ cdecl nanl(str) msvcr120.nanl @ cdecl nearbyint(double) msvcr120.nearbyint @ cdecl nearbyintf(float) msvcr120.nearbyintf @ cdecl nearbyintl(double) msvcr120.nearbyintl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 921785d..74685d4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2969,3 +2969,20 @@ LDOUBLE CDECL MSVCR120_lgammal(LDOUBLE x) { return MSVCR120_lgamma(x); } + +/********************************************************************* + * nan (MSVCR120.@) + */ +double CDECL MSVCR120_nan(const char *tagp) +{ + /* Windows ignores input (MSDN) */ + return NAN; +} + +/********************************************************************* + * nanf (MSVCR120.@) + */ +float CDECL MSVCR120_nanf(const char *tagp) +{ + return NAN; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e4a2201..ffd4333 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2429,9 +2429,9 @@ @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) MSVCR120_nan +@ cdecl nanf(str) MSVCR120_nanf +@ cdecl nanl(str) MSVCR120_nan @ cdecl nearbyint(double) MSVCRT_nearbyint @ cdecl nearbyintf(float) MSVCRT_nearbyintf @ cdecl nearbyintl(double) MSVCRT_nearbyint

1 0

Lauri Kenttä : readme: Update Swedish translation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 9bb1904fccb0577d6735d234b2cfffa82d8fa85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb1904fccb0577d6735d234b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:44:11 2017 +0200 readme: Update Swedish translation. The actual updates concern the removal of wineinstall. Use the opportunity to convert to UTF-8 as well. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 50a047b1bb370bb02ffbbe945454236f24d0ac7c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.sv | 174 ++++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bb1904fccb0577d6735d…

1 0

Józef Kucia : d3d9: Do not decrease swapchain surface refcount when it is already 0.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 68e064fe17d4c3df60574707db11e032327fc585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e064fe17d4c3df60574707d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:34 2017 +0100 d3d9: Do not decrease swapchain surface refcount when it is already 0. Based on a patch by Henri Verbeet. 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> (cherry picked from commit d39630fc396b0f732b49e9bbc29669c62338248f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/surface.c | 6 ++++++ dlls/d3d9/tests/device.c | 22 ++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 07eaf7b..976a7fa 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -91,6 +91,12 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) return IDirect3DBaseTexture9_Release(&surface->texture->IDirect3DBaseTexture9_iface); } + if (!surface->resource.refcount) + { + WARN("Surface does not have any references.\n"); + return 0; + } + refcount = InterlockedDecrement(&surface->resource.refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 14a9cc1..6f4f540 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1464,16 +1464,20 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); } /* Render target and back buffer are identical. */ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, 0, &pBackBuffer); CHECK_CALL(hr, "GetBackBuffer", device, ++refcount); - if(pBackBuffer) + if (pBackBuffer) { CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); ok(pRenderTarget == pBackBuffer, "RenderTarget=%p and BackBuffer=%p should be the same.\n", - pRenderTarget, pBackBuffer); + pRenderTarget, pBackBuffer); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } CHECK_REFCOUNT(device, --refcount); @@ -1481,7 +1485,7 @@ static void test_refcount(void) hr = IDirect3DDevice9_GetDepthStencilSurface(device, &pStencilSurface); CHECK_CALL(hr, "GetDepthStencilSurface", device, ++refcount); CHECK_REFCOUNT( pSwapChain, 1); - if(pStencilSurface) + if (pStencilSurface) { CHECK_SURFACE_CONTAINER(pStencilSurface, IID_IDirect3DDevice9, device); CHECK_REFCOUNT( pStencilSurface, 1); @@ -1491,7 +1495,7 @@ static void test_refcount(void) CHECK_RELEASE_REFCOUNT(pStencilSurface, 1); CHECK_REFCOUNT(device, refcount); - CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); CHECK_REFCOUNT(device, --refcount); /* The stencil surface is released with the device, so AddRef with refcount=0 is fine here. */ @@ -1499,6 +1503,8 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); pStencilSurface = NULL; } @@ -1653,6 +1659,8 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } CHECK_REFCOUNT( pSwapChain, 1); @@ -1669,12 +1677,14 @@ static void test_refcount(void) * Otherwise GetRenderTarget would re-allocate it and the pointer would change.*/ hr = IDirect3DDevice9_GetRenderTarget(device, 0, &pRenderTarget2); CHECK_CALL(hr, "GetRenderTarget", device, ++refcount); - if(pRenderTarget2) + if (pRenderTarget2) { CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); ok(pRenderTarget == pRenderTarget2, "RenderTarget=%p and RenderTarget2=%p should be the same.\n", - pRenderTarget, pRenderTarget2); + pRenderTarget, pRenderTarget2); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); + CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); pRenderTarget2 = NULL; } pRenderTarget = NULL;

1 0

Dmitry Timoshkov : user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: e964430556e27666694fe402d2141140c00d1fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e964430556e27666694fe402d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 14:23:42 2017 +0300 user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d639d3bba011bcae0134705bde5a47bf3934f166) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index cc70e37..e5cee12 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -394,6 +394,9 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, GetClientRect(hWnd, &client); rc = client; + /* FIXME: check other BS_* handlers */ + if (btn_type == BS_GROUPBOX) + InflateRect(&rc, -7, 1); /* GB_Paint does this */ BUTTON_CalcLabelRect(hWnd, hdc, &rc); /* Clip by client rect bounds */ if (rc.right > client.right) rc.right = client.right;

1 0

Piotr Caban : msvcrt: Add fesetenv implementation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: f4a36c9e6c09e1648b7bc9a96391fe9c981e29f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a36c9e6c09e1648b7bc9a96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 7 17:42:43 2017 +0100 msvcrt: Add fesetenv implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 98a0c3df2e640fba5312acbeb07fd527e9c24b5e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/math.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 94b507c..921785d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1272,8 +1272,67 @@ void CDECL _fpreset(void) */ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) { - FIXME("(%p) stub\n", env); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + struct { + WORD control_word; + WORD unused1; + WORD status_word; + WORD unused2; + WORD tag_word; + WORD unused3; + DWORD instruction_pointer; + WORD code_segment; + WORD unused4; + DWORD operand_addr; + WORD data_segment; + WORD unused5; + } fenv; + + TRACE( "(%p)\n", env ); + + if (!env->control && !env->status) { + _fpreset(); + return 0; + } + + __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); + + fenv.control_word &= ~0x3d; + if (env->control & MSVCRT__EM_INVALID) fenv.control_word |= 0x1; + if (env->control & MSVCRT__EM_ZERODIVIDE) fenv.control_word |= 0x4; + if (env->control & MSVCRT__EM_OVERFLOW) fenv.control_word |= 0x8; + if (env->control & MSVCRT__EM_UNDERFLOW) fenv.control_word |= 0x10; + if (env->control & MSVCRT__EM_INEXACT) fenv.control_word |= 0x20; + + fenv.status_word &= ~0x3d; + if (env->status & MSVCRT__SW_INVALID) fenv.status_word |= 0x1; + if (env->status & MSVCRT__SW_ZERODIVIDE) fenv.status_word |= 0x4; + if (env->status & MSVCRT__SW_OVERFLOW) fenv.status_word |= 0x8; + if (env->status & MSVCRT__SW_UNDERFLOW) fenv.status_word |= 0x10; + if (env->status & MSVCRT__SW_INEXACT) fenv.status_word |= 0x20; + + __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", + "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); + + if (sse2_supported) + { + DWORD fpword; + + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + fpword &= ~0x1e80; + if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; + if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; + if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; + if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; + if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; + __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); + } + return 0; +#else + FIXME( "not implemented\n" ); +#endif + return 1; } /*********************************************************************

1 0

Jarkko Korpi : ntoskrnl: Add IoStopTimer stub.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: e88776f17917861a8448708956b348287a2773c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e88776f17917861a844870895… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Sat Feb 4 17:59:18 2017 +0200 ntoskrnl: Add IoStopTimer stub. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85214c56e3dc3577bee09aab89b2c79eafbf728f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bc12788..06320d0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -682,6 +682,15 @@ void WINAPI IoStartTimer(PDEVICE_OBJECT DeviceObject) /*********************************************************************** + * IoStopTimer (NTOSKRNL.EXE.@) + */ +void WINAPI IoStopTimer(PDEVICE_OBJECT DeviceObject) +{ + FIXME( "stub: %p\n", DeviceObject ); +} + + +/*********************************************************************** * IoAllocateIrp (NTOSKRNL.EXE.@) */ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 078178b..3e9dba2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -463,7 +463,7 @@ @ stub IoStartPacket @ stdcall IoStartTimer(ptr) @ stub IoStatisticsLock -@ stub IoStopTimer +@ stdcall IoStopTimer(ptr) @ stub IoSynchronousInvalidateDeviceRelations @ stub IoSynchronousPageWrite @ stub IoThreadToProcess

1 0