June 2009 - Wine-Commits - list.winehq.org

Paul Vriens : user32/tests: Skip some tests on Win9x/WinME.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 267c39bc9c26353fbc8506f57f79d17c3ed63b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267c39bc9c26353fbc8506f57… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jun 13 14:28:29 2009 +0200 user32/tests: Skip some tests on Win9x/WinME. --- dlls/user32/tests/msg.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 28b0420..bde52ca 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11612,8 +11612,15 @@ static void test_PostMessage(void) HWND hwnd; BOOL ret; MSG msg; + static const WCHAR staticW[] = {'s','t','a','t','i','c',0}; - hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL); + SetLastError(0xdeadbeef); + hwnd = CreateWindowExW(0, staticW, NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL); + if (!hwnd && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Skipping some PostMessage tests on Win9x/WinMe\n"); + return; + } assert(hwnd); flush_events(); @@ -11631,13 +11638,13 @@ static void test_PostMessage(void) if (data[i].hwnd) ok(ret && msg.hwnd == 0 && msg.message == WM_USER+2 && msg.wParam == 0x5678 && msg.lParam == 0x1234, - "got ret %d hwnd %p msg %04x wParam %08lx lParam %08lx instead of TRUE/0/WM_USER/0x1234/0x5678\n", - ret, msg.hwnd, msg.message, msg.wParam, msg.lParam); + "%d: got ret %d hwnd %p msg %04x wParam %08lx lParam %08lx instead of TRUE/0/WM_USER+2/0x5678/0x1234\n", + i, ret, msg.hwnd, msg.message, msg.wParam, msg.lParam); else ok(ret && msg.hwnd == hwnd && msg.message == WM_USER+1 && msg.wParam == 0x1234 && msg.lParam == 0x5678, - "got ret %d hwnd %p msg %04x wParam %08lx lParam %08lx instead of TRUE/0/WM_USER/0x1234/0x5678\n", - ret, msg.hwnd, msg.message, msg.wParam, msg.lParam); + "%d: got ret %d hwnd %p msg %04x wParam %08lx lParam %08lx instead of TRUE/%p/WM_USER+1/0x1234/0x5678\n", + i, ret, msg.hwnd, msg.message, msg.wParam, msg.lParam, msg.hwnd); } }

1 0

Aurimas Fišeras : wininet: Add Lithuanian translation.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: e078ad3e2a5496a7d1074e5d975e6374426f786f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e078ad3e2a5496a7d1074e5d9… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 14 11:50:33 2009 +0300 wininet: Add Lithuanian translation. --- dlls/wininet/rsrc.rc | 1 + dlls/wininet/wininet_Lt.rc | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc index 5a81511..fdf3692 100644 --- a/dlls/wininet/rsrc.rc +++ b/dlls/wininet/rsrc.rc @@ -53,6 +53,7 @@ #include "wininet_It.rc" #include "wininet_Ja.rc" #include "wininet_Ko.rc" +#include "wininet_Lt.rc" #include "wininet_Nl.rc" #include "wininet_No.rc" #include "wininet_Pl.rc" diff --git a/dlls/wininet/wininet_Lt.rc b/dlls/wininet/wininet_Lt.rc new file mode 100644 index 0000000..bf5dbf2 --- /dev/null +++ b/dlls/wininet/wininet_Lt.rc @@ -0,0 +1,49 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įveskite tinklo slaptažodį" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Įveskite savo naudotojo vardą ir slaptažodį:", -1, 40, 6, 150, 15 + LTEXT "Įgaliot. serv.", -1, 40, 26, 50, 10 + LTEXT "Sritis", -1, 40, 46, 50, 10 + LTEXT "Naudotojas", -1, 40, 66, 50, 10 + LTEXT "Slaptažodis", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Į&rašyti šį slaptažodį (nesaugu)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "Vietinio tinklo ryšys" +} + +#pragma code_page(default)

1 0

Austin English : kernel32: GetConsoleAliasW is a stub, make sure it acts like one.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 056131f67e9c9402269f84c964ddb20e5905aad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056131f67e9c9402269f84c96… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 12 12:03:53 2009 -0500 kernel32: GetConsoleAliasW is a stub, make sure it acts like one. --- dlls/kernel32/console.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 0caa0ea..34994af 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2680,14 +2680,7 @@ BOOL CONSOLE_GetEditionMode(HANDLE hConIn, int* mode) DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer, DWORD TargetBufferLength, LPWSTR lpExename) { - static const WCHAR empty[] = {' ',0}; - FIXME("(%s,%p,%d,%s): stub\n", debugstr_w(lpSource), lpTargetBuffer, TargetBufferLength, debugstr_w(lpExename)); - - if(TargetBufferLength < sizeof(empty)/sizeof(WCHAR)) - return 0; - - lstrcpyW(lpTargetBuffer, empty); - - return 1; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }

