wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Alexandre Julliard : rpcrt4: Disable HTTP support if we don' t have socketpair and related networking functions.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: ce3ce9be8f085197a6a8a44b417ecef4ff9b9272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3ce9be8f085197a6a8a44b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 14:02:01 2009 +0100 rpcrt4: Disable HTTP support if we don't have socketpair and related networking functions. --- dlls/rpcrt4/rpc_transport.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 9e4186c..e308564 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1414,8 +1414,6 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq return 1; } -#endif /* HAVE_SOCKETPAIR */ - static RPC_STATUS rpcrt4_ncacn_ip_tcp_parse_top_of_tower(const unsigned char *tower_data, size_t tower_size, char **networkaddr, @@ -2364,6 +2362,7 @@ static RPC_STATUS rpcrt4_ncacn_http_parse_top_of_tower(const unsigned char *towe networkaddr, EPM_PROTOCOL_HTTP, endpoint); } +#endif /* HAVE_SOCKETPAIR */ static const struct connection_ops conn_protseq_list[] = { { "ncacn_np", @@ -2409,7 +2408,6 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_ip_tcp_parse_top_of_tower, NULL, }, -#endif { "ncacn_http", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_HTTP }, rpcrt4_ncacn_http_alloc, @@ -2424,6 +2422,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_http_parse_top_of_tower, rpcrt4_ncacn_http_receive_fragment, }, +#endif };

1 0

Alexandre Julliard : msi/tests: Avoid size_t in traces.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 836d9af1be1fea9c66e7b8418dda33f989ecedb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836d9af1be1fea9c66e7b8418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 14:01:26 2009 +0100 msi/tests: Avoid size_t in traces. --- dlls/msi/tests/msi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 1c843ef..928e48a 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -7771,7 +7771,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid ok(context == MSIINSTALLCONTEXT_USERMANAGED, "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context); ok(size == lstrlenA(expectedsid) * sizeof(WCHAR), - "Expected %d, got %d\n", lstrlenA(expectedsid) * sizeof(WCHAR), size); + "Expected %d*sizeof(WCHAR), got %d\n", lstrlenA(expectedsid), size); /* pcchTargetUserSid is exactly the length of szTargetUserSid */ lstrcpyA(patchcode, "apple"); @@ -7792,7 +7792,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid ok(!strncmp(targetsid, expectedsid, lstrlenA(expectedsid) - 1), "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid); ok(size == lstrlenA(expectedsid) * sizeof(WCHAR), - "Expected %d, got %d\n", lstrlenA(expectedsid) * sizeof(WCHAR), size); + "Expected %d*sizeof(WCHAR), got %d\n", lstrlenA(expectedsid), size); /* pcchTargetUserSid has enough room for NULL terminator */ lstrcpyA(patchcode, "apple");

1 0

