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

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

Stefan Dösinger : wined3d: Index buffer data is unsigned.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: a9e04dd87fdf95d92f671a0728208b88bfe8167e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e04dd87fdf95d92f671a072… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 6 14:22:14 2007 +0200 wined3d: Index buffer data is unsigned. --- dlls/wined3d/drawprim.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 089030b..9820158 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -449,8 +449,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData unsigned int textureNo = 0; unsigned int texture_idx = 0; - const short *pIdxBufS = NULL; - const long *pIdxBufL = NULL; + const WORD *pIdxBufS = NULL; + const DWORD *pIdxBufL = NULL; LONG vx_index; float x = 0.0f, y = 0.0f, z = 0.0f; /* x,y,z coordinates */ float rhw = 0.0f; /* rhw */ @@ -458,7 +458,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData DWORD specularColor = 0; /* Specular Color */ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT *streamOffset = This->stateBlock->streamOffset; - LONG SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; + DWORD SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; BYTE *texCoords[WINED3DDP_MAXTEXCOORD]; BYTE *diffuse = NULL, *specular = NULL, *normal = NULL, *position = NULL; @@ -475,8 +475,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData idxData = ((IWineD3DIndexBufferImpl *) This->stateBlock->pIndexData)->resource.allocatedMemory; } - if (idxSize == 2) pIdxBufS = (const short *) idxData; - else pIdxBufL = (const long *) idxData; + if (idxSize == 2) pIdxBufS = (const WORD *) idxData; + else pIdxBufL = (const DWORD *) idxData; } /* Adding the stream offset once is cheaper than doing it every iteration. Do not modify the strided data, it is a pointer

1 0

Lei Zhang : advapi32: Spelling fixes.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: d347ebe1968a32d62834d897ecfed647e001c06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d347ebe1968a32d62834d897e… Author: Lei Zhang <thestig(a)google.com> Date: Fri Apr 6 16:46:59 2007 -0700 advapi32: Spelling fixes. --- dlls/advapi32/crypt.c | 4 ++-- dlls/advapi32/registry.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 3a2f770..1fd16c3 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -987,7 +987,7 @@ BOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags * Encrypts data. * * PARAMS - * hKey [I] Handle to the enryption key. + * hKey [I] Handle to the encryption key. * hHash [I] Handle to a hash object. * Final [I] TRUE if this is the last section to encrypt. * dwFlags [I] Can be CRYPT_OAEP. @@ -1027,7 +1027,7 @@ BOOL WINAPI CryptEncrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final, /****************************************************************************** * CryptEnumProvidersW (ADVAPI32.@) * - * Returns the next availabe CSP. + * Returns the next available CSP. * * PARAMS * dwIndex [I] Index of the next provider to be enumerated. diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 28689cd..4406004 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -566,7 +566,7 @@ LONG WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_len, /****************************************************************************** * RegEnumKeyW [ADVAPI32.@] * - * Enumerates subkyes of the specified open reg key. + * Enumerates subkeys of the specified open reg key. * * PARAMS * hKey [I] Handle to an open key. @@ -805,7 +805,7 @@ LONG WINAPI RegQueryMultipleValuesW( HKEY hkey, PVALENTW val_list, DWORD num_val * lpcMaxValueNameLen [O] Size of the key's longest value name in TCHARS. * lpcMaxValueLen [O] Longest data component among the key's values * lpcbSecurityDescriptor [O] Size of the key's security descriptor. - * lpftLastWriteTime [O] FILETIME strucutre that is the last write time. + * lpftLastWriteTime [O] FILETIME structure that is the last write time. * * RETURNS * Success: ERROR_SUCCESS @@ -2264,7 +2264,7 @@ LONG WINAPI RegFlushKey( HKEY hkey ) /****************************************************************************** * RegConnectRegistryW [ADVAPI32.@] * - * Establishe a connection to a predefined registry key on another computer. + * Establish a connection to a predefined registry key on another computer. * * PARAMS * lpMachineName [I] Address of name of remote computer @@ -2373,7 +2373,7 @@ LONG WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree, * * PARAMS * hToken [I] Handle of token representing the user - * dwOptions [I] Reserved, nust be 0 + * dwOptions [I] Reserved, must be 0 * samDesired [I] Desired access rights * phkResult [O] Destination for the resulting key handle *

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

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