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

Michael Stefaniuc : comctl32/tests: Add an ImageList_Copy() test.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: d1db77cc44210fc766addcb6fd2c0f6c0a66711d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1db77cc44210fc766addcb6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 5 15:25:44 2017 +0200 comctl32/tests: Add an ImageList_Copy() test. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6a9ec4459d1ba912b4ce13671fe8ba0bfe531ee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b5445c5..7669fb6 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2230,6 +2230,29 @@ static void test_color_table(UINT ilc) ImageList_Destroy(himl); } +static void test_copy(void) +{ + HIMAGELIST dst, src; + BOOL ret; + int count; + + dst = ImageList_Create(5, 11, ILC_COLOR, 1, 1); + count = ImageList_GetImageCount(dst); + ok(!count, "ImageList not empty.\n"); + src = createImageList(7, 13); + count = ImageList_GetImageCount(src); + ok(count > 2, "Tests need an ImageList with more than 2 images\n"); + + /* ImageList_Copy() cannot copy between two ImageLists */ + ret = ImageList_Copy(dst, 0, src, 2, ILCF_MOVE); + ok(!ret, "ImageList_Copy() should have returned FALSE\n"); + count = ImageList_GetImageCount(dst); + ok(count == 0, "Expected no image in dst ImageList, got %d\n", count); + + ImageList_Destroy(dst); + ImageList_Destroy(src); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2380,6 +2403,7 @@ START_TEST(imagelist) test_iconsize(); test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); + test_copy(); FreeLibrary(hComCtl32);

1 0

