wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

appdb/. addcomment.php
by WineHQ 09 Apr '07

09 Apr '07

ChangeSet ID: 31037 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/08 20:23:11 Modified files: . : addcomment.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> addcomment.php, use version::objectMakeUrl() Patch: http://cvs.winehq.org/patch.py?id=31037 Old revision New revision Changes Path 1.34 1.35 +2 -1 appdb/addcomment.php Index: appdb/addcomment.php diff -u -p appdb/addcomment.php:1.34 appdb/addcomment.php:1.35 --- appdb/addcomment.php:1.34 9 Apr 2007 1:23:11 -0000 +++ appdb/addcomment.php 9 Apr 2007 1:23:11 -0000 @@ -29,7 +29,8 @@ if(!empty($aClean['sBody'])) { $oComment = new Comment(); $oComment->create($aClean['sSubject'], $aClean['sBody'], $aClean['iThread'], $aClean['iVersionId']); - util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$oComment->iVersionId)); + $oVersion = new version($oComment->iVersionId); + util_redirect_and_exit($oVersion->objectMakeUrl()); // let's show the comment form } else {

1 0

appdb/unit_test test_maintainer.php
by WineHQ 08 Apr '07

08 Apr '07

ChangeSet ID: 31036 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/08 18:06:27 Modified files: unit_test : test_maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> test maintainer::getMaintainersForAppIdVersionId() Patch: http://cvs.winehq.org/patch.py?id=31036 Old revision New revision Changes Path 1.8 1.9 +118 -0 appdb/unit_test/test_maintainer.php Index: appdb/unit_test/test_maintainer.php diff -u -p appdb/unit_test/test_maintainer.php:1.8 appdb/unit_test/test_maintainer.php:1.9 --- appdb/unit_test/test_maintainer.php:1.8 8 Apr 2007 23: 6:27 -0000 +++ appdb/unit_test/test_maintainer.php 8 Apr 2007 23: 6:27 -0000 @@ -447,6 +447,115 @@ function test_maintainer_deleteMaintaine return TRUE; } +function test_maintainer_getMaintainersForAppIdVersionId() +{ + test_start(__FUNCTION__); + + global $test_email, $test_password; + $oUser = new user(); + if($oUser->login($test_email, $test_password) != SUCCESS) + { + echo "Failed to create and log in user!\n"; + return FALSE; + } + + $oUser->addPriv("admin"); + + $oApp = new application(); + $oApp->create(); + $oFirstVersion = new version(); + $oFirstVersion->iAppId = $oApp->iAppId; + $oFirstVersion->create(); + $oSecondVersion = new version(); + $oSecondVersion->iAppid = $oApp->iAppId; + $oSecondVersion->create(); + + $oSuperMaintainer = new maintainer(); + $oSuperMaintainer->bSuperMaintainer = TRUE; + $oSuperMaintainer->sMaintainReason = "Because"; + $oSuperMaintainer->iAppId = $oApp->iAppId; + $oSuperMaintainer->iUserId = $oUser->iUserId; + $oSuperMaintainer->create(); + + if(!$hResult = maintainer::getMaintainersForAppIdVersionId($oApp->iAppId)) + { + echo "Failed to get list of maintainers!\n"; + return FALSE; + } + + /* The application should have one maintainer */ + $iExpected = 1; + $iReceived = mysql_num_rows($hResult); + if($iExpected != $iReceived) + { + echo "Got super maintainer count of $iReceived instead of $iExpected!\n"; + return FALSE; + } + + if(!$hResult = maintainer::getMaintainersForAppIdVersionId(null, + $oFirstVersion->iVersionId)) + { + echo "Failed to get list of maintainers!\n"; + return FALSE; + } + + /* The version should have one maintainer */ + $iExpected = 1; + $iReceived = mysql_num_rows($hResult); + if($iExpected != $iReceived) + { + echo "Got maintainer count of $iReceived instead of $iExpected!\n"; + return FALSE; + } + + $oSuperMaintainer->delete(); + + /* Become a maintainer for one of the versions only */ + $oFirstVersionMaintainer = new maintainer(); + $oFirstVersionMaintainer->sMaintainReason = "I need it"; + $oFirstVersionMaintainer->iVersionId = $oFirstVersion->iVersionId; + $oFirstVersionMaintainer->iAppId = $oFirstVersion->iAppId; + $oFisrtVersionMaintainer->bSuperMaintainer = FALSE; + $oFirstVersionMaintainer->iUserId = $oUser->iUserId; + $oFirstVersionMaintainer->create(); + + if(!$hResult = maintainer::getMaintainersForAppIdVersionId(null, + $oFirstVersion->iVersionId)) + { + echo "Failed to get list of maintainers!\n"; + return FALSE; + } + + /* The first version should have one maintainer */ + $iExpected = 1; + $iReceived = mysql_num_rows($hResult); + if($iExpected != $iReceived) + { + echo "Got maintainer count of $iReceived instead of $iExpected!\n"; + return FALSE; + } + + if(!$hResult = maintainer::getMaintainersForAppIdVersionId(null, + $oSecondVersion->iVersionId)) + { + echo "Failed to get list of maintainers!\n"; + return FALSE; + } + + /* The second version should not have any maintainers */ + $iExpected = 0; + $iReceived = mysql_num_rows($hResult); + if($iExpected != $iReceived) + { + echo "Got maintainer count of $iReceived instead of $iExpected!\n"; + return FALSE; + } + + $oApp->delete(); + $oUser->delete(); + + return TRUE; +} if(!test_maintainer_getMaintainerCountForUser()) { echo "test_maintainer_getMaintainerCountForUser() failed!\n"; @@ -494,4 +603,13 @@ if(!test_maintainer_deleteMaintainersFor echo "test_maintainer_deleteMaintianersForVersion() passed\n"; } +if(!test_maintainer_getMaintainersForAppIdVersionId()) +{ + echo "test_maintainer_getMaintainersForAppIdVersionId() failed!\n"; + $bTestSuccess = false; +} else +{ + echo "test_maintainer_getMaintainersForAppIdVersionId() passed\n"; +} + ?>

