August 2007 - Wine-commits - list.winehq.org

Francois Gouget : wined3d: Add a '\n' to a Wine trace.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 93b5a0e93484db1d4e3453e61f1200f03ad082e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b5a0e93484db1d4e3453e61… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:23:59 2007 +0200 wined3d: Add a '\n' to a Wine trace. --- dlls/wined3d/wined3d_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1f35056..5ec14be 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -126,7 +126,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) if (!RegisterClassA(&wc) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) { - ERR("Failed to register window class 'WineD3D_OpenGL'!"); + ERR("Failed to register window class 'WineD3D_OpenGL'!\n"); return FALSE; }

1 0

Francois Gouget : userenv: Add a skeleton userenv.h header and use it.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 41c6d233652f2a4d85d24ee8e30144af0eb9d9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c6d233652f2a4d85d24ee8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:24:19 2007 +0200 userenv: Add a skeleton userenv.h header and use it. --- dlls/userenv/userenv_main.c | 9 +----- include/Makefile.in | 1 + include/userenv.h | 54 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 8fd00c7..75fd651 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" -#include "profinfo.h" +#include "userenv.h" #include "wine/debug.h" @@ -103,12 +103,7 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) return FALSE; } -/* FIXME: these belong in userenv.h */ -#define PT_TEMPORARY 0x00000001 -#define PT_ROAMING 0x00000002 -#define PT_MANDATORY 0x00000004 - -BOOL WINAPI GetProfileType( LPDWORD pdwFlags ) +BOOL WINAPI GetProfileType( DWORD *pdwFlags ) { FIXME("%p\n", pdwFlags ); *pdwFlags = 0; diff --git a/include/Makefile.in b/include/Makefile.in index 00c0a7b..3df3172 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -348,6 +348,7 @@ SRCDIR_INCLUDES = \ tlhelp32.h \ tmschema.h \ twain.h \ + userenv.h \ usp10.h \ uuids.h \ uxtheme.h \ diff --git a/include/userenv.h b/include/userenv.h new file mode 100644 index 0000000..f2f2176 --- /dev/null +++ b/include/userenv.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * 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 + */ + +#ifndef __WINE_USERENV_H +#define __WINE_USERENV_H + +/* FIXME: #include <wbemcli.h> */ +#include <profinfo.h> + +#define PT_TEMPORARY 0x00000001 +#define PT_ROAMING 0x00000002 +#define PT_MANDATORY 0x00000004 + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI CreateEnvironmentBlock(LPVOID*,HANDLE,BOOL); +BOOL WINAPI ExpandEnvironmentStringsForUserA(HANDLE,LPCSTR,LPSTR,DWORD); +BOOL WINAPI ExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD); +#define ExpandEnvironmentStringsForUser WINELIB_NAME_AW(ExpandEnvironmentStringsForUser) +BOOL WINAPI GetUserProfileDirectoryA(HANDLE,LPSTR,LPDWORD); +BOOL WINAPI GetUserProfileDirectoryW(HANDLE,LPWSTR,LPDWORD); +#define GetUserProfileDirectory WINELIB_NAME_AW(GetUserProfileDirectory) +BOOL WINAPI GetProfilesDirectoryA(LPSTR,LPDWORD); +BOOL WINAPI GetProfilesDirectoryW(LPWSTR,LPDWORD); +#define GetProfilesDirectory WINELIB_NAME_AW(GetProfilesDirectory) +BOOL WINAPI GetProfileType(DWORD*); +BOOL WINAPI LoadUserProfileA(HANDLE,LPPROFILEINFOA); +BOOL WINAPI LoadUserProfileW(HANDLE,LPPROFILEINFOW); +#define LoadUserProfile WINELIB_NAME_AW(LoadUserProfile) +BOOL WINAPI RegisterGPNotification(HANDLE,BOOL); +BOOL WINAPI UnregisterGPNotification(HANDLE); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_USERENV_H */

1 0

