Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[gadamopoulos] 72328: [SHELL32] - CDefaultContextMenu: Fix some cosmetic issues.
by gadamopoulos＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: gadamopoulos Date: Thu Aug 18 14:01:44 2016 New Revision: 72328 URL: http://svn.reactos.org/svn/reactos?rev=72328&view=rev Log: [SHELL32] - CDefaultContextMenu: Fix some cosmetic issues. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Thu Aug 18 14:01:44 2016 @@ -339,7 +339,7 @@ BOOL bRet = FALSE; CComPtr<IDataObject> pDataObj; - if(SUCCEEDED(OleGetClipboard(&pDataObj))) + if (SUCCEEDED(OleGetClipboard(&pDataObj))) { STGMEDIUM medium; FORMATETC formatetc; @@ -348,7 +348,7 @@ /* Set the FORMATETC structure*/ InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - if(SUCCEEDED(pDataObj->GetData(&formatetc, &medium))) + if (SUCCEEDED(pDataObj->GetData(&formatetc, &medium))) { bRet = TRUE; ReleaseStgMedium(&medium); @@ -1002,7 +1002,7 @@ HRESULT hr; if (!m_site) - return E_FAIL;; + return E_FAIL; /* Get a pointer to the shell browser */ hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); @@ -1020,7 +1020,7 @@ LPCMINVOKECOMMANDINFO lpcmi) { if (!m_site) - return E_FAIL;; + return E_FAIL; /* Get a pointer to the shell view */ CComPtr<IShellView> psv; @@ -1210,7 +1210,7 @@ HRESULT hr; hr = SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); - if(FAILED_UNEXPECTEDLY(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; if (!bCopy) @@ -1321,7 +1321,7 @@ else if (_ILIsBitBucket(pidlChild)) { /* FIXME: detect the drive path of bitbucket if appropiate */ - if(!SH_ShowRecycleBinProperties(L'C')) + if (!SH_ShowRecycleBinProperties(L'C')) hr = E_FAIL; } else @@ -1564,7 +1564,7 @@ BOOL bHasPath = SHGetPathFromIDListW(pidlFull, wszPath); WCHAR wszDir[MAX_PATH]; - if(bHasPath) + if (bHasPath) { wcscpy(wszDir, wszPath); PathRemoveFileSpec(wszDir); @@ -1819,7 +1819,7 @@ { DRAWITEMSTRUCT* pDrawStruct = reinterpret_cast<DRAWITEMSTRUCT*>(lParam); PDynamicShellEntry pEntry = GetDynamicEntry(pDrawStruct->itemID); - if(pEntry) + if (pEntry) SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); break; } @@ -1827,7 +1827,7 @@ { MEASUREITEMSTRUCT* pMeasureStruct = reinterpret_cast<MEASUREITEMSTRUCT*>(lParam); PDynamicShellEntry pEntry = GetDynamicEntry(pMeasureStruct->itemID); - if(pEntry) + if (pEntry) SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); break; }

1 0

[gadamopoulos] 72327: [SHELL32] - CDefView: Set the site of the context menu to the CDefView essentialy reverting r68727 which was wrong. - CDefaultContextMenu: Implement IObjectWithSite interface....
by gadamopoulos＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: gadamopoulos Date: Thu Aug 18 13:50:56 2016 New Revision: 72327 URL: http://svn.reactos.org/svn/reactos?rev=72327&view=rev Log: [SHELL32] - CDefView: Set the site of the context menu to the CDefView essentialy reverting r68727 which was wrong. - CDefaultContextMenu: Implement IObjectWithSite interface. Don't use CWM_GETISHELLBROWSER to get a pointer to the shell browser. Do a IUnknown_QueryService to the site instead asking for either the shell browser or the shell view (and it is fine if there is none of them). - Rename IDefaultContextMenu_Constructor to CDefaultContextMenu_CreateInstance and use ShellObjectCreatorInit to simplify its code. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Thu Aug 18 13:50:56 2016 @@ -1210,6 +1210,8 @@ if (FAILED(hResult)) goto cleanup; + IUnknown_SetSite(m_pCM, (IShellView *)this); + hResult = m_pCM->QueryContextMenu(hMenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY); if (FAILED(hResult)) goto cleanup; @@ -1229,7 +1231,10 @@ DestroyMenu(hMenu); if (m_pCM) + { + IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); + } return hResult; } @@ -1262,6 +1267,8 @@ hResult = GetItemObject( m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); if (FAILED( hResult)) goto cleanup; + + IUnknown_SetSite(m_pCM, (IShellView *)this); hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) @@ -1280,7 +1287,10 @@ cleanup: if (m_pCM) + { + IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); + } if (hMenu) DestroyMenu(hMenu); @@ -1301,6 +1311,8 @@ if (FAILED( hResult)) goto cleanup; + IUnknown_SetSite(m_pCM, (IShellView *)this); + hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) goto cleanup; @@ -1309,7 +1321,10 @@ cleanup: if (m_pCM) + { + IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); + } if (hMenu) DestroyMenu(hMenu); Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Thu Aug 18 13:50:56 2016 @@ -5,12 +5,6 @@ * PURPOSE: provides default context menu implementation * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) */ - -/* -TODO: - The code in NotifyShellViewWindow to deliver commands to the view is broken. It is an excellent - example of the wrong way to do it. -*/ #include "precomp.h" @@ -61,9 +55,11 @@ class CDefaultContextMenu : public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu3 + public IContextMenu3, + public IObjectWithSite { private: + CComPtr<IUnknown> m_site; CComPtr<IShellFolder> m_psf; UINT m_cidl; PCUITEMID_CHILD_ARRAY m_apidl; @@ -87,6 +83,7 @@ UINT BuildBackgroundContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT IndexMenu); UINT BuildShellItemContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); + HRESULT NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi, BOOL bRefresh); HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi); @@ -121,10 +118,15 @@ // IContextMenu3 virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); + // IObjectWithSite + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); + BEGIN_COM_MAP(CDefaultContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) END_COM_MAP() }; @@ -992,21 +994,23 @@ return S_OK; } -static -HRESULT -NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi, BOOL bRefresh) -{ - /* Note: CWM_GETISHELLBROWSER returns not referenced object */ - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - return E_FAIL; - - CComPtr<IShellView> lpSV; - if (FAILED(lpSB->QueryActiveShellView(&lpSV))) - return E_FAIL; +HRESULT +CDefaultContextMenu::NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi, BOOL bRefresh) +{ + CComPtr<IShellView> psv; + + HRESULT hr; + + if (!m_site) + return E_FAIL;; + + /* Get a pointer to the shell browser */ + hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; HWND hwndSV = NULL; - if (SUCCEEDED(lpSV->GetWindow(&hwndSV))) + if (SUCCEEDED(psv->GetWindow(&hwndSV))) SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); return S_OK; } @@ -1015,19 +1019,16 @@ CDefaultContextMenu::DoRefresh( LPCMINVOKECOMMANDINFO lpcmi) { - CComPtr<IPersistFolder2> ppf2 = NULL; - LPITEMIDLIST pidl; - HRESULT hr = m_psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&pidl); - if (SUCCEEDED(hr)) - { - SHChangeNotify(SHCNE_UPDATEDIR, SHCNF_IDLIST, pidl, NULL); - ILFree(pidl); - } - } - return hr; + if (!m_site) + return E_FAIL;; + + /* Get a pointer to the shell view */ + CComPtr<IShellView> psv; + HRESULT hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psv->Refresh(); } HRESULT @@ -1208,69 +1209,44 @@ CComPtr<IDataObject> pDataObj; HRESULT hr; - if (SUCCEEDED(SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) - { - if (!bCopy) - { - FORMATETC formatetc; - STGMEDIUM medium; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECT), TYMED_HGLOBAL); - pDataObj->GetData(&formatetc, &medium); - DWORD * pdwFlag = (DWORD*)GlobalLock(medium.hGlobal); - if (pdwFlag) - *pdwFlag = DROPEFFECT_MOVE; - GlobalUnlock(medium.hGlobal); - pDataObj->SetData(&formatetc, &medium, TRUE); - } - - hr = OleSetClipboard(pDataObj); + hr = SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); + if(FAILED_UNEXPECTEDLY(hr)) return hr; - } - - /* Note: CWM_GETISHELLBROWSER returns not referenced object */ - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - { - ERR("failed to get shellbrowser\n"); - return E_FAIL; - } - - CComPtr<IShellView> lpSV; - hr = lpSB->QueryActiveShellView(&lpSV); - if (FAILED(hr)) - { - ERR("failed to query the active shellview\n"); - return hr; - } - - hr = lpSV->GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IDataObject, &pDataObj)); - if (SUCCEEDED(hr)) - { - hr = OleSetClipboard(pDataObj); - if (FAILED(hr)) - ERR("OleSetClipboard failed"); - pDataObj->Release(); - } else - ERR("failed to get item object\n"); - - return hr; + + if (!bCopy) + { + FORMATETC formatetc; + STGMEDIUM medium; + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECT), TYMED_HGLOBAL); + pDataObj->GetData(&formatetc, &medium); + DWORD * pdwFlag = (DWORD*)GlobalLock(medium.hGlobal); + if (pdwFlag) + *pdwFlag = DROPEFFECT_MOVE; + GlobalUnlock(medium.hGlobal); + pDataObj->SetData(&formatetc, &medium, TRUE); + } + + return OleSetClipboard(pDataObj); } HRESULT CDefaultContextMenu::DoRename( LPCMINVOKECOMMANDINFO lpcmi) { - /* get the active IShellView. Note: CWM_GETISHELLBROWSER returns not referenced object */ - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - { - ERR("CWM_GETISHELLBROWSER failed\n"); + CComPtr<IShellBrowser> psb; + HRESULT hr; + + if (!m_site) return E_FAIL; - } + + /* Get a pointer to the shell browser */ + hr = IUnknown_QueryService(m_site, SID_IShellBrowser, IID_PPV_ARG(IShellBrowser, &psb)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; /* is the treeview focused */ HWND hwnd; - if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwnd))) + if (SUCCEEDED(psb->GetControlWindow(FCW_TREE, &hwnd))) { HTREEITEM hItem = TreeView_GetSelection(hwnd); if (hItem) @@ -1278,12 +1254,9 @@ } CComPtr<IShellView> lpSV; - HRESULT hr = lpSB->QueryActiveShellView(&lpSV); - if (FAILED(hr)) - { - ERR("CWM_GETISHELLBROWSER failed\n"); + hr = psb->QueryActiveShellView(&lpSV); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - } SVSIF selFlags = SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; lpSV->SelectItem(m_apidl[0], selFlags); @@ -1423,24 +1396,20 @@ return E_FAIL; /* Show and select the new item in the def view */ - CComPtr<IShellBrowser> lpSB; - CComPtr<IShellView> lpSV; LPITEMIDLIST pidl; PITEMID_CHILD pidlNewItem; + CComPtr<IShellView> psv; /* Notify the view object about the new item */ SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, (LPCVOID)wszName, NULL); - /* FIXME: I think that this can be implemented using callbacks to the shell folder */ - - /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ - lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - return E_FAIL; - - hr = lpSB->QueryActiveShellView(&lpSV); - if (FAILED(hr)) - return hr; + if (!m_site) + return S_OK; + + /* Get a pointer to the shell view */ + hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; /* Attempt to get the pidl of the new item */ hr = SHILCreateFromPathW(wszName, &pidl, NULL); @@ -1449,7 +1418,7 @@ pidlNewItem = ILFindLastID(pidl); - hr = lpSV->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | + hr = psv->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT); SHFree(pidl); @@ -1528,7 +1497,7 @@ DWORD CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry) { - LPSHELLBROWSER lpSB; + CComPtr<IShellBrowser> psb; HWND hwndTree; LPCWSTR FlagsName; WCHAR wszKey[256]; @@ -1536,13 +1505,16 @@ DWORD wFlags; DWORD cbVerb; + if (!m_site) + return 0; + /* Get a pointer to the shell browser */ - lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (lpSB == NULL) + hr = IUnknown_QueryService(m_site, SID_IShellBrowser, IID_PPV_ARG(IShellBrowser, &psb)); + if (FAILED_UNEXPECTEDLY(hr)) return 0; /* See if we are in Explore or Browse mode. If the browser's tree is present, we are in Explore mode.*/ - if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwndTree)) && hwndTree) + if (SUCCEEDED(psb->GetControlWindow(FCW_TREE, &hwndTree)) && hwndTree) FlagsName = L"ExplorerFlags"; else FlagsName = L"BrowserFlags"; @@ -1565,15 +1537,18 @@ CDefaultContextMenu::TryToBrowse( LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags) { - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + CComPtr<IShellBrowser> psb; HRESULT hr; - if (lpSB == NULL) + if (!m_site) return E_FAIL; - hr = lpSB->BrowseObject(ILCombine(m_pidlFolder, pidl), wFlags); - - return hr; + /* Get a pointer to the shell browser */ + hr = IUnknown_QueryService(m_site, SID_IShellBrowser, IID_PPV_ARG(IShellBrowser, &psb)); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + return psb->BrowseObject(ILCombine(m_pidlFolder, pidl), wFlags); } HRESULT @@ -1865,42 +1840,29 @@ return S_OK; } +HRESULT +WINAPI +CDefaultContextMenu::SetSite(IUnknown *pUnkSite) +{ + m_site = pUnkSite; + return S_OK; +} + +HRESULT +WINAPI +CDefaultContextMenu::GetSite(REFIID riid, void **ppvSite) +{ + if (!m_site) + return E_FAIL; + + return m_site->QueryInterface(riid, ppvSite); +} + static HRESULT -IDefaultContextMenu_Constructor( - const DEFCONTEXTMENU *pdcm, - REFIID riid, - void **ppv) -{ - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - - CComObject<CDefaultContextMenu> *pCM; - HRESULT hr = CComObject<CDefaultContextMenu>::CreateInstance(&pCM); - if (FAILED(hr)) - return hr; - pCM->AddRef(); // CreateInstance returns object with 0 ref count */ - - CComPtr<IUnknown> pResult; - hr = pCM->QueryInterface(riid, (void **)&pResult); - if (FAILED(hr)) - { - pCM->Release(); - return hr; - } - - hr = pCM->Initialize(pdcm); - if (FAILED(hr)) - { - pCM->Release(); - return hr; - } - - *ppv = pResult.Detach(); - pCM->Release(); - TRACE("This(%p) cidl %u\n", *ppv, pdcm->cidl); - return S_OK; +CDefaultContextMenu_CreateInstance(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CDefaultContextMenu>(pdcm, riid, ppv); } /************************************************************************* @@ -1910,17 +1872,9 @@ HRESULT WINAPI -SHCreateDefaultContextMenu( - const DEFCONTEXTMENU *pdcm, - REFIID riid, - void **ppv) -{ - *ppv = NULL; - HRESULT hr = IDefaultContextMenu_Constructor(pdcm, riid, ppv); - if (FAILED(hr)) - ERR("IDefaultContextMenu_Constructor failed: %x\n", hr); - TRACE("pcm %p hr %x\n", pdcm, hr); - return hr; +SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) +{ + return CDefaultContextMenu_CreateInstance(pdcm, riid, ppv); } /*************************************************************************

