April 2016 - Wine-commits - list.winehq.org

Austin English : kernel32: Add GetConsoleScreenBufferInfoEx/ SetConsoleScreenBufferInfoEx stubs.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: c35293060ecde4656499fd757ac0ecfe96f71a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35293060ecde4656499fd757… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Dec 26 21:56:10 2015 -0600 kernel32: Add GetConsoleScreenBufferInfoEx/SetConsoleScreenBufferInfoEx stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57d1171208b2114d82422c1d1af2be9b3c86495b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/console.c | 14 ++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 51d6e60..99f2061 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3321,3 +3321,17 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) return get_console_font_size(hConsole, index); } #endif /* !defined(__i386__) */ + +BOOL WINAPI GetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) +{ + FIXME("(%p %p): stub!\n", hConsole, csbix); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) +{ + FIXME("(%p %p): stub!\n", hConsole, csbix); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 80a4e79..9cb5ca3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -615,7 +615,7 @@ @ stdcall GetConsoleOutputCP() @ stdcall GetConsoleProcessList(ptr long) @ stdcall GetConsoleScreenBufferInfo(long ptr) -# @ stub GetConsoleScreenBufferInfoEx +@ stdcall GetConsoleScreenBufferInfoEx(long ptr) # @ stub GetConsoleSelectionInfo @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @@ -1362,7 +1362,7 @@ @ stub SetConsoleOS2OemFormat @ stdcall SetConsoleOutputCP(long) @ stub SetConsolePalette -# @ stub SetConsoleScreenBufferInfoEx +@ stdcall SetConsoleScreenBufferInfoEx(long ptr) @ stdcall SetConsoleScreenBufferSize(long long) @ stdcall SetConsoleTextAttribute(long long) @ stdcall SetConsoleTitleA(str)

1 0

Matteo Bruni : wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 621a1e2670b9367483747445ab60b6bc6edc2852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621a1e2670b9367483747445a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 11 16:10:46 2016 +0100 wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM. Signed-off-by: Matteo Bruni <mbruni(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 1061969eb6e291566591f37a5ea5e48af3a48297) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4406067..47ad93c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1026,7 +1026,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B5G5R5A1_UNORM, GL_RGB5_A1, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0,

1 0

Alexandre Julliard : server: Implement serial port read interval timeouts.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 32a387e9b03c776ef258a16957f02c893b13fb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a387e9b03c776ef258a1695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 23:18:31 2016 -0700 server: Implement serial port read interval timeouts. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc0bf9e505922b81df1c317d6493665bbe946554) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/serial.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/server/serial.c b/server/serial.c index 164a4b1..7beb8ff 100644 --- a/server/serial.c +++ b/server/serial.c @@ -62,12 +62,15 @@ static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ); struct serial { struct object obj; struct fd *fd; + struct timeout_user *read_timer; + /* timeout values */ unsigned int readinterval; unsigned int readconst; @@ -115,7 +118,7 @@ static const struct fd_ops serial_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ + serial_reselect_async, /* reselect_async */ default_fd_cancel_async /* cancel_async */ }; @@ -134,6 +137,7 @@ struct object *create_serial( struct fd *fd ) if (!(serial = alloc_object( &serial_ops ))) return NULL; + serial->read_timer = NULL; serial->readinterval = 0; serial->readmult = 0; serial->readconst = 0; @@ -157,6 +161,7 @@ static struct fd *serial_get_fd( struct object *obj ) static void serial_destroy( struct object *obj) { struct serial *serial = (struct serial *)obj; + if (serial->read_timer) remove_timeout_user( serial->read_timer ); release_object( serial->fd ); } @@ -203,6 +208,34 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ } } +static void serial_read_timeout( void *arg ) +{ + struct serial *serial = arg; + + serial->read_timer = NULL; + fd_async_wake_up( serial->fd, ASYNC_TYPE_READ, STATUS_TIMEOUT ); +} + +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ) +{ + struct serial *serial = get_fd_user( fd ); + + if (serial->read_timer) + { + if (!(default_fd_get_poll_events( fd ) & POLLIN)) + { + remove_timeout_user( serial->read_timer ); + serial->read_timer = NULL; + } + } + else if (serial->readinterval && (default_fd_get_poll_events( fd ) & POLLIN)) + { + serial->read_timer = add_timeout_user( (timeout_t)serial->readinterval * -10000, + serial_read_timeout, serial ); + } + default_fd_reselect_async( fd, queue ); +} + DECL_HANDLER(get_serial_info) { struct serial *serial;

1 0

Sebastian Lackner : kernel32: Forward InterlockedPushListSList[Ex] to ntdll.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: f61c9e310bc862ce83557b0f4993776f41a0bb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61c9e310bc862ce83557b0f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:54:55 2016 +0100 kernel32: Forward InterlockedPushListSList[Ex] to ntdll. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 49051392d79b1e0e0760f1649a47a1d70dcc11d5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-interlocked-l1-1-0.spec | 2 +- .../api-ms-win-core-interlocked-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec b/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec index 9c6d25c..8b2d3ac 100644 --- a/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec +++ b/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec @@ -8,5 +8,5 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList -@ stub InterlockedPushListSList +@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) kernel32.InterlockedPushListSList @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec index f1fbd94..c3e2d0c 100644 --- a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec +++ b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec @@ -8,5 +8,5 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList -@ stub InterlockedPushListSListEx +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) kernel32.InterlockedPushListSListEx @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ff67e54..80a4e79 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -957,7 +957,8 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -# @ stub InterlockedPushListSList +@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) ntdll.RtlInterlockedPushListSListEx @ stub InvalidateConsoleDIBits @ stdcall InvalidateNLSCache() @ stdcall IsBadCodePtr(ptr)

