March 2009 - Wine-commits - list.winehq.org

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

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: 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

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

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

Huw Davies : ole32: Move the code to set the clipboard formats to a separate function.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 3383db61074d05bbf3d5e4d58e9cbacb6a4c54e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3383db61074d05bbf3d5e4d58… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 24 13:49:24 2009 +0000 ole32: Move the code to set the clipboard formats to a separate function. --- dlls/ole32/clipboard.c | 87 +++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 4c6f35f..008e35b 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1271,6 +1271,46 @@ static HWND OLEClipbrd_CreateWindow(void) return hwnd; } +/********************************************************************* + * set_clipboard_formats + * + * Enumerate all HGLOBAL formats supported by the source and make + * those formats available using delayed rendering using SetClipboardData. + * + * TODO: We need to additionally handle TYMED_IStorage and + * TYMED_IStream data by copying into global memory. + */ +static HRESULT set_clipboard_formats(IDataObject *data) +{ + HRESULT hr; + FORMATETC fmt; + IEnumFORMATETC *enum_fmt; + + hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt); + if(FAILED(hr)) return hr; + + while(IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL) == S_OK) + { + if (fmt.tymed == TYMED_HGLOBAL) + { + char fmt_name[80]; + TRACE("(cfFormat=%d:%s)\n", fmt.cfFormat, + GetClipboardFormatNameA(fmt.cfFormat, fmt_name, sizeof(fmt_name)-1) ? fmt_name : ""); + + SetClipboardData(fmt.cfFormat, NULL); + } + } + + IEnumFORMATETC_Release(enum_fmt); + return S_OK; +} + +/********************************************************************* + * set_dataobject_format + * + * Windows creates a 'DataObject' clipboard format that contains the + * clipboard window's HWND or NULL if the Ole clipboard has been flushed. + */ static HRESULT set_dataobject_format(HWND hwnd) { HGLOBAL h = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, sizeof(hwnd)); @@ -1312,8 +1352,6 @@ static HRESULT set_dataobject_format(HWND hwnd) HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) { HRESULT hr = S_OK; - IEnumFORMATETC* penumFormatetc = NULL; - FORMATETC rgelt; BOOL bClipboardOpen = FALSE; struct oletls *info = COM_CurrentInfo(); @@ -1361,54 +1399,15 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) theOleClipboard->pIDataObjectSrc = NULL; } - /* - * AddRef the data object passed in and save its pointer. - * A NULL value indicates that the clipboard should be emptied. - */ + /* A NULL value indicates that the clipboard should be emptied. */ theOleClipboard->pIDataObjectSrc = pDataObj; if ( pDataObj ) { IDataObject_AddRef(theOleClipboard->pIDataObjectSrc); + hr = set_clipboard_formats(pDataObj); + if(FAILED(hr)) goto CLEANUP; } - /* - * Enumerate all HGLOBAL formats supported by the source and make - * those formats available using delayed rendering using SetClipboardData. - * Only global memory based data items may be made available to non-OLE - * applications via the standard Windows clipboard API. Data based on other - * mediums(non TYMED_HGLOBAL) can only be accessed via the Ole Clipboard API. - * - * TODO: Do we need to additionally handle TYMED_IStorage media by copying - * the storage into global memory? - */ - if ( pDataObj ) - { - if ( FAILED(hr = IDataObject_EnumFormatEtc( pDataObj, - DATADIR_GET, - &penumFormatetc ))) - { - HANDLE_ERROR( hr ); - } - - while ( S_OK == IEnumFORMATETC_Next(penumFormatetc, 1, &rgelt, NULL) ) - { - if ( rgelt.tymed == TYMED_HGLOBAL ) - { - CHAR szFmtName[80]; - TRACE("(cfFormat=%d:%s)\n", rgelt.cfFormat, - GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1) - ? szFmtName : ""); - - SetClipboardData( rgelt.cfFormat, NULL); - } - } - IEnumFORMATETC_Release(penumFormatetc); - } - - /* - * Windows additionally creates a new "DataObject" clipboard format - * and stores the clipboard window's HWND in it - */ hr = set_dataobject_format(theOleClipboard->hWndClipboard); CLEANUP:

1 0