1 0

[gadamopoulos] 72326: [BROWSEUI] - CInternetToolbar: Fix resizing the top rebar. Works in windows (but not in ros).
by gadamopoulos＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: gadamopoulos Date: Thu Aug 18 13:24:16 2016 New Revision: 72326 URL: http://svn.reactos.org/svn/reactos?rev=72326&view=rev Log: [BROWSEUI] - CInternetToolbar: Fix resizing the top rebar. Works in windows (but not in ros). Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Thu Aug 18 13:24:16 2016 @@ -646,9 +646,9 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - if (availableBorderSpace.top > maxHeight) - { - availableBorderSpace.top = maxHeight; + if (maxHeight && availableBorderSpace.bottom - availableBorderSpace.top > maxHeight) + { + availableBorderSpace.bottom = availableBorderSpace.top + maxHeight; } return ResizeBorderDW(&availableBorderSpace, fSite, FALSE); @@ -742,7 +742,7 @@ SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); } } - hResult = ReserveBorderSpace(); + hResult = ReserveBorderSpace(0); // TODO: refresh view menu? }

1 0

[gadamopoulos] 72325: [BROWSEUI] - Use OleFlushClipboard while the browser window is being destroyed in order to make make any IDataObject that is in clipboard to render so as make is data availabl...
by gadamopoulos＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: gadamopoulos Date: Thu Aug 18 13:16:05 2016 New Revision: 72325 URL: http://svn.reactos.org/svn/reactos?rev=72325&view=rev Log: [BROWSEUI] - Use OleFlushClipboard while the browser window is being destroyed in order to make make any IDataObject that is in clipboard to render so as make is data available after the browser thread exits. CORE-11565 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Thu Aug 18 13:16:05 2016 @@ -3350,6 +3350,10 @@ LRESULT CShellBrowser::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { HRESULT hr; + + /* The current thread is about to go down so render any IDataObject that may be left in the clipboard */ + OleFlushClipboard(); + // TODO: rip down everything { fCurrentShellView->DestroyViewWindow();

1 0