1 0

Charles Davis : winex11.drv: Actually query the swap method attribute.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 32c912253b219c0e1c17da8039fbd5d2930dc2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c912253b219c0e1c17da803… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 12 02:01:42 2016 -0700 winex11.drv: Actually query the swap method attribute. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6509f90eacae5990de63d6f9a493fb60dd1982ad) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3d0bd24..704d62a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2738,7 +2738,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int case WGL_SWAP_METHOD_ARB: if (has_swap_method) { - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &tmp); + hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_SWAP_METHOD_OML, &tmp); if (hTest) goto get_error; switch (tmp) {

1 0

Charles Davis : dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: ac418d52b1367139ee4f9733dc8267a94f64437a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac418d52b1367139ee4f9733d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 12 02:00:02 2016 -0700 dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dcca411ac32e69a4c2f1be01595db113a20498e4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/opentype.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b48a769..98e7ab0 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -470,7 +470,7 @@ enum TT_NAME_MAC_LANGUAGE_ID TT_NAME_MAC_LANGID_LAO, TT_NAME_MAC_LANGID_VIETNAMESE, TT_NAME_MAC_LANGID_INDONESIAN, - TT_NAME_MAC_LANGID_TAGALONG, + TT_NAME_MAC_LANGID_TAGALOG, TT_NAME_MAC_LANGID_MALAY_ROMAN, TT_NAME_MAC_LANGID_MALAY_ARABIC, TT_NAME_MAC_LANGID_AMHARIC, @@ -483,11 +483,11 @@ enum TT_NAME_MAC_LANGUAGE_ID TT_NAME_MAC_LANGID_NYANJA, TT_NAME_MAC_LANGID_MALAGASY, TT_NAME_MAC_LANGID_ESPERANTO, - TT_NAME_MAC_LANGID_WELSH, + TT_NAME_MAC_LANGID_WELSH = 128, TT_NAME_MAC_LANGID_BASQUE, TT_NAME_MAC_LANGID_CATALAN, TT_NAME_MAC_LANGID_LATIN, - TT_NAME_MAC_LANGID_QUENCHUA, + TT_NAME_MAC_LANGID_QUECHUA, TT_NAME_MAC_LANGID_GUARANI, TT_NAME_MAC_LANGID_AYMARA, TT_NAME_MAC_LANGID_TATAR, @@ -605,6 +605,39 @@ static const char name_mac_langid_to_locale[][10] = { "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "cy-GB", "eu-ES", "ca-ES",

1 0

Anton Baskanov : quartz: Set the result to 1.0 in FilterGraph::GetRate.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: daf5fae80aefc8f24bfc1670bdec7ff02f16b6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf5fae80aefc8f24bfc1670b… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Feb 13 22:12:56 2016 +0600 quartz: Set the result to 1.0 in FilterGraph::GetRate. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f253e6cf9395c5895920ea4f09bd0994d253483e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 495f4be..028a31e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2610,6 +2610,11 @@ static HRESULT WINAPI MediaSeeking_GetRate(IMediaSeeking *iface, double *pdRate) FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pdRate); + if (!pdRate) + return E_POINTER; + + *pdRate = 1.0; + return S_OK; }

1 0