Huw Davies : comctl32: Don' t create a masked imagelist if CLR_NONE is specified.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 57657d1673e9be1e5f5a9eaecb6658c494c029c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57657d1673e9be1e5f5a9eae… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 20 13:26:16 2017 +0000 comctl32: Don't create a masked imagelist if CLR_NONE is specified. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92e999f34bff4a27112d22a6d48176daa20ad5f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/imagelist.c | 3 ++- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 157344c..70457c7 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2037,7 +2037,8 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); + if (clrMask != CLR_NONE) color |= ILC_MASK; + himl = ImageList_Create (cx, dib.dsBm.bmHeight, color, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 7669fb6..6a62b40 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -39,6 +39,7 @@ #include "wine/test.h" #include "v6util.h" +#include "resources.h" #define IMAGELIST_MAGIC (('L' << 8) | 'I') @@ -67,6 +68,7 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); +static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); static HINSTANCE hinst; @@ -2253,6 +2255,26 @@ static void test_copy(void) ImageList_Destroy(src); } +static void test_loadimage(void) +{ + HIMAGELIST list; + DWORD flags; + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == (ILC_COLOR4 | ILC_MASK), "got %08x\n", flags ); + ImageList_Destroy( list ); + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == ILC_COLOR4, "got %08x\n", flags ); + ImageList_Destroy( list ); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2386,6 +2408,7 @@ START_TEST(imagelist) pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); + pImageList_GetFlags = (void*)GetProcAddress(hComCtl32, "ImageList_GetFlags"); hinst = GetModuleHandleA(NULL); @@ -2404,6 +2427,7 @@ START_TEST(imagelist) test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); test_copy(); + test_loadimage(); FreeLibrary(hComCtl32);

1 0

Piotr Caban : msvcrt: Fix buffer size checks in swscanf_s.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 24c691956459fcbe5007fc00a99c598718f94d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c691956459fcbe5007fc00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 1 12:29:08 2017 +0100 msvcrt: Fix buffer size checks in swscanf_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7aa67f1e5f4e0ecafe9fbeec982326c4d78bf883) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/scanf.h | 6 +++--- dlls/msvcrt/tests/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 2920b9b..cbbcae4 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -540,7 +540,7 @@ _FUNCTION_ { char *str = suppress ? NULL : va_arg(ap, char*); char *pstr = str; #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(char); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif @@ -566,7 +566,7 @@ _FUNCTION_ { MSVCRT_wchar_t *str = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); MSVCRT_wchar_t *pstr = str; #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(MSVCRT_wchar_t); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif @@ -615,7 +615,7 @@ _FUNCTION_ { ULONG *Mask; int invert = 0; /* Set if we are NOT to find the chars */ #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(_CHAR_); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 1d1f28e..e3e0efd 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -324,9 +324,43 @@ static void test_swscanf( void ) ok(c == 'b', "c = %x\n", c); } +static void test_swscanf_s(void) +{ + static const wchar_t fmt1[] = {'%','c',0}; + static const wchar_t fmt2[] = {'%','[','a','-','z',']',0}; + + int (WINAPIV *pswscanf_s)(const wchar_t*,const wchar_t*,...); + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + wchar_t buf[2], out[2]; + int ret; + + pswscanf_s = (void*)GetProcAddress(hmod, "swscanf_s"); + if(!pswscanf_s) { + win_skip("swscanf_s not available\n"); + return; + } + + buf[0] = 'a'; + buf[1] = '1'; + out[1] = 'b'; + ret = pswscanf_s(buf, fmt1, out, 1); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(out[1] == 'b', "out[1] = %x\n", out[1]); + + ret = pswscanf_s(buf, fmt2, out, 1); + ok(!ret, "swscanf_s returned %d\n", ret); + + ret = pswscanf_s(buf, fmt2, out, 2); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(!out[1], "out[1] = %x\n", out[1]); +} + START_TEST(scanf) { test_sscanf(); test_sscanf_s(); test_swscanf(); + test_swscanf_s(); }

1 0

Nikolay Sivov : msvcrt: Added _get_purecall_handler().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 135b7b40cd8975c991c9934eb7e7b00d5eb938bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=135b7b40cd8975c991c9934e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 24 21:17:08 2017 +0300 msvcrt: Added _get_purecall_handler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8d294cd7b277893de98721f6b81626d12952fd6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d1cd0b4..bc5414c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -55,7 +55,7 @@ @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a85cbe..8a7e29e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -883,7 +883,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d7c2044..feba5d3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1230,7 +1230,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0a09475..9d9d891 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1230,7 +1230,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 68992a5..cedc09f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1158,7 +1158,7 @@ @ cdecl _get_output_format() msvcr120._get_output_format @ cdecl _get_pgmptr(ptr) msvcr120._get_pgmptr @ cdecl _get_printf_count_output() msvcr120._get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() msvcr120._get_purecall_handler @ cdecl _get_terminate() msvcr120._get_terminate @ cdecl _get_timezone(ptr) msvcr120._get_timezone @ cdecl _get_tzname(ptr str long long) msvcr120._get_tzname diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 96c4f0f..947479b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -552,7 +552,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_sbh_threshold() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a6a02ed..38ce86c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -533,7 +533,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_sbh_threshold() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9fd373e..475082b 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -440,6 +440,15 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func } /********************************************************************* + * _get_purecall_handler + */ +MSVCRT_purecall_handler CDECL _get_purecall_handler(void) +{ + TRACE("\n"); + return purecall_handler; +} + +/********************************************************************* * _purecall (MSVCRT.@) */ void CDECL _purecall(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index eb87ba6..ef616e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -372,7 +372,7 @@ @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_thread_local_invalid_parameter_handler() diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 1b9f3f9..b2ea7a7 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -57,7 +57,7 @@ @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof

1 0

Fabian Maurer : gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: f14c832313f51a0ea2e5556d8d06bd88f61b0e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f14c832313f51a0ea2e5556d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 26 14:33:18 2017 +0100 gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89366f740f1e3629a58711057afba39681a07ad6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/font.c | 38 ++++++++++-------- dlls/gdiplus/tests/Makefile.in | 5 +++ dlls/gdiplus/tests/font.c | 73 +++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/resource.rc | 22 +++++++++++ dlls/gdiplus/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++ dlls/gdiplus/tests/wine_longname.ttf | Bin 0 -> 2216 bytes 6 files changed, 188 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f14c832313f51a0ea2e5…

1 0

Piotr Caban : msvcrt: Call cdecl functions with empty FPU stack in _CI* functions.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 24f97b33e1cc7118fe983a6ac939ed36cf4c5073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f97b33e1cc7118fe983a6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 27 20:29:44 2017 +0100 msvcrt: Call cdecl functions with empty FPU stack in _CI* functions. The FPU stack should be empty on cdecl function call. Failing to do so breaks GCC 6.4.0 -O2 optimized code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ee33d38c5041a8293c64257801572d1c742b0aba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/math.c | 269 ++++++++++++++++++++++------------------------------- 1 file changed, 111 insertions(+), 158 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 775fbac..8a84a26 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -496,164 +496,117 @@ double CDECL MSVCRT_tanh( double x ) #if defined(__GNUC__) && defined(__i386__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) - -/********************************************************************* - * _CIacos (MSVCRT.@) - */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); - return MSVCRT_acos(x); -} - -/********************************************************************* - * _CIasin (MSVCRT.@) - */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); - return MSVCRT_asin(x); -} - -/********************************************************************* - * _CIatan (MSVCRT.@) - */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); - return MSVCRT_atan(x); -} - -/********************************************************************* - * _CIatan2 (MSVCRT.@) - */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_atan2(x,y); -} - -/********************************************************************* - * _CIcos (MSVCRT.@) - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return MSVCRT_cos(x); -} - -/********************************************************************* - * _CIcosh (MSVCRT.@) - */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_cosh(x); -} - -/********************************************************************* - * _CIexp (MSVCRT.@) - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); - return MSVCRT_exp(x); -} - -/********************************************************************* - * _CIfmod (MSVCRT.@) - */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_fmod(x,y); -} - -/********************************************************************* - * _CIlog (MSVCRT.@) - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return MSVCRT_log(x); -} - -/********************************************************************* - * _CIlog10 (MSVCRT.@) - */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); - return MSVCRT_log10(x); -} - -/********************************************************************* - * _CIpow (MSVCRT.@) - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_pow(x,y); -} - -/********************************************************************* - * _CIsin (MSVCRT.@) - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sin(x); -} - -/********************************************************************* - * _CIsinh (MSVCRT.@) - */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sinh(x); -} - -/********************************************************************* - * _CIsqrt (MSVCRT.@) - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sqrt(x); -} - -/********************************************************************* - * _CItan (MSVCRT.@) - */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); - return MSVCRT_tan(x); -} - -/********************************************************************* - * _CItanh (MSVCRT.@) - */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_tanh(x); -} - -/********************************************************************* - * _ftol (MSVCRT.@) - */ -LONGLONG CDECL MSVCRT__ftol(void) -{ - FPU_DOUBLE(x); - return (LONGLONG)x; -} +#define CREATE_FPU_FUNC1(name, call) \ + __ASM_GLOBAL_FUNC(name, \ + "pushl %ebp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") \ + "movl %esp, %ebp\n\t" \ + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") \ + "subl $68, %esp\n\t" /* sizeof(double)*8 + sizeof(int) */ \ + "fstpl (%esp)\n\t" /* store function argument */ \ + "fwait\n\t" \ + "movl $1, %ecx\n\t" /* empty FPU stack */ \ + "1:\n\t" \ + "fxam\n\t" \ + "fstsw %ax\n\t" \ + "and $0x4500, %ax\n\t" \ + "cmp $0x4100, %ax\n\t" \ + "je 2f\n\t" \ + "fstpl (%esp,%ecx,8)\n\t" \ + "fwait\n\t" \ + "incl %ecx\n\t" \ + "jmp 1b\n\t" \ + "2:\n\t" \ + "movl %ecx, -4(%ebp)\n\t" \ + "call " __ASM_NAME( #call ) "\n\t" \ + "movl -4(%ebp), %ecx\n\t" \ + "fstpl (%esp)\n\t" /* save result */ \ + "3:\n\t" /* restore FPU stack */ \ + "decl %ecx\n\t" \ + "fldl (%esp,%ecx,8)\n\t" \ + "cmpl $0, %ecx\n\t" \ + "jne 3b\n\t" \ + "leave\n\t" \ + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") \ + __ASM_CFI(".cfi_same_value %ebp\n\t") \ + "ret") + +#define CREATE_FPU_FUNC2(name, call) \ + __ASM_GLOBAL_FUNC(name, \ + "pushl %ebp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") \ + "movl %esp, %ebp\n\t" \ + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") \ + "subl $68, %esp\n\t" /* sizeof(double)*8 + sizeof(int) */ \ + "fstpl 8(%esp)\n\t" /* store function argument */ \ + "fwait\n\t" \ + "fstpl (%esp)\n\t" \ + "fwait\n\t" \ + "movl $2, %ecx\n\t" /* empty FPU stack */ \ + "1:\n\t" \ + "fxam\n\t" \ + "fstsw %ax\n\t" \ + "and $0x4500, %ax\n\t" \ + "cmp $0x4100, %ax\n\t" \ + "je 2f\n\t" \ + "fstpl (%esp,%ecx,8)\n\t" \ + "fwait\n\t" \ + "incl %ecx\n\t" \ + "jmp 1b\n\t" \ + "2:\n\t" \ + "movl %ecx, -4(%ebp)\n\t" \ + "call " __ASM_NAME( #call ) "\n\t" \ + "movl -4(%ebp), %ecx\n\t" \ + "fstpl 8(%esp)\n\t" /* save result */ \ + "3:\n\t" /* restore FPU stack */ \ + "decl %ecx\n\t" \ + "fldl (%esp,%ecx,8)\n\t" \ + "cmpl $1, %ecx\n\t" \ + "jne 3b\n\t" \ + "leave\n\t" \ + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") \ + __ASM_CFI(".cfi_same_value %ebp\n\t") \ + "ret") + +CREATE_FPU_FUNC1(_CIacos, MSVCRT_acos) +CREATE_FPU_FUNC1(_CIasin, MSVCRT_asin) +CREATE_FPU_FUNC1(_CIatan, MSVCRT_atan) +CREATE_FPU_FUNC2(_CIatan2, MSVCRT_atan2) +CREATE_FPU_FUNC1(_CIcos, MSVCRT_cos) +CREATE_FPU_FUNC1(_CIcosh, MSVCRT_cosh) +CREATE_FPU_FUNC1(_CIexp, MSVCRT_exp) +CREATE_FPU_FUNC2(_CIfmod, MSVCRT_fmod) +CREATE_FPU_FUNC1(_CIlog, MSVCRT_log) +CREATE_FPU_FUNC1(_CIlog10, MSVCRT_log10) +CREATE_FPU_FUNC2(_CIpow, MSVCRT_pow) +CREATE_FPU_FUNC1(_CIsin, MSVCRT_sin) +CREATE_FPU_FUNC1(_CIsinh, MSVCRT_sinh) +CREATE_FPU_FUNC1(_CIsqrt, MSVCRT_sqrt) +CREATE_FPU_FUNC1(_CItan, MSVCRT_tan) +CREATE_FPU_FUNC1(_CItanh, MSVCRT_tanh) + +__ASM_GLOBAL_FUNC(MSVCRT__ftol, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $12, %esp\n\t" /* sizeof(LONGLONG) + 2*sizeof(WORD) */ + "fnstcw (%esp)\n\t" + "mov (%esp), %ax\n\t" + "or $0xc, %ax\n\t" + "mov %ax, 2(%esp)\n\t" + "fldcw 2(%esp)\n\t" + "fistpq 4(%esp)\n\t" + "fldcw (%esp)\n\t" + "movl 4(%esp), %eax\n\t" + "movl 8(%esp), %edx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret") #endif /* defined(__GNUC__) && defined(__i386__) */

1 0

Piotr Caban : msvcrt: Correctly set rounding mode in _ftol implementation.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: b7b880c3bba73cb59a550fdb9f5b6e5fbacc2b35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b880c3bba73cb59a550fdb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 18 12:10:28 2017 +0100 msvcrt: Correctly set rounding mode in _ftol implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 22edbd849ada33e8037f6f2b7fde75b1617f3f78) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8a84a26..f2d41c8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -596,7 +596,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__ftol, "subl $12, %esp\n\t" /* sizeof(LONGLONG) + 2*sizeof(WORD) */ "fnstcw (%esp)\n\t" "mov (%esp), %ax\n\t" - "or $0xc, %ax\n\t" + "or $0xc00, %ax\n\t" "mov %ax, 2(%esp)\n\t" "fldcw 2(%esp)\n\t" "fistpq 4(%esp)\n\t"