1 0

appdb/ ./testResults.php ./viewScreenshots.php ...
by WineHQ 08 Apr '07

08 Apr '07

ChangeSet ID: 31035 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/08 18:04:31 Modified files: . : testResults.php viewScreenshots.php viewbugs.php admin : editAppFamily.php editAppNote.php editAppVersion.php moveAppVersion.php include : maintainer.php monitor.php note.php screenshot.php testData.php url.php util.php version.php vote.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use objectMakeUrl()/Link() in more places Patch: http://cvs.winehq.org/patch.py?id=31035 Old revision New revision Changes Path 1.28 1.29 +2 -3 appdb/testResults.php 1.11 1.12 +4 -8 appdb/viewScreenshots.php 1.12 1.13 +4 -2 appdb/viewbugs.php 1.46 1.47 +3 -2 appdb/admin/editAppFamily.php 1.31 1.32 +3 -2 appdb/admin/editAppNote.php 1.47 1.48 +3 -2 appdb/admin/editAppVersion.php 1.12 1.13 +8 -6 appdb/admin/moveAppVersion.php 1.37 1.38 +11 -6 appdb/include/maintainer.php 1.13 1.14 +21 -27 appdb/include/monitor.php 1.23 1.24 +9 -5 appdb/include/note.php 1.62 1.63 +15 -10 appdb/include/screenshot.php 1.37 1.38 +15 -8 appdb/include/testData.php 1.14 1.15 +24 -10 appdb/include/url.php 1.86 1.87 +4 -4 appdb/include/util.php 1.113 1.114 +8 -6 appdb/include/version.php 1.26 1.27 +5 -5 appdb/include/vote.php

1 0

appdb/unit_test test_om_objects.php
by WineHQ 08 Apr '07

08 Apr '07

ChangeSet ID: 31034 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/08 18:01:22 Modified files: unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Test version class in objectManager tests Patch: http://cvs.winehq.org/patch.py?id=31034 Old revision New revision Changes Path 1.7 1.8 +2 -2 appdb/unit_test/test_om_objects.php Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.7 appdb/unit_test/test_om_objects.php:1.8 --- appdb/unit_test/test_om_objects.php:1.7 8 Apr 2007 23: 1:22 -0000 +++ appdb/unit_test/test_om_objects.php 8 Apr 2007 23: 1:22 -0000 @@ -142,8 +142,8 @@ function test_object_methods() if(!test_class("testData", $aTestMethods)) return FALSE; -/* if(!test_class("version", $aTestMethods)) - return FALSE; */ + if(!test_class("version", $aTestMethods)) + return FALSE; return true; }