1 0

Paul Vriens : shell32/tests: Fix a test failure on some Win95 boxes and NT4 .
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 397e7ed31d76bac17c4628a1e97d4353ce6bf99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=397e7ed31d76bac17c4628a1e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jun 13 16:29:02 2009 +0200 shell32/tests: Fix a test failure on some Win95 boxes and NT4. --- dlls/shell32/tests/appbar.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index e23d728..dbb75b9 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -399,7 +399,9 @@ static void test_appbarget(void) if(ret) { ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); - ok(abd.uEdge <= ABE_BOTTOM, "uEdge not returned\n"); + ok(abd.uEdge <= ABE_BOTTOM || + broken(abd.uEdge == 0xcccccccc), /* Some Win95 and NT4 */ + "uEdge not returned\n"); ok(abd.rc.left != 0xcccccccc, "rc not updated\n"); }

1 0

Austin English : configure: Fix mach-o/dyld_images.h detection on OS X.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 2d7ccb3862217efff0b0346e46682c55a8537452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7ccb3862217efff0b0346e4… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jun 13 18:01:24 2009 -0500 configure: Fix mach-o/dyld_images.h detection on OS X. --- configure | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 10 ++++++- include/config.h.in | 3 ++ 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dcc43b6..73ced57 100755 --- a/configure +++ b/configure @@ -5786,7 +5786,6 @@ for ac_header in \ linux/serial.h \ linux/types.h \ linux/ucdrom.h \ - mach-o/dyld_images.h \ mach-o/nlist.h \ mach/mach.h \ mach/machine.h \ @@ -5813,6 +5812,7 @@ for ac_header in \ scsi/scsi_ioctl.h \ scsi/sg.h \ soundcard.h \ + stdbool.h \ stdint.h \ strings.h \ stropts.h \ @@ -6440,6 +6440,74 @@ done +for ac_header in mach-o/dyld_images.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_STDBOOL_H + # include <stdbool.h> + #endif + #ifdef HAVE_STDINT_H + # include <stdint.h> + #endif + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + for ac_header in resolv.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 5fc708e..258a864 100644 --- a/configure.ac +++ b/configure.ac @@ -309,7 +309,6 @@ AC_CHECK_HEADERS(\ linux/serial.h \ linux/types.h \ linux/ucdrom.h \ - mach-o/dyld_images.h \ mach-o/nlist.h \ mach/mach.h \ mach/machine.h \ @@ -336,6 +335,7 @@ AC_CHECK_HEADERS(\ scsi/scsi_ioctl.h \ scsi/sg.h \ soundcard.h \ + stdbool.h \ stdint.h \ strings.h \ stropts.h \ @@ -486,6 +486,14 @@ AC_CHECK_HEADERS([linux/ipx.h],,, # include <linux/types.h> #endif]) +AC_CHECK_HEADERS([mach-o/dyld_images.h],,, + [#ifdef HAVE_STDBOOL_H + # include <stdbool.h> + #endif + #ifdef HAVE_STDINT_H + # include <stdint.h> + #endif]) + AC_CHECK_HEADERS([resolv.h],,, [#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H diff --git a/include/config.h.in b/include/config.h.in index aab0591..c113fcb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -699,6 +699,9 @@ /* Define to 1 if you have the `statvfs' function. */ #undef HAVE_STATVFS +/* Define to 1 if you have the <stdbool.h> header file. */ +#undef HAVE_STDBOOL_H + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H