Francois Gouget : userenv: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 9c17c4ccfe76831e1df98101014e9484e36f4168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c17c4ccfe76831e1df981010… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:29:57 2007 +0200 userenv: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 78935ac..0bf8277 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4864,6 +4864,31 @@ void LPCWSTR LPWSTR +%%userenv.dll + +%long + +BOOL +DWORD +HANDLE + +%ptr + +DWORD * +LPDWORD +LPPROFILEINFOA +LPVOID * + +%str + +LPCSTR +LPSTR + +%wstr + +LPCWSTR +LPWSTR + %%usp10.dll %long

1 0

Francois Gouget : wined3d: '0x' is redundant with the '#' format modifier.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: a80903e54bfb075a0f1d39e830a6abb925957f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80903e54bfb075a0f1d39e83… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:30:03 2007 +0200 wined3d: '0x' is redundant with the '#' format modifier. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d6f932a..5cbadc2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -614,10 +614,10 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { partialprecision = mask & WINED3DSPDM_PARTIALPRECISION; mask &= ~(WINED3DSPDM_MSAMPCENTROID | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_SATURATE); if (mask) - FIXME("Unrecognized modifier(0x%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); + FIXME("Unrecognized modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); if (centroid) - FIXME("Unhandled modifier(0x%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); + FIXME("Unhandled modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); } shift = (dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT;

1 0

Francois Gouget : mapi32: Update win32.api to fix the winapi_check warnings .
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: a72b53ee62a6c41b8131f8a1ad4438a22a6a324d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72b53ee62a6c41b8131f8a1a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:30:16 2007 +0200 mapi32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 0bf8277..e0a659b 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2104,6 +2104,7 @@ LPMAPIADVISESINK * LPMAPINAMEID LPMAPIPROP LPMAPISESSION * +LPPROFADMIN * LPPROPDATA * LPSPropTagArray LPSPropValue

1 0

Alexandre Julliard : server: Fixed handling of a relative start time for a timer.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: c3624439c888c17180b0c60c7db478241fcc51b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3624439c888c17180b0c60c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 9 17:16:26 2007 +0200 server: Fixed handling of a relative start time for a timer. --- server/timer.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/timer.c b/server/timer.c index ffa4b03..05c0e81 100644 --- a/server/timer.c +++ b/server/timer.c @@ -164,8 +164,7 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period period = 0; /* period doesn't make any sense for a manual timer */ timer->signaled = 0; } - if (expire > 0 && expire < current_time) expire = current_time; - timer->when = expire; + timer->when = (expire <= 0) ? current_time - expire : max( expire, current_time ); timer->period = period; timer->callback = callback; timer->arg = arg;

1 0

Francois Gouget : d3d8/tests: DXGetErrorString8() prints 'Unknown' for too many hresults which makes diagnosis impossible. So print the raw code instead.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: a9abf580b50478b36a83f467a2ff8c958bd17c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9abf580b50478b36a83f467a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:23:01 2007 +0200 d3d8/tests: DXGetErrorString8() prints 'Unknown' for too many hresults which makes diagnosis impossible. So print the raw code instead. --- dlls/d3d8/tests/device.c | 186 +++++++++++++++++++++++----------------------- dlls/d3d8/tests/visual.c | 164 ++++++++++++++++++++-------------------- 2 files changed, 175 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9abf580b50478b36a83f…

1 0

