wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Eric Pouech : dbghelp: Improve speed of our hashtable implementation by remembering the last element added to every bucket .
by Alexandre Julliard 15 Jun '09

15 Jun '09

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

Austin English : configure: Fix mach-o/dyld_images.h detection on OS X.
by Alexandre Julliard 15 Jun '09

15 Jun '09

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

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

15 Jun '09

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 15 Jun '09

15 Jun '09

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

Paul Vriens : user32/tests: Skip some tests on Win9x/WinME.
by Alexandre Julliard 15 Jun '09

15 Jun '09

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

Paul Vriens : mlang/tests: Fix a test failure on Win95.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 3a5a79ff759b758253ecec25d3359380cea64532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5a79ff759b758253ecec25d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 12 21:51:00 2009 +0200 mlang/tests: Fix a test failure on Win95. --- dlls/mlang/tests/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 6a871b8..14568df 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -121,7 +121,7 @@ static const WCHAR de_engb[] = {'E','n','g','l','i','s','c','h',' ', '(','G','r','o',0xDF,'b','r','i','t','a','n','n','i','e','n',')',0}; static const WCHAR de_engb2[] ={'E','n','g','l','i','s','c','h',' ', '(','V','e','r','e','i','n','i','g','t','e','s',' ', - 'K',0xF6,'n','i','g','r','e','i','c',0}; + 'K',0xF6,'n','i','g','r','e','i',0}; static const WCHAR de_enus[] = {'E','n','g','l','i','s','c','h',' ', '(','U','S','A',')',0}; static const WCHAR de_de[] = {'D','e','u','t','s','c','h',' ',

1 0

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

15 Jun '09

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

Juan Lang : wintrust: Check for the presence of required members of WINTRUST_CERT_INFO rather than requiring callers to be compiled with the same SDK version .
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 9da4d2f3a9dedd724c66c2e3a90da516fd3d0c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da4d2f3a9dedd724c66c2e3a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 12 09:35:41 2009 -0700 wintrust: Check for the presence of required members of WINTRUST_CERT_INFO rather than requiring callers to be compiled with the same SDK version. --- dlls/wintrust/softpub.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 9c79fa8..7f5f86f 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -256,7 +256,8 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) BOOL ret; if (data->pWintrustData->u.pCert && - data->pWintrustData->u.pCert->cbStruct == sizeof(WINTRUST_CERT_INFO)) + WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(WINTRUST_CERT_INFO, + data->pWintrustData->u.pCert->cbStruct, psCertContext)) { if (data->psPfns) { @@ -266,7 +267,9 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) /* Add a signer with nothing but the time to verify, so we can * add a cert to it */ - if (data->pWintrustData->u.pCert->psftVerifyAsOf) + if (WVT_ISINSTRUCT(WINTRUST_CERT_INFO, + data->pWintrustData->u.pCert->cbStruct, psftVerifyAsOf) && + data->pWintrustData->u.pCert->psftVerifyAsOf) data->sftSystemTime = signer.sftVerifyAsOf; else { @@ -280,10 +283,12 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) { ret = data->psPfns->pfnAddCert2Chain(data, 0, FALSE, 0, data->pWintrustData->u.pCert->psCertContext); - for (i = 0; ret && i < data->pWintrustData->u.pCert->chStores; - i++) - ret = data->psPfns->pfnAddStore2Chain(data, - data->pWintrustData->u.pCert->pahStores[i]); + if (WVT_ISINSTRUCT(WINTRUST_CERT_INFO, + data->pWintrustData->u.pCert->cbStruct, pahStores)) + for (i = 0; + ret && i < data->pWintrustData->u.pCert->chStores; i++) + ret = data->psPfns->pfnAddStore2Chain(data, + data->pWintrustData->u.pCert->pahStores[i]); } } else

1 0

Juan Lang : wintrust: Check for the presence of required members of WINTRUST_BLOB_INFO rather than requiring callers to be compiled with the same SDK version .
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: abacfc0f451cf1247c619167ba4dcb16bd7ac95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abacfc0f451cf1247c619167b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 12 09:21:35 2009 -0700 wintrust: Check for the presence of required members of WINTRUST_BLOB_INFO rather than requiring callers to be compiled with the same SDK version. --- dlls/wintrust/wintrust_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index fa4da16..0a40fba 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -303,7 +303,8 @@ static HRESULT WINAPI WINTRUST_CertVerifyObjTrust(CRYPT_PROVIDER_DATA *data) { case WTD_CHOICE_BLOB: if (data->pWintrustData->u.pBlob && - data->pWintrustData->u.pBlob->cbStruct == sizeof(WINTRUST_BLOB_INFO) && + WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(WINTRUST_BLOB_INFO, + data->pWintrustData->u.pBlob->cbStruct, pbMemObject) && data->pWintrustData->u.pBlob->cbMemObject == sizeof(CERT_VERIFY_CERTIFICATE_TRUST) && data->pWintrustData->u.pBlob->pbMemObject)

1 0

Alexandre Julliard : ntdll: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: e65ebee63f58ab6a63e2ed7cee505bcb94d1b5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65ebee63f58ab6a63e2ed7ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:09 2009 +0200 ntdll: Add appropriate stdcall decorations to assembly functions. --- dlls/ntdll/resource.c | 2 +- dlls/ntdll/rtl.c | 4 ++-- dlls/ntdll/signal_i386.c | 6 +++--- dlls/ntdll/signal_x86_64.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 5f3e845..b9d2a6b 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -357,7 +357,7 @@ static inline NTSTATUS access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ * "call access_resource" instruction being there. */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( LdrAccessResource, +__ASM_STDCALL_FUNC( LdrAccessResource, 16, "pushl %ebp\n\t" "movl %esp, %ebp\n\t" "subl $4,%esp\n\t" diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 4959946..16533b2 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -405,7 +405,7 @@ RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor ) * Glorified "enter xxxx". */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( _chkstk, +__ASM_STDCALL_FUNC( _chkstk, 0, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" @@ -420,7 +420,7 @@ __ASM_GLOBAL_FUNC( _chkstk, * Glorified "enter xxxx". */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( _alloca_probe, +__ASM_STDCALL_FUNC( _alloca_probe, 0, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 13896f6..dc1f12c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2267,17 +2267,17 @@ DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") /********************************************************************** * NtCurrentTeb (NTDLL.@) */ -__ASM_GLOBAL_FUNC( NtCurrentTeb, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) +__ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1748221..4987643 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1668,11 +1668,11 @@ void __wine_enter_vm86( CONTEXT *context ) /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") #endif /* __x86_64__ */

1 0

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 2009