1 0

Eric Pouech : dbghelp: Improve speed of our hashtable implementation by remembering the last element added to every bucket .
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: b37996305d1c64c908ea6a125ac60ca4bfec903f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37996305d1c64c908ea6a125… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 14 09:19:08 2009 +0200 dbghelp: Improve speed of our hashtable implementation by remembering the last element added to every bucket. --- dlls/dbghelp/dbghelp_private.h | 8 +++++++- dlls/dbghelp/storage.c | 20 +++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e1941be..9f8a612 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -80,11 +80,17 @@ struct hash_table_elt struct hash_table_elt* next; }; +struct hash_table_bucket +{ + struct hash_table_elt* first; + struct hash_table_elt* last; +}; + struct hash_table { unsigned num_elts; unsigned num_buckets; - struct hash_table_elt** buckets; + struct hash_table_bucket* buckets; struct pool* pool; }; diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index d687862..4e62f11 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -378,20 +378,26 @@ void hash_table_destroy(struct hash_table* ht) void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt) { unsigned hash = hash_table_hash(elt->name, ht->num_buckets); - struct hash_table_elt** p; if (!ht->buckets) { - ht->buckets = pool_alloc(ht->pool, ht->num_buckets * sizeof(struct hash_table_elt*)); + ht->buckets = pool_alloc(ht->pool, ht->num_buckets * sizeof(struct hash_table_bucket)); assert(ht->buckets); - memset(ht->buckets, 0, ht->num_buckets * sizeof(struct hash_table_elt*)); + memset(ht->buckets, 0, ht->num_buckets * sizeof(struct hash_table_bucket)); } /* in some cases, we need to get back the symbols of same name in the order * in which they've been inserted. So insert new elements at the end of the list. */ - for (p = &ht->buckets[hash]; *p; p = &((*p)->next)); - *p = elt; + if (!ht->buckets[hash].first) + { + ht->buckets[hash].first = elt; + } + else + { + ht->buckets[hash].last->next = elt; + } + ht->buckets[hash].last = elt; elt->next = NULL; ht->num_elts++; } @@ -415,10 +421,10 @@ void hash_table_iter_init(const struct hash_table* ht, void* hash_table_iter_up(struct hash_table_iter* hti) { - if(!hti->ht->buckets) return NULL; + if (!hti->ht->buckets) return NULL; if (hti->element) hti->element = hti->element->next; while (!hti->element && hti->index < hti->last) - hti->element = hti->ht->buckets[++hti->index]; + hti->element = hti->ht->buckets[++hti->index].first; return hti->element; }

1 0

Paul Vriens : riched32/tests: Fix test failures on Win9x, WinMe and NT4.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: c5946beccc4c316df024b1ecc489c3b4c619fa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5946beccc4c316df024b1ecc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 12 21:24:59 2009 +0200 riched32/tests: Fix test failures on Win9x, WinMe and NT4. --- dlls/riched32/tests/editor.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 0d853a6..5cc269d 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -768,7 +768,9 @@ static void test_EM_POSFROMCHAR(void) if (i == 0) { ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); - ok(pl.x == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == 1 || + broken(pl.x == 0), /* Win9x, WinME and NT4 */ + "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); xpos = pl.x; } else if (i == 1) @@ -829,7 +831,9 @@ static void test_EM_POSFROMCHAR(void) result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 0); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); - ok(pl.x == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == 1 || + broken(pl.x == 0), /* Win9x, WinME and NT4 */ + "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); xpos = pl.x; SendMessage(hwndRichEdit, WM_HSCROLL, SB_LINERIGHT, 0); @@ -838,7 +842,9 @@ static void test_EM_POSFROMCHAR(void) ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); todo_wine { /* Fails on builtin because horizontal scrollbar is not being shown */ - ok(pl.x < xpos, "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", pl.x, xpos); + ok(pl.x < xpos || + broken(pl.x == xpos), /* Win9x, WinME and NT4 */ + "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", pl.x, xpos); } DestroyWindow(hwndRichEdit); }