Jason Edmeades : user32: Skip system menu entries when using keyboard.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 39d615eeed7f63b63beca600871f1666bd318484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d615eeed7f63b63beca6008… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Aug 6 22:51:01 2007 +0100 user32: Skip system menu entries when using keyboard. --- dlls/user32/menu.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 1660c20..2f57779 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2668,9 +2668,39 @@ static void MENU_SetCapture( HWND hwnd ) static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk ) { POPUPMENU *menu = MENU_GetMenu( pmt->hTopMenu ); + BOOL atEnd = FALSE; - if( (vk == VK_LEFT && menu->FocusedItem == 0 ) || - (vk == VK_RIGHT && menu->FocusedItem == menu->nItems - 1)) + /* When skipping left, we need to do something special after the + first menu. */ + if (vk == VK_LEFT && menu->FocusedItem == 0) + { + atEnd = TRUE; + } + /* When skipping right, for the non-system menu, we need to + handle the last non-special menu item (ie skip any window + icons such as MDI maximize, restore or close) */ + else if ((vk == VK_RIGHT) && !IS_SYSTEM_MENU(menu)) + { + int i = menu->FocusedItem + 1; + while (i < (menu->nItems - 1)) { + if ((menu->items[i].wID >= SC_SIZE && + menu->items[i].wID <= SC_RESTORE)) { + i++; + } else break; + } + if (i == (menu->nItems - 1)) { + atEnd = TRUE; + } + } + /* When skipping right, we need to cater for the system menu */ + else if ((vk == VK_RIGHT) && IS_SYSTEM_MENU(menu)) + { + if (menu->FocusedItem == (menu->nItems - 1)) { + atEnd = TRUE; + } + } + + if( atEnd ) { MDINEXTMENU next_menu; HMENU hNewMenu; @@ -2699,6 +2729,12 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk ) { menu = MENU_GetMenu( hNewMenu ); id = menu->nItems - 1; + + /* Skip backwards over any system predefined icons, + eg. MDI close, restore etc icons */ + while ((id > 0) && + (menu->items[id].wID >= SC_SIZE && + menu->items[id].wID <= SC_RESTORE)) id--; } } else if (style & WS_SYSMENU )

1 0