1 0

Alexandre Julliard : kernel32: Also set the preloader range for 64-bit binaries.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: ba50246f94a598b66c1d4c9fd1aa5b2bf7bdc0bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba50246f94a598b66c1d4c9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 23 11:35:24 2017 +0200 kernel32: Also set the preloader range for 64-bit binaries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1d49a57e77c2e18dd0b9e74aa6b71fc95ac57017) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/kernel_private.h | 4 ++-- dlls/kernel32/module.c | 12 +++++++----- dlls/kernel32/process.c | 20 +++++++++++--------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 76611d7..7e7ee61 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -84,8 +84,8 @@ struct binary_info enum binary_type type; DWORD arch; DWORD flags; - void *res_start; - void *res_end; + ULONGLONG res_start; + ULONGLONG res_end; }; /* module.c */ diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index badfe1d..3179b67 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -319,6 +319,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) { IMAGE_OS2_HEADER os2; IMAGE_NT_HEADERS32 nt; + IMAGE_NT_HEADERS64 nt64; } ext_header; /* We do have a DOS image so we will now try to seek into @@ -347,16 +348,17 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) info->arch = ext_header.nt.FileHeader.Machine; if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) info->flags |= BINARY_FLAG_DLL; - if (len < sizeof(ext_header.nt)) /* clear remaining part of header if missing */ - memset( (char *)&ext_header.nt + len, 0, sizeof(ext_header.nt) - len ); + if (len < sizeof(ext_header)) /* clear remaining part of header if missing */ + memset( (char *)&ext_header + len, 0, sizeof(ext_header) - len ); switch (ext_header.nt.OptionalHeader.Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - info->res_start = (void *)(ULONG_PTR)ext_header.nt.OptionalHeader.ImageBase; - info->res_end = (void *)((ULONG_PTR)ext_header.nt.OptionalHeader.ImageBase + - ext_header.nt.OptionalHeader.SizeOfImage); + info->res_start = ext_header.nt.OptionalHeader.ImageBase; + info->res_end = info->res_start + ext_header.nt.OptionalHeader.SizeOfImage; break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + info->res_start = ext_header.nt64.OptionalHeader.ImageBase; + info->res_end = info->res_start + ext_header.nt64.OptionalHeader.SizeOfImage; info->flags |= BINARY_FLAG_64BIT; break; } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e1372fb..595adf9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -207,8 +207,8 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil } binary_info->type = BINARY_UNIX_LIB; binary_info->flags = flags; - binary_info->res_start = NULL; - binary_info->res_end = NULL; + binary_info->res_start = 0; + binary_info->res_end = 0; /* assume current arch */ #if defined(__i386__) || defined(__x86_64__) binary_info->arch = (flags & BINARY_FLAG_64BIT) ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; @@ -1916,8 +1916,9 @@ static pid_t exec_loader( LPCWSTR cmd_line, unsigned int flags, int socketfd, signal( SIGPIPE, SIG_DFL ); sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd ); - sprintf( preloader_reserve, "WINEPRELOADRESERVE=%lx-%lx", - (unsigned long)binary_info->res_start, (unsigned long)binary_info->res_end ); + sprintf( preloader_reserve, "WINEPRELOADRESERVE=%x%08x-%x%08x", + (ULONG)(binary_info->res_start >> 32), (ULONG)binary_info->res_start, + (ULONG)(binary_info->res_end >> 32), (ULONG)binary_info->res_end ); putenv( preloader_reserve ); putenv( socket_env ); @@ -2383,10 +2384,10 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A else switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p, arch %04x%s)\n", + TRACE( "starting %s as Win%d binary (%s-%s, arch %04x%s)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end, binary_info.arch, - (binary_info.flags & BINARY_FLAG_FAKEDLL) ? ", fakedll" : "" ); + wine_dbgstr_longlong(binary_info.res_start), wine_dbgstr_longlong(binary_info.res_end), + binary_info.arch, (binary_info.flags & BINARY_FLAG_FAKEDLL) ? ", fakedll" : "" ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; @@ -2536,9 +2537,10 @@ static void exec_process( LPCWSTR name ) switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p, arch %04x)\n", + TRACE( "starting %s as Win%d binary (%s-%s, arch %04x)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end, binary_info.arch ); + wine_dbgstr_longlong(binary_info.res_start), wine_dbgstr_longlong(binary_info.res_end), + binary_info.arch ); create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL, FALSE, 0, &startup_info, &info, NULL, &binary_info, TRUE ); break;