Alexandre Julliard : include: Get rid of the definitions for the pthread emulation.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 4aa98e030e352f020f401b3173ecd1a241e57ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa98e030e352f020f401b317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 13:26:57 2009 +0100 include: Get rid of the definitions for the pthread emulation. --- configure | 214 ------------------------------------------------ configure.ac | 4 - include/config.h.in | 6 -- include/wine/pthread.h | 51 ------------ loader/pthread.c | 6 ++ 5 files changed, 6 insertions(+), 275 deletions(-) diff --git a/configure b/configure index 3bf72df..a97f33e 100755 --- a/configure +++ b/configure @@ -15227,220 +15227,6 @@ _ACEOF fi -{ $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5 -$as_echo_n "checking for pthread_rwlock_t... " >&6; } -if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_pthread_rwlock_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof (pthread_rwlock_t)) - return 0; - ; - 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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof ((pthread_rwlock_t))) - return 0; - ; - 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 - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pthread_rwlock_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5 -$as_echo "$ac_cv_type_pthread_rwlock_t" >&6; } -if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_PTHREAD_RWLOCK_T 1 -_ACEOF - - -fi -{ $as_echo "$as_me:$LINENO: checking for pthread_rwlockattr_t" >&5 -$as_echo_n "checking for pthread_rwlockattr_t... " >&6; } -if test "${ac_cv_type_pthread_rwlockattr_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_pthread_rwlockattr_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof (pthread_rwlockattr_t)) - return 0; - ; - 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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof ((pthread_rwlockattr_t))) - return 0; - ; - 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 - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pthread_rwlockattr_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlockattr_t" >&5 -$as_echo "$ac_cv_type_pthread_rwlockattr_t" >&6; } -if test "x$ac_cv_type_pthread_rwlockattr_t" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_PTHREAD_RWLOCKATTR_T 1 -_ACEOF - - -fi - - ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $LIBPTHREAD" diff --git a/configure.ac b/configure.ac index 6a60c9e..c13abc4 100644 --- a/configure.ac +++ b/configure.ac @@ -1151,10 +1151,6 @@ then AC_DEFINE(HAVE_PPDEV, 1, [Define if we can use ppdev.h for parallel port access]) fi -dnl **** Check for pthread_rwlock_t **** -AC_CHECK_TYPES([pthread_rwlock_t, pthread_rwlockattr_t],,,[#define _GNU_SOURCE -#include <pthread.h>]) - dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ pthread_attr_get_np \ diff --git a/include/config.h.in b/include/config.h.in index 047e90c..9e93513 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -594,12 +594,6 @@ /* Define to 1 if you have the <pthread_np.h> header file. */ #undef HAVE_PTHREAD_NP_H -/* Define to 1 if the system has the type `pthread_rwlockattr_t'. */ -#undef HAVE_PTHREAD_RWLOCKATTR_T - -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ -#undef HAVE_PTHREAD_RWLOCK_T - /* Define to 1 if you have the <pwd.h> header file. */ #undef HAVE_PWD_H diff --git a/include/wine/pthread.h b/include/wine/pthread.h index a8d5ba3..561c22c 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -30,57 +30,6 @@ struct sigset_t; typedef struct sigset_t sigset_t; #endif -#ifdef HAVE_PTHREAD_H - -#define _GNU_SOURCE -#include <pthread.h> -#ifdef HAVE_PTHREAD_NP_H -#include <pthread_np.h> -#endif - -#ifndef HAVE_PTHREAD_RWLOCK_T -typedef void *pthread_rwlock_t; -#endif -#ifndef HAVE_PTHREAD_RWLOCKATTR_T -typedef void *pthread_rwlockattr_t; -#endif - -struct wine_pthread_callbacks -{ - void * (*ptr_get_thread_data)(void); - void (*ptr_set_thread_data)(void *data); - pthread_t (*ptr_pthread_self)(void); - int (*ptr_pthread_equal)(pthread_t thread1, pthread_t thread2); - int (*ptr_pthread_create)(pthread_t* thread, const pthread_attr_t* attr, - void* (*start_routine)(void *), void* arg); - int (*ptr_pthread_cancel)(pthread_t thread); - int (*ptr_pthread_join)(pthread_t thread, void **value_ptr); - int (*ptr_pthread_detach)(pthread_t thread); - void (*ptr_pthread_exit)(void *retval, char *currentframe); - int (*ptr_pthread_mutex_init)(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr); - int (*ptr_pthread_mutex_lock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_trylock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_unlock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_destroy)(pthread_mutex_t *mutex); - int (*ptr_pthread_rwlock_init)(pthread_rwlock_t *rwlock, - const pthread_rwlockattr_t *rwlock_attr); - int (*ptr_pthread_rwlock_destroy)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_rdlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_tryrdlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_wrlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_trywrlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_unlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_cond_init)(pthread_cond_t *cond, const pthread_condattr_t *cond_attr); - int (*ptr_pthread_cond_destroy)(pthread_cond_t *cond); - int (*ptr_pthread_cond_signal)(pthread_cond_t *cond); - int (*ptr_pthread_cond_broadcast)(pthread_cond_t *cond); - int (*ptr_pthread_cond_wait)(pthread_cond_t *cond, pthread_mutex_t *mutex); - int (*ptr_pthread_cond_timedwait)(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime); -}; - -#endif /* HAVE_PTHREAD_H */ - /* thread information used to creating and exiting threads */ struct wine_pthread_thread_info { diff --git a/loader/pthread.c b/loader/pthread.c index 4c0c892..e4e0831 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -39,6 +39,12 @@ #include <sys/ucontext.h> #include <sys/thr.h> #endif +#ifdef HAVE_PTHREAD_H +#include <pthread.h> +#endif +#ifdef HAVE_PTHREAD_NP_H +#include <pthread_np.h> +#endif #include "wine/library.h" #include "wine/pthread.h"