1 0

appdb/ admin/adminAppQueue.php include/sidebar ...
by WineHQ 07 Apr '07

07 Apr '07

ChangeSet ID: 31033 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/07 15:42:08 Modified files: admin : adminAppQueue.php include : sidebar_admin.php sidebar_maintainer_admin.php user.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use objectmanager to list queued/rejected versions Patch: http://cvs.winehq.org/patch.py?id=31033 Old revision New revision Changes Path 1.74 1.75 +27 -40 appdb/admin/adminAppQueue.php 1.38 1.39 +4 -2 appdb/include/sidebar_admin.php 1.7 1.8 +2 -1 appdb/include/sidebar_maintainer_admin.php 1.86 1.87 +0 -42 appdb/include/user.php 1.112 1.113 +138 -22 appdb/include/version.php

1 0

Eric Pouech : taskmgr: Let the debug channels work again.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 955ba73ebf1ed54a73bec783a82f095717fea001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955ba73ebf1ed54a73bec783a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Apr 7 10:47:46 2007 +0200 taskmgr: Let the debug channels work again. While I was at it, simplified the symbol lookup for the debug options. --- programs/taskmgr/dbgchnl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 9671469..1102606 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -157,22 +157,22 @@ static int change_channel_CB(HANDLE hProcess, void* addr, struct __wine_debug_ch return 1; } -static void* get_symbol(HANDLE hProcess, const char* name, const char* lib) +static void* get_symbol(HANDLE hProcess, const char* name) { char buffer[sizeof(IMAGEHLP_SYMBOL) + 256]; SYMBOL_INFO* si = (SYMBOL_INFO*)buffer; void* ret = NULL; - pSymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_PUBLICS_ONLY); - /* FIXME: the TRUE option is due to the face that dbghelp requires it + /* also ask for wine extensions (loading symbols from ELF files) */ + pSymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_PUBLICS_ONLY | 0x40000000); + /* FIXME: the TRUE option is due to the fact that dbghelp requires it * when loading an ELF module */ if (pSymInitialize(hProcess, NULL, TRUE)) { si->SizeOfStruct = sizeof(*si); si->MaxNameLen = sizeof(buffer) - sizeof(IMAGEHLP_SYMBOL); - if (pSymLoadModule(hProcess, NULL, lib, NULL, 0, 0) && - pSymFromName(hProcess, name, si)) + if (pSymFromName(hProcess, name, si)) ret = (void*)(ULONG_PTR)si->Address; pSymCleanup(hProcess); } @@ -193,7 +193,7 @@ static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user) int ret = 1; void* addr; - if (!(addr = get_symbol(hProcess, "debug_options", "libwine.so"))) return -1; + if (!(addr = get_symbol(hProcess, "libwine.so.1!debug_options"))) return -1; while (ret && addr && ReadProcessMemory(hProcess, addr, &channel, sizeof(channel), NULL)) {

1 0

Chris Robinson : quartz: Make sure cached media samples are released for parser filters.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 20d87e768b5e5ea76e5d3eb8a46242160f47cb79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d87e768b5e5ea76e5d3eb8a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 6 21:24:59 2007 -0700 quartz: Make sure cached media samples are released for parser filters. --- dlls/quartz/avisplit.c | 15 ++++++++++++++- dlls/quartz/waveparser.c | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 20bfe92..f3a6f64 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -577,6 +577,19 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) return hr; } +static HRESULT AVISplitter_Cleanup(LPVOID iface) +{ + AVISplitterImpl *This = (AVISplitterImpl*)iface; + + TRACE("(%p)->()\n", This); + + if (This->pCurrentSample) + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + + return S_OK; +} + HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; @@ -594,7 +607,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, NULL); + hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Cleanup); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 7feeadf..3997782 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -301,6 +301,19 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) return hr; } +static HRESULT WAVEParser_Cleanup(LPVOID iface) +{ + WAVEParserImpl *This = (WAVEParserImpl*)iface; + + TRACE("(%p)->()\n", This); + + if (This->pCurrentSample) + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + + return S_OK; +} + HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; @@ -318,7 +331,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, NULL); + hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup); if (FAILED(hr)) return hr;