[dreimer] 72324: [BOOTDATA] Update CA root scripts adding "ISRG Root X1"
by dreimer＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: dreimer Date: Thu Aug 18 12:07:59 2016 New Revision: 72324 URL: http://svn.reactos.org/svn/reactos?rev=72324&view=rev Log: [BOOTDATA] Update CA root scripts adding "ISRG Root X1" Modified: trunk/reactos/boot/bootdata/caroots.inf Modified: trunk/reactos/boot/bootdata/caroots.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/caroots.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/caroots.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/caroots.inf [iso-8859-1] Thu Aug 18 12:07:59 2016 @@ -1,13 +1,106 @@ ; Automatically-generated list of fresh Root CA certificates ; with the data coming from Mozilla's NSS library. ; -- -; Created on 2016-07-05T20:52:12Z UTC with swyter's script. +; Created on 2016-08-18T12:04:05Z UTC with swyter's script. ; Data licensed under MPL 2.0 <https://mozilla.org/MPL/2.0/> [Version] Signature = "$ReactOS$" [AddReg] +; "ISRG Root X1" (1391 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\CABD2A79A1076A31F21D253635CB039D4329A5E8","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x6F,0x05,0x00,0x00,\ + 0x30,0x82,0x05,0x6B,0x30,0x82,0x03,0x53,0xA0,0x03,0x02,0x01,0x02,0x02,0x11,0x00,\ + 0x82,0x10,0xCF,0xB0,0xD2,0x40,0xE3,0x59,0x44,0x63,0xE0,0xBB,0x63,0x82,0x8B,0x00,\ + 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x30,\ + 0x4F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x29,\ + 0x30,0x27,0x06,0x03,0x55,0x04,0x0A,0x13,0x20,0x49,0x6E,0x74,0x65,0x72,0x6E,0x65,\ + 0x74,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x20,0x52,0x65,0x73,0x65,0x61,\ + 0x72,0x63,0x68,0x20,0x47,0x72,0x6F,0x75,0x70,0x31,0x15,0x30,0x13,0x06,0x03,0x55,\ + 0x04,0x03,0x13,0x0C,0x49,0x53,0x52,0x47,0x20,0x52,0x6F,0x6F,0x74,0x20,0x58,0x31,\ + 0x30,0x1E,0x17,0x0D,0x31,0x35,0x30,0x36,0x30,0x34,0x31,0x31,0x30,0x34,0x33,0x38,\ + 0x5A,0x17,0x0D,0x33,0x35,0x30,0x36,0x30,0x34,0x31,0x31,0x30,0x34,0x33,0x38,0x5A,\ + 0x30,0x4F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,\ + 0x29,0x30,0x27,0x06,0x03,0x55,0x04,0x0A,0x13,0x20,0x49,0x6E,0x74,0x65,0x72,0x6E,\ + 0x65,0x74,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x20,0x52,0x65,0x73,0x65,\ + 0x61,0x72,0x63,0x68,0x20,0x47,0x72,0x6F,0x75,0x70,0x31,0x15,0x30,0x13,0x06,0x03,\ + 0x55,0x04,0x03,0x13,0x0C,0x49,0x53,0x52,0x47,0x20,0x52,0x6F,0x6F,0x74,0x20,0x58,\ + 0x31,0x30,0x82,0x02,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,\ + 0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0F,0x00,0x30,0x82,0x02,0x0A,0x02,0x82,0x02,\ + 0x01,0x00,0xAD,0xE8,0x24,0x73,0xF4,0x14,0x37,0xF3,0x9B,0x9E,0x2B,0x57,0x28,0x1C,\ + 0x87,0xBE,0xDC,0xB7,0xDF,0x38,0x90,0x8C,0x6E,0x3C,0xE6,0x57,0xA0,0x78,0xF7,0x75,\ + 0xC2,0xA2,0xFE,0xF5,0x6A,0x6E,0xF6,0x00,0x4F,0x28,0xDB,0xDE,0x68,0x86,0x6C,0x44,\ + 0x93,0xB6,0xB1,0x63,0xFD,0x14,0x12,0x6B,0xBF,0x1F,0xD2,0xEA,0x31,0x9B,0x21,0x7E,\ + 0xD1,0x33,0x3C,0xBA,0x48,0xF5,0xDD,0x79,0xDF,0xB3,0xB8,0xFF,0x12,0xF1,0x21,0x9A,\ + 0x4B,0xC1,0x8A,0x86,0x71,0x69,0x4A,0x66,0x66,0x6C,0x8F,0x7E,0x3C,0x70,0xBF,0xAD,\ + 0x29,0x22,0x06,0xF3,0xE4,0xC0,0xE6,0x80,0xAE,0xE2,0x4B,0x8F,0xB7,0x99,0x7E,0x94,\ + 0x03,0x9F,0xD3,0x47,0x97,0x7C,0x99,0x48,0x23,0x53,0xE8,0x38,0xAE,0x4F,0x0A,0x6F,\ + 0x83,0x2E,0xD1,0x49,0x57,0x8C,0x80,0x74,0xB6,0xDA,0x2F,0xD0,0x38,0x8D,0x7B,0x03,\ + 0x70,0x21,0x1B,0x75,0xF2,0x30,0x3C,0xFA,0x8F,0xAE,0xDD,0xDA,0x63,0xAB,0xEB,0x16,\ + 0x4F,0xC2,0x8E,0x11,0x4B,0x7E,0xCF,0x0B,0xE8,0xFF,0xB5,0x77,0x2E,0xF4,0xB2,0x7B,\ + 0x4A,0xE0,0x4C,0x12,0x25,0x0C,0x70,0x8D,0x03,0x29,0xA0,0xE1,0x53,0x24,0xEC,0x13,\ + 0xD9,0xEE,0x19,0xBF,0x10,0xB3,0x4A,0x8C,0x3F,0x89,0xA3,0x61,0x51,0xDE,0xAC,0x87,\ + 0x07,0x94,0xF4,0x63,0x71,0xEC,0x2E,0xE2,0x6F,0x5B,0x98,0x81,0xE1,0x89,0x5C,0x34,\ + 0x79,0x6C,0x76,0xEF,0x3B,0x90,0x62,0x79,0xE6,0xDB,0xA4,0x9A,0x2F,0x26,0xC5,0xD0,\ + 0x10,0xE1,0x0E,0xDE,0xD9,0x10,0x8E,0x16,0xFB,0xB7,0xF7,0xA8,0xF7,0xC7,0xE5,0x02,\ + 0x07,0x98,0x8F,0x36,0x08,0x95,0xE7,0xE2,0x37,0x96,0x0D,0x36,0x75,0x9E,0xFB,0x0E,\ + 0x72,0xB1,0x1D,0x9B,0xBC,0x03,0xF9,0x49,0x05,0xD8,0x81,0xDD,0x05,0xB4,0x2A,0xD6,\ + 0x41,0xE9,0xAC,0x01,0x76,0x95,0x0A,0x0F,0xD8,0xDF,0xD5,0xBD,0x12,0x1F,0x35,0x2F,\ + 0x28,0x17,0x6C,0xD2,0x98,0xC1,0xA8,0x09,0x64,0x77,0x6E,0x47,0x37,0xBA,0xCE,0xAC,\ + 0x59,0x5E,0x68,0x9D,0x7F,0x72,0xD6,0x89,0xC5,0x06,0x41,0x29,0x3E,0x59,0x3E,0xDD,\ + 0x26,0xF5,0x24,0xC9,0x11,0xA7,0x5A,0xA3,0x4C,0x40,0x1F,0x46,0xA1,0x99,0xB5,0xA7,\ + 0x3A,0x51,0x6E,0x86,0x3B,0x9E,0x7D,0x72,0xA7,0x12,0x05,0x78,0x59,0xED,0x3E,0x51,\ + 0x78,0x15,0x0B,0x03,0x8F,0x8D,0xD0,0x2F,0x05,0xB2,0x3E,0x7B,0x4A,0x1C,0x4B,0x73,\ + 0x05,0x12,0xFC,0xC6,0xEA,0xE0,0x50,0x13,0x7C,0x43,0x93,0x74,0xB3,0xCA,0x74,0xE7,\ + 0x8E,0x1F,0x01,0x08,0xD0,0x30,0xD4,0x5B,0x71,0x36,0xB4,0x07,0xBA,0xC1,0x30,0x30,\ + 0x5C,0x48,0xB7,0x82,0x3B,0x98,0xA6,0x7D,0x60,0x8A,0xA2,0xA3,0x29,0x82,0xCC,0xBA,\ + 0xBD,0x83,0x04,0x1B,0xA2,0x83,0x03,0x41,0xA1,0xD6,0x05,0xF1,0x1B,0xC2,0xB6,0xF0,\ + 0xA8,0x7C,0x86,0x3B,0x46,0xA8,0x48,0x2A,0x88,0xDC,0x76,0x9A,0x76,0xBF,0x1F,0x6A,\ + 0xA5,0x3D,0x19,0x8F,0xEB,0x38,0xF3,0x64,0xDE,0xC8,0x2B,0x0D,0x0A,0x28,0xFF,0xF7,\ + 0xDB,0xE2,0x15,0x42,0xD4,0x22,0xD0,0x27,0x5D,0xE1,0x79,0xFE,0x18,0xE7,0x70,0x88,\ + 0xAD,0x4E,0xE6,0xD9,0x8B,0x3A,0xC6,0xDD,0x27,0x51,0x6E,0xFF,0xBC,0x64,0xF5,0x33,\ + 0x43,0x4F,0x02,0x03,0x01,0x00,0x01,0xA3,0x42,0x30,0x40,0x30,0x0E,0x06,0x03,0x55,\ + 0x1D,0x0F,0x01,0x01,0xFF,0x04,0x04,0x03,0x02,0x01,0x06,0x30,0x0F,0x06,0x03,0x55,\ + 0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,0x30,0x1D,0x06,0x03,\ + 0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0x79,0xB4,0x59,0xE6,0x7B,0xB6,0xE5,0xE4,0x01,\ + 0x73,0x80,0x08,0x88,0xC8,0x1A,0x58,0xF6,0xE9,0x9B,0x6E,0x30,0x0D,0x06,0x09,0x2A,\ + 0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x03,0x82,0x02,0x01,0x00,0x55,\ + 0x1F,0x58,0xA9,0xBC,0xB2,0xA8,0x50,0xD0,0x0C,0xB1,0xD8,0x1A,0x69,0x20,0x27,0x29,\ + 0x08,0xAC,0x61,0x75,0x5C,0x8A,0x6E,0xF8,0x82,0xE5,0x69,0x2F,0xD5,0xF6,0x56,0x4B,\ + 0xB9,0xB8,0x73,0x10,0x59,0xD3,0x21,0x97,0x7E,0xE7,0x4C,0x71,0xFB,0xB2,0xD2,0x60,\ + 0xAD,0x39,0xA8,0x0B,0xEA,0x17,0x21,0x56,0x85,0xF1,0x50,0x0E,0x59,0xEB,0xCE,0xE0,\ + 0x59,0xE9,0xBA,0xC9,0x15,0xEF,0x86,0x9D,0x8F,0x84,0x80,0xF6,0xE4,0xE9,0x91,0x90,\ + 0xDC,0x17,0x9B,0x62,0x1B,0x45,0xF0,0x66,0x95,0xD2,0x7C,0x6F,0xC2,0xEA,0x3B,0xEF,\ + 0x1F,0xCF,0xCB,0xD6,0xAE,0x27,0xF1,0xA9,0xB0,0xC8,0xAE,0xFD,0x7D,0x7E,0x9A,0xFA,\ + 0x22,0x04,0xEB,0xFF,0xD9,0x7F,0xEA,0x91,0x2B,0x22,0xB1,0x17,0x0E,0x8F,0xF2,0x8A,\ + 0x34,0x5B,0x58,0xD8,0xFC,0x01,0xC9,0x54,0xB9,0xB8,0x26,0xCC,0x8A,0x88,0x33,0x89,\ + 0x4C,0x2D,0x84,0x3C,0x82,0xDF,0xEE,0x96,0x57,0x05,0xBA,0x2C,0xBB,0xF7,0xC4,0xB7,\ + 0xC7,0x4E,0x3B,0x82,0xBE,0x31,0xC8,0x22,0x73,0x73,0x92,0xD1,0xC2,0x80,0xA4,0x39,\ + 0x39,0x10,0x33,0x23,0x82,0x4C,0x3C,0x9F,0x86,0xB2,0x55,0x98,0x1D,0xBE,0x29,0x86,\ + 0x8C,0x22,0x9B,0x9E,0xE2,0x6B,0x3B,0x57,0x3A,0x82,0x70,0x4D,0xDC,0x09,0xC7,0x89,\ + 0xCB,0x0A,0x07,0x4D,0x6C,0xE8,0x5D,0x8E,0xC9,0xEF,0xCE,0xAB,0xC7,0xBB,0xB5,0x2B,\ + 0x4E,0x45,0xD6,0x4A,0xD0,0x26,0xCC,0xE5,0x72,0xCA,0x08,0x6A,0xA5,0x95,0xE3,0x15,\ + 0xA1,0xF7,0xA4,0xED,0xC9,0x2C,0x5F,0xA5,0xFB,0xFF,0xAC,0x28,0x02,0x2E,0xBE,0xD7,\ + 0x7B,0xBB,0xE3,0x71,0x7B,0x90,0x16,0xD3,0x07,0x5E,0x46,0x53,0x7C,0x37,0x07,0x42,\ + 0x8C,0xD3,0xC4,0x96,0x9C,0xD5,0x99,0xB5,0x2A,0xE0,0x95,0x1A,0x80,0x48,0xAE,0x4C,\ + 0x39,0x07,0xCE,0xCC,0x47,0xA4,0x52,0x95,0x2B,0xBA,0xB8,0xFB,0xAD,0xD2,0x33,0x53,\ + 0x7D,0xE5,0x1D,0x4D,0x6D,0xD5,0xA1,0xB1,0xC7,0x42,0x6F,0xE6,0x40,0x27,0x35,0x5C,\ + 0xA3,0x28,0xB7,0x07,0x8D,0xE7,0x8D,0x33,0x90,0xE7,0x23,0x9F,0xFB,0x50,0x9C,0x79,\ + 0x6C,0x46,0xD5,0xB4,0x15,0xB3,0x96,0x6E,0x7E,0x9B,0x0C,0x96,0x3A,0xB8,0x52,0x2D,\ + 0x3F,0xD6,0x5B,0xE1,0xFB,0x08,0xC2,0x84,0xFE,0x24,0xA8,0xA3,0x89,0xDA,0xAC,0x6A,\ + 0xE1,0x18,0x2A,0xB1,0xA8,0x43,0x61,0x5B,0xD3,0x1F,0xDC,0x3B,0x8D,0x76,0xF2,0x2D,\ + 0xE8,0x8D,0x75,0xDF,0x17,0x33,0x6C,0x3D,0x53,0xFB,0x7B,0xCB,0x41,0x5F,0xFF,0xDC,\ + 0xA2,0xD0,0x61,0x38,0xE1,0x96,0xB8,0xAC,0x5D,0x8B,0x37,0xD7,0x75,0xD5,0x33,0xC0,\ + 0x99,0x11,0xAE,0x9D,0x41,0xC1,0x72,0x75,0x84,0xBE,0x02,0x41,0x42,0x5F,0x67,0x24,\ + 0x48,0x94,0xD1,0x9B,0x27,0xBE,0x07,0x3F,0xB9,0xB8,0x4F,0x81,0x74,0x51,0xE1,0x7A,\ + 0xB7,0xED,0x9D,0x23,0xE2,0xBE,0xE0,0xD5,0x28,0x04,0x13,0x3C,0x31,0x03,0x9E,0xDD,\ + 0x7A,0x6C,0x8F,0xC6,0x07,0x18,0xC6,0x7F,0xDE,0x47,0x8E,0x3F,0x28,0x9E,0x04,0x06,\ + 0xCF,0xA5,0x54,0x34,0x77,0xBD,0xEC,0x89,0x9B,0xE9,0x17,0x43,0xDF,0x5B,0xDB,0x5F,\ + 0xFE,0x8E,0x1E,0x57,0xA2,0xCD,0x40,0x9D,0x7E,0x62,0x22,0xDA,0xDE,0x18,0x27 + ; "OpenTrust Root CA G3" (549 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\6E2664F356BF3455BFD1933F7C01DED813DA8AA6","Blob",0x00000001,\ 0x20,0x00,0x00,0x00,\

1 0