1 0

Alexandre Julliard : ntdll: Get rid of the no longer used pthread emulation .
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: c4567214356c61e7d5fd2d1635df91caed681030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4567214356c61e7d5fd2d163… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 13:20:04 2009 +0100 ntdll: Get rid of the no longer used pthread emulation. --- dlls/ntdll/Makefile.in | 1 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/pthread.c | 599 ----------------------------------------------- dlls/ntdll/thread.c | 1 - 4 files changed, 0 insertions(+), 602 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4567214356c61e7d5fd2…

1 0

Aric Stewart : msctf: Implement ThreadMgr ITfSource::UnadviseSink.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 91e2f61cda8037b0f276fd3efa097a4faf24e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e2f61cda8037b0f276fd3ef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 25 14:35:37 2009 -0500 msctf: Implement ThreadMgr ITfSource::UnadviseSink. --- dlls/msctf/threadmgr.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index b2ec069..5461425 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -372,9 +372,14 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { + ThreadMgrSink *sink = (ThreadMgrSink*)pdwCookie; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %x\n",This,pdwCookie); + + list_remove(&sink->entry); + free_sink(sink); + + return S_OK; } static const ITfSourceVtbl ThreadMgr_SourceVtbl =

1 0

Nikolay Sivov : comctl32/tab: Selected item should have TCIS_BUTTONPRESSED state.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 0e5dac618f0f3c9575864a078c3ce614035ef4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5dac618f0f3c9575864a078… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Mar 25 18:34:58 2009 -0400 comctl32/tab: Selected item should have TCIS_BUTTONPRESSED state. --- dlls/comctl32/tab.c | 16 +++++----------- dlls/comctl32/tests/tab.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index ac81016..62770aa 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -252,6 +252,9 @@ static inline LRESULT TAB_SetCurSel (TAB_INFO *infoPtr, INT iItem) return -1; else { if (infoPtr->iSelected != iItem) { + infoPtr->items[prevItem].dwState &= ~TCIS_BUTTONPRESSED; + infoPtr->items[iItem].dwState |= TCIS_BUTTONPRESSED; + infoPtr->iSelected=iItem; infoPtr->uFocus=iItem; TAB_EnsureSelectionVisible(infoPtr); @@ -489,12 +492,8 @@ static LRESULT TAB_KeyUp(TAB_INFO* infoPtr, WPARAM keyCode) { if (!TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) { - infoPtr->iSelected = newItem; - infoPtr->uFocus = newItem; + TAB_SetCurSel(infoPtr, newItem); TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); - - TAB_EnsureSelectionVisible(infoPtr); - TAB_InvalidateTabArea(infoPtr); } } @@ -615,13 +614,8 @@ TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { if (!TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) { - infoPtr->iSelected = newItem; - infoPtr->uFocus = newItem; + TAB_SetCurSel(infoPtr, newItem); TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); - - TAB_EnsureSelectionVisible(infoPtr); - - TAB_InvalidateTabArea(infoPtr); } } return 0; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 5f5e4b9..7cee79d 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -727,6 +727,7 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) { INT selectionIndex; INT focusIndex; + TCITEM tcItem; flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -756,6 +757,15 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_sel_seq, "Getset curSel test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Getset curSel test parent sequence", FALSE); + + /* selected item should have TCIS_BUTTONPRESSED state + It doesn't depend on button state */ + memset(&tcItem, 0, sizeof(TCITEM)); + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_BUTTONPRESSED; + selectionIndex = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + SendMessage(hTab, TCM_GETITEM, selectionIndex, (LPARAM) &tcItem); + ok (tcItem.dwState & TCIS_BUTTONPRESSED, "Selected item should have TCIS_BUTTONPRESSED\n"); } /* Testing ExtendedStyle */

1 0