1 0

Chris Robinson : quartz: Add a cleanup callback for parser filters to call on release.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 828d5a0c4a8f13e170916801ac020b90ddcddbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828d5a0c4a8f13e170916801a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 6 21:18:25 2007 -0700 quartz: Add a cleanup callback for parser filters to call on release. --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/parser.c | 6 +++++- dlls/quartz/parser.h | 4 +++- dlls/quartz/waveparser.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index e90035d..20bfe92 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -594,7 +594,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect); + hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 01d215f..8e85456 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -60,7 +60,7 @@ static inline Parser_OutputPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) } -HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect) +HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup) { HRESULT hr; PIN_INFO piInput; @@ -74,6 +74,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMP pParser->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ParserImpl.csFilter"); pParser->state = State_Stopped; pParser->pClock = NULL; + pParser->fnCleanup = fnCleanup; ZeroMemory(&pParser->filterInfo, sizeof(FILTER_INFO)); pParser->cStreams = 0; @@ -187,6 +188,9 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) { ULONG i; + if (This->fnCleanup) + This->fnCleanup(This); + if (This->pClock) IReferenceClock_Release(This->pClock); diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index fec1d37..25f1d6d 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -23,6 +23,7 @@ typedef struct ParserImpl ParserImpl; typedef HRESULT (*PFN_PROCESS_SAMPLE) (LPVOID iface, IMediaSample * pSample); typedef HRESULT (*PFN_QUERY_ACCEPT) (LPVOID iface, const AM_MEDIA_TYPE * pmt); typedef HRESULT (*PFN_PRE_CONNECT) (IPin * iface, IPin * pConnectPin); +typedef HRESULT (*PFN_CLEANUP) (LPVOID iface); struct ParserImpl { @@ -33,6 +34,7 @@ struct ParserImpl FILTER_STATE state; REFERENCE_TIME rtStreamStart; IReferenceClock * pClock; + PFN_CLEANUP fnCleanup; FILTER_INFO filterInfo; CLSID clsid; @@ -54,4 +56,4 @@ typedef struct Parser_OutputPin } Parser_OutputPin; HRESULT Parser_AddPin(ParserImpl * This, PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, AM_MEDIA_TYPE * amt, float fSamplesPerSec, DWORD dwSampleSize, DWORD dwLength); -HRESULT Parser_Create(ParserImpl*, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT); +HRESULT Parser_Create(ParserImpl*, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 5cd979f..7feeadf 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -318,7 +318,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect); + hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, NULL); if (FAILED(hr)) return hr;

1 0

Felix Nawothnig : d3d8: Add missing relay trace.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: ea0d7f17caeb698a1c381f33a06168ba76e7cf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0d7f17caeb698a1c381f33a… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sat Apr 7 06:02:33 2007 +0200 d3d8: Add missing relay trace. --- dlls/d3d8/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 66d3a57..87d31d0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -758,6 +758,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(LPDIRECT3DDE static HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + TRACE("(%p) Relay\n" , This); + return IWineD3DDevice_BeginScene(This->WineD3DDevice); }

1 0

Felix Nawothnig : comctl32: Allow enabling TVS_CHECKBOXES on the fly.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: fe5881c788ea6309036909d14fd421f16677c808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5881c788ea6309036909d14… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sat Apr 7 05:37:29 2007 +0200 comctl32: Allow enabling TVS_CHECKBOXES on the fly. --- dlls/comctl32/treeview.c | 128 +++++++++++++++++++++++++--------------------- 1 files changed, 70 insertions(+), 58 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 47afdf5..8adf28b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4829,6 +4829,46 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam) /* Create/Destroy *******************************************************/ +static void +initialize_checkboxes(TREEVIEW_INFO *infoPtr) +{ + RECT rc; + HBITMAP hbm, hbmOld; + HDC hdc, hdcScreen; + int nIndex; + + infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + + hdcScreen = GetDC(0); + + hdc = CreateCompatibleDC(hdcScreen); + hbm = CreateCompatibleBitmap(hdcScreen, 48, 16); + hbmOld = SelectObject(hdc, hbm); + + SetRect(&rc, 0, 0, 48, 16); + FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1)); + + SetRect(&rc, 18, 2, 30, 14); + DrawFrameControl(hdc, &rc, DFC_BUTTON, + DFCS_BUTTONCHECK|DFCS_FLAT); + + SetRect(&rc, 34, 2, 46, 14); + DrawFrameControl(hdc, &rc, DFC_BUTTON, + DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); + + SelectObject(hdc, hbmOld); + nIndex = ImageList_AddMasked(infoPtr->himlState, hbm, + GetSysColor(COLOR_WINDOW)); + TRACE("checkbox index %d\n", nIndex); + + DeleteObject(hbm); + DeleteDC(hdc); + ReleaseDC(0, hdcScreen); + + infoPtr->stateImageWidth = 16; + infoPtr->stateImageHeight = 16; +} + static LRESULT TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { @@ -4930,48 +4970,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->hwndToolTip = COMCTL32_CreateToolTip(hwnd); if (infoPtr->dwStyle & TVS_CHECKBOXES) - { - RECT rc; - HBITMAP hbm, hbmOld; - HDC hdc,hdcScreen; - int nIndex; - - infoPtr->himlState = - ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); - - hdcScreen = GetDC(0); - - /* Create a coloured bitmap compatible with the screen depth - because checkboxes are not black&white */ - hdc = CreateCompatibleDC(hdcScreen); - hbm = CreateCompatibleBitmap(hdcScreen, 48, 16); - hbmOld = SelectObject(hdc, hbm); - - rc.left = 0; rc.top = 0; - rc.right = 48; rc.bottom = 16; - FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1)); - - rc.left = 18; rc.top = 2; - rc.right = 30; rc.bottom = 14; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT); - - rc.left = 34; rc.right = 46; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); - - SelectObject(hdc, hbmOld); - nIndex = ImageList_AddMasked(infoPtr->himlState, hbm, - GetSysColor(COLOR_WINDOW)); - TRACE("checkbox index %d\n", nIndex); - - DeleteObject(hbm); - DeleteDC(hdc); - ReleaseDC(0, hdcScreen); - - infoPtr->stateImageWidth = 16; - infoPtr->stateImageHeight = 16; - } + initialize_checkboxes(infoPtr); /* Make sure actual scrollbar state is consistent with uInternalStatus */ ShowScrollBar(hwnd, SB_VERT, FALSE); @@ -5333,24 +5332,37 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (wParam == GWL_STYLE) { - DWORD dwNewStyle = ((LPSTYLESTRUCT)lParam)->styleNew; + DWORD dwNewStyle = ((LPSTYLESTRUCT)lParam)->styleNew; - /* we have to take special care about tooltips */ - if ((infoPtr->dwStyle ^ dwNewStyle) & TVS_NOTOOLTIPS) - { - if (infoPtr->dwStyle & TVS_NOTOOLTIPS) - { - infoPtr->hwndToolTip = COMCTL32_CreateToolTip(infoPtr->hwnd); - TRACE("\n"); - } - else - { - DestroyWindow(infoPtr->hwndToolTip); - infoPtr->hwndToolTip = 0; - } - } + if ((infoPtr->dwStyle ^ dwNewStyle) & TVS_CHECKBOXES) + { + if (dwNewStyle & TVS_CHECKBOXES) + { + initialize_checkboxes(infoPtr); + TRACE("checkboxes enabled\n"); + } + else + { + FIXME("tried to disable checkboxes\n"); + } + } + + if ((infoPtr->dwStyle ^ dwNewStyle) & TVS_NOTOOLTIPS) + { + if (infoPtr->dwStyle & TVS_NOTOOLTIPS) + { + infoPtr->hwndToolTip = COMCTL32_CreateToolTip(infoPtr->hwnd); + TRACE("tooltips enabled\n"); + } + else + { + DestroyWindow(infoPtr->hwndToolTip); + infoPtr->hwndToolTip = 0; + TRACE("tooltips disabled\n"); + } + } - infoPtr->dwStyle = dwNewStyle; + infoPtr->dwStyle = dwNewStyle; } TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root);

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
69
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 April 2007