Michael Müller : kernel32: Allow to pass NULL as old protection in VirtualProtect for Win9x compatibility.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 7121526c1273da06ea3c20246abe32334b39817e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7121526c1273da06ea3c20246… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 16 06:53:14 2016 +0100 kernel32: Allow to pass NULL as old protection in VirtualProtect for Win9x compatibility. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8eb893f185414278dc45b238349c2e87a73381c5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/virtual.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 03ef38c..4bfc6cc 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -235,7 +235,13 @@ BOOL WINAPI VirtualProtect( LPVOID addr, SIZE_T size, DWORD new_prot, LPDWORD ol BOOL WINAPI VirtualProtectEx( HANDLE process, LPVOID addr, SIZE_T size, DWORD new_prot, LPDWORD old_prot ) { - NTSTATUS status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); + NTSTATUS status; + DWORD prot; + + /* Win9x allows to pass NULL as old_prot while it fails on NT */ + if (!old_prot && (GetVersion() & 0x80000000)) old_prot = &prot; + + status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; }

1 0

André Hentschel : ntdll: Set TPIDRURW also on ARMv8-A.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 56648c55cb0182ea72a111dc0e4a2e9fa2803eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56648c55cb0182ea72a111dc0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 25 21:29:26 2016 +0100 ntdll: Set TPIDRURW also on ARMv8-A. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b363f386cda116901db126be3f4688c4cc5c481c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1f6da96..5ee9f45 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -926,7 +926,7 @@ void signal_init_thread( TEB *teb ) init_done = TRUE; } -#ifdef __ARM_ARCH_7A__ +#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) /* Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. */ __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); #endif

1 0

Charles Davis : configure: Check for __builtin_ms_va_list on all x86_64 platforms.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: cf0b579412728d93d35301cd6e664dc5d9158e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0b579412728d93d35301cd6… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:43:17 2016 -0700 configure: Check for __builtin_ms_va_list on all x86_64 platforms. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7d295d381c003eb2e43e781b818e5eaeb8a27f3c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 33 +++++++++++---------------------- configure.ac | 31 +++++++++++-------------------- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/configure b/configure index a31a3bd..584c2fe 100755 --- a/configure +++ b/configure @@ -4936,25 +4936,15 @@ fi case $host in *-darwin*) - if test "x$enable_win64" = "xyes" - then - CC="$CC -m64" - CXX="$CXX -m64" - host_cpu="x86_64" - notice_platform="64-bit " - TARGETFLAGS="-m64" - - else - CC="$CC -m32" - CXX="$CXX -m32" - host_cpu="i386" - notice_platform="32-bit " - TARGETFLAGS="-m32" - - enable_win16=${enable_win16:-yes} - fi with_fontconfig=${with_fontconfig:-no} ;; + *-mingw32*|*-cygwin*) + enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" + ;; +esac + +case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then @@ -5011,11 +5001,14 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need gcc >= 4.4 to build Wine as 64-bit." "$LINENO" 5 + as_fn_error $? "You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + CC="$CC -m64" + CXX="$CXX -m64" host_cpu="x86_64" + notice_platform="64-bit " TARGETFLAGS="-m64" fi @@ -5048,10 +5041,6 @@ rm -f core conftest.err conftest.$ac_objext \ TARGETFLAGS="-marm" ;; - *-mingw32*|*-cygwin*) - enable_win16=${enable_win16:-no} - CFLAGS="$CFLAGS -D_WIN32" - ;; i[3456789]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/configure.ac b/configure.ac index 37ceab5..88e6b32 100644 --- a/configure.ac +++ b/configure.ac @@ -127,23 +127,15 @@ AC_CHECK_TOOL(LD,ld) case $host in *-darwin*) - if test "x$enable_win64" = "xyes" - then - CC="$CC -m64" - CXX="$CXX -m64" - host_cpu="x86_64" - notice_platform="64-bit " - AC_SUBST(TARGETFLAGS,"-m64") - else - CC="$CC -m32" - CXX="$CXX -m32" - host_cpu="i386" - notice_platform="32-bit " - AC_SUBST(TARGETFLAGS,"-m32") - enable_win16=${enable_win16:-yes} - fi with_fontconfig=${with_fontconfig:-no} ;; + *-mingw32*|*-cygwin*) + enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" + ;; +esac + +case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then @@ -164,9 +156,12 @@ case $host in AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])]) + AC_MSG_ERROR([You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit.])]) fi + CC="$CC -m64" + CXX="$CXX -m64" host_cpu="x86_64" + notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") fi ;; @@ -179,10 +174,6 @@ case $host in CFLAGS="$CFLAGS -marm" AC_SUBST(TARGETFLAGS,"-marm") ;; - *-mingw32*|*-cygwin*) - enable_win16=${enable_win16:-no} - CFLAGS="$CFLAGS -D_WIN32" - ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;;

1 0