Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/01: [HAL] Implement APIC-based profiling for x64.

by Ivan Labutin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ae27504672373728aa5a… commit 5ae27504672373728aa5a0ba9b10b16ce9a4d900 Author: Ivan Labutin <linuxrf(a)gmail.com> AuthorDate: Mon Nov 6 21:40:21 2017 +0300 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 15 12:45:29 2018 +0100 [HAL] Implement APIC-based profiling for x64. --- hal/halx86/apic/apic.h | 4 +++ hal/halx86/apic/apictimer.c | 79 +++++++++++++++++++++++++++++++++++++++--- hal/halx86/apic/halinit_apic.c | 3 ++ hal/halx86/include/halp.h | 4 +++ 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/hal/halx86/apic/apic.h b/hal/halx86/apic/apic.h index 5de22834be..edabaa3b9d 100644 --- a/hal/halx86/apic/apic.h +++ b/hal/halx86/apic/apic.h @@ -278,5 +278,9 @@ VOID NTAPI ApicInitializeTimer(ULONG Cpu); +VOID +NTAPI +HalInitializeProfiling(VOID); + VOID __cdecl ApicSpuriousService(VOID); diff --git a/hal/halx86/apic/apictimer.c b/hal/halx86/apic/apictimer.c index cc0231623f..5fe9305660 100644 --- a/hal/halx86/apic/apictimer.c +++ b/hal/halx86/apic/apictimer.c @@ -16,6 +16,12 @@ extern LARGE_INTEGER HalpCpuClockFrequency; +/* HAL profiling variables */ +BOOLEAN HalIsProfiling = FALSE; +ULONGLONG HalCurProfileInterval = 10000000; +ULONGLONG HalMinProfileInterval = 1000; +ULONGLONG HalMaxProfileInterval = 10000000; + /* TIMER FUNCTIONS ************************************************************/ VOID @@ -59,26 +65,89 @@ ApicInitializeTimer(ULONG Cpu) /* PUBLIC FUNCTIONS ***********************************************************/ +VOID +NTAPI +HalInitializeProfiling(VOID) +{ + KeGetPcr()->HalReserved[HAL_PROFILING_INTERVAL] = HalCurProfileInterval; + KeGetPcr()->HalReserved[HAL_PROFILING_MULTIPLIER] = 1; /* TODO: HACK */ +} + VOID NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - UNIMPLEMENTED; - return; + LVT_REGISTER LvtEntry; + + /* Only handle ProfileTime */ + if (ProfileSource == ProfileTime) + { + /* OK, we are profiling now */ + HalIsProfiling = TRUE; + + /* Set interrupt interval */ + ApicWrite(APIC_TICR, KeGetPcr()->HalReserved[HAL_PROFILING_INTERVAL]); + + /* Unmask it */ + LvtEntry.Long = 0; + LvtEntry.TimerMode = 1; + LvtEntry.Vector = APIC_PROFILE_VECTOR; + LvtEntry.Mask = 0; + ApicWrite(APIC_TMRLVTR, LvtEntry.Long); + } } VOID NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - UNIMPLEMENTED; - return; + LVT_REGISTER LvtEntry; + + /* Only handle ProfileTime */ + if (ProfileSource == ProfileTime) + { + /* We are not profiling */ + HalIsProfiling = FALSE; + + /* Mask interrupt */ + LvtEntry.Long = 0; + LvtEntry.TimerMode = 1; + LvtEntry.Vector = APIC_PROFILE_VECTOR; + LvtEntry.Mask = 1; + ApicWrite(APIC_TMRLVTR, LvtEntry.Long); + } } ULONG_PTR NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - UNIMPLEMENTED; + ULONGLONG TimerInterval; + ULONGLONG FixedInterval; + + FixedInterval = (ULONGLONG)Interval; + + /* Check bounds */ + if (FixedInterval < HalMinProfileInterval) + { + FixedInterval = HalMinProfileInterval; + } + else if (FixedInterval > HalMaxProfileInterval) + { + FixedInterval = HalMaxProfileInterval; + } + + /* Remember interval */ + HalCurProfileInterval = FixedInterval; + + /* Recalculate interval for APIC */ + TimerInterval = FixedInterval * KeGetPcr()->HalReserved[HAL_PROFILING_MULTIPLIER] / HalMaxProfileInterval; + + /* Remember recalculated interval in PCR */ + KeGetPcr()->HalReserved[HAL_PROFILING_INTERVAL] = (ULONG)TimerInterval; + + /* And set it */ + ApicWrite(APIC_TICR, (ULONG)TimerInterval); + return Interval; } diff --git a/hal/halx86/apic/halinit_apic.c b/hal/halx86/apic/halinit_apic.c index 0ac23c5c2f..cd5e0daf9d 100644 --- a/hal/halx86/apic/halinit_apic.c +++ b/hal/halx86/apic/halinit_apic.c @@ -32,6 +32,9 @@ HalpInitProcessor( /* Initialize the local APIC for this cpu */ ApicInitializeLocalApic(ProcessorNumber); + /* Initialize profiling data (but don't start it) */ + HalInitializeProfiling(); + /* Initialize the timer */ //ApicInitializeTimer(ProcessorNumber); diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 315282f809..079b1adb6d 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -49,6 +49,10 @@ VOID #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 +/* HAL profiling offsets in KeGetPcr()->HalReserved[] */ +#define HAL_PROFILING_INTERVAL 0 +#define HAL_PROFILING_MULTIPLIER 1 + /* CMOS Registers and Ports */ #define CMOS_CONTROL_PORT (PUCHAR)0x70 #define CMOS_DATA_PORT (PUCHAR)0x71

6 years, 10 months

01/01: [IP] Silence "TCP operation failed" debug spam.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad68422a7bbdcf5214128… commit ad68422a7bbdcf52141288c73bcdb52a39586ac4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Feb 15 12:19:57 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 15 12:26:35 2018 +0100 [IP] Silence "TCP operation failed" debug spam. --- sdk/lib/drivers/ip/transport/tcp/tcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/lib/drivers/ip/transport/tcp/tcp.c b/sdk/lib/drivers/ip/transport/tcp/tcp.c index 399d954c95..69a2f42366 100644 --- a/sdk/lib/drivers/ip/transport/tcp/tcp.c +++ b/sdk/lib/drivers/ip/transport/tcp/tcp.c @@ -267,8 +267,8 @@ NTSTATUS TCPTranslateError(const err_t err) Status = STATUS_UNSUCCESSFUL; break; } - - DbgPrint("TCP operation failed: 0x%x (%d)\n", Status, err); + + TI_DbgPrint(DEBUG_TCP,("TCP operation failed: 0x%x (%d)\n", Status, err)); return Status; } @@ -367,7 +367,7 @@ NTSTATUS TCPConnect Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; - + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); Status = TCPTranslateError(LibTCPConnect(Connection,

6 years, 10 months

01/01: [SHELL32] CNewMenu: Don't use CWM_GETISHELLBROWSER. CDefaultContextMenu: Set the site for context menu extensions CNewMenu: Get SID_IFolderView service of the site to get the IShellView

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67f99833cdb861a11720a… commit 67f99833cdb861a11720ad03685b439b599e3233 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Feb 15 00:58:22 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Thu Feb 15 00:58:22 2018 +0200 [SHELL32] CNewMenu: Don't use CWM_GETISHELLBROWSER. CDefaultContextMenu: Set the site for context menu extensions CNewMenu: Get SID_IFolderView service of the site to get the IShellView --- dll/win32/shell32/CDefaultContextMenu.cpp | 3 +++ dll/win32/shell32/CNewMenu.cpp | 21 +++++++++------------ dll/win32/shell32/CNewMenu.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index dcb754bd96..0834995abd 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -376,6 +376,9 @@ CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsi return hr; } + if (m_site) + IUnknown_SetSite(pcm, m_site); + PDynamicShellEntry pEntry = (DynamicShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(DynamicShellEntry)); if (!pEntry) return E_OUTOFMEMORY; diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index 8dd1d86f74..4a17e9b58b 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -404,7 +404,7 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::FindItemFromIdOffset(UINT IdOffset) return pItem; } -HRESULT CNewMenu::SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName) +HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName) { CComPtr<IShellBrowser> lpSB; CComPtr<IShellView> lpSV; @@ -415,16 +415,13 @@ HRESULT CNewMenu::SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT /* Notify the view object about the new item */ SHChangeNotify(wEventId, uFlags, (LPCVOID) pszName, NULL); - /* FIXME: I think that this can be implemented using callbacks to the shell folder */ + if (!m_pSite) + return S_OK; - /* 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; + /* Get a pointer to the shell view */ + hr = IUnknown_QueryService(m_pSite, SID_IFolderView, IID_PPV_ARG(IShellView, &lpSV)); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; /* Attempt to get the pidl of the new item */ hr = SHILCreateFromPathW(pszName, &pidl, NULL); @@ -466,7 +463,7 @@ HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici) return E_FAIL; /* Show and select the new item in the def view */ - SelectNewItem(lpici, SHCNE_MKDIR, SHCNF_PATHW, wszName); + SelectNewItem(SHCNE_MKDIR, SHCNF_PATHW, wszName); return S_OK; } @@ -572,7 +569,7 @@ HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcm if (bSuccess) { TRACE("Notifying fs %s\n", debugstr_w(wszName)); - SelectNewItem(lpcmi, SHCNE_CREATE, SHCNF_PATHW, wszName); + SelectNewItem(SHCNE_CREATE, SHCNF_PATHW, wszName); } else { diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h index 2d2c52a355..2475e725a9 100644 --- a/dll/win32/shell32/CNewMenu.h +++ b/dll/win32/shell32/CNewMenu.h @@ -71,7 +71,7 @@ private: SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); HRESULT CreateNewFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi); - HRESULT SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName); + HRESULT SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName); public: CNewMenu();

6 years, 10 months

01/01: [SHELL32] Fix the toolbar buttons in the file open dialog CDefView: Make GetItemObject return an IContectMenu after setting itself as the site. CDefViewBckgrndMenu: Make the inner context menu use the same site. Implement handling CMDSTR_VIEWLISTA and CMDSTR_VIEWDETAILSA. CDefaultContextMenu: CMDSTR_VIEWLISTA and CMDSTR_VIEWDETAILSA shouldn't be handled in this class. Fixes CORE-14327 and the two buttons that change the view mode

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b97886ea9f17c62a84963… commit b97886ea9f17c62a849634053ef3dd0521a00848 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Feb 15 00:23:18 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Thu Feb 15 00:23:18 2018 +0200 [SHELL32] Fix the toolbar buttons in the file open dialog CDefView: Make GetItemObject return an IContectMenu after setting itself as the site. CDefViewBckgrndMenu: Make the inner context menu use the same site. Implement handling CMDSTR_VIEWLISTA and CMDSTR_VIEWDETAILSA. CDefaultContextMenu: CMDSTR_VIEWLISTA and CMDSTR_VIEWDETAILSA shouldn't be handled in this class. Fixes CORE-14327 and the two buttons that change the view mode --- dll/win32/shell32/CDefView.cpp | 13 +++++-------- dll/win32/shell32/CDefViewBckgrndMenu.cpp | 23 +++++++++++++++++++---- dll/win32/shell32/CDefaultContextMenu.cpp | 4 +--- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 9863205273..c3d37e5c0e 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1110,8 +1110,6 @@ HRESULT CDefView::FillFileMenu() if (FAILED_UNEXPECTEDLY(hr)) return hr; - IUnknown_SetSite(m_pCM, (IShellView *)this); - HMENU hmenu = CreatePopupMenu(); hr = m_pCM->QueryContextMenu(hmenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, 0); @@ -1274,8 +1272,6 @@ HRESULT CDefView::OpenSelectedItems() if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; - IUnknown_SetSite(m_pCM, (IShellView *)this); - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_DEFAULTONLY); if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; @@ -1327,8 +1323,6 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; - IUnknown_SetSite(m_pCM, (IShellView *)this); - /* Use 1 as the first id as we want 0 the mean that the user canceled the menu */ hResult = m_pCM->QueryContextMenu(m_hContextMenu, 0, CONTEXT_MENU_BASE_ID, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED_UNEXPECTEDLY(hResult)) @@ -1374,8 +1368,6 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) if (FAILED_UNEXPECTEDLY( hResult)) goto cleanup; - IUnknown_SetSite(m_pCM, (IShellView *)this); - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED_UNEXPECTEDLY( hResult)) goto cleanup; @@ -2287,6 +2279,7 @@ HRESULT WINAPI CDefView::GetItemObject(UINT uItem, REFIID riid, LPVOID *ppvOut) if (FAILED_UNEXPECTEDLY(hr)) return hr; + IUnknown_SetSite(*((IUnknown**)ppvOut), (IShellView *)this); } else if (IsEqualIID(riid, IID_IDispatch)) { @@ -2305,6 +2298,10 @@ HRESULT WINAPI CDefView::GetItemObject(UINT uItem, REFIID riid, LPVOID *ppvOut) hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, riid, 0, ppvOut); if (FAILED_UNEXPECTEDLY(hr)) return hr; + + if (IsEqualIID(riid, IID_IContextMenu)) + IUnknown_SetSite(*((IUnknown**)ppvOut), (IShellView *)this); + break; } diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp b/dll/win32/shell32/CDefViewBckgrndMenu.cpp index 3815019894..5636cdf548 100644 --- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp +++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp @@ -126,6 +126,10 @@ WINAPI CDefViewBckgrndMenu::SetSite(IUnknown *pUnkSite) { m_site = pUnkSite; + + if(m_folderCM) + IUnknown_SetSite(m_folderCM, pUnkSite); + return S_OK; } @@ -212,7 +216,16 @@ WINAPI CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { UINT idCmd = LOWORD(lpcmi->lpVerb); - if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId) + + if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, CMDSTR_VIEWLISTA)) + { + idCmd = FCIDM_SHVIEW_LISTVIEW; + } + else if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, CMDSTR_VIEWDETAILSA)) + { + idCmd = FCIDM_SHVIEW_REPORTVIEW; + } + else if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId) { if (m_folderCM) { @@ -221,9 +234,11 @@ CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) WARN("m_folderCM is NULL!\n"); return E_NOTIMPL; } - - /* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */ - idCmd += m_idCmdFirst; + else + { + /* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */ + idCmd += m_idCmdFirst; + } /* The commands that are handled by the def view are forwarded to it */ switch (idCmd) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 13d084ffbb..dcb754bd96 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -47,9 +47,7 @@ struct _StaticInvokeCommandMap_ { "Print", 0 }, // Unimplemented { "Preview", 0 }, // Unimplemented { "Open", FCIDM_SHVIEW_OPEN }, - { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER }, - { CMDSTR_VIEWLISTA, FCIDM_SHVIEW_LISTVIEW }, - { CMDSTR_VIEWDETAILSA, FCIDM_SHVIEW_REPORTVIEW } + { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER } };

6 years, 10 months

01/01: [SHELL32] Fix glitch in de-DE.rc

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4aa45f63a31df3f954b8… commit e4aa45f63a31df3f954b89d83f44f6bcfbf16c99 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Feb 14 20:12:10 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Feb 14 20:12:10 2018 +0100 [SHELL32] Fix glitch in de-DE.rc checkbox captions are too long. issue was introduced by 3624c5d6fd2cf1c589c26f75ac2d6054f7a838a0 fixes CORE-14329 for de-DE --- dll/win32/shell32/lang/de-DE.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 099947a4ff..ef31156bc1 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -228,9 +228,9 @@ BEGIN EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Attribute:", 14020, 8, 152, 46, 10 - AUTOCHECKBOX "&Schreibgeschützt", 14021, 58, 151, 70, 10 - AUTOCHECKBOX "&Versteckt", 14022, 126, 151, 70, 10 - AUTOCHECKBOX "&Archiv", 14023, 181, 151, 70, 10 + AUTOCHECKBOX "&Schreibgeschützt", 14021, 58, 151, 65, 10 + AUTOCHECKBOX "&Versteckt", 14022, 126, 151, 50, 10 + AUTOCHECKBOX "&Archiv", 14023, 181, 151, 50, 10 PUSHBUTTON "Er&weitert...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

6 years, 10 months

01/01: [SHELL32] CDefViewBckgrndMenu: Fix handling string verbs. It shouldn't be necessary for QueryContextMenu to be called before InvokeCommand. Move retrieving the IContextMenu of the folder to the initialization of the class. CORE-12866

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=111c40e012dc07e7f829b… commit 111c40e012dc07e7f829bc314615f4e37d86e6d0 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Feb 14 00:03:35 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Feb 14 00:03:35 2018 +0200 [SHELL32] CDefViewBckgrndMenu: Fix handling string verbs. It shouldn't be necessary for QueryContextMenu to be called before InvokeCommand. Move retrieving the IContextMenu of the folder to the initialization of the class. CORE-12866 --- dll/win32/shell32/CDefViewBckgrndMenu.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp b/dll/win32/shell32/CDefViewBckgrndMenu.cpp index 2fc6f1ac02..3815019894 100644 --- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp +++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp @@ -113,6 +113,11 @@ HRESULT CDefViewBckgrndMenu::Initialize(IShellFolder* psf) { m_psf = psf; + + /* Get the context menu of the folder. Do it here because someone may call + InvokeCommand without calling QueryContextMenu. It is fine if this fails */ + m_psf->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &m_folderCM)); + return S_OK; } @@ -154,9 +159,8 @@ CDefViewBckgrndMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFir but as stated above, its sole user is CDefView and should really be that way. */ m_idCmdFirst = idCmdFirst; - /* Query the shell folder to add any items it wants to add in the background context menu */ - hr = m_psf->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &m_folderCM)); - if (SUCCEEDED(hr)) + /* Let the shell folder add any items it wants to add in the background context menu */ + if (m_folderCM) { hr = m_folderCM->QueryContextMenu(hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); if (SUCCEEDED(hr))

6 years, 10 months

01/01: [SHLWAPI] Import wine commit 2c163225730e88 as addendum to the SHCreateWorkerWindowW/A fixes from commit 770bf93.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb3987e172fe1d3627a39… commit eb3987e172fe1d3627a391cd7fcb768a8a337f3c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Feb 13 22:05:13 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 13 22:30:59 2018 +0100 [SHLWAPI] Import wine commit 2c163225730e88 as addendum to the SHCreateWorkerWindowW/A fixes from commit 770bf93. --- dll/win32/shlwapi/ordinal.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index d81adbbf0b..61e8804d50 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -2555,19 +2555,14 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * Success: The window handle of the newly created window. * Failure: 0. */ -#ifndef __REACTOS__ -HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) -#else HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) -#endif { static const char szClass[] = "WorkerA"; WNDCLASSA wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); /* Create Window class */ @@ -2589,12 +2584,7 @@ HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExSt if (hWnd) { SetWindowLongPtrW(hWnd, 0, wnd_extra); -#ifndef __REACTOS__ - - if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); -#else if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); -#endif } return hWnd; @@ -2853,45 +2843,28 @@ DWORD WINAPI WhichPlatform(void) * * Unicode version of SHCreateWorkerWindowA. */ -#ifndef __REACTOS__ -HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG msg_result) -#else HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) -#endif { static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', 0 }; WNDCLASSW wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", -#ifndef __REACTOS__ - wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); -#else + TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); -#endif /* If our OS is natively ANSI, use the ANSI version */ if (GetVersion() & 0x80000000) /* not NT */ { TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); -#ifndef __REACTOS__ - return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); -#else return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); -#endif } /* Create Window class */ wc.style = 0; wc.lpfnWndProc = DefWindowProcW; wc.cbClsExtra = 0; -#ifndef __REACTOS__ - wc.cbWndExtra = 4; -#else wc.cbWndExtra = sizeof(LONG_PTR); -#endif wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); @@ -2905,14 +2878,8 @@ HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExSt hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { -#ifndef __REACTOS__ - SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); - - if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); -#else SetWindowLongPtrW(hWnd, 0, wnd_extra); if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); -#endif } return hWnd;

6 years, 10 months

01/01: [TRANSLATION][INF] Update Simplified Chinese translation. (#378)

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37b9ca3fe3d613b78f9e2… commit 37b9ca3fe3d613b78f9e2d87a66f5e1b7ce4c4e5 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Wed Feb 14 05:16:25 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 13 22:16:25 2018 +0100 [TRANSLATION][INF] Update Simplified Chinese translation. (#378) --- media/inf/shortcuts.inf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 662a618d25..c9d4c181a3 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1462,6 +1462,9 @@ ENTERTAINMENT=娱乐 COMMUNICATIONS=通讯 GAMES=游戏 +README_TITLE=请先读我 +README_DESC=ReactOS 自述文件 + CMD_TITLE=命令提示符 CMD_DESC=命令提示符 EXPLORER_TITLE=ReactOS 资源管理器

6 years, 10 months

01/01: [COMCTL32] Import wine commit 71cf0a31d99feb to fix the name column width in rapps.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb7caa745240b523f6e82… commit fb7caa745240b523f6e826b60b2c735558f6bd68 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Feb 13 19:47:58 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Feb 13 19:48:18 2018 +0100 [COMCTL32] Import wine commit 71cf0a31d99feb to fix the name column width in rapps. --- dll/win32/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 00c6ba2ad7..94b1fc28b1 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -8415,6 +8415,8 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) if (infoPtr->himlSmall && (nColumn == 0 || (LISTVIEW_GetColumnInfo(infoPtr, nColumn)->fmt & LVCFMT_IMAGE))) max_cx += infoPtr->iconSize.cx; max_cx += TRAILING_LABEL_PADDING; + if (nColumn == 0 && (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)) + max_cx += GetSystemMetrics(SM_CXSMICON); } /* autosize based on listview items width */

6 years, 10 months

01/01: [SHLWAPI] Improvements for SHCreateWorkerWindowW/A() prototypes + fix x64-bit compatibility. Sent upstream.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=770bf93be372cfc78342e… commit 770bf93be372cfc78342e7bbf11fb2e251ae591d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Feb 13 00:10:09 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 13 00:13:47 2018 +0100 [SHLWAPI] Improvements for SHCreateWorkerWindowW/A() prototypes + fix x64-bit compatibility. Sent upstream. [SHLWAPI] Refactor the SHCreateWorkerWindowW() prototype to match its ANSI SHCreateWorkerWindowA() counterpart. The last parameter is really to be understood as an extra window data, and not a "message result" (as it would be the case for dialog window procedure). That is why I also remove the mention of "DWLP_MSGRESULT" in the SetWindowLongPtrW() call. SHCreateWorkerWindowA() had it OK but SHCreateWorkerWindowW() did not. ------------------ [SHLWAPI] Make SHCreateWorkerWindowA() and SHCreateWorkerWindowW() x64-compatible. The first parameter of these functions is a pointer to a window procedure, having a definite prototype, so employ a correct typedef WNDPROC, which ensures both correct pointer size and parameter type enforcement. This also ensures that we use instead a correct pointer size, since otherwise LONG remains 32-bits for Windows compatibility on x64 platforms. The wndProc parameter is thus casted to LONG_PTR to comply with the SetWindowLongPtrA/W calls. In SHCreateWorkerWindowW(), the last "wnd_extra" parameter should also be LONG_PTR to be able to pass 64-bit data pointer on x64 platforms. Therefore fix also setting the wc.cbWndExtra size. One should note that the ANSI SHCreateWorkerWindowA() function had everything OK already. --- dll/win32/shlwapi/ordinal.c | 31 +++++++++++++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 4 ++-- sdk/include/reactos/shlwapi_undoc.h | 8 ++++---- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index b2543d4154..d81adbbf0b 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -2555,8 +2555,13 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * Success: The window handle of the newly created window. * Failure: 0. */ +#ifndef __REACTOS__ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) +#else +HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) +#endif { static const char szClass[] = "WorkerA"; WNDCLASSA wc; @@ -2584,8 +2589,12 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle if (hWnd) { SetWindowLongPtrW(hWnd, 0, wnd_extra); +#ifndef __REACTOS__ if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); +#else + if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); +#endif } return hWnd; @@ -2844,28 +2853,45 @@ DWORD WINAPI WhichPlatform(void) * * Unicode version of SHCreateWorkerWindowA. */ +#ifndef __REACTOS__ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG msg_result) +#else +HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) +#endif { static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', 0 }; WNDCLASSW wc; HWND hWnd; TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", +#ifndef __REACTOS__ wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); +#else + wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); +#endif /* If our OS is natively ANSI, use the ANSI version */ if (GetVersion() & 0x80000000) /* not NT */ { TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); +#ifndef __REACTOS__ return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); +#else + return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); +#endif } /* Create Window class */ wc.style = 0; wc.lpfnWndProc = DefWindowProcW; wc.cbClsExtra = 0; +#ifndef __REACTOS__ wc.cbWndExtra = 4; +#else + wc.cbWndExtra = sizeof(LONG_PTR); +#endif wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); @@ -2879,9 +2905,14 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { +#ifndef __REACTOS__ SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); +#else + SetWindowLongPtrW(hWnd, 0, wnd_extra); + if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); +#endif } return hWnd; diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index e49c87e1c1..b70601775d 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -254,7 +254,7 @@ 254 stub -noname StopWatchExW 255 stub -noname EventTraceHandler 256 stdcall -noname IUnknown_GetSite(ptr ptr ptr) -257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) +257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait 260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) @@ -275,7 +275,7 @@ 275 stub -noname RegisterGlobalHotkeyA 276 stdcall -noname WhichPlatform() 277 stub -noname SHDialogBox -278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) +278 stdcall -noname SHCreateWorkerWindowW(ptr ptr long long ptr long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) 280 stdcall -noname SHRegGetIntW(ptr wstr long) 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 3fb4b21f91..27000e3bdd 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -92,11 +92,11 @@ HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**); -HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG z); +HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra); -HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG z); +HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra); #ifdef UNICODE #define SHCreateWorkerWindow SHCreateWorkerWindowW #else

6 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2018