Tijl Coosemans : configure: Remove check for libxpg4.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: af78fa7b683464e328b62b61723a89b86169115f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af78fa7b683464e328b62b617… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Wed Aug 8 00:23:45 2007 +0200 configure: Remove check for libxpg4. --- configure | 71 --------------------------------------------------- configure.ac | 2 - include/config.h.in | 3 -- 3 files changed, 0 insertions(+), 76 deletions(-) diff --git a/configure b/configure index 2175a09..d64ad13 100755 --- a/configure +++ b/configure @@ -6316,77 +6316,6 @@ _ACEOF fi - -{ echo "$as_me:$LINENO: checking for _xpg4_setrunelocale in -lxpg4" >&5 -echo $ECHO_N "checking for _xpg4_setrunelocale in -lxpg4... $ECHO_C" >&6; } -if test "${ac_cv_lib_xpg4__xpg4_setrunelocale+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lxpg4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _xpg4_setrunelocale (); -int -main () -{ -return _xpg4_setrunelocale (); - ; - 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 "echo \"\$as_me:$LINENO: $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 - 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 && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_xpg4__xpg4_setrunelocale=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_xpg4__xpg4_setrunelocale=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 -echo "${ECHO_T}$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } -if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBXPG4 1 -_ACEOF - - LIBS="-lxpg4 $LIBS" - -fi - { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then diff --git a/configure.ac b/configure.ac index 6adff61..3e22c28 100644 --- a/configure.ac +++ b/configure.ac @@ -143,8 +143,6 @@ dnl Check for -li386 for NetBSD and OpenBSD AC_CHECK_LIB(i386,i386_set_ldt) dnl Check for -lossaudio for NetBSD AC_CHECK_LIB(ossaudio,_oss_ioctl) -dnl Check for -lxpg4 for FreeBSD -AC_CHECK_LIB(xpg4,_xpg4_setrunelocale) dnl Check for -lpthread AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread")) diff --git a/include/config.h.in b/include/config.h.in index c95abd0..cf99681 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -306,9 +306,6 @@ /* Define to 1 if you have the <libxml/parser.h> header file. */ #undef HAVE_LIBXML_PARSER_H -/* Define to 1 if you have the `xpg4' library (-lxpg4). */ -#undef HAVE_LIBXPG4 - /* Define if you have the X Shape extension */ #undef HAVE_LIBXSHAPE

1 0

Tijl Coosemans : loader: Use thr_self syscall to get thread id on FreeBSD.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 60833da9f2b2dc95fe4e39c581b90f18337facf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60833da9f2b2dc95fe4e39c58… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Wed Aug 8 00:25:24 2007 +0200 loader: Use thr_self syscall to get thread id on FreeBSD. --- configure | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 +++++ include/config.h.in | 3 ++ loader/pthread.c | 10 ++++++++ server/ptrace.c | 19 +++++++++++---- 5 files changed, 95 insertions(+), 5 deletions(-) diff --git a/configure b/configure index d64ad13..e191aa1 100755 --- a/configure +++ b/configure @@ -7478,6 +7478,68 @@ done +for ac_header in sys/thr.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/types.h> +#if HAVE_UCONTEXT_H +#include <ucontext.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 "echo \"\$as_me:$LINENO: $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 + 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 + 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 echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + for ac_header in pthread_np.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 3e22c28..6b90cd2 100644 --- a/configure.ac +++ b/configure.ac @@ -325,6 +325,12 @@ AC_CHECK_HEADERS([resolv.h],,, AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) +AC_CHECK_HEADERS([sys/thr.h],,, +[#include <sys/types.h> +#if HAVE_UCONTEXT_H +#include <ucontext.h> +#endif]) + AC_CHECK_HEADERS([pthread_np.h],,, [#ifdef HAVE_PTHREAD_H #include <pthread.h> diff --git a/include/config.h.in b/include/config.h.in index cf99681..0c4935c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -813,6 +813,9 @@ /* Define to 1 if you have the <sys/sysctl.h> header file. */ #undef HAVE_SYS_SYSCTL_H +/* Define to 1 if you have the <sys/thr.h> header file. */ +#undef HAVE_SYS_THR_H + /* Define to 1 if you have the <sys/times.h> header file. */ #undef HAVE_SYS_TIMES_H diff --git a/loader/pthread.c b/loader/pthread.c index 17be9e4..7414e98 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -37,6 +37,10 @@ #ifdef HAVE_MACH_MACH_H #include <mach/mach.h> #endif +#ifdef HAVE_SYS_THR_H +#include <sys/ucontext.h> +#include <sys/thr.h> +#endif #include "wine/library.h" #include "wine/pthread.h" @@ -149,6 +153,12 @@ static void init_current_teb( struct wine_pthread_thread_info *info ) info->tid = pthread_self(); /* this should return the lwp id on solaris */ #elif defined(__APPLE__) info->tid = mach_thread_self(); +#elif defined(__FreeBSD__) + { + long lwpid; + thr_self( &lwpid ); + info->tid = (int) lwpid; + } #else info->tid = gettid(); #endif diff --git a/server/ptrace.c b/server/ptrace.c index 99cb910..f1a9afb 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -156,9 +156,18 @@ void sigchld_callback(void) } } -/* return the Unix pid to use in ptrace calls for a given thread */ +/* return the Unix pid to use in ptrace calls for a given process */ static int get_ptrace_pid( struct thread *thread ) { +#ifdef linux /* linux always uses thread id */ + if (thread->unix_tid != -1) return thread->unix_tid; +#endif + return thread->unix_pid; +} + +/* return the Unix tid to use in ptrace calls for a given thread */ +static int get_ptrace_tid( struct thread *thread ) +{ if (thread->unix_tid != -1) return thread->unix_tid; return thread->unix_pid; } @@ -501,7 +510,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { - int i, pid = get_ptrace_pid(thread); + int i, pid = get_ptrace_tid(thread); long data[8]; /* all other regs are handled on the client side */ @@ -534,7 +543,7 @@ done: /* set the thread x86 registers */ void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned int flags ) { - int pid = get_ptrace_pid( thread ); + int pid = get_ptrace_tid( thread ); /* all other regs are handled on the client side */ assert( (flags | CONTEXT_i386) == CONTEXT_DEBUG_REGISTERS ); @@ -568,7 +577,7 @@ void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { - int pid = get_ptrace_pid(thread); + int pid = get_ptrace_tid(thread); struct dbreg dbregs; /* all other regs are handled on the client side */ @@ -603,7 +612,7 @@ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int f /* set the thread x86 registers */ void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned int flags ) { - int pid = get_ptrace_pid(thread); + int pid = get_ptrace_tid(thread); struct dbreg dbregs; /* all other regs are handled on the client side */

1 0