Nikolay Sivov : comctl32/tab: Handle state mask in TCM_[G,S]ETITEM.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: db60f69cba70795a43e557b0c96890a2f2e6d8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db60f69cba70795a43e557b0c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Mar 25 17:39:11 2009 -0400 comctl32/tab: Handle state mask in TCM_[G,S]ETITEM. --- dlls/comctl32/tab.c | 5 +++-- dlls/comctl32/tests/tab.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 800857f..ac81016 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2719,7 +2719,8 @@ TAB_SetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) FIXME("TCIF_RTLREADING\n"); if (tabItem->mask & TCIF_STATE) - wineItem->dwState = tabItem->dwState; + wineItem->dwState = (wineItem->dwState & ~tabItem->dwStateMask) | + ( tabItem->dwState & tabItem->dwStateMask); if (tabItem->mask & TCIF_TEXT) { @@ -2766,7 +2767,7 @@ TAB_GetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) FIXME("TCIF_RTLREADING\n"); if (tabItem->mask & TCIF_STATE) - tabItem->dwState = wineItem->dwState; + tabItem->dwState = wineItem->dwState & tabItem->dwStateMask; if (tabItem->mask & TCIF_TEXT) { diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index d24d097..5f5e4b9 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -831,6 +831,29 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) ok_sequence(sequences, TAB_SEQ_INDEX, getset_item_seq, "Getset item test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Getset item test parent sequence", FALSE); + + /* TCIS_BUTTONPRESSED doesn't depend on tab style */ + memset(&tcItem, 0, sizeof(tcItem)); + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_BUTTONPRESSED; + tcItem.dwState = TCIS_BUTTONPRESSED; + ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); + tcItem.dwState = 0; + ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); + ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); + /* next highlight item, test that dwStateMask actually masks */ + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_HIGHLIGHTED; + tcItem.dwState = TCIS_HIGHLIGHTED; + ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); + tcItem.dwState = 0; + ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); + ok (tcItem.dwState == TCIS_HIGHLIGHTED, "TCIS_HIGHLIGHTED should be set.\n"); + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_BUTTONPRESSED; + tcItem.dwState = 0; + ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); + ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); } /* Testing GetSet ToolTip */

1 0

Nikolay Sivov : comctl32/tab: Draw tab button properly on TCIS_BUTTONPRESSED state.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 751732e6949808d7ca240a56513f6d1320bce132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=751732e6949808d7ca240a565… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Mar 25 16:34:48 2009 -0400 comctl32/tab: Draw tab button properly on TCIS_BUTTONPRESSED state. --- dlls/comctl32/tab.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 3a0e477..800857f 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1962,8 +1962,13 @@ static void TAB_DrawItem(const TAB_INFO *infoPtr, HDC hdc, INT iItem) } else /* ! selected */ { - if (!(lStyle & TCS_FLATBUTTONS)) - DrawEdge(hdc, &r, EDGE_RAISED, BF_SOFT|BF_RECT); + DWORD state = infoPtr->items[iItem].dwState; + + if (state & TCIS_BUTTONPRESSED) + DrawEdge(hdc, &r, EDGE_SUNKEN, BF_SOFT|BF_RECT); + else + if (!(lStyle & TCS_FLATBUTTONS)) + DrawEdge(hdc, &r, EDGE_RAISED, BF_SOFT|BF_RECT); } } else /* !TCS_BUTTONS */

1 0

Michael Stefaniuc : d3dxof: Remove redundant NULL check before HeapFree ( Smatch).
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 289dca2e0e5f132cb15917fa191a140487e15fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289dca2e0e5f132cb15917fa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 23:02:42 2009 +0100 d3dxof: Remove redundant NULL check before HeapFree (Smatch). --- dlls/d3dxof/d3dxof.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6f9b266..5d42d53 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1100,9 +1100,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE error: HeapFree(GetProcessHeap(), 0, This->buf.pxo_tab); + HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); HeapFree(GetProcessHeap(), 0, pstrings); - if (This->buf.pxo->pdata) - HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); return hr; }

1 0

Michael Stefaniuc : msi: Remove redundant NULL check before msi_free ( Smatch).
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 6fa69c3f2b667d860cb5654164417a20c8008143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa69c3f2b667d860cb565416… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 23:02:37 2009 +0100 msi: Remove redundant NULL check before msi_free (Smatch). --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ec8495f..82de944 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -260,7 +260,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!check) { - if (file) msi_free(file); + msi_free(file); return NULL; }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
84
Older →

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 March 2009