Huw Davies : ole32/tests: Tests for the 'Ole Private Data' clipboard format .
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: b75caee2abbde87903f2a62edb8f215e037b9d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75caee2abbde87903f2a62ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 14:18:51 2009 +0000 ole32/tests: Tests for the 'Ole Private Data' clipboard format. --- dlls/ole32/tests/clipboard.c | 233 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 209 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b75caee2abbde87903f2a…

1 0

Alexandre Julliard : winebuild: Skip non-functions when building the undefined exports file.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: cdad788d3315a8759c581d768eb4f3a59ee0a739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdad788d3315a8759c581d768… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 13:27:27 2009 +0100 winebuild: Skip non-functions when building the undefined exports file. --- tools/winebuild/import.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 1cc3689..e782c99 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -510,7 +510,7 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; - if (odp->type == TYPE_STUB) continue; + if (odp->type == TYPE_STUB || odp->type == TYPE_ABS) continue; if (odp->flags & FLAG_FORWARD) continue; fprintf( f, "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); }

1 0

Aric Stewart : advapi32: Stub TreeResetNamedSecurityInfo for the IE8 installer.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: df1203342c50116d687a65a4bb27abac410b12d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df1203342c50116d687a65a4b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 25 07:24:13 2009 -0500 advapi32: Stub TreeResetNamedSecurityInfo for the IE8 installer. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 13 +++++++++++++ include/aclapi.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9d56c46..d641efd 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -640,7 +640,7 @@ @ stub TraceMessage @ stub TraceMessageVa # @ stub TreeResetNamedSecurityInfoA -# @ stub TreeResetNamedSecurityInfoW +@ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) # @ stub TrusteeAccessToObjectA # @ stub TrusteeAccessToObjectW # @ stub UninstallApplication diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 454c98f..a220ddb 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5207,3 +5207,16 @@ BOOL WINAPI SaferCreateLevel(DWORD ScopeId, DWORD LevelId, DWORD OpenFlags, FIXME("(%u, %x, %u, %p, %p) stub\n", ScopeId, LevelId, OpenFlags, LevelHandle, lpReserved); return FALSE; } + +DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, + PSID pOwner, PSID pGroup, PACL pDacl, PACL pSacl, + BOOL KeepExplicit, FN_PROGRESS fnProgress, + PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args) +{ + FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p Stub\n", + debugstr_w(pObjectName), ObjectType, SecurityInfo, pOwner, pGroup, + pDacl, pSacl, KeepExplicit, fnProgress, ProgressInvokeSetting, Args); + + return ERROR_SUCCESS; +} diff --git a/include/aclapi.h b/include/aclapi.h index fc2ff76..249cd03 100644 --- a/include/aclapi.h +++ b/include/aclapi.h @@ -28,6 +28,8 @@ extern "C" { #endif +typedef void (*FN_PROGRESS)(LPWSTR,DWORD,PPROG_INVOKE_SETTING,PVOID,BOOL); + WINADVAPI DWORD WINAPI GetExplicitEntriesFromAclA( PACL, PULONG, PEXPLICIT_ACCESS_A* ); WINADVAPI DWORD WINAPI GetExplicitEntriesFromAclW( PACL, PULONG, PEXPLICIT_ACCESS_W* ); #define GetExplicitEntriesFromAcl WINELIB_NAME_AW(GetExplicitEntriesFromAcl)

1 0

Alexandre Julliard : kernel32: Revert incorrect part of commit 7c3529f1cc6a3ce6f0a403c337926c8fc9fbfc57.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 79cd9183e810aab7f94ad5bbcf11406d27d16a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79cd9183e810aab7f94ad5bbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 14:19:02 2009 +0100 kernel32: Revert incorrect part of commit 7c3529f1cc6a3ce6f0a403c337926c8fc9fbfc57. --- dlls/kernel32/profile.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 5d563a5..d44e819 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -208,9 +208,8 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING for (key = section->key; key; key = key->next) { - len += strlenW(key->name); - if (key->value && key->value[0]) len += strlenW(key->value); - len += 3; /* '=' and "\r\n" */ + len += strlenW(key->name) + 2; + if (key->value) len += strlenW(key->value) + 1; } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));

1 0