[dreimer] 72323: [FONTS] Update DejaVu to v2.37
by dreimer＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: dreimer Date: Thu Aug 18 12:03:31 2016 New Revision: 72323 URL: http://svn.reactos.org/svn/reactos?rev=72323&view=rev Log: [FONTS] Update DejaVu to v2.37 Added: trunk/reactos/media/fonts/DejaVuMathTeXGyre.ttf (with props) Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/media/fonts/CMakeLists.txt trunk/reactos/media/fonts/DejaVuSans-Bold.ttf trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf trunk/reactos/media/fonts/DejaVuSans.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed.ttf trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansMono.ttf trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf trunk/reactos/media/fonts/DejaVuSerif.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Thu Aug 18 12:03:31 2016 @@ -7,7 +7,7 @@ Website: https://fedorahosted.org/liberation-fonts/ Title: DejaVu Fonts -Used Version: 2.35 +Used Version: 2.37 Website: http://dejavu.sourceforge.net Title: Ubuntu Fonts Modified: trunk/reactos/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/CMakeLists.txt… ============================================================================== --- trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] Thu Aug 18 12:03:31 2016 @@ -1,5 +1,6 @@ list(APPEND FONT_FILES + DejaVuMathTeXGyre.ttf DejaVuSans-Bold.ttf DejaVuSans-BoldOblique.ttf DejaVuSans-ExtraLight.ttf Added: trunk/reactos/media/fonts/DejaVuMathTeXGyre.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuMathTeXG… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/DejaVuMathTeXGyre.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Ext… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-It… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 72322: [PSDK] Update wincodecsdk.idl. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 11:11:13 2016 New Revision: 72322 URL: http://svn.reactos.org/svn/reactos?rev=72322&view=rev Log: [PSDK] Update wincodecsdk.idl. CORE-11866 Modified: trunk/reactos/sdk/include/psdk/wincodecsdk.idl Modified: trunk/reactos/sdk/include/psdk/wincodecsdk.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wincodecs… ============================================================================== --- trunk/reactos/sdk/include/psdk/wincodecsdk.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/wincodecsdk.idl [iso-8859-1] Thu Aug 18 11:11:13 2016 @@ -37,6 +37,7 @@ } WICMetadataCreationOptions; cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkcHRM, 0x9db3655b,0x2842,0x44b3,0x80,0x67,0x12,0xe9,0xb3,0x75,0x55,0x6a);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkgAMA, 0xf00935a5,0x1d5d,0x4cd1,0x81,0xb2,0x93,0x24,0xd7,0xec,0xa7,0x81);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktIME, 0x6b00ae2d,0xe24b,0x460a,0x98,0xb6,0x87,0x8b,0xd0,0x30,0x72,0xfd);") @@ -52,6 +53,7 @@ cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") +cpp_quote("DEFINE_GUID(CLSID_WICPngChrmMetadataReader, 0xf90b5f36,0x367b,0x402a,0x9d,0xd1,0xbc,0x0f,0xd5,0x9d,0x8f,0x62);") cpp_quote("DEFINE_GUID(CLSID_WICPngGamaMetadataReader, 0x3692ca39,0xe082,0x4350,0x9e,0x1f,0x37,0x04,0xcb,0x08,0x3c,0xd5);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);")

1 0