1 0

Alexandre Julliard : Wine release 3.4
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: website Branch: master Commit: 744a0e3b974182e0bbe55d92c615abdcddae0c6a URL: https://source.winehq.org/git/website.git/?a=commit;h=744a0e3b974182e0bbe55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 19:53:25 2018 +0100 Wine release 3.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018031601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018031601.xml b/news/en/2018031601.xml new file mode 100644 index 0000000..96d0226 --- /dev/null +++ b/news/en/2018031601.xml @@ -0,0 +1,16 @@ +<news> +<date>March 16, 2018</date> +<title>Wine 3.4 Released</title> +<body> + The Wine development release 3.4 is now available. + <a href="{$root}/announce/3.4">What's new</a> in this release: +<ul> + <li>More Vulkan support, including integration with the X11 driver.</li> + <li>Better handling of privileged instructions on x86-64.</li> + <li>Hex edit dialog improvements in RegEdit.</li> + <li>Assortment of patches merged from wine-staging.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.4.tar.xz">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

Henri Verbeet : wined3d: Merge the surface_created() and volume_created() wined3d_device_parent_ops callbacks.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 0a354365bd2aa5854ffcc5157bf9db3ad03441b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a354365bd2aa5854ffcc515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 16 13:56:25 2018 +0330 wined3d: Merge the surface_created() and volume_created() wined3d_device_parent_ops callbacks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 13 ++++++------ dlls/d3d8/device.c | 57 +++++++++++++++++++++++++------------------------- dlls/d3d9/device.c | 57 +++++++++++++++++++++++++------------------------- dlls/ddraw/ddraw.c | 27 +++++++----------------- dlls/wined3d/texture.c | 8 +++---- include/wine/wined3d.h | 7 ++----- 6 files changed, 75 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a354365bd2aa5854ffc…

1 0