1 0

Alexandre Julliard : configure: Make sure that gcc is recent enough for building 64-bit code.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 8812d241f0fb55293b9559eb3475f24b2f17c590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8812d241f0fb55293b9559eb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 11:19:54 2009 +0200 configure: Make sure that gcc is recent enough for building 64-bit code. --- configure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 8 ++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3130f70..5b973e4 100755 --- a/configure +++ b/configure @@ -3897,6 +3897,58 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ enable_win16=${enable_win16:-yes} else + if test "x${GCC}" = "xyes" + then + { $as_echo "$as_me:$LINENO: checking whether $CC supports __builtin_ms_va_list" >&5 +$as_echo_n "checking whether $CC supports __builtin_ms_va_list... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdarg.h> +int +main () +{ +void func(__builtin_ms_va_list *args); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: You need gcc >= 4.4 to build Wine as 64-bit." >&5 +$as_echo "$as_me: error: You need gcc >= 4.4 to build Wine as 64-bit." >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi TARGETFLAGS="-m64" fi diff --git a/configure.ac b/configure.ac index 4b89c19..48c76fe 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,14 @@ case $host in AC_SUBST(TARGETFLAGS,"-m32") enable_win16=${enable_win16:-yes} else + if test "x${GCC}" = "xyes" + then + AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) + 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.])]) + fi AC_SUBST(TARGETFLAGS,"-m64") fi ;;

1 0