[akhaldi] 72321: [COMCTL32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 11:10:51 2016 New Revision: 72321 URL: http://svn.reactos.org/svn/reactos?rev=72321&view=rev Log: [COMCTL32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/comctl32/header.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/progress.c trunk/rostests/winetests/comctl32/rebar.c trunk/rostests/winetests/comctl32/status.c trunk/rostests/winetests/comctl32/toolbar.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/trackbar.c Modified: trunk/rostests/winetests/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/header… ============================================================================== --- trunk/rostests/winetests/comctl32/header.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/header.c [iso-8859-1] Thu Aug 18 11:10:51 2016 @@ -1361,8 +1361,8 @@ ok(nm->lItemlParam == lparam, "Invalid lItemlParam %d vs %ld\n", lparam, nm->lItemlParam); \ ok((nm->rc.top == _top && nm->rc.bottom == _bottom && nm->rc.left == _left && nm->rc.right == _right) || \ broken(draw_stage != CDDS_ITEMPREPAINT), /* comctl32 < 5.80 */ \ - "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", _left, _top, _right, _bottom, \ - nm->rc.left, nm->rc.top, nm->rc.right, nm->rc.bottom); + "Invalid rect (%d,%d)-(%d,%d) vs %s\n", _left, _top, _right, _bottom, \ + wine_dbgstr_rect(&nm->rc)); static LRESULT customdraw_1(int n, NMCUSTOMDRAW *nm) { Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… ============================================================================== --- trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] Thu Aug 18 11:10:51 2016 @@ -893,8 +893,7 @@ r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); - memset(&r1, 0, sizeof r1); - r1.left = LVIR_ICON; + SetRect(&r1, LVIR_ICON, 0, 0, 0); r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r1); expect(1, r); @@ -906,12 +905,11 @@ r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); - memset(&r2, 0, sizeof r2); - r2.left = LVIR_ICON; + SetRect(&r2, LVIR_ICON, 0, 0, 0); r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2); expect(1, r); - ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n"); + ok(EqualRect(&r1, &r2), "rectangle should be the same\n"); DestroyWindow(hwnd); } @@ -1184,7 +1182,8 @@ r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_SELECTED, "Expected LVIS_SELECTED\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* LVIS_SELECTED with zero stateMask */ /* set */ @@ -1206,7 +1205,8 @@ r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_FOCUSED, "Expected LVIS_FOCUSED\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* LVIS_CUT with LVIS_FOCUSED stateMask */ /* set */ @@ -1228,7 +1228,8 @@ r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_CUT, "Expected LVIS_CUT\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* Insert an item with just a param */ memset (&item, 0xcc, sizeof (item)); @@ -1424,6 +1425,12 @@ hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); + + rc = SendMessageA(hwnd, LVM_DELETECOLUMN, -1, 0); + ok(!rc, "got %d\n", rc); + + rc = SendMessageA(hwnd, LVM_DELETECOLUMN, 0, 0); + ok(!rc, "got %d\n", rc); /* Add a column with no mask */ memset(&column, 0xcc, sizeof(column)); @@ -1826,14 +1833,16 @@ clr = GetBkColor(nmlvcd->nmcd.hdc); ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); - if (nmlvcd->iSubItem) - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); - else - ok(clr == c0ffee, "clr=%.8x\n", clr); + if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS)) + { + todo_wine_if(nmlvcd->iSubItem) + ok(clr == c0ffee, "clr=%.8x\n", clr); + } return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS)) + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); return CDRF_DODEFAULT; @@ -2275,7 +2284,29 @@ item_count = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items, item_count); - for (i = 0; i < 4; i++) { + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + ok(r == -1, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, 0); + ok(r == -1, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, 0); + ok(r == 0, "got %d\n", r); + + /* out of range index */ + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, items); + ok(r == 0, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(r == 0, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -2); + ok(r == 0, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(r == 0, "got %d\n", r); + + for (i = 0; i < sizeof(task_list)/sizeof(task_list[0]); i++) { DWORD selected_count; LVITEMA item; @@ -2284,15 +2315,18 @@ /* deselect all items */ item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); /* set initial position */ - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos)); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos)); + ok(r, "got %d\n", r); item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); + ok(r, "got %d\n", r); selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); ok(selected_count == 1, "expected 1, got %d\n", selected_count); @@ -2337,7 +2371,8 @@ /* select all, check notifications */ item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2371,7 +2406,8 @@ item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, "deselect all notification", FALSE); @@ -2400,11 +2436,13 @@ ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, "set state all notification 3", FALSE); - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + ok(r, "got %d\n", r); for (i = 0; i < 3; i++) { item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); + ok(r, "got %d\n", r); } r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); @@ -2425,13 +2463,14 @@ } r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(3, r); - SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); - expect(3, r); + r = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(r == -1, "got %d\n", r); /* select one more */ item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); + ok(r, "got %d\n", r); for (i=0;i<3;i++) { r = SendMessageA(hwnd, LVM_GETITEMSTATE, i, LVIS_SELECTED); @@ -2451,7 +2490,8 @@ item.stateMask = LVIS_SELECTED; r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, r); - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + ok(r == -1, "got %d\n", r); item.stateMask = LVIS_SELECTED; item.state = LVIS_SELECTED; @@ -2671,7 +2711,8 @@ expect(100, rect.left); expect(250, rect.right); - SendMessageA(hwnd, LVM_SCROLL, 10, 0); + r = SendMessageA(hwnd, LVM_SCROLL, 10, 0); + ok(r, "got %d\n", r); SetRect(&rect, LVIR_BOUNDS, 1, 0, 0); r = SendMessageA(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); @@ -3621,8 +3662,7 @@ r = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(100, 0)); expect(TRUE, r); - memset(&bounds, 0, sizeof(bounds)); - bounds.left = LVIR_BOUNDS; + SetRect(&bounds, LVIR_BOUNDS, 0, 0, 0); r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&bounds); expect(1, r); ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); @@ -3789,7 +3829,8 @@ memset(&item, 0, sizeof(item)); item.iItem = 0; item.iSubItem = 0; - SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(!r, "got %d\n", r); r = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(100, 0)); expect(TRUE, r); @@ -3850,8 +3891,9 @@ expect(TRUE, r); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq2, "get item position 2", TRUE); - memset(&rect, 0, sizeof(rect)); - SendMessageA(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + SetRectEmpty(&rect); + r = SendMessageA(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + ok(r, "got %d\n", r); /* some padding? */ expect(2, pt.x); /* offset by header height */ @@ -4850,7 +4892,8 @@ /* default column width with item added */ hwnd = create_listview_control(LVS_LIST); memset(&itema, 0, sizeof(itema)); - SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ok(!ret, "got %d\n", ret); ret = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); height = get_current_font_height(hwnd); ok((ret / height) >= 6, "got width %d, height %d\n", ret, height); @@ -5785,6 +5828,26 @@ expect(0, r); r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(1, r); + + DestroyWindow(hwnd); +} + +static void test_callback_mask(void) +{ + DWORD mask; + HWND hwnd; + BOOL ret; + + hwnd = create_listview_control(LVS_REPORT); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, ~0u, 0); + ok(ret, "got %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, ~0u, 1); + ok(ret, "got %d\n", ret); + + mask = SendMessageA(hwnd, LVM_GETCALLBACKMASK, 0, 0); + ok(mask == ~0u, "got 0x%08x\n", mask); DestroyWindow(hwnd); } @@ -5859,6 +5922,7 @@ test_insertitem(); test_header_proc(); test_oneclickactivate(); + test_callback_mask(); if (!load_v6_module(&ctx_cookie, &hCtx)) { Modified: trunk/rostests/winetests/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/progre… ============================================================================== --- trunk/rostests/winetests/comctl32/progress.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/progress.c [iso-8859-1] Thu Aug 18 11:10:51 2016 @@ -206,10 +206,8 @@ SetRectEmpty(&last_paint_rect); SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); GetClientRect(hProgressWnd, &client_rect); - ok(EqualRect(&last_paint_rect, &client_rect), - "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", - last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was %s instead of %s\n", + wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(!erased, "Progress bar shouldn't have erased the background\n"); @@ -218,10 +216,8 @@ SetRectEmpty(&last_paint_rect); SendMessageA(hProgressWnd, PBM_SETPOS, 0, 0); GetClientRect(hProgressWnd, &client_rect); - ok(EqualRect(&last_paint_rect, &client_rect), - "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", - last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was %s instead of %s\n", + wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(erased, "Progress bar should have erased the background\n"); } Modified: trunk/rostests/winetests/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rebar.… ============================================================================== --- trunk/rostests/winetests/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/rebar.c [iso-8859-1] Thu Aug 18 11:10:51 2016 @@ -37,15 +37,14 @@ static int system_font_height; -#define check_rect(name, val, exp) ok(val.top == exp.top && val.bottom == exp.bottom && \ - val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); +#define check_rect(name, val, exp) ok(EqualRect(&val, &exp), \ + "invalid rect (" name ") %s - expected %s\n", wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp)); #define check_rect_no_top(name, val, exp) { \ ok((val.bottom - val.top == exp.bottom - exp.top) && \ - val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d), ignoring top\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); \ - } + val.left == exp.left && val.right == exp.right, \ + "invalid rect (" name ") %s - expected %s, ignoring top\n", \ + wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp)); } #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp)); Modified: trunk/rostests/winetests/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/status… ============================================================================== --- trunk/rostests/winetests/comctl32/status.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/status.c [iso-8859-1] Thu Aug 18 11:10:51 2016 @@ -32,9 +32,8 @@ RECT exp = {abs(got.left - _left), abs(got.top - _top), \ abs(got.right - _right), abs(got.bottom - _bottom)}; \ ok(exp.left <= 2 && exp.top <= 2 && exp.right <= 2 && exp.bottom <= 2, \ - "Expected rect {%d,%d, %d,%d}, got {%d,%d, %d,%d}\n", \ - _left, _top, _right, _bottom, \ - (got).left, (got).top, (got).right, (got).bottom); } while (0) + "Expected rect (%d,%d)-(%d,%d), got %s\n", _left, _top, _right, _bottom, \ + wine_dbgstr_rect(&(got))); } while (0) static HINSTANCE hinst; static WNDPROC g_status_wndproc; Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… ============================================================================== --- trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] Thu Aug 18 11:10:51 2016 @@ -108,9 +108,9 @@ #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) -#define check_rect(name, val, exp, ...) ok(val.top == exp.top && val.bottom == exp.bottom && \ - val.left == exp.left && val.right == exp.right, "invalid rect (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d) - (" name ")\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom, __VA_ARGS__); +#define check_rect(name, val, exp, ...) ok(EqualRect(&val, &exp), \ + "invalid rect %s - expected %s - (" name ")\n", \ + wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp), __VA_ARGS__); #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp)); @@ -1232,7 +1232,7 @@ for (i=0; i<min(buttonCount, res->nButtons); i++) { \ ok(SendMessageA(hToolbar, TB_GETITEMRECT, i, (LPARAM)&rc) == 1, "TB_GETITEMRECT\n"); \ if (broken(tbsize_alt_numtests < sizeof(tbsize_alt_results)/sizeof(tbsize_alt_results[0]) && \ - memcmp(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton, sizeof(RECT)) == 0)) { \ + EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \ win_skip("Alternate rect found\n"); \ tbsize_alt_numtests++; \ } else if (!(mask&1)) { \ Modified: trunk/rostests/winetests/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti… ============================================================================== --- trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] Thu Aug 18 11:10:51 2016 @@ -1041,6 +1041,43 @@ DestroyWindow(parent2); } +static void test_margin(void) +{ + RECT r, r1; + HWND hwnd; + DWORD ret; + + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + ok(hwnd != NULL, "failed to create tooltip wnd\n"); + + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + SetRect(&r, -1, -1, 1, 1); + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, (LPARAM)&r); + ok(!ret, "got %d\n", ret); + + SetRectEmpty(&r1); + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, (LPARAM)&r1); + ok(!ret, "got %d\n", ret); + ok(EqualRect(&r, &r1), "got %s, was %s\n", wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r)); + + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + SetRectEmpty(&r1); + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, (LPARAM)&r1); + ok(!ret, "got %d\n", ret); + ok(EqualRect(&r, &r1), "got %s, was %s\n", wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r)); + + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); @@ -1053,4 +1090,5 @@ test_longtextW(); test_track(); test_setinfo(); -} + test_margin(); +} Modified: trunk/rostests/winetests/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/trackb… ============================================================================== --- trunk/rostests/winetests/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/trackbar.c [iso-8859-1] Thu Aug 18 11:10:51 2016 @@ -658,8 +658,8 @@ oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); - memset(&rect, 0, sizeof(rect)); - memset(&rect2, 0, sizeof(rect2)); + SetRectEmpty(&rect); + SetRectEmpty(&rect2); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); @@ -690,6 +690,7 @@ static void test_range(void) { HWND hWndTrackbar; + RECT rect1, rect2; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -754,6 +755,28 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, range_test_seq, "range test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_range_test_seq, "parent range test sequence", TRUE); + + /* TBM_SETRANGE updates thumb visual position (rectangle) if needed */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 10)); + ok(r == 0, "got %d\n", r); + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(!EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + + /* change range back, don't force repaint */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); DestroyWindow(hWndTrackbar); }

1 0

[akhaldi] 72320: [COMCTL32] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 11:09:45 2016 New Revision: 72320 URL: http://svn.reactos.org/svn/reactos?rev=72320&view=rev Log: [COMCTL32] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/draglist.c trunk/reactos/dll/win32/comctl32/dsa.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/theme_button.c trunk/reactos/dll/win32/comctl32/theme_combo.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -1,5 +1,5 @@ diff -pudN e:\wine\dlls\comctl32/comctl32.h e:\reactos\dll\win32\comctl32/comctl32.h ---- e:\wine\dlls\comctl32/comctl32.h 2016-05-31 18:00:02 +0100 +--- e:\wine\dlls\comctl32/comctl32.h 2016-08-14 19:11:25 +0100 +++ e:\reactos\dll\win32\comctl32/comctl32.h 2014-03-05 11:47:40 +0100 @@ -53,67 +53,6 @@ extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; @@ -79,7 +79,7 @@ typedef struct _SUBCLASSPROCS { SUBCLASSPROC subproc; diff -pudN e:\wine\dlls\comctl32/commctrl.c e:\reactos\dll\win32\comctl32/commctrl.c ---- e:\wine\dlls\comctl32/commctrl.c 2016-05-31 18:00:02 +0100 +--- e:\wine\dlls\comctl32/commctrl.c 2016-08-14 19:11:25 +0100 +++ e:\reactos\dll\win32\comctl32/commctrl.c 2016-03-01 20:00:53 +0100 @@ -60,6 +60,19 @@ @@ -333,8 +333,8 @@ + return TRUE; +} diff -pudN e:\wine\dlls\comctl32/imagelist.c e:\reactos\dll\win32\comctl32/imagelist.c ---- e:\wine\dlls\comctl32/imagelist.c 2016-05-31 18:00:02 +0100 -+++ e:\reactos\dll\win32\comctl32/imagelist.c 2016-06-05 19:39:00 +0100 +--- e:\wine\dlls\comctl32/imagelist.c 2016-08-14 19:11:25 +0100 ++++ e:\reactos\dll\win32\comctl32/imagelist.c 2016-08-18 12:03:13 +0100 @@ -33,7 +33,7 @@ * * TODO: @@ -504,8 +504,8 @@ Common subdirectories: e:\wine\dlls\comctl32/lang and e:\reactos\dll\win32\comctl32/lang diff -pudN e:\wine\dlls\comctl32/listview.c e:\reactos\dll\win32\comctl32/listview.c ---- e:\wine\dlls\comctl32/listview.c 2016-05-31 18:00:02 +0100 -+++ e:\reactos\dll\win32\comctl32/listview.c 2016-06-05 19:39:00 +0100 +--- e:\wine\dlls\comctl32/listview.c 2016-08-14 19:11:25 +0100 ++++ e:\reactos\dll\win32\comctl32/listview.c 2016-08-18 12:03:13 +0100 @@ -287,6 +287,9 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; @@ -516,7 +516,7 @@ /* font */ HFONT hDefaultFont; -@@ -1678,8 +1681,24 @@ static inline BOOL LISTVIEW_GetItemW(con +@@ -1696,8 +1699,24 @@ static inline BOOL LISTVIEW_GetItemW(con /* used to handle collapse main item column case */ static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc) { @@ -541,7 +541,7 @@ } /* Listview invalidation functions: use _only_ these functions to invalidate */ -@@ -4671,7 +4690,12 @@ static void LISTVIEW_DrawItemPart(LISTVI +@@ -4688,7 +4707,12 @@ static void LISTVIEW_DrawItemPart(LISTVI if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) rcLabel.bottom--; @@ -555,7 +555,7 @@ } /*** -@@ -5212,7 +5236,11 @@ enddraw: +@@ -5232,7 +5256,11 @@ enddraw: /* Draw marquee rectangle if appropriate */ if (infoPtr->bMarqueeSelect) @@ -567,7 +567,7 @@ if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); -@@ -8013,6 +8041,9 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW +@@ -8035,6 +8063,9 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW { TRACE("(color=%x)\n", color); @@ -577,7 +577,7 @@ if(infoPtr->clrBk != color) { if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); infoPtr->clrBk = color; -@@ -8688,7 +8719,7 @@ static DWORD LISTVIEW_SetIconSpacing(LIS +@@ -8710,7 +8741,7 @@ static DWORD LISTVIEW_SetIconSpacing(LIS return oldspacing; } @@ -586,7 +586,7 @@ { INT cx, cy; -@@ -8699,8 +8730,8 @@ static inline void set_icon_size(SIZE *s +@@ -8721,8 +8752,8 @@ static inline void set_icon_size(SIZE *s } else { @@ -597,7 +597,7 @@ } } -@@ -9435,6 +9466,9 @@ static LRESULT LISTVIEW_NCCreate(HWND hw +@@ -9458,6 +9489,9 @@ static LRESULT LISTVIEW_NCCreate(HWND hw infoPtr->clrText = CLR_DEFAULT; infoPtr->clrTextBk = CLR_DEFAULT; LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); @@ -607,7 +607,7 @@ /* set default values */ infoPtr->nFocusedItem = -1; -@@ -11718,6 +11752,14 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg +@@ -11741,6 +11775,14 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); @@ -622,9 +622,22 @@ return 0; /* case WM_TIMER: */ +diff -pudN e:\wine\dlls\comctl32/monthcal.c e:\reactos\dll\win32\comctl32/monthcal.c +--- e:\wine\dlls\comctl32/monthcal.c 2016-08-14 19:11:25 +0100 ++++ e:\reactos\dll\win32\comctl32/monthcal.c 2016-08-18 12:03:13 +0100 +@@ -43,6 +43,9 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(monthcal); + ++/* FIXME: Inspect */ ++#define MCS_NOSELCHANGEONNAV 0x0100 ++ + #define MC_SEL_LBUTUP 1 /* Left button released */ + #define MC_SEL_LBUTDOWN 2 /* Left button pressed in calendar */ + #define MC_PREVPRESSED 4 /* Prev month button pressed */ diff -pudN e:\wine\dlls\comctl32/propsheet.c e:\reactos\dll\win32\comctl32/propsheet.c ---- e:\wine\dlls\comctl32/propsheet.c 2016-05-31 18:00:02 +0100 -+++ e:\reactos\dll\win32\comctl32/propsheet.c 2016-06-05 19:39:01 +0100 +--- e:\wine\dlls\comctl32/propsheet.c 2016-08-14 19:11:25 +0100 ++++ e:\reactos\dll\win32\comctl32/propsheet.c 2016-08-18 12:03:14 +0100 @@ -2355,12 +2355,19 @@ static void PROPSHEET_SetWizButtons(HWND HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); @@ -680,8 +693,8 @@ /****************************************************************************** diff -pudN e:\wine\dlls\comctl32/rebar.c e:\reactos\dll\win32\comctl32/rebar.c ---- e:\wine\dlls\comctl32/rebar.c 2016-05-31 18:00:02 +0100 -+++ e:\reactos\dll\win32\comctl32/rebar.c 2016-06-05 19:39:01 +0100 +--- e:\wine\dlls\comctl32/rebar.c 2016-08-14 19:11:25 +0100 ++++ e:\reactos\dll\win32\comctl32/rebar.c 2016-08-18 12:03:14 +0100 @@ -50,7 +50,6 @@ * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN @@ -690,7 +703,7 @@ * - WM_VKEYTOITEM * - WM_WININICHANGE * Notifications: -@@ -1821,16 +1820,43 @@ static LRESULT REBAR_EraseBkGnd (const R +@@ -1819,16 +1818,43 @@ static LRESULT REBAR_EraseBkGnd (const R RECT cr; COLORREF old = CLR_NONE, new; HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); @@ -734,7 +747,7 @@ /* draw band separator between rows */ if (lpBand->iRow != oldrow) { oldrow = lpBand->iRow; -@@ -1855,6 +1881,9 @@ static LRESULT REBAR_EraseBkGnd (const R +@@ -1853,6 +1879,9 @@ static LRESULT REBAR_EraseBkGnd (const R } TRACE ("drawing band separator bottom (%s)\n", wine_dbgstr_rect(&rcRowSep)); @@ -744,7 +757,7 @@ } } -@@ -1865,6 +1894,9 @@ static LRESULT REBAR_EraseBkGnd (const R +@@ -1863,6 +1892,9 @@ static LRESULT REBAR_EraseBkGnd (const R if (infoPtr->dwStyle & CCS_VERT) { rcSep.bottom = rcSep.top; rcSep.top -= SEP_WIDTH_SIZE; @@ -754,7 +767,7 @@ if (theme) DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcSep, EDGE_ETCHED, BF_BOTTOM, NULL); else -@@ -1873,6 +1905,9 @@ static LRESULT REBAR_EraseBkGnd (const R +@@ -1871,6 +1903,9 @@ static LRESULT REBAR_EraseBkGnd (const R else { rcSep.right = rcSep.left; rcSep.left -= SEP_WIDTH_SIZE; @@ -764,7 +777,7 @@ if (theme) DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcSep, EDGE_ETCHED, BF_RIGHT, NULL); else -@@ -1903,6 +1938,9 @@ static LRESULT REBAR_EraseBkGnd (const R +@@ -1901,6 +1936,9 @@ static LRESULT REBAR_EraseBkGnd (const R #endif } @@ -774,7 +787,7 @@ if (theme) { /* When themed, the background color is ignored (but not a -@@ -1910,6 +1948,7 @@ static LRESULT REBAR_EraseBkGnd (const R +@@ -1908,6 +1946,7 @@ static LRESULT REBAR_EraseBkGnd (const R DrawThemeBackground (theme, hdc, 0, 0, &cr, &rcBand); } else @@ -782,7 +795,7 @@ { old = SetBkColor (hdc, new); TRACE("%s background color=0x%06x, band %s\n", -@@ -1920,7 +1959,26 @@ static LRESULT REBAR_EraseBkGnd (const R +@@ -1918,7 +1957,26 @@ static LRESULT REBAR_EraseBkGnd (const R if (lpBand->clrBack != CLR_NONE) SetBkColor (hdc, old); } @@ -792,7 +805,7 @@ + CombineRgn(hrgn, hrgn, hrgnBand, RGN_DIFF); + DeleteObject(hrgnBand); +#endif -+ } + } + +#if 1 +#ifdef __REACTOS__ @@ -804,12 +817,12 @@ + FillRgn(hdc, hrgn, hbrush); + DeleteObject(hbrush); + DeleteObject(hrgn); - } ++ } +#endif return TRUE; } -@@ -2889,12 +2947,26 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT +@@ -2887,12 +2945,26 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT static LRESULT @@ -836,7 +849,7 @@ return TRUE; } -@@ -3201,7 +3273,11 @@ REBAR_NCCalcSize (const REBAR_INFO *info +@@ -3199,7 +3271,11 @@ REBAR_NCCalcSize (const REBAR_INFO *info else if ((theme = GetWindowTheme (infoPtr->hwndSelf))) { /* FIXME: should use GetThemeInt */ @@ -848,7 +861,7 @@ } TRACE("new client=(%s)\n", wine_dbgstr_rect(rect)); return 0; -@@ -3302,7 +3365,11 @@ REBAR_NCHitTest (const REBAR_INFO *infoP +@@ -3300,7 +3376,11 @@ REBAR_NCHitTest (const REBAR_INFO *infoP (INT *)&nmmouse.dwItemSpec); nmmouse.dwItemData = 0; nmmouse.pt = clpt; @@ -860,7 +873,7 @@ if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) { TRACE("notify changed return value from %ld to %d\n", ret, i); -@@ -3374,6 +3441,9 @@ REBAR_Paint (const REBAR_INFO *infoPtr, +@@ -3372,6 +3452,9 @@ REBAR_Paint (const REBAR_INFO *infoPtr, { if (hdc) { TRACE("painting\n"); @@ -870,7 +883,7 @@ REBAR_Refresh (infoPtr, hdc); } else { PAINTSTRUCT ps; -@@ -3652,7 +3728,11 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, +@@ -3650,7 +3733,11 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, return REBAR_ShowBand (infoPtr, wParam, lParam); case RB_SIZETORECT: @@ -882,7 +895,7 @@ /* Messages passed to parent */ -@@ -3735,6 +3815,11 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, +@@ -3733,6 +3820,11 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); @@ -895,8 +908,8 @@ /* case WM_VKEYTOITEM: supported according to ControlSpy */ diff -pudN e:\wine\dlls\comctl32/toolbar.c e:\reactos\dll\win32\comctl32/toolbar.c ---- e:\wine\dlls\comctl32/toolbar.c 2016-05-31 18:00:02 +0100 -+++ e:\reactos\dll\win32\comctl32/toolbar.c 2016-06-05 19:39:01 +0100 +--- e:\wine\dlls\comctl32/toolbar.c 2016-08-14 19:11:25 +0100 ++++ e:\reactos\dll\win32\comctl32/toolbar.c 2016-08-18 12:03:14 +0100 @@ -33,11 +33,9 @@ * - TBSTYLE_REGISTERDROP * - TBSTYLE_EX_DOUBLEBUFFER @@ -1056,7 +1069,7 @@ } /* get a pointer to the text */ -@@ -1028,7 +1092,11 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * +@@ -1027,7 +1091,11 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * } } @@ -1068,7 +1081,7 @@ { int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; int stateId = TS_NORMAL; -@@ -1045,7 +1113,12 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * +@@ -1044,7 +1112,12 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); } @@ -1081,7 +1094,7 @@ TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); if (drawSepDropDownArrow) -@@ -1571,9 +1644,14 @@ static inline SIZE TOOLBAR_MeasureButton +@@ -1570,9 +1643,14 @@ static inline SIZE TOOLBAR_MeasureButton /* ... add on the necessary padding */ if (bValidImageList) { @@ -1096,7 +1109,7 @@ sizeButton.cy += LISTPAD_CY; } else -@@ -1590,7 +1668,11 @@ static inline SIZE TOOLBAR_MeasureButton +@@ -1589,7 +1667,11 @@ static inline SIZE TOOLBAR_MeasureButton { if (bHasBitmap) { @@ -1108,7 +1121,7 @@ if (sizeString.cy > 0) sizeButton.cy += 1 + sizeString.cy; sizeButton.cx = infoPtr->szPadding.cx + -@@ -1695,7 +1777,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *info +@@ -1694,7 +1776,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *info { if (btnPtr->cx) cx = btnPtr->cx; @@ -1123,7 +1136,7 @@ { SIZE sz; HDC hdc; -@@ -1954,6 +2043,17 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND h +@@ -1953,6 +2042,17 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND h SendMessageW (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg); } @@ -1141,7 +1154,7 @@ static void TOOLBAR_TooltipAddTool(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button) { -@@ -3535,6 +3635,36 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO * +@@ -3534,6 +3634,36 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO * return TRUE; } @@ -1178,7 +1191,7 @@ /* << TOOLBAR_GetObject >> */ -@@ -4790,6 +4920,44 @@ TOOLBAR_SetMaxTextRows (TOOLBAR_INFO *in +@@ -4789,6 +4919,44 @@ TOOLBAR_SetMaxTextRows (TOOLBAR_INFO *in return TRUE; } @@ -1223,7 +1236,7 @@ /* MSDN gives slightly wrong info on padding. * 1. It is not only used on buttons with the BTNS_AUTOSIZE style -@@ -6030,6 +6198,10 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wPar +@@ -6029,6 +6197,10 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wPar infoPtr->clrBtnShadow = CLR_DEFAULT; infoPtr->szPadding.cx = DEFPAD_CX; infoPtr->szPadding.cy = DEFPAD_CY; @@ -1234,7 +1247,7 @@ infoPtr->iListGap = DEFLISTGAP; infoPtr->iTopMargin = default_top_margin(infoPtr); infoPtr->dwStyle = lpcs->style; -@@ -6439,7 +6611,7 @@ TOOLBAR_SysColorChange (void) +@@ -6438,7 +6610,7 @@ TOOLBAR_SysColorChange (void) return 0; } @@ -1243,7 +1256,7 @@ /* update theme after a WM_THEMECHANGED message */ static LRESULT theme_changed (HWND hwnd) { -@@ -6448,7 +6620,7 @@ static LRESULT theme_changed (HWND hwnd) +@@ -6447,7 +6619,7 @@ static LRESULT theme_changed (HWND hwnd) OpenThemeData (hwnd, themeClass); return 0; } @@ -1252,7 +1265,7 @@ static LRESULT WINAPI ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -@@ -6553,6 +6725,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6552,6 +6724,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, case TB_GETMAXSIZE: return TOOLBAR_GetMaxSize (infoPtr, (LPSIZE)lParam); @@ -1263,7 +1276,7 @@ /* case TB_GETOBJECT: */ /* 4.71 */ -@@ -6694,6 +6870,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6693,6 +6869,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, case TB_SETMAXTEXTROWS: return TOOLBAR_SetMaxTextRows (infoPtr, wParam); @@ -1275,7 +1288,7 @@ case TB_SETPADDING: return TOOLBAR_SetPadding (infoPtr, lParam); -@@ -6835,7 +7016,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6834,7 +7015,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, return TOOLBAR_SysColorChange (); case WM_THEMECHANGED: @@ -1288,9 +1301,9 @@ /* case WM_WININICHANGE: */ diff -pudN e:\wine\dlls\comctl32/tooltips.c e:\reactos\dll\win32\comctl32/tooltips.c ---- e:\wine\dlls\comctl32/tooltips.c 2016-05-31 18:00:02 +0100 -+++ e:\reactos\dll\win32\comctl32/tooltips.c 2016-06-05 19:39:01 +0100 -@@ -2013,7 +2013,36 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO +--- e:\wine\dlls\comctl32/tooltips.c 2016-08-14 19:11:25 +0100 ++++ e:\reactos\dll\win32\comctl32/tooltips.c 2016-08-18 12:03:14 +0100 +@@ -2009,7 +2009,36 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO static LRESULT TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { @@ -1328,8 +1341,8 @@ return 0; } diff -pudN e:\wine\dlls\comctl32/treeview.c e:\reactos\dll\win32\comctl32/treeview.c ---- e:\wine\dlls\comctl32/treeview.c 2016-05-31 18:00:02 +0100 -+++ e:\reactos\dll\win32\comctl32/treeview.c 2016-03-01 20:00:54 +0100 +--- e:\wine\dlls\comctl32/treeview.c 2016-08-14 19:11:25 +0100 ++++ e:\reactos\dll\win32\comctl32/treeview.c 2016-08-18 12:03:14 +0100 @@ -2888,7 +2888,14 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, } } Modified: trunk/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/draglis… ============================================================================== --- trunk/reactos/dll/win32/comctl32/draglist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/draglist.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -255,7 +255,7 @@ RedrawWindow(hwndParent, &data->last_drag_icon_rect, NULL, RDW_INTERNALPAINT | RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); - CopyRect(&data->last_drag_icon_rect, &rcDragIcon); + data->last_drag_icon_rect = rcDragIcon; if (nItem >= 0) { Modified: trunk/reactos/dll/win32/comctl32/dsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dsa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/dsa.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -259,6 +259,9 @@ nNewItems = hdsa->nMaxCount + hdsa->nGrow; nSize = hdsa->nItemSize * nNewItems; + if (nSize / hdsa->nItemSize != nNewItems) + return -1; + lpTemp = ReAlloc (hdsa->pData, nSize); if (!lpTemp) return -1; Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -2254,7 +2254,7 @@ /* helper for ImageList_Read, see comments below */ -static void *read_bitmap(LPSTREAM pstm, BITMAPINFO *bmi) +static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi) { BITMAPFILEHEADER bmfh; int bitsperpixel, palspace; @@ -2330,7 +2330,7 @@ * * BYTE maskbits[imagesize]; */ -HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) +HIMAGELIST WINAPI ImageList_Read(IStream *pstm) { char image_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; char mask_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; @@ -3064,8 +3064,7 @@ /* helper for ImageList_Write - write bitmap to pstm * currently everything is written as 24 bit RGB, except masks */ -static BOOL -_write_bitmap(HBITMAP hBitmap, LPSTREAM pstm) +static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) { LPBITMAPFILEHEADER bmfh; LPBITMAPINFOHEADER bmih; @@ -3151,8 +3150,7 @@ * probably. */ -BOOL WINAPI -ImageList_Write (HIMAGELIST himl, LPSTREAM pstm) +BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm) { ILHEAD ilHead; int i; @@ -3558,7 +3556,9 @@ if (!ImageList_GetImageInfo(imgl, i, &info)) return E_FAIL; - return CopyRect(prc, &info.rcImage) ? S_OK : E_FAIL; + *prc = info.rcImage; + + return S_OK; } static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList2 *iface, int *cx, Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -572,23 +572,28 @@ if (pScrollInfo == NULL) return "(null)"; len = snprintf(buf, size, "{cbSize=%u, ", pScrollInfo->cbSize); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_RANGE) len = snprintf(buf, size, "nMin=%d, nMax=%d, ", pScrollInfo->nMin, pScrollInfo->nMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_PAGE) len = snprintf(buf, size, "nPage=%u, ", pScrollInfo->nPage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_POS) len = snprintf(buf, size, "nPos=%d, ", pScrollInfo->nPos); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_TRACKPOS) len = snprintf(buf, size, "nTrackPos=%d, ", pScrollInfo->nTrackPos); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text); @@ -613,27 +618,33 @@ if (lpLVItem == NULL) return "(null)"; len = snprintf(buf, size, "{iItem=%d, iSubItem=%d, ", lpLVItem->iItem, lpLVItem->iSubItem); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_STATE) len = snprintf(buf, size, "state=%x, stateMask=%x, ", lpLVItem->state, lpLVItem->stateMask); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_TEXT) len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpLVItem->pszText, isW, 80), lpLVItem->cchTextMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_IMAGE) len = snprintf(buf, size, "iImage=%d, ", lpLVItem->iImage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_PARAM) len = snprintf(buf, size, "lParam=%lx, ", lpLVItem->lParam); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_INDENT) len = snprintf(buf, size, "iIndent=%d, ", lpLVItem->iIndent); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text); @@ -649,31 +660,38 @@ if (lpColumn == NULL) return "(null)"; len = snprintf(buf, size, "{"); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_SUBITEM) len = snprintf(buf, size, "iSubItem=%d, ", lpColumn->iSubItem); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_FMT) len = snprintf(buf, size, "fmt=%x, ", lpColumn->fmt); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_WIDTH) len = snprintf(buf, size, "cx=%d, ", lpColumn->cx); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_TEXT) len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpColumn->pszText, isW, 80), lpColumn->cchTextMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_IMAGE) len = snprintf(buf, size, "iImage=%d, ", lpColumn->iImage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_ORDER) len = snprintf(buf, size, "iOrder=%d, ", lpColumn->iOrder); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text); @@ -3856,9 +3874,8 @@ iterator_frameditems_absolute(&old_elems, infoPtr, &infoPtr->marqueeRect); - CopyRect(&infoPtr->marqueeRect, &rect); - - CopyRect(&infoPtr->marqueeDrawRect, &rect); + infoPtr->marqueeRect = rect; + infoPtr->marqueeDrawRect = rect; OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); @@ -5629,8 +5646,8 @@ TRACE("nColumn=%d\n", nColumn); - if (nColumn < 0 || DPA_GetPtrCount(infoPtr->hdpaColumns) == 0 - || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; + if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) + return FALSE; /* While the MSDN specifically says that column zero should not be deleted, what actually happens is that the column itself is deleted but no items or subitems @@ -5871,13 +5888,15 @@ { DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit); - if (len) + if (len++) { - if ((pszText = Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR))))) - { - if (isW) GetWindowTextW(infoPtr->hwndEdit, pszText, len+1); - else GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len+1); - } + if (!(pszText = Alloc(len * (isW ? sizeof(WCHAR) : sizeof(CHAR))))) + return FALSE; + + if (isW) + GetWindowTextW(infoPtr->hwndEdit, pszText, len); + else + GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len); } } @@ -9064,7 +9083,8 @@ TRACE("(nIndex=%d)\n", nIndex); - infoPtr->nSelectionMark = nIndex; + if (nIndex >= -1 && nIndex < infoPtr->nItemCount) + infoPtr->nSelectionMark = nIndex; return nOldIndex; } Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -42,6 +42,9 @@ #include "comctl32.h" WINE_DEFAULT_DEBUG_CHANNEL(monthcal); + +/* FIXME: Inspect */ +#define MCS_NOSELCHANGEONNAV 0x0100 #define MC_SEL_LBUTUP 1 /* Left button released */ #define MC_SEL_LBUTDOWN 2 /* Left button pressed in calendar */ @@ -1953,7 +1956,7 @@ } /* no valid range check performed */ -static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) +static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta, BOOL keep_selection) { INT i, selIdx = -1; @@ -1966,8 +1969,11 @@ MONTHCAL_GetMonth(&infoPtr->calendars[i].month, delta); } + if (keep_selection) + return; + /* selection is always shifted to first calendar */ - if(infoPtr->dwStyle & MCS_MULTISELECT) + if (infoPtr->dwStyle & MCS_MULTISELECT) { SYSTEMTIME range[2]; @@ -1988,6 +1994,7 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direction) { INT delta = infoPtr->delta ? infoPtr->delta : MONTHCAL_GetCalCount(infoPtr); + BOOL keep_selection; SYSTEMTIME st; TRACE("%s\n", direction == DIRECTION_BACKWARD ? "back" : "fwd"); @@ -2006,9 +2013,11 @@ if(!MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) return; - MONTHCAL_Scroll(infoPtr, direction == DIRECTION_BACKWARD ? -delta : delta); + keep_selection = infoPtr->dwStyle & MCS_NOSELCHANGEONNAV; + MONTHCAL_Scroll(infoPtr, direction == DIRECTION_BACKWARD ? -delta : delta, keep_selection); MONTHCAL_NotifyDayState(infoPtr); - MONTHCAL_NotifySelectionChange(infoPtr); + if (!keep_selection) + MONTHCAL_NotifySelectionChange(infoPtr); } static LRESULT @@ -2196,7 +2205,7 @@ if (MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) { - MONTHCAL_Scroll(infoPtr, delta); + MONTHCAL_Scroll(infoPtr, delta, FALSE); MONTHCAL_NotifyDayState(infoPtr); MONTHCAL_NotifySelectionChange(infoPtr); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); @@ -2835,7 +2844,7 @@ if (hdr->hwndFrom == infoPtr->hWndYearUpDown && nmud->iDelta) { /* year value limits are set up explicitly after updown creation */ - MONTHCAL_Scroll(infoPtr, 12 * nmud->iDelta); + MONTHCAL_Scroll(infoPtr, 12 * nmud->iDelta, FALSE); MONTHCAL_NotifyDayState(infoPtr); MONTHCAL_NotifySelectionChange(infoPtr); } Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres… ============================================================================== --- trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -344,7 +344,7 @@ DrawThemeParentBackground (infoPtr->Self, hdc, NULL); DrawThemeBackground (pdi.theme, hdc, part, 0, &pdi.rect, NULL); SelectClipRgn (hdc, NULL); - CopyRect (&pdi.rect, &cntRect); + pdi.rect = cntRect; } /* compute some drawing parameters */ Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -3268,7 +3268,7 @@ if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) { hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); - CopyRect(&r, &rzone); + r = rzone; if (bm.bmWidth < r.right) { r.left = bm.bmWidth; Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -714,8 +714,7 @@ lpBand->fDraw |= DRAW_GRIPPER; lpBand->rcGripper.left += REBAR_PRE_GRIPPER; lpBand->rcGripper.right = lpBand->rcGripper.left + GRIPPER_WIDTH; - lpBand->rcGripper.top += 2; - lpBand->rcGripper.bottom -= 2; + InflateRect(&lpBand->rcGripper, 0, -2); SetRect (&lpBand->rcCapImage, lpBand->rcGripper.right+REBAR_ALWAYS_SPACE, lpBand->rcBand.top, @@ -843,8 +842,7 @@ } else { /* horizontal gripper */ - lpBand->rcGripper.left += 2; - lpBand->rcGripper.right -= 2; + InflateRect(&lpBand->rcGripper, -2, 0); lpBand->rcGripper.top += REBAR_PRE_GRIPPER; lpBand->rcGripper.bottom = lpBand->rcGripper.top + GRIPPER_WIDTH; @@ -1557,7 +1555,7 @@ GetClientRect(infoPtr->hwndSelf, &rcNew); GetClientRect(infoPtr->hwndSelf, &autosize.rcTarget); - autosize.fChanged = (memcmp(&rc, &rcNew, sizeof(RECT)) == 0); + autosize.fChanged = EqualRect(&rc, &rcNew); autosize.rcTarget = rc; autosize.rcActual = rcNew; REBAR_Notify((NMHDR *)&autosize, infoPtr, RBN_AUTOSIZE); @@ -2434,7 +2432,7 @@ lpBand = REBAR_GetBand(infoPtr, iBand); /* For CCS_VERT the coordinates will be swapped - like on Windows */ - CopyRect (lprc, &lpBand->rcBand); + *lprc = lpBand->rcBand; TRACE("band %d, (%s)\n", iBand, wine_dbgstr_rect(lprc)); Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/status.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/status.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -114,8 +114,8 @@ * textHeight pixels large */ HDC hdc = GetDC(infoPtr->Self); RECT r; - memset (&r, 0, sizeof (r)); - r.bottom = max(infoPtr->minHeight, tm.tmHeight); + + SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) { height = r.bottom - r.top; Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tab.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -357,14 +357,8 @@ (itemIndex < infoPtr->leftmostVisible))) { TRACE("Not Visible\n"); - /* need to initialize these to empty rects */ - if (itemRect) - { - memset(itemRect,0,sizeof(RECT)); - itemRect->bottom = infoPtr->tabHeight; - } - if (selectedRect) - memset(selectedRect,0,sizeof(RECT)); + SetRect(itemRect, 0, 0, 0, infoPtr->tabHeight); + SetRectEmpty(selectedRect); return FALSE; } @@ -444,7 +438,7 @@ /* Now, calculate the position of the item as if it were selected. */ if (selectedRect!=NULL) { - CopyRect(selectedRect, itemRect); + *selectedRect = *itemRect; /* The rectangle of a selected item is a bit wider. */ if(infoPtr->dwStyle & TCS_VERTICAL) @@ -1595,12 +1589,7 @@ } } else - { - drawRect->left += 2; - drawRect->top += 2; - drawRect->right -= 2; - drawRect->bottom -= 2; - } + InflateRect(drawRect, -2, -2); } else { @@ -1609,8 +1598,7 @@ if (iItem != infoPtr->iSelected) { drawRect->left += 2; - drawRect->top += 2; - drawRect->bottom -= 2; + InflateRect(drawRect, 0, -2); } } else if (infoPtr->dwStyle & TCS_VERTICAL) @@ -1621,9 +1609,8 @@ } else { - drawRect->top += 2; drawRect->right -= 2; - drawRect->bottom -= 2; + InflateRect(drawRect, 0, -2); } } else if (infoPtr->dwStyle & TCS_BOTTOM) @@ -1706,10 +1693,7 @@ drawRect->top += 2; drawRect->right -= 1; if ( iItem == infoPtr->iSelected ) - { - drawRect->right -= 1; - drawRect->left += 1; - } + InflateRect(drawRect, -1, 0); id = (UINT)GetWindowLongPtrW( infoPtr->hwnd, GWLP_ID ); @@ -1725,7 +1709,7 @@ dis.itemState |= ODS_FOCUS; dis.hwndItem = infoPtr->hwnd; dis.hDC = hdc; - CopyRect(&dis.rcItem,drawRect); + dis.rcItem = *drawRect; /* when extra data fits ULONG_PTR, store it directly */ if (infoPtr->cbInfo > sizeof(LPARAM)) Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -265,8 +265,7 @@ if (text) { - textRect.left += 2; - textRect.right -= 2; + InflateRect(&textRect, -2, 0); DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); HeapFree(GetProcessHeap(), 0, text); } Modified: trunk/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_combo.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -69,7 +69,7 @@ /* * Give ourselves some space. */ - CopyRect (&rectEdit, &cbi->rcItem); + rectEdit = cbi->rcItem; InflateRect( &rectEdit, -1, -1 ); if(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) @@ -176,8 +176,7 @@ GetClientRect (hwnd, &frameRect); else { - CopyRect (&frameRect, &cbi.rcItem); - + frameRect = cbi.rcItem; InflateRect(&frameRect, EDIT_CONTROL_PADDING + COMBO_XBORDERSIZE, EDIT_CONTROL_PADDING + COMBO_YBORDERSIZE); Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -925,7 +925,7 @@ HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); rc = btnPtr->rect; - CopyRect (&rcArrow, &rc); + rcArrow = rc; /* separator - doesn't send NM_CUSTOMDRAW */ if (btnPtr->fsStyle & BTNS_SEP) { @@ -979,8 +979,8 @@ /* copy text & bitmap rects after adjusting for drop-down arrow * so that text & bitmap is centered in the rectangle not containing * the arrow */ - CopyRect(&rcText, &rc); - CopyRect(&rcBitmap, &rc); + rcText = rc; + rcBitmap = rc; /* Center the bitmap horizontally and vertically */ if (dwStyle & TBSTYLE_LIST) @@ -1007,8 +1007,7 @@ /* calculate text position */ if (lpText) { - rcText.left += GetSystemMetrics(SM_CXEDGE); - rcText.right -= GetSystemMetrics(SM_CXEDGE); + InflateRect(&rcText, -GetSystemMetrics(SM_CXEDGE), 0); if (dwStyle & TBSTYLE_LIST) { rcText.left += infoPtr->nBitmapWidth + infoPtr->iListGap + 2; @@ -2734,9 +2733,9 @@ lpdis->rcItem.right, lpdis->rcItem.bottom); /* calculate button and text rectangles */ - CopyRect (&rcButton, &lpdis->rcItem); + rcButton = lpdis->rcItem; InflateRect (&rcButton, -1, -1); - CopyRect (&rcText, &rcButton); + rcText = rcButton; rcButton.right = rcButton.left + custInfo->tbInfo->nBitmapWidth + 6; rcText.left = rcButton.right + 2; @@ -5704,7 +5703,7 @@ RECT arrowRect; infoPtr->nOldHit = nHit; - CopyRect(&arrowRect, &btnPtr->rect); + arrowRect = btnPtr->rect; arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH); /* for EX_DRAWDDARROWS style, click must be in the drop-down arrow rect */ Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -1321,12 +1321,10 @@ static LRESULT -TOOLTIPS_GetMargin (const TOOLTIPS_INFO *infoPtr, LPRECT lpRect) -{ - lpRect->left = infoPtr->rcMargin.left; - lpRect->right = infoPtr->rcMargin.right; - lpRect->bottom = infoPtr->rcMargin.bottom; - lpRect->top = infoPtr->rcMargin.top; +TOOLTIPS_GetMargin (const TOOLTIPS_INFO *infoPtr, RECT *rect) +{ + if (rect) + *rect = infoPtr->rcMargin; return 0; } @@ -1598,12 +1596,10 @@ static LRESULT -TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *lpRect) -{ - infoPtr->rcMargin.left = lpRect->left; - infoPtr->rcMargin.right = lpRect->right; - infoPtr->rcMargin.bottom = lpRect->bottom; - infoPtr->rcMargin.top = lpRect->top; +TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *rect) +{ + if (rect) + infoPtr->rcMargin = *rect; return 0; } Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -32,6 +32,8 @@ #include "comctl32.h" +#include <math.h> + WINE_DEFAULT_DEBUG_CHANNEL(trackbar); typedef struct @@ -188,7 +190,7 @@ pos = infoPtr->lRangeMin; TRACE("%.2f\n", pos); - return (LONG)(pos + 0.5); + return (LONG)floor(pos + 0.5); } @@ -936,8 +938,11 @@ if (GetWindowTheme (infoPtr->hwndSelf)) { DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); } - else - FillRect (hdc, &rcClient, GetSysColorBrush(COLOR_BTNFACE)); + else { + HBRUSH brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); + FillRect (hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); + } if (gcdrf != CDRF_DODEFAULT) notify_customdraw(infoPtr, &nmcd, CDDS_POSTERASE); } @@ -1230,21 +1235,21 @@ infoPtr->lRangeMin = (SHORT)LOWORD(range); infoPtr->lRangeMax = (SHORT)HIWORD(range); - if (infoPtr->lPos < infoPtr->lRangeMin) { + /* clip position to new min/max limit */ + if (infoPtr->lPos < infoPtr->lRangeMin) infoPtr->lPos = infoPtr->lRangeMin; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } - - if (infoPtr->lPos > infoPtr->lRangeMax) { + + if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) - TRACKBAR_RecalculateTics (infoPtr); + if (changed) { + if (infoPtr->dwStyle & TBS_AUTOTICKS) + TRACKBAR_RecalculateTics (infoPtr); + infoPtr->flags |= TB_THUMBPOSCHANGED; + } if (redraw) TRACKBAR_InvalidateAll(infoPtr); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -3621,7 +3621,7 @@ return item; } -static LRESULT +static TREEVIEW_ITEM * TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) { TREEVIEW_ITEM *item; @@ -3656,14 +3656,14 @@ if (status) { lpht->flags = status; - return 0; + return NULL; } item = TREEVIEW_HitTestPoint(infoPtr, lpht->pt); if (!item) { lpht->flags = TVHT_NOWHERE; - return 0; + return NULL; } if (x >= item->textOffset + item->textWidth) @@ -3694,7 +3694,7 @@ lpht->hItem = item; TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags); - return (LRESULT)item; + return item; } /* Item Label Editing ***************************************************/ @@ -4117,7 +4117,7 @@ hit.pt.x = (short)LOWORD(lParam); hit.pt.y = (short)HIWORD(lParam); - item = (TREEVIEW_ITEM *)TREEVIEW_HitTest(infoPtr, &hit); + item = TREEVIEW_HitTest(infoPtr, &hit); if (!item) return 0; TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, item)); @@ -5317,9 +5317,9 @@ static LRESULT TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) { - POINT pt; TRACKMOUSEEVENT trackinfo; TREEVIEW_ITEM * item; + TVHITTESTINFO ht; if (!(infoPtr->dwStyle & TVS_TRACKSELECT)) return 0; @@ -5344,18 +5344,21 @@ _TrackMouseEvent(&trackinfo); } - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - - item = TREEVIEW_HitTestPoint(infoPtr, pt); - - if (item != infoPtr->hotItem) + ht.pt.x = (short)LOWORD(lParam); + ht.pt.y = (short)HIWORD(lParam); + + item = TREEVIEW_HitTest(infoPtr, &ht); + if ((item != infoPtr->hotItem) || !(ht.flags & TVHT_ONITEM)) { /* redraw old hot item */ TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); - infoPtr->hotItem = item; - /* redraw new hot item */ - TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + infoPtr->hotItem = NULL; + if (item && (ht.flags & TVHT_ONITEM)) + { + infoPtr->hotItem = item; + /* redraw new hot item */ + TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + } } return 0; @@ -5494,14 +5497,14 @@ static LRESULT TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - POINT pt; TREEVIEW_ITEM * item; + TVHITTESTINFO ht; NMMOUSE nmmouse; - GetCursorPos(&pt); - ScreenToClient(infoPtr->hwnd, &pt); - - item = TREEVIEW_HitTestPoint(infoPtr, pt); + GetCursorPos(&ht.pt); + ScreenToClient(infoPtr->hwnd, &ht.pt); + + item = TREEVIEW_HitTest(infoPtr, &ht); memset(&nmmouse, 0, sizeof(nmmouse)); if (item) @@ -5515,7 +5518,7 @@ if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; - if (item && (infoPtr->dwStyle & TVS_TRACKSELECT)) + if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && (ht.flags & TVHT_ONITEM)) { SetCursor(infoPtr->hcurHand); return 0; @@ -5659,7 +5662,7 @@ return TREEVIEW_GetVisibleCount(infoPtr); case TVM_HITTEST: - return TREEVIEW_HitTest(infoPtr, (LPTVHITTESTINFO)lParam); + return (LRESULT)TREEVIEW_HitTest(infoPtr, (TVHITTESTINFO*)lParam); case TVM_INSERTITEMA: case TVM_INSERTITEMW: @@ -5735,6 +5738,7 @@ return TREEVIEW_HScroll(infoPtr, wParam); case WM_KEYDOWN: + case WM_SYSKEYDOWN: return TREEVIEW_KeyDown(infoPtr, wParam); case WM_KILLFOCUS: @@ -5798,8 +5802,6 @@ case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); return 0; - - /* WM_SYSKEYDOWN */ case WM_TIMER: return TREEVIEW_HandleTimer(infoPtr, wParam); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 11:09:45 2016 @@ -54,7 +54,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-1.9.16 reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 -reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.16 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 reactos/dll/win32/credui # Synced to WineStaging-1.9.16

1 0

[akhaldi] 72319: [PSDK] Update gdiplusflat.h. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:56:57 2016 New Revision: 72319 URL: http://svn.reactos.org/svn/reactos?rev=72319&view=rev Log: [PSDK] Update gdiplusflat.h. CORE-11866 Modified: trunk/reactos/sdk/include/psdk/gdiplusflat.h Modified: trunk/reactos/sdk/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusfl… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusflat.h [iso-8859-1] Thu Aug 18 10:56:57 2016 @@ -436,6 +436,8 @@ /* ImageAttributes */ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); +GpStatus WINGDIPAPI GdipGetImageAttributesAdjustedPalette(GpImageAttributes*, + ColorPalette*,ColorAdjustType); GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes*, BOOL); GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*,

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
47
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

Ros-diffs August 2016