wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Piotr Caban : ucrtbase: Add __fpe_flt_rounds implementation.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 6b6f3406f4be92287f8f097803fd96811d785a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6f3406f4be92287f8f09780… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 13 11:34:49 2016 +0200 ucrtbase: Add __fpe_flt_rounds implementation. Based on a patch by Alex Henrie. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/math.c | 22 +++++++++++ dlls/ucrtbase/tests/misc.c | 45 +++++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 9864c6c..8d96f98 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -1,7 +1,7 @@ @ stub _Exit @ cdecl -arch=i386 __control87_2(long long ptr ptr) ucrtbase.__control87_2 @ cdecl __doserrno() ucrtbase.__doserrno -@ stub __fpe_flt_rounds +@ cdecl __fpe_flt_rounds() ucrtbase.__fpe_flt_rounds @ cdecl __fpecode() ucrtbase.__fpecode @ cdecl __p___argc() ucrtbase.__p___argc @ cdecl __p___argv() ucrtbase.__p___argv diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 402e8b2..3d2104b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1199,6 +1199,28 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask } /********************************************************************* + * __fpe_flt_rounds (UCRTBASE.@) + */ +int CDECL __fpe_flt_rounds(void) +{ + unsigned int fpc = _controlfp(0, 0) & MSVCRT__RC_CHOP; + + TRACE("()\n"); + + switch(fpc) { + case MSVCRT__RC_CHOP: return 0; + case MSVCRT__RC_NEAR: return 1; +#ifdef _WIN64 + case MSVCRT__RC_UP: return 3; + default: return 2; +#else + case MSVCRT__RC_UP: return 2; + default: return 3; +#endif + } +} + +/********************************************************************* * _copysign (MSVCRT.@) */ double CDECL MSVCRT__copysign(double num, double sign) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 63ea465..bfdf3c1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <wchar.h> #include <stdio.h> +#include <float.h> #include <windef.h> #include <winbase.h> @@ -38,6 +39,8 @@ typedef struct MSVCRT__onexit_table_t static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); +static int (CDECL *p___fpe_flt_rounds)(void); +static unsigned int (CDECL *p__controlfp)(unsigned int, unsigned int); static void test__initialize_onexit_table(void) { @@ -211,20 +214,58 @@ static void test__execute_onexit_table(void) ok(g_onexit_called == 2, "got %d\n", g_onexit_called); } -static void init(void) +static void test___fpe_flt_rounds(void) +{ + unsigned int cfp = p__controlfp(0, 0); + int ret; + + if(!cfp) { + skip("_controlfp not supported\n"); + return; + } + + ok((p__controlfp(_RC_NEAR, _RC_CHOP) & _RC_CHOP) == _RC_NEAR, "_controlfp(_RC_NEAR, _RC_CHOP) failed\n"); + ret = p___fpe_flt_rounds(); + ok(ret == 1, "__fpe_flt_rounds returned %d\n", ret); + + ok((p__controlfp(_RC_UP, _RC_CHOP) & _RC_CHOP) == _RC_UP, "_controlfp(_RC_UP, _RC_CHOP) failed\n"); + ret = p___fpe_flt_rounds(); + ok(ret == 2 + (sizeof(void*)>sizeof(int)), "__fpe_flt_rounds returned %d\n", ret); + + ok((p__controlfp(_RC_DOWN, _RC_CHOP) & _RC_CHOP) == _RC_DOWN, "_controlfp(_RC_DOWN, _RC_CHOP) failed\n"); + ret = p___fpe_flt_rounds(); + ok(ret == 3 - (sizeof(void*)>sizeof(int)), "__fpe_flt_rounds returned %d\n", ret); + + ok((p__controlfp(_RC_CHOP, _RC_CHOP) & _RC_CHOP) == _RC_CHOP, "_controlfp(_RC_CHOP, _RC_CHOP) failed\n"); + ret = p___fpe_flt_rounds(); + ok(ret == 0, "__fpe_flt_rounds returned %d\n", ret); +} + +static BOOL init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); + if(!module) { + win_skip("ucrtbase.dll not available\n"); + return FALSE; + } + p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); p_execute_onexit_table = (void*)GetProcAddress(module, "_execute_onexit_table"); + p___fpe_flt_rounds = (void*)GetProcAddress(module, "__fpe_flt_rounds"); + p__controlfp = (void*)GetProcAddress(module, "_controlfp"); + + return TRUE; } START_TEST(misc) { - init(); + if(!init()) + return; test__initialize_onexit_table(); test__register_onexit_function(); test__execute_onexit_table(); + test___fpe_flt_rounds(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9d65d3c..14ffa63 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -89,7 +89,7 @@ @ stub __dcrt_initial_narrow_environment @ cdecl __doserrno() MSVCRT___doserrno @ cdecl __dstbias() MSVCRT___p__dstbias -@ stub __fpe_flt_rounds +@ cdecl __fpe_flt_rounds() @ cdecl __fpecode() @ stub __initialize_lconv_for_unsigned_char @ stub __intrinsic_abnormal_termination

1 0

Nikolay Sivov : msscript: Implement GetControlInfo().
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 10f58a5e25eac9d8072de26e0f7c1f3d038eca2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f58a5e25eac9d8072de26e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 11 13:02:38 2016 +0300 msscript: Implement GetControlInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 10 ++++++++-- dlls/msscript.ocx/tests/msscript.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b2f4e77..5a03f0c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -808,9 +808,15 @@ static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO { ScriptControl *This = impl_from_IOleControl(iface); - FIXME("(%p)->(%p)\n", This, info); + TRACE("(%p)->(%p)\n", This, info); - return E_NOTIMPL; + if (!info) + return E_POINTER; + + info->hAccel = NULL; + info->cAccel = 0; + + return S_OK; } static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index f0245a6..12f7003 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -181,12 +181,35 @@ static void test_persiststreaminit(void) static void test_olecontrol(void) { IOleControl *olecontrol; + CONTROLINFO info; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IOleControl, (void**)&olecontrol); ok(hr == S_OK, "got 0x%08x\n", hr); + memset(&info, 0xab, sizeof(info)); + info.cb = sizeof(info); + hr = IOleControl_GetControlInfo(olecontrol, &info); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(info.hAccel == NULL, "got %p\n", info.hAccel); + ok(info.cAccel == 0, "got %d\n", info.cAccel); + ok(info.dwFlags == 0xabababab, "got %x\n", info.dwFlags); + + memset(&info, 0xab, sizeof(info)); + info.cb = sizeof(info) - 1; + hr = IOleControl_GetControlInfo(olecontrol, &info); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(info.hAccel == NULL, "got %p\n", info.hAccel); + ok(info.cAccel == 0, "got %d\n", info.cAccel); + ok(info.dwFlags == 0xabababab, "got %x\n", info.dwFlags); + + if (0) /* crashes on win2k3 */ + { + hr = IOleControl_GetControlInfo(olecontrol, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + IOleControl_Release(olecontrol); }

1 0

Nikolay Sivov : mshtml/tests: Release interface after successful QI.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 08cdd05be0556e6747e323c644b4bc62116d9084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08cdd05be0556e6747e323c64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 11 22:10:05 2016 +0300 mshtml/tests: Release interface after successful QI. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 73b1185..3574a0a 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2505,7 +2505,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteInterruptPoll, (void**)&poll); ok(hres == S_OK, "Could not get IActiveScriptSiteInterruptPoll interface: %08x\n", hres); - if(FAILED(hres)) + if(SUCCEEDED(hres)) IActiveScriptSiteInterruptPoll_Release(poll); hres = IActiveScriptSite_GetLCID(pass, &lcid);

1 0

Alexandre Julliard : user32: Add helper functions to get and set the window internal flags.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: fb6304119a967ea13688ff9e34ed9d819bd50785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6304119a967ea13688ff9e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 14:54:15 2016 +0900 user32: Add helper functions to get and set the window internal flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 7 +------ dlls/user32/mdi.c | 7 +------ dlls/user32/nonclient.c | 15 ++++----------- dlls/user32/win.c | 51 +++++++++++++++++++++---------------------------- dlls/user32/win.h | 6 ++++++ dlls/user32/winpos.c | 36 ++++++---------------------------- 6 files changed, 40 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb6304119a967ea13688f…

1 0

Nikolay Sivov : shlwapi: Fix a string leak (Valgrind).
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 568b08047b71ba12f9e35f73a87ca3a53f0736b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568b08047b71ba12f9e35f73a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 11 21:42:05 2016 +0300 shlwapi: Fix a string leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 85fa3c1..ee93818 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -958,8 +958,10 @@ HRESULT WINAPI UrlEscapeA( if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; - if(dwFlags & URL_ESCAPE_AS_UTF8) + if(dwFlags & URL_ESCAPE_AS_UTF8) { + RtlFreeUnicodeString(&urlW); return E_NOTIMPL; + } if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) { escapedW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags);

1 0

Francois Gouget : shell32/tests: Spelling fix.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 8e548c41c13b1c5ea9a2b46eb0e2dcbc9587b1e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e548c41c13b1c5ea9a2b46eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 13:53:39 2016 +0200 shell32/tests: Spelling fix. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 274c0fc..2cd06d2 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -116,7 +116,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW if (expected_string) { ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr); if (hr != S_FALSE) { - /* don't try to allocate memory using unitialized len */ + /* don't try to allocate memory using uninitialized len */ IQueryAssociations_Release(assoc); return; }

1 0

Francois Gouget : explorer: Spelling fix.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: b81d3f069fe27301dc132064fb27c557654e5c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81d3f069fe27301dc132064f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 13:53:34 2016 +0200 explorer: Spelling fix. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 623743f..fe8af86 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -842,7 +842,7 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return 0; } -/* notifcation posted to the desktop window */ +/* notification posted to the desktop window */ void handle_parent_notify( HWND hwnd, WPARAM wp ) { switch (LOWORD(wp))

1 0

Michael Stefaniuc : gdiplus/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 64a1028bfeb30483efa8860ff66c2a5a890e0fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a1028bfeb30483efa8860ff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 10 09:41:59 2016 +0200 gdiplus/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 80 +++++++++++++++++++++---------------------- dlls/gdiplus/tests/region.c | 17 ++++----- 2 files changed, 47 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64a1028bfeb30483efa88…

1 0

Alexandre Julliard : Wine release 1.9.12
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: website Branch: master Commit: e0e59ed792808d49f6f6b6bdcdce5f6edc70970f URL: http://source.winehq.org/git/website.git/?a=commit;h=e0e59ed792808d49f6f6b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 23:05:55 2016 +0900 Wine release 1.9.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016061001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2016061001.xml b/news/en/2016061001.xml new file mode 100644 index 0000000..24bc807 --- /dev/null +++ b/news/en/2016061001.xml @@ -0,0 +1,17 @@ +<news> +<date>June 10, 2016</date> +<title>Wine 1.9.12 Released</title> +<body> + The Wine development release 1.9.12 is now available. + <a href="{$root}/announce/1.9.12">What's new</a> in this release: +<ul> + <li>Bug fix update of the Mono engine.</li> + <li>Initial version of a taskbar in desktop mode.</li> + <li>Fixes for right-to-left languages in Uniscribe.</li> + <li>More Shader Model 4 support in Direct3D.</li> + <li>Better metafile support in RichEdit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.12.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.9.12 : Alexandre Julliard : Release 1.9.12
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: refs/tags/wine-1.9.12 Tag: 0797c16e1c8857baaf6ece4d5a7d2a8d8cd0d755 URL: http://source.winehq.org/git/wine.git/?a=tag;h=0797c16e1c8857baaf6ece4d5a7d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 23:04:02 2016 +0900 Release 1.9.12

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
60
Older →

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 June 2016