Alexandre Julliard : configure: Add a macro to define an stdcall suffix in assembly code.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 9cebf090af110a4760470d16da1b5b076cbe8c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cebf090af110a4760470d16d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 11:24:20 2009 +0200 configure: Add a macro to define an stdcall suffix in assembly code. --- configure | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 21 +++++++++++++ include/config.h.in | 3 ++ 3 files changed, 102 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5b973e4..1536001 100755 --- a/configure +++ b/configure @@ -17615,6 +17615,69 @@ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_c_extern_prefix" >&5 $as_echo "$ac_cv_c_extern_prefix" >&6; } +case $host_cpu in + *i[3456789]86*) + { $as_echo "$as_me:$LINENO: checking whether external symbols need stdcall decoration" >&5 +$as_echo_n "checking whether external symbols need stdcall decoration... " >&6; } +if test "${ac_cv_c_stdcall_suffix+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef _MSC_VER +#define __stdcall __attribute__((__stdcall__)) +#endif +int __stdcall ac_test(int i) { return i; } +int +main () +{ +asm("jmp _ac_test(a)4"); if (ac_test(1)) return 1 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_c_stdcall_suffix="yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_stdcall_suffix="no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stdcall_suffix" >&5 +$as_echo "$ac_cv_c_stdcall_suffix" >&6; } ;; + *) ac_cv_c_stdcall_suffix="no" ;; +esac + if test "$ac_cv_c_extern_prefix" = "yes" @@ -17633,6 +17696,21 @@ _ACEOF fi + +if test "$ac_cv_c_stdcall_suffix" = "yes" +then + cat >>confdefs.h <<\_ACEOF +#define __ASM_STDCALL(args) "@" #args +_ACEOF + +else + cat >>confdefs.h <<\_ACEOF +#define __ASM_STDCALL(args) "" +_ACEOF + +fi + + { $as_echo "$as_me:$LINENO: checking how to define a function in assembly code" >&5 $as_echo_n "checking how to define a function in assembly code... " >&6; } if test "${ac_cv_asm_func_def+set}" = set; then diff --git a/configure.ac b/configure.ac index 48c76fe..aa3b892 100644 --- a/configure.ac +++ b/configure.ac @@ -1400,6 +1400,19 @@ AC_CACHE_CHECK([whether external symbols need an underscore prefix], ac_cv_c_ext [if (ac_test) return 1], ac_cv_c_extern_prefix="yes",ac_cv_c_extern_prefix="no")) +case $host_cpu in + *i[[3456789]]86*) + AC_CACHE_CHECK([whether external symbols need stdcall decoration], ac_cv_c_stdcall_suffix, + WINE_TRY_ASM_LINK(["jmp _ac_test(a)4"], +[#ifndef _MSC_VER +#define __stdcall __attribute__((__stdcall__)) +#endif +int __stdcall ac_test(int i) { return i; }], + [if (ac_test(1)) return 1], + ac_cv_c_stdcall_suffix="yes",ac_cv_c_stdcall_suffix="no")) ;; + *) ac_cv_c_stdcall_suffix="no" ;; +esac + AH_TEMPLATE(__ASM_NAME,[Define to a macro to generate an assembly name from a C symbol]) if test "$ac_cv_c_extern_prefix" = "yes" then @@ -1410,6 +1423,14 @@ else asm_name_prefix="" fi +AH_TEMPLATE(__ASM_STDCALL,[Define to a macro to generate an stdcall suffix]) +if test "$ac_cv_c_stdcall_suffix" = "yes" +then + AC_DEFINE([__ASM_STDCALL(args)],["@" #args]) +else + AC_DEFINE([__ASM_STDCALL(args)],[""]) +fi + dnl **** Check how to define a function in assembly code **** AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def, diff --git a/include/config.h.in b/include/config.h.in index c94523e..5b5f7c8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1197,6 +1197,9 @@ /* Define to a macro to generate an assembly name from a C symbol */ #undef __ASM_NAME +/* Define to a macro to generate an stdcall suffix */ +#undef __ASM_STDCALL + /* Define to empty if `const' does not conform to ANSI C. */ #undef const

1 0

Alexandre Julliard : configure: Add a macro to define an stdcall function in assembly.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: ea9cf9e49d394cd661adb0207555f36105185f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9cf9e49d394cd661adb0207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 16:03:46 2009 +0200 configure: Add a macro to define an stdcall function in assembly. --- configure | 22 ++++++++++++++++------ configure.ac | 18 +++++++++++------- include/config.h.in | 10 +++++++++- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 1536001..dcc43b6 100755 --- a/configure +++ b/configure @@ -17867,19 +17867,19 @@ case "$ac_cv_asm_func_def" in #define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" _ACEOF - asm_func_header=".def $asm_name_prefix\" #name \"; .scl 2; .type 32; .endef" ;; + asm_func_header=".def $asm_name_prefix\" #name suffix \"; .scl 2; .type 32; .endef" ;; ".type @function") cat >>confdefs.h <<\_ACEOF #define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",@function" _ACEOF - asm_func_header=".type $asm_name_prefix\" #name \",@function" ;; + asm_func_header=".type $asm_name_prefix\" #name suffix \",@function" ;; ".type 2") cat >>confdefs.h <<\_ACEOF #define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",2" _ACEOF - asm_func_header=".type $asm_name_prefix\" #name \",2" ;; + asm_func_header=".type $asm_name_prefix\" #name suffix \",2" ;; *) cat >>confdefs.h <<\_ACEOF #define __ASM_FUNC(name) "" @@ -18046,7 +18046,7 @@ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_c_cfi_support" >&5 $as_echo "$ac_cv_c_cfi_support" >&6; } -asm_func_header=".globl $asm_name_prefix\" #name \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name \":\\n\\t" +asm_func_header=".globl $asm_name_prefix\" #name suffix \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name suffix \":\\n\\t" asm_func_trailer="" if test "$ac_cv_c_dot_previous" = "yes" then @@ -18065,16 +18065,26 @@ asm_func_code="$asm_func_header\" code \"$asm_func_trailer" if test "$ac_cv_c_asm_outside_funcs" = "yes" then cat >>confdefs.h <<_ACEOF -#define __ASM_GLOBAL_FUNC(name,code) asm(".text\n\t.align 4\n\t$asm_func_code"); +#define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t$asm_func_code"); _ACEOF else cat >>confdefs.h <<_ACEOF -#define __ASM_GLOBAL_FUNC(name,code) void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); } +#define __ASM_DEFINE_FUNC(name,suffix,code) void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); } _ACEOF fi +cat >>confdefs.h <<\_ACEOF +#define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(name,"",code) +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code) +_ACEOF + + LDPATH="" diff --git a/configure.ac b/configure.ac index aa3b892..5fc708e 100644 --- a/configure.ac +++ b/configure.ac @@ -1447,13 +1447,13 @@ AH_TEMPLATE(__ASM_FUNC,[Define to a macro to generate an assembly function direc case "$ac_cv_asm_func_def" in ".def") AC_DEFINE([__ASM_FUNC(name)], [".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef"]) - asm_func_header=".def $asm_name_prefix\" #name \"; .scl 2; .type 32; .endef" ;; + asm_func_header=".def $asm_name_prefix\" #name suffix \"; .scl 2; .type 32; .endef" ;; ".type @function") AC_DEFINE([__ASM_FUNC(name)], [".type " __ASM_NAME(name) ",@function"]) - asm_func_header=".type $asm_name_prefix\" #name \",@function" ;; + asm_func_header=".type $asm_name_prefix\" #name suffix \",@function" ;; ".type 2") AC_DEFINE([__ASM_FUNC(name)], [".type " __ASM_NAME(name) ",2"]) - asm_func_header=".type $asm_name_prefix\" #name \",2" ;; + asm_func_header=".type $asm_name_prefix\" #name suffix \",2" ;; *) AC_DEFINE([__ASM_FUNC(name)], [""]) asm_func_header="" ;; @@ -1471,7 +1471,7 @@ AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc");]])], ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no")) -asm_func_header=".globl $asm_name_prefix\" #name \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name \":\\n\\t" +asm_func_header=".globl $asm_name_prefix\" #name suffix \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name suffix \":\\n\\t" asm_func_trailer="" if test "$ac_cv_c_dot_previous" = "yes" then @@ -1485,13 +1485,17 @@ fi asm_func_code="$asm_func_header\" code \"$asm_func_trailer" -AH_TEMPLATE(__ASM_GLOBAL_FUNC,[Define to a macro to generate an assembly function]) +AH_TEMPLATE(__ASM_DEFINE_FUNC,[Define to a macro to define an assembly function]) if test "$ac_cv_c_asm_outside_funcs" = "yes" then - AC_DEFINE_UNQUOTED([__ASM_GLOBAL_FUNC(name,code)],[asm(".text\n\t.align 4\n\t$asm_func_code");]) + AC_DEFINE_UNQUOTED([__ASM_DEFINE_FUNC(name,suffix,code)],[asm(".text\n\t.align 4\n\t$asm_func_code");]) else - AC_DEFINE_UNQUOTED([__ASM_GLOBAL_FUNC(name,code)],[void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); }]) + AC_DEFINE_UNQUOTED([__ASM_DEFINE_FUNC(name,suffix,code)],[void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); }]) fi +AC_DEFINE([__ASM_GLOBAL_FUNC(name,code)],[__ASM_DEFINE_FUNC(name,"",code)], + [Define to a macro to generate an assembly function with C calling convention]) +AC_DEFINE([__ASM_STDCALL_FUNC(name,args,code)],[__ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code)], + [Define to a macro to generate an assembly function with stdcall calling convention]) dnl **** Platform-specific checks **** diff --git a/include/config.h.in b/include/config.h.in index 5b5f7c8..aab0591 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1188,10 +1188,14 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING +/* Define to a macro to define an assembly function */ +#undef __ASM_DEFINE_FUNC + /* Define to a macro to generate an assembly function directive */ #undef __ASM_FUNC -/* Define to a macro to generate an assembly function */ +/* Define to a macro to generate an assembly function with C calling + convention */ #undef __ASM_GLOBAL_FUNC /* Define to a macro to generate an assembly name from a C symbol */ @@ -1200,6 +1204,10 @@ /* Define to a macro to generate an stdcall suffix */ #undef __ASM_STDCALL +/* Define to a macro to generate an assembly function with stdcall calling + convention */ +#undef __ASM_STDCALL_FUNC + /* Define to empty if `const' does not conform to ANSI C. */ #undef const

1 0