Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 03/03: [ACPPAGE] Convert CLayerUIPropPage to use CPropertyPageImpl

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27fe3d475f48a9d591b05… commit 27fe3d475f48a9d591b05f709aa03ed1ea360020 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 23 18:56:57 2017 +0300 [ACPPAGE] Convert CLayerUIPropPage to use CPropertyPageImpl --- dll/shellext/acppage/CLayerUIPropPage.cpp | 192 +++++++++--------------------- dll/shellext/acppage/CLayerUIPropPage.hpp | 47 ++++++-- dll/shellext/acppage/precomp.h | 2 + 3 files changed, 97 insertions(+), 144 deletions(-) diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp b/dll/shellext/acppage/CLayerUIPropPage.cpp index 10739ddd78..a923281a55 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.cpp +++ b/dll/shellext/acppage/CLayerUIPropPage.cpp @@ -226,24 +226,26 @@ static BOOL GetLayerInfo(PCWSTR Filename, DWORD QueryFlags, PDWORD OSMode, PDWOR return TRUE; } -void CLayerUIPropPage::OnRefresh(HWND hWnd) +int CLayerUIPropPage::OnSetActive() { if (!GetLayerInfo(m_Filename, m_LayerQueryFlags, &m_RegistryOSMode, &m_RegistryEnabledLayers, m_RegistryCustomLayers)) m_RegistryOSMode = m_RegistryEnabledLayers = 0; for (size_t n = 0; g_Layers[n].Name; ++n) - CheckDlgButton(hWnd, g_Layers[n].Id, (m_RegistryEnabledLayers & (1<<n)) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(g_Layers[n].Id, (m_RegistryEnabledLayers & (1<<n)) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_CHKRUNCOMPATIBILITY, m_RegistryOSMode ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHKRUNCOMPATIBILITY, m_RegistryOSMode ? BST_CHECKED : BST_UNCHECKED); if (m_RegistryOSMode) - ComboBox_SetCurSel(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE), m_RegistryOSMode-1); + ComboBox_SetCurSel(GetDlgItem(IDC_COMPATIBILITYMODE), m_RegistryOSMode-1); m_CustomLayers = m_RegistryCustomLayers; /* TODO: visualize 'custom' layers! */ - UpdateControls(hWnd); + UpdateControls(); + + return 0; } @@ -274,7 +276,7 @@ BOOL CLayerUIPropPage::HasChanges() const return FALSE; } -void CLayerUIPropPage::OnApply(HWND hWnd) +int CLayerUIPropPage::OnApply() { if (HasChanges()) { @@ -302,11 +304,13 @@ void CLayerUIPropPage::OnApply(HWND hWnd) SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATHW, (PCWSTR)m_Filename, NULL); } + + return PSNRET_NOERROR; } -INT_PTR CLayerUIPropPage::InitDialog(HWND hWnd) +LRESULT CLayerUIPropPage::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - HWND cboMode = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); + HWND cboMode = GetDlgItem(IDC_COMPATIBILITYMODE); for (size_t n = 0; g_CompatModes[n].Display; ++n) ComboBox_AddString(cboMode, g_CompatModes[n].Display); ComboBox_SetCurSel(cboMode, 5); @@ -315,134 +319,68 @@ INT_PTR CLayerUIPropPage::InitDialog(HWND hWnd) if (!m_AllowPermLayer) { explanation.LoadString(g_hModule, IDS_FAILED_NETWORK); - DisableControls(hWnd); + DisableControls(); ACDBG(L"AllowPermLayer returned FALSE\r\n"); } else if (m_IsSfcProtected) { explanation.LoadString(g_hModule, IDS_FAILED_PROTECTED); - DisableControls(hWnd); + DisableControls(); ACDBG(L"Protected OS file\r\n"); } else { return TRUE; } - SetDlgItemTextW(hWnd, IDC_EXPLANATION, explanation); + SetDlgItemTextW(IDC_EXPLANATION, explanation); return TRUE; } -INT_PTR CLayerUIPropPage::DisableControls(HWND hWnd) +INT_PTR CLayerUIPropPage::DisableControls() { - EnableWindow(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE), 0); - EnableWindow(GetDlgItem(hWnd, IDC_CHKRUNCOMPATIBILITY), 0); + ::EnableWindow(GetDlgItem(IDC_COMPATIBILITYMODE), 0); + ::EnableWindow(GetDlgItem(IDC_CHKRUNCOMPATIBILITY), 0); for (size_t n = 0; g_Layers[n].Name; ++n) - EnableWindow(GetDlgItem(hWnd, g_Layers[n].Id), 0); - EnableWindow(GetDlgItem(hWnd, IDC_EDITCOMPATIBILITYMODES), 0); + ::EnableWindow(GetDlgItem(g_Layers[n].Id), 0); + ::EnableWindow(GetDlgItem(IDC_EDITCOMPATIBILITYMODES), 0); return TRUE; } -void CLayerUIPropPage::UpdateControls(HWND hWnd) +void CLayerUIPropPage::UpdateControls() { m_OSMode = 0, m_EnabledLayers = 0; - BOOL ModeEnabled = IsDlgButtonChecked(hWnd, IDC_CHKRUNCOMPATIBILITY); + BOOL ModeEnabled = IsDlgButtonChecked(IDC_CHKRUNCOMPATIBILITY); if (ModeEnabled) - m_OSMode = ComboBox_GetCurSel(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE))+1; - EnableWindow(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE), ModeEnabled); + m_OSMode = ComboBox_GetCurSel(GetDlgItem(IDC_COMPATIBILITYMODE))+1; + ::EnableWindow(GetDlgItem(IDC_COMPATIBILITYMODE), ModeEnabled); for (size_t n = 0; g_Layers[n].Name; ++n) { - m_EnabledLayers |= IsDlgButtonChecked(hWnd, g_Layers[n].Id) ? (1<<n) : 0; - ShowWindow(GetDlgItem(hWnd, g_Layers[n].Id), SW_SHOW); + m_EnabledLayers |= IsDlgButtonChecked(g_Layers[n].Id) ? (1<<n) : 0; + ::ShowWindow(GetDlgItem(g_Layers[n].Id), SW_SHOW); } - if (HasChanges()) - { - PropSheet_Changed(GetParent(hWnd), hWnd); - } - else - { - PropSheet_UnChanged(GetParent(hWnd), hWnd); - } + SetModified(HasChanges()); } -INT_PTR CLayerUIPropPage::OnCommand(HWND hWnd, WORD id) +LRESULT CLayerUIPropPage::OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - switch (id) - { - case IDC_CHKRUNCOMPATIBILITY: - UpdateControls(hWnd); - break; - case IDC_COMPATIBILITYMODE: - UpdateControls(hWnd); - break; - case IDC_CHKRUNIN256COLORS: - case IDC_CHKRUNIN640480RES: - case IDC_CHKDISABLEVISUALTHEMES: - UpdateControls(hWnd); - break; - case IDC_EDITCOMPATIBILITYMODES: - if (DialogBoxParam(g_hModule, MAKEINTRESOURCE(IDD_EDITCOMPATIBILITYMODES), hWnd, EditModesProc, (LPARAM)this) == IDOK) - { - UpdateControls(hWnd); - } - break; - } - return FALSE; + UpdateControls(); + return 0; } -INT_PTR CALLBACK CLayerUIPropPage::PropDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +LRESULT CLayerUIPropPage::OnEditModes(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CLayerUIPropPage* page = NULL; - - switch (uMsg) - { - case WM_INITDIALOG: - page = (CLayerUIPropPage*)((LPPROPSHEETPAGE)lParam)->lParam; - SetProp(hWnd, ACP_WNDPROP, page); - return page->InitDialog(hWnd); - - case WM_ENDSESSION: - case WM_DESTROY: - page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); - RemoveProp(hWnd, ACP_WNDPROP); - page->Release(); - break; - - case WM_COMMAND: - page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); - return page->OnCommand(hWnd, LOWORD(wParam)); - case WM_NOTIFY: - switch (((LPNMHDR)lParam)->code) - { - case PSN_SETACTIVE: - if (((LPNMHDR)lParam)->hwndFrom == GetParent(hWnd)) - { - page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); - page->OnRefresh(hWnd); - } - break; - case PSN_APPLY: - if (((LPNMHDR)lParam)->hwndFrom == GetParent(hWnd)) - { - page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); - page->OnApply(hWnd); - } - break; - case NM_CLICK: - case NM_RETURN: - if (((LPNMHDR)lParam)->idFrom == IDC_INFOLINK) - { - ShellExecute(NULL, L"open", L"https://www.reactos.org/forum/viewforum.php?f=4", NULL, NULL, SW_SHOW); - } - break; - default: - break; - } - break; - } + if (DialogBoxParam(g_hModule, MAKEINTRESOURCE(IDD_EDITCOMPATIBILITYMODES), m_hWnd, EditModesProc, (LPARAM)this) == IDOK) + UpdateControls(); + return 0; +} - return FALSE; +LRESULT CLayerUIPropPage::OnClickNotify(INT uCode, LPNMHDR hdr, BOOL& bHandled) +{ + if (hdr->idFrom == IDC_INFOLINK) + ShellExecute(NULL, L"open", L"https://www.reactos.org/forum/viewforum.php?f=4", NULL, NULL, SW_SHOW); + return 0; } static void ListboxChanged(HWND hWnd) @@ -487,9 +425,9 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP case WM_INITDIALOG: page = (CLayerUIPropPage*)lParam; page->AddRef(); - SetProp(hWnd, ACP_WNDPROP, page); + ::SetProp(hWnd, ACP_WNDPROP, page); { - HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); + HWND Combo = ::GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); CComObject<CLayerStringList> pList; while (TRUE) @@ -501,7 +439,7 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP ComboBox_AddString(Combo, str); } - HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); + HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); for (int n = 0; n < page->m_CustomLayers.GetSize(); ++n) { const WCHAR* Str = page->m_CustomLayers[n].GetString(); @@ -513,8 +451,8 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP break; case WM_ENDSESSION: case WM_DESTROY: - page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); - RemoveProp(hWnd, ACP_WNDPROP); + page = (CLayerUIPropPage*)::GetProp(hWnd, ACP_WNDPROP); + ::RemoveProp(hWnd, ACP_WNDPROP); page->Release(); break; @@ -526,23 +464,23 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP break; case IDC_EDIT: { - HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); + HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); int Cur = ListBox_GetCurSel(List); int Length = ListBox_GetTextLen(List, Cur); CComBSTR Str(Length); ListBox_GetText(List, Cur, Str); ListBox_DeleteString(List, Cur); - HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); + HWND Combo = ::GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); ComboBox_SetCurSel(Combo, -1); - ComboBox_SetText(Combo, Str); + ::SetWindowText(Combo,Str); ListboxChanged(hWnd); ComboBox_SetEditSel(Combo, 30000, 30000); - SetFocus(Combo); + ::SetFocus(Combo); } break; case IDC_DELETE: { - HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); + HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); ListBox_DeleteString(List, ListBox_GetCurSel(List)); ListboxChanged(hWnd); } @@ -552,7 +490,7 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP break; case IDC_NEWCOMPATIBILITYMODE: { - EnableWindow(GetDlgItem(hWnd, IDC_ADD), ComboHasData(hWnd)); + ::EnableWindow(::GetDlgItem(hWnd, IDC_ADD), ComboHasData(hWnd)); } break; case IDOK: @@ -563,7 +501,7 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP CComBSTR question, title; title.LoadString(g_hModule, IDS_TABTITLE); question.LoadString(g_hModule, IDS_YOU_DID_NOT_ADD); - int result = MessageBoxW(hWnd, question, title, MB_YESNOCANCEL | MB_ICONQUESTION); + int result = ::MessageBoxW(hWnd, question, title, MB_YESNOCANCEL | MB_ICONQUESTION); switch (result) { case IDYES: @@ -576,9 +514,9 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP } } - page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); + page = (CLayerUIPropPage*)::GetProp(hWnd, ACP_WNDPROP); - HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); + HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); int Count = ListBox_GetCount(List); page->m_CustomLayers.RemoveAll(); for (int Cur = 0; Cur < Count; ++Cur) @@ -593,12 +531,12 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP } /* Fall trough */ case IDCANCEL: - EndDialog(hWnd, LOWORD(wParam)); + ::EndDialog(hWnd, LOWORD(wParam)); break; } break; case WM_CLOSE: - EndDialog(hWnd, IDCANCEL); + ::EndDialog(hWnd, IDCANCEL); break; } return FALSE; @@ -678,21 +616,3 @@ STDMETHODIMP CLayerUIPropPage::Initialize(LPCITEMIDLIST pidlFolder, LPDATAOBJECT ReleaseStgMedium(&stg); return hr; } - -STDMETHODIMP CLayerUIPropPage::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) -{ - PROPSHEETPAGEW psp = { 0 }; - psp.dwSize = sizeof(psp); - psp.dwFlags = PSP_USEREFPARENT | PSP_USETITLE; - psp.hInstance = g_hModule; - psp.pszTemplate = MAKEINTRESOURCE(IDD_ACPPAGESHEET); - psp.pszTitle = MAKEINTRESOURCE(IDS_TABTITLE); - psp.pfnDlgProc = PropDlgProc; - psp.lParam = (LPARAM)this; - psp.pcRefParent = (PUINT)&g_ModuleRefCnt; - HPROPSHEETPAGE hPage = CreatePropertySheetPageW(&psp); - if (hPage && !pfnAddPage(hPage, lParam)) - DestroyPropertySheetPage(hPage); - - return S_OK; -} diff --git a/dll/shellext/acppage/CLayerUIPropPage.hpp b/dll/shellext/acppage/CLayerUIPropPage.hpp index 8b9cce879d..ac4886d33a 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.hpp +++ b/dll/shellext/acppage/CLayerUIPropPage.hpp @@ -6,6 +6,7 @@ */ class CLayerUIPropPage : + public CPropertyPageImpl<CLayerUIPropPage>, public CComCoClass<CLayerUIPropPage, &CLSID_CLayerUIPropPage>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellExtInit, @@ -20,26 +21,45 @@ public: // IShellPropSheetExt - STDMETHODIMP AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); + STDMETHODIMP AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) + { + HPROPSHEETPAGE hPage = Create(); + if (hPage && !pfnAddPage(hPage, lParam)) + DestroyPropertySheetPage(hPage); + + return S_OK; + } + STDMETHODIMP ReplacePage(UINT, LPFNADDPROPSHEETPAGE, LPARAM) { return E_NOTIMPL; } + VOID OnPageAddRef() + { + InterlockedIncrement(&g_ModuleRefCnt); + } + + VOID OnPageRelease() + { + InterlockedDecrement(&g_ModuleRefCnt); + } + HRESULT InitFile(PCWSTR Filename); - INT_PTR InitDialog(HWND hWnd); - INT_PTR OnCommand(HWND hWnd, WORD id); - void UpdateControls(HWND hWnd); - INT_PTR DisableControls(HWND hWnd); + void UpdateControls(); + INT_PTR DisableControls(); BOOL HasChanges() const; - void OnRefresh(HWND hWnd); - void OnApply(HWND hWnd); + int OnSetActive(); + int OnApply(); + LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); + LRESULT OnEditModes(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); + LRESULT OnClickNotify(INT uCode, LPNMHDR hdr, BOOL& bHandled); static INT_PTR CALLBACK PropDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK EditModesProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - protected: CString m_Filename; BOOL m_IsSfcProtected; @@ -50,6 +70,17 @@ protected: CSimpleArray<CString> m_RegistryCustomLayers, m_CustomLayers; public: + enum { IDD = IDD_ACPPAGESHEET }; + + BEGIN_MSG_MAP(CLayerUIPropPage) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + COMMAND_RANGE_HANDLER(IDC_CHKRUNCOMPATIBILITY, IDC_CHKDISABLEVISUALTHEMES, OnCtrlCommand) + COMMAND_ID_HANDLER(IDC_EDITCOMPATIBILITYMODES, OnEditModes) + NOTIFY_CODE_HANDLER(NM_CLICK, OnClickNotify) + NOTIFY_CODE_HANDLER(NM_RETURN, OnClickNotify) + CHAIN_MSG_MAP(CPropertyPageImpl<CLayerUIPropPage>) + END_MSG_MAP() + DECLARE_REGISTRY_RESOURCEID(IDR_ACPPAGE) DECLARE_NOT_AGGREGATABLE(CLayerUIPropPage) diff --git a/dll/shellext/acppage/precomp.h b/dll/shellext/acppage/precomp.h index 967564810a..21dd0c159c 100644 --- a/dll/shellext/acppage/precomp.h +++ b/dll/shellext/acppage/precomp.h @@ -16,6 +16,8 @@ #include <atlcom.h> #include <atlsimpcoll.h> #include <atlstr.h> +#include <atlwin.h> +#include <rosdlgs.h> ULONG DbgPrint(PCH Format,...); #include <apphelp.h>

7 years, 1 month

[reactos] 02/03: Add CPropertyPageImpl that allows us to make property pages object oriented

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=283afefc4eb1fb8ae43bd… commit 283afefc4eb1fb8ae43bdd4719026349cbe871ac Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 23 23:41:47 2017 +0300 Add CPropertyPageImpl that allows us to make property pages object oriented --- sdk/include/reactos/rosdlgs.h | 194 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/sdk/include/reactos/rosdlgs.h b/sdk/include/reactos/rosdlgs.h new file mode 100644 index 0000000000..61361ab313 --- /dev/null +++ b/sdk/include/reactos/rosdlgs.h @@ -0,0 +1,194 @@ +#pragma once + +#include <atlwin.h> + +namespace ATL +{ + template <class T> + class CPropertyPageImpl: public CDialogImplBaseT<CWindow> + { + public: + PROPSHEETPAGE m_psp; + + operator PROPSHEETPAGE*() + { + return &m_psp; + } + + CPropertyPageImpl(LPCTSTR lpszTitle = NULL) + { + T* pT = static_cast<T*>(this); + + memset(&m_psp, 0, sizeof(m_psp)); + m_psp.dwSize = sizeof(m_psp); + m_psp.hInstance = _AtlBaseModule.GetResourceInstance(); + m_psp.pszTemplate = MAKEINTRESOURCE(T::IDD); + m_psp.pszTitle = lpszTitle; + m_psp.pfnDlgProc = T::StartDialogProc; + m_psp.pfnCallback = T::PropPageCallback; + m_psp.lParam = reinterpret_cast<LPARAM>(pT); + + m_psp.dwFlags = PSP_USECALLBACK; + if (lpszTitle) + m_psp.dwFlags |= PSP_USETITLE; + } + + static UINT CALLBACK PropPageCallback(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp) + { + T* pT = reinterpret_cast<T*>(ppsp->lParam); + CDialogImplBaseT<CWindow>* pThis = static_cast<CDialogImplBaseT<CWindow>*>(pT); + + switch (uMsg) + { + case PSPCB_CREATE: + _AtlWinModule.AddCreateWndData(&pThis->m_thunk.cd, pThis); + return pT->OnPageCreate(); + case PSPCB_ADDREF: + pT->OnPageAddRef(); + break; + case PSPCB_RELEASE: + pT->OnPageRelease(); + break; + } + + return 0; + } + + HPROPSHEETPAGE Create() + { + return ::CreatePropertySheetPage(&m_psp); + } + + BOOL EndDialog(_In_ int nRetCode) + { + return FALSE; + } + + void SetModified(BOOL bChanged = TRUE) + { + ::SendMessage(GetParent(), bChanged ? PSM_CHANGED : PSM_UNCHANGED, (WPARAM)m_hWnd, 0L); + } + + BOOL OnPageCreate() + { + return TRUE; + } + + VOID OnPageAddRef() + { + } + + VOID OnPageRelease() + { + } + + int OnSetActive() + { + return 0; + } + + BOOL OnKillActive() + { + return FALSE; + } + + int OnApply() + { + return PSNRET_NOERROR; + } + + void OnReset() + { + } + + void OnHelp() + { + } + + int OnWizardBack() + { + return 0; + } + + int OnWizardNext() + { + return 0; + } + + BOOL OnWizardFinish() + { + return FALSE; + } + + BOOL OnQueryCancel() + { + return FALSE; + } + + BOOL OnGetObject(LPNMOBJECTNOTIFY lpObjectNotify) + { + return FALSE; + } + + int OnTranslateAccelerator(LPMSG lpMsg) + { + return 0; + } + + HWND OnQueryInitialFocus(HWND hwnd) + { + return NULL; + } + + // message map and handlers + typedef CPropertyPageImpl<T> thisClass; + BEGIN_MSG_MAP(thisClass) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + END_MSG_MAP() + + LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) + { + NMHDR* pnmh = (NMHDR*)lParam; + T* pThis = static_cast<T*>(this); + + if (pnmh->hwndFrom != GetParent() && pnmh->hwndFrom != m_hWnd) + { + bHandled = FALSE; + return TRUE; + } + + switch (pnmh->code) + { + case PSN_SETACTIVE: + return pThis->OnSetActive(); + case PSN_KILLACTIVE: + return pThis->OnKillActive(); + case PSN_APPLY: + return pThis->OnApply(); + case PSN_RESET: + pThis->OnReset(); + return 0; + case PSN_HELP: + pThis->OnHelp(); + return 0; + case PSN_WIZBACK: + return pThis->OnWizardBack(); + case PSN_WIZNEXT: + return pThis->OnWizardNext(); + case PSN_WIZFINISH: + return pThis->OnWizardFinish(); + case PSN_QUERYCANCEL: + return pThis->OnQueryCancel(); + case PSN_GETOBJECT: + return pThis->OnGetObject((LPNMOBJECTNOTIFY)lParam); + case PSN_TRANSLATEACCELERATOR: + return pThis->OnTranslateAccelerator((LPMSG)lParam); + case PSN_QUERYINITIALFOCUS: + return (LRESULT)pThis->OnQueryInitialFocus((HWND)lParam); + } + + bHandled = FALSE; + return 0; + } + }; +}

7 years, 1 month

[reactos] 01/03: [ATL] Add CHAIN_MSG_MAP macro

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7c29bb1fcdb261e84373… commit e7c29bb1fcdb261e8437349e3c3a559bdb06cba8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 23 18:56:35 2017 +0300 [ATL] Add CHAIN_MSG_MAP macro --- sdk/lib/atl/atlwin.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 5540574e03..3f68348a4e 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1827,6 +1827,12 @@ public: return TRUE; \ } +#define CHAIN_MSG_MAP(theChainClass) \ + { \ + if (theChainClass::ProcessWindowMessage(hWnd, uMsg, wParam, lParam, lResult)) \ + return TRUE; \ + } + #define DECLARE_WND_CLASS_EX(WndClassName, style, bkgnd) \ static ATL::CWndClassInfo& GetWndClassInfo() \ { \

7 years, 1 month

[reactos] 01/01: [WIN32SS] fix font extent. CORE-13840

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85ae8421055f51eac48cb… commit 85ae8421055f51eac48cb3d8acce47a7cd715982 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 25 18:10:36 2017 +0900 [WIN32SS] fix font extent. CORE-13840 --- win32ss/gdi/ntgdi/freetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index ca1af462c5..eb2fc7756d 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3570,6 +3570,7 @@ TextIntGetTextExtentPoint(PDC dc, PMATRIX pmxWorldToDevice; LOGFONTW *plf; BOOL EmuBold, EmuItalic; + LONG ascender, descender; FontGDI = ObjToGDI(TextObj->Font, FONT); @@ -3676,13 +3677,12 @@ TextIntGetTextExtentPoint(PDC dc, previous = glyph_index; String++; } + ascender = (face->size->metrics.ascender + 32) >> 6; /* Units above baseline */ + descender = (32 - face->size->metrics.descender) >> 6; /* Units below baseline */ IntUnLockFreeType; Size->cx = (TotalWidth + 32) >> 6; - Size->cy = (plf->lfHeight == 0 ? - dc->ppdev->devinfo.lfDefaultFont.lfHeight : - abs(plf->lfHeight)); - Size->cy = EngMulDiv(Size->cy, dc->ppdev->gdiinfo.ulLogPixelsY, 72); + Size->cy = ascender + descender; return TRUE; }

7 years, 2 months

[reactos] 01/01: [KMTEST] Initial usermode support for testing FS mini-filters (#81)

by Ged Murphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b10dd06aa5254bf7b7caa… commit b10dd06aa5254bf7b7caa8c3a793ee28182db6a2 Author: Ged Murphy <gedmurphy(a)gmail.com> AuthorDate: Wed Oct 25 10:39:55 2017 +0100 [KMTEST] Initial usermode support for testing FS mini-filters (#81) * [KMTEST] Initial usermode support for testing FS mini-filters - Add base routines to wrap the win32 'Filter' APis - Add support routines to be used when testing FS filter drivers - Move KmtCreateService to a private routine so it can be shared with KmtFltCreateService - Completely untested at the mo, so likely contains bugs at this point --- modules/rostests/kmtests/CMakeLists.txt | 6 +- modules/rostests/kmtests/include/kmt_platform.h | 1 + modules/rostests/kmtests/include/kmt_public.h | 5 + modules/rostests/kmtests/include/kmt_test.h | 10 + modules/rostests/kmtests/kmtest/filter.c | 428 ++++++++++++++++++++++++ modules/rostests/kmtests/kmtest/fltsupport.c | 301 +++++++++++++++++ modules/rostests/kmtests/kmtest/kmtest.h | 71 ++++ modules/rostests/kmtests/kmtest/service.c | 91 +++-- 8 files changed, 882 insertions(+), 31 deletions(-) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index d51ef000c7..64b088d221 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -119,6 +119,8 @@ add_target_include_directories(kmtest_printf ${REACTOS_SOURCE_DIR}/sdk/lib/crt/i # list(APPEND KMTEST_SOURCE + kmtest/filter.c + kmtest/fltsupport.c kmtest/kmtest.c kmtest/service.c kmtest/support.c @@ -143,8 +145,8 @@ list(APPEND KMTEST_SOURCE add_executable(kmtest ${KMTEST_SOURCE}) set_module_type(kmtest win32cui) target_link_libraries(kmtest ${PSEH_LIB}) -add_importlibs(kmtest advapi32 ws2_32 msvcrt kernel32 ntdll) -add_target_compile_definitions(kmtest KMT_USER_MODE) +add_importlibs(kmtest fltlib advapi32 ws2_32 msvcrt kernel32 ntdll) +add_target_compile_definitions(kmtest KMT_USER_MODE NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(kmtest include/kmt_test.h) set_target_properties(kmtest PROPERTIES OUTPUT_NAME "kmtest_") #add_rostests_file(TARGET kmtest) diff --git a/modules/rostests/kmtests/include/kmt_platform.h b/modules/rostests/kmtests/include/kmt_platform.h index 9e732c397a..636f099cf6 100644 --- a/modules/rostests/kmtests/include/kmt_platform.h +++ b/modules/rostests/kmtests/include/kmt_platform.h @@ -42,6 +42,7 @@ #include <ndk/rtlfuncs.h> #include <ndk/mmfuncs.h> #include <strsafe.h> +#include <fltuser.h> #ifdef KMT_EMULATE_KERNEL #define ok_irql(i) diff --git a/modules/rostests/kmtests/include/kmt_public.h b/modules/rostests/kmtests/include/kmt_public.h index 963ff3b859..00442f4d3e 100644 --- a/modules/rostests/kmtests/include/kmt_public.h +++ b/modules/rostests/kmtests/include/kmt_public.h @@ -23,6 +23,11 @@ #define IOCTL_KMTEST_USERMODE_AWAIT_REQ \ CTL_CODE(FILE_DEVICE_UNKNOWN, 0x804, METHOD_BUFFERED, FILE_READ_DATA) + +#define KMTFLT_GET_TESTS 0x800 +#define KMTFLT_RUN_TEST 0x801 + + #define KMTEST_DEVICE_NAME L"Kmtest" #define KMTEST_DEVICE_DRIVER_PATH L"\\Device\\" KMTEST_DEVICE_NAME #define KMTEST_DEVICE_PATH L"\\\\.\\Global\\GLOBALROOT" KMTEST_DEVICE_DRIVER_PATH diff --git a/modules/rostests/kmtests/include/kmt_test.h b/modules/rostests/kmtests/include/kmt_test.h index 5941676140..8fcc93a419 100644 --- a/modules/rostests/kmtests/include/kmt_test.h +++ b/modules/rostests/kmtests/include/kmt_test.h @@ -173,6 +173,16 @@ DWORD KmtSendStringToDriver(IN DWORD ControlCode, IN PCSTR String); DWORD KmtSendWStringToDriver(IN DWORD ControlCode, IN PCWSTR String); DWORD KmtSendUlongToDriver(IN DWORD ControlCode, IN DWORD Value); DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer OPTIONAL, IN DWORD InLength, IN OUT PDWORD OutLength); + +DWORD KmtFltLoadDriver(_In_z_ PCWSTR ServiceName, _In_ BOOLEAN RestartIfRunning, _In_ BOOLEAN ConnectComms, _Out_ HANDLE *hPort); +DWORD KmtFltUnloadDriver(_In_ HANDLE *hPort, _In_ BOOLEAN DisonnectComms); +DWORD KmtFltRunKernelTest(_In_ HANDLE hPort, _In_z_ PCSTR TestName); +DWORD KmtFltSendToDriver(_In_ HANDLE hPort, _In_ DWORD Message); +DWORD KmtFltSendStringToDriver(_In_ HANDLE hPort, _In_ DWORD Message, _In_ PCSTR String); +DWORD KmtFltSendWStringToDriver(_In_ HANDLE hPort, _In_ DWORD Message, _In_ PCWSTR String); +DWORD KmtFltSendUlongToDriver(_In_ HANDLE hPort, _In_ DWORD Message, _In_ DWORD Value); +DWORD KmtFltSendBufferToDriver(_In_ HANDLE hPort, _In_ DWORD Message, _In_reads_bytes_(BufferSize) LPVOID Buffer, _In_ DWORD BufferSize, _Out_writes_bytes_to_opt_(dwOutBufferSize, *lpBytesReturned) LPVOID lpOutBuffer, _In_ DWORD dwOutBufferSize, _Out_opt_ LPDWORD lpBytesReturned); + #else /* if !defined KMT_KERNEL_MODE && !defined KMT_USER_MODE */ #error either KMT_KERNEL_MODE or KMT_USER_MODE must be defined #endif /* !defined KMT_KERNEL_MODE && !defined KMT_USER_MODE */ diff --git a/modules/rostests/kmtests/kmtest/filter.c b/modules/rostests/kmtests/kmtest/filter.c new file mode 100644 index 0000000000..cb5957477c --- /dev/null +++ b/modules/rostests/kmtests/kmtest/filter.c @@ -0,0 +1,428 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: File system filter implementation of the original service.c file + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * Ged Murphy <gedmurphy(a)reactos.org> + */ + +//#include <fltuser.h> +#include <kmt_test.h> +#include "kmtest.h" + +#include <assert.h> + +#define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE) + +/* + * We need to call the internal function in the service.c file + */ +DWORD +KmtpCreateService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + IN DWORD ServiceType, + OUT SC_HANDLE *ServiceHandle); + +static SC_HANDLE ScmHandle; + + +/** + * @name KmtFltCreateService + * + * Create the specified driver service and return a handle to it + * + * @param ServiceName + * Name of the service to create + * @param ServicePath + * File name of the driver, relative to the current directory + * @param DisplayName + * Service display name + * @param ServiceHandle + * Pointer to a variable to receive the handle to the service + * + * @return Win32 error code + */ +DWORD +KmtFltCreateService( + _In_z_ PCWSTR ServiceName, + _In_z_ PCWSTR ServicePath, + _In_z_ PCWSTR DisplayName OPTIONAL, + _Out_ SC_HANDLE *ServiceHandle) +{ + return KmtpCreateService(ServiceName, + ServicePath, + DisplayName, + SERVICE_FILE_SYSTEM_DRIVER, + ServiceHandle); +} + +/** + * @name KmtFltLoad + * + * Start the specified filter driver by name + * + * @param ServiceName + * The name of the filter to start + * + * @return Win32 error code + */ +DWORD +KmtFltLoad( + _In_z_ PCWSTR ServiceName) +{ + HRESULT hResult; + DWORD Error = ERROR_SUCCESS; + + assert(ServiceName); + + hResult = FilterLoad(ServiceName); + Error = SCODE_CODE(hResult); + + return Error; +} + +/** + * @name KmtFltCreateAndStartService + * + * Create and load the specified filter driver and return a handle to it + * + * @param ServiceName + * Name of the service to create + * @param ServicePath + * File name of the driver, relative to the current directory + * @param DisplayName + * Service display name + * @param ServiceHandle + * Pointer to a variable to receive the handle to the service + * @param RestartIfRunning + * TRUE to stop and restart the service if it is already running + * + * @return Win32 error code + */ +DWORD +KmtFltCreateAndStartService( + _In_z_ PCWSTR ServiceName, + _In_z_ PCWSTR ServicePath, + _In_z_ PCWSTR DisplayName OPTIONAL, + _Out_ SC_HANDLE *ServiceHandle, + _In_ BOOLEAN RestartIfRunning) +{ + DWORD Error = ERROR_SUCCESS; + + assert(ServiceHandle); + + Error = KmtFltCreateService(ServiceName, ServicePath, DisplayName, ServiceHandle); + + if (Error == ERROR_SERVICE_EXISTS) + *ServiceHandle = OpenService(ScmHandle, ServiceName, SERVICE_ACCESS); + + if (Error && Error != ERROR_SERVICE_EXISTS) + goto cleanup; + + Error = KmtFltLoad(ServiceName); + + if (Error != ERROR_SERVICE_ALREADY_RUNNING) + goto cleanup; + + Error = ERROR_SUCCESS; + + if (!RestartIfRunning) + goto cleanup; + + Error = KmtFltUnload(ServiceName); + if (Error) + goto cleanup; + + Error = KmtFltLoad(ServiceName); + if (Error) + goto cleanup; + +cleanup: + assert(Error); + return Error; +} + + +/** + * @name KmtFltConnect + * + * Create a comms connection to the specified filter + * + * @param ServiceName + * Name of the filter to connect to + * @param hPort + * Handle to the filter's comms port + * + * @return Win32 error code + */ +DWORD +KmtFltConnect( + _In_z_ PCWSTR ServiceName, + _Out_ HANDLE *hPort) +{ + HRESULT hResult; + DWORD Error = ERROR_SUCCESS; + + assert(ServiceName); + assert(hPort); + + hResult = FilterConnectCommunicationPort(ServiceName, + 0, + NULL, + 0, + NULL, + hPort); + Error = SCODE_CODE(hResult); + + return Error; +} + +/** + * @name KmtFltDisconnect + * + * Disconenct from the comms port + * + * @param hPort + * Handle to the filter's comms port + * + * @return Win32 error code + */ +DWORD +KmtFltDisconnect( + _Out_ HANDLE *hPort) +{ + DWORD Error = ERROR_SUCCESS; + + assert(hPort); + + if (!CloseHandle(hPort)) + { + Error = GetLastError(); + } + + return Error; +} + +/** + * @name KmtFltSendMessage + * + * Sneds a message to a filter driver + * + * @param hPort + * Handle to the filter's comms port + * @InBuffer + * Pointer to a buffer to send to the filter + * @InBufferSize + * Size of the buffer pointed to by InBuffer + * @OutBuffer + * Pointer to a buffer to receive reply data from the filter + * @OutBufferSize + * Size of the buffer pointed to by OutBuffer + * @BytesReturned + * Number of bytes written in the reply buffer + * + * @return Win32 error code + */ +DWORD +KmtFltSendMessage( + _In_ HANDLE hPort, + _In_reads_bytes_(dwInBufferSize) LPVOID InBuffer, + _In_ DWORD InBufferSize, + _Out_writes_bytes_to_opt_(dutBufferSize, *BytesReturned) LPVOID OutBuffer, + _In_ DWORD OutBufferSize, + _Out_opt_ LPDWORD BytesReturned) +{ + DWORD BytesRet; + HRESULT hResult; + DWORD Error; + + assert(hPort); + assert(InBuffer); + assert(InBufferSize); + + if (BytesReturned) *BytesReturned = 0; + + hResult = FilterSendMessage(hPort, + InBuffer, + InBufferSize, + OutBuffer, + OutBufferSize, + &BytesRet); + + Error = SCODE_CODE(hResult); + if (Error == ERROR_SUCCESS) + { + if (BytesRet) + { + *BytesReturned = BytesRet; + } + } + + return Error; +} + +/** + * @name KmtFltGetMessage + * + * Gets a message from a filter driver + * + * @param hPort + * Handle to the filter's comms port + * @MessageBuffer + * Pointer to a buffer to receive the data from the filter + * @MessageBufferSize + * Size of the buffer pointed to by MessageBuffer + * @Overlapped + * Pointer to an overlapped structure + * + * @return Win32 error code + */ +DWORD +KmtFltGetMessage( + _In_ HANDLE hPort, + _Out_writes_bytes_(MessageBufferSize) PFILTER_MESSAGE_HEADER MessageBuffer, + _In_ DWORD MessageBufferSize, + _In_opt_ LPOVERLAPPED Overlapped) +{ + HRESULT hResult; + DWORD Error; + + assert(hPort); + assert(MessageBuffer); + + hResult = FilterGetMessage(hPort, + MessageBuffer, + MessageBufferSize, + Overlapped); + Error = SCODE_CODE(hResult); + return Error; +} + +/** + * @name KmtFltReplyMessage + * + * Replies to a message from a filter driver + * + * @param hPort + * Handle to the filter's comms port + * @ReplyBuffer + * Pointer to a buffer to return to the filter + * @ReplyBufferSize + * Size of the buffer pointed to by ReplyBuffer + * + * @return Win32 error code + */ +DWORD +KmtFltReplyMessage( + _In_ HANDLE hPort, + _In_reads_bytes_(ReplyBufferSize) PFILTER_REPLY_HEADER ReplyBuffer, + _In_ DWORD ReplyBufferSize) +{ + HRESULT hResult; + DWORD Error; + + hResult = FilterReplyMessage(hPort, + ReplyBuffer, + ReplyBufferSize); + Error = SCODE_CODE(hResult); + return Error; +} + +/** +* @name KmtFltGetMessageResult +* +* Gets the overlapped result from the IO +* +* @param hPort +* Handle to the filter's comms port +* @Overlapped +* Pointer to the overlapped structure usdd in the IO +* @BytesTransferred +* Number of bytes transferred in the IO +* +* @return Win32 error code +*/ +DWORD +KmtFltGetMessageResult( + _In_ HANDLE hPort, + _In_ LPOVERLAPPED Overlapped, + _Out_ LPDWORD BytesTransferred) +{ + BOOL Success; + DWORD Error = ERROR_SUCCESS; + + *BytesTransferred = 0; + + Success = GetOverlappedResult(hPort, Overlapped, BytesTransferred, TRUE); + if (!Success) + { + Error = GetLastError(); + } + + return Error; +} + +/** + * @name KmtFltUnload + * + * Unload the specified filter driver + * + * @param ServiceName + * The name of the filter to unload + * + * @return Win32 error code + */ +DWORD +KmtFltUnload( + _In_z_ PCWSTR ServiceName) +{ + HRESULT hResult; + DWORD Error = ERROR_SUCCESS; + + assert(ServiceName); + + hResult = FilterUnload(ServiceName); + Error = SCODE_CODE(hResult); + + return Error; +} + +/** + * @name KmtFltDeleteService + * + * Delete the specified filter driver + * + * @param ServiceName + * If *ServiceHandle is NULL, name of the service to delete + * @param ServiceHandle + * Pointer to a variable containing the service handle. + * Will be set to NULL on success + * + * @return Win32 error code + */ +DWORD +KmtFltDeleteService( + _In_z_ PCWSTR ServiceName OPTIONAL, + _Inout_ SC_HANDLE *ServiceHandle) +{ + return KmtDeleteService(ServiceName, ServiceHandle); +} + +/** + * @name KmtFltCloseService + * + * Close the specified driver service handle + * + * @param ServiceHandle + * Pointer to a variable containing the service handle. + * Will be set to NULL on success + * + * @return Win32 error code + */ +DWORD KmtFltCloseService( + _Inout_ SC_HANDLE *ServiceHandle) +{ + return KmtCloseService(ServiceHandle); +} diff --git a/modules/rostests/kmtests/kmtest/fltsupport.c b/modules/rostests/kmtests/kmtest/fltsupport.c new file mode 100644 index 0000000000..772e98a211 --- /dev/null +++ b/modules/rostests/kmtests/kmtest/fltsupport.c @@ -0,0 +1,301 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: File system mini-filter support routines + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +#include <kmt_test.h> + +#include "kmtest.h" +#include <kmt_public.h> + +#include <assert.h> +#include <debug.h> + +// move to a shared location +typedef struct _KMTFLT_MESSAGE_HEADER +{ + ULONG Message; + PVOID Buffer; + ULONG BufferSize; + +} KMTFLT_MESSAGE_HEADER, *PKMTFLT_MESSAGE_HEADER; + +extern HANDLE KmtestHandle; +static WCHAR TestServiceName[MAX_PATH]; + + +/** + * @name KmtFltLoadDriver + * + * Load the specified filter driver + * This routine will create the service entry if it doesn't already exist + * + * @param ServiceName + * Name of the driver service (Kmtest- prefix will be added automatically) + * @param RestartIfRunning + * TRUE to stop and restart the service if it is already running + * @param ConnectComms + * TRUE to create a comms connection to the specified filter + * @param hPort + * Handle to the filter's comms port + * + * @return Win32 error code + */ +DWORD +KmtFltLoadDriver( + _In_z_ PCWSTR ServiceName, + _In_ BOOLEAN RestartIfRunning, + _In_ BOOLEAN ConnectComms, + _Out_ HANDLE *hPort) +{ + DWORD Error = ERROR_SUCCESS; + WCHAR ServicePath[MAX_PATH]; + SC_HANDLE TestServiceHandle; + + StringCbCopy(ServicePath, sizeof ServicePath, ServiceName); + StringCbCat(ServicePath, sizeof ServicePath, L"_drv.sys"); + + StringCbCopy(TestServiceName, sizeof TestServiceName, L"Kmtest-"); + StringCbCat(TestServiceName, sizeof TestServiceName, ServiceName); + + Error = KmtFltCreateAndStartService(TestServiceName, ServicePath, NULL, &TestServiceHandle, TRUE); + + if (Error == ERROR_SUCCESS && ConnectComms) + { + Error = KmtFltConnect(ServiceName, hPort); + } + + return Error; +} + +/** + * @name KmtFltUnloadDriver + * + * Unload the specified filter driver + * + * @param hPort + * Handle to the filter's comms port + * @param ConnectComms + * TRUE to disconnect the comms connection before unloading + * + * @return Win32 error code + */ +DWORD +KmtFltUnloadDriver( + _In_ HANDLE *hPort, + _In_ BOOLEAN DisonnectComms) +{ + DWORD Error = ERROR_SUCCESS; + + if (DisonnectComms) + { + Error = KmtFltDisconnect(hPort); + + if (Error) + { + return Error; + } + } + + Error = KmtFltUnload(TestServiceName); + + if (Error) + { + // TODO + __debugbreak(); + } + + return Error; +} + + +/** +* @name KmtFltRunKernelTest +* +* Run the specified filter test part +* +* @param hPort +* Handle to the filter's comms port +* @param TestName +* Name of the test to run +* +* @return Win32 error code +*/ +DWORD +KmtFltRunKernelTest( + _In_ HANDLE hPort, + _In_z_ PCSTR TestName) +{ + return KmtFltSendStringToDriver(hPort, KMTFLT_RUN_TEST, TestName); +} + +/** +* @name KmtFltSendToDriver +* +* Send an I/O control message with no arguments to the driver opened with KmtOpenDriver +* +* @param hPort +* Handle to the filter's comms port +* @param Message +* The message to send to the filter +* +* @return Win32 error code as returned by DeviceIoControl +*/ +DWORD +KmtFltSendToDriver( + _In_ HANDLE hPort, + _In_ DWORD Message) +{ + assert(hPort); + return KmtFltSendBufferToDriver(hPort, Message, NULL, 0, NULL, 0, NULL); +} + +/** + * @name KmtFltSendStringToDriver + * + * Send an I/O control message with a string argument to the driver opened with KmtOpenDriver + * + * + * @param hPort + * Handle to the filter's comms port + * @param Message + * The message associated with the string + * @param String + * An ANSI string to send to the filter + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtFltSendStringToDriver( + _In_ HANDLE hPort, + _In_ DWORD Message, + _In_ PCSTR String) +{ + assert(hPort); + assert(String); + return KmtFltSendBufferToDriver(hPort, Message, (PVOID)String, (DWORD)strlen(String), NULL, 0, NULL); +} + +/** + * @name KmtFltSendWStringToDriver + * + * Send an I/O control message with a wide string argument to the driver opened with KmtOpenDriver + * + * @param hPort + * Handle to the filter's comms port + * @param Message + * The message associated with the string + * @param String + * An wide string to send to the filter + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtFltSendWStringToDriver( + _In_ HANDLE hPort, + _In_ DWORD Message, + _In_ PCWSTR String) +{ + return KmtFltSendBufferToDriver(hPort, Message, (PVOID)String, (DWORD)wcslen(String) * sizeof(WCHAR), NULL, 0, NULL); +} + +/** + * @name KmtFltSendUlongToDriver + * + * Send an I/O control message with an integer argument to the driver opened with KmtOpenDriver + * + * @param hPort + * Handle to the filter's comms port + * @param Message + * The message associated with the value + * @param Value + * An 32bit valueng to send to the filter + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtFltSendUlongToDriver( + _In_ HANDLE hPort, + _In_ DWORD Message, + _In_ DWORD Value) +{ + return KmtFltSendBufferToDriver(hPort, Message, &Value, sizeof(Value), NULL, 0, NULL); +} + +/** + * @name KmtSendBufferToDriver + * + * Send an I/O control message with the specified arguments to the driver opened with KmtOpenDriver + * + * @param hPort + * Handle to the filter's comms port + * @param Message + * The message associated with the value + * @param InBuffer + * Pointer to a buffer to send to the filter + * @param BufferSize + * Size of the buffer pointed to by InBuffer + * @param OutBuffer + * Pointer to a buffer to receive a response from the filter + * @param OutBufferSize + * Size of the buffer pointed to by OutBuffer + * @param BytesReturned + * Number of bytes written in the reply buffer + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtFltSendBufferToDriver( + _In_ HANDLE hPort, + _In_ DWORD Message, + _In_reads_bytes_(BufferSize) LPVOID InBuffer, + _In_ DWORD BufferSize, + _Out_writes_bytes_to_opt_(OutBufferSize, *BytesReturned) LPVOID OutBuffer, + _In_ DWORD OutBufferSize, + _Out_opt_ LPDWORD BytesReturned) +{ + PKMTFLT_MESSAGE_HEADER Ptr; + KMTFLT_MESSAGE_HEADER Header; + BOOLEAN FreeMemory = FALSE; + DWORD InBufferSize; + DWORD Error; + + assert(hPort); + + if (BufferSize) + { + assert(InBuffer); + + InBufferSize = sizeof(KMTFLT_MESSAGE_HEADER) + BufferSize; + Ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, InBufferSize); + if (!Ptr) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + FreeMemory = TRUE; + } + else + { + InBufferSize = sizeof(KMTFLT_MESSAGE_HEADER); + Ptr = &Header; + } + + Ptr->Message = Message; + if (BufferSize) + { + Ptr->Buffer = (Ptr + 1); + StringCbCopy(Ptr->Buffer, BufferSize, InBuffer); + Ptr->BufferSize = BufferSize; + } + + Error = KmtFltSendMessage(hPort, Ptr, InBufferSize, OutBuffer, OutBufferSize, BytesReturned); + + if (FreeMemory) + { + HeapFree(GetProcessHeap(), 0, Ptr); + } + + return Error; +} diff --git a/modules/rostests/kmtests/kmtest/kmtest.h b/modules/rostests/kmtests/kmtest/kmtest.h index 4f9709245f..7329d18e48 100644 --- a/modules/rostests/kmtests/kmtest/kmtest.h +++ b/modules/rostests/kmtests/kmtest/kmtest.h @@ -60,5 +60,76 @@ KmtDeleteService( DWORD KmtCloseService( IN OUT SC_HANDLE *ServiceHandle); + + +/* FS Filter management functions */ + +DWORD +KmtFltCreateService( + _In_z_ PCWSTR ServiceName, + _In_z_ PCWSTR ServicePath, + _In_z_ PCWSTR DisplayName OPTIONAL, + _Out_ SC_HANDLE *ServiceHandle); + +DWORD +KmtFltLoad( + _In_z_ PCWSTR ServiceName); + +DWORD +KmtFltCreateAndStartService( + _In_z_ PCWSTR ServiceName, + _In_z_ PCWSTR ServicePath, + _In_z_ PCWSTR DisplayName OPTIONAL, + _Out_ SC_HANDLE *ServiceHandle, + _In_ BOOLEAN RestartIfRunning); + +DWORD +KmtFltConnect( + _In_z_ PCWSTR ServiceName, + _Out_ HANDLE *hPort); + +DWORD +KmtFltDisconnect( + _Out_ HANDLE *hPort); + +DWORD +KmtFltSendMessage( + _In_ HANDLE hPort, + _In_reads_bytes_(dwInBufferSize) LPVOID lpInBuffer, + _In_ DWORD dwInBufferSize, + _Out_writes_bytes_to_opt_(dwOutBufferSize, *lpBytesReturned) LPVOID lpOutBuffer, + _In_ DWORD dwOutBufferSize, + _Out_opt_ LPDWORD lpBytesReturned); + +DWORD +KmtFltGetMessage( + _In_ HANDLE hPort, + _Out_writes_bytes_(dwMessageBufferSize) PFILTER_MESSAGE_HEADER lpMessageBuffer, + _In_ DWORD dwMessageBufferSize, + _In_opt_ LPOVERLAPPED Overlapped); + +DWORD +KmtFltReplyMessage( + _In_ HANDLE hPort, + _In_reads_bytes_(dwReplyBufferSize) PFILTER_REPLY_HEADER lpReplyBuffer, + _In_ DWORD dwReplyBufferSize); + +DWORD +KmtFltGetMessageResult( + _In_ HANDLE hPort, + _In_ LPOVERLAPPED Overlapped, + _Out_ LPDWORD BytesTransferred); + +DWORD +KmtFltUnload( + _In_z_ PCWSTR ServiceName); + +DWORD +KmtFltDeleteService( + _In_z_ PCWSTR ServiceName OPTIONAL, + _Inout_ SC_HANDLE *ServiceHandle); + +DWORD KmtFltCloseService( + _Inout_ SC_HANDLE *ServiceHandle); #endif /* !defined _KMTESTS_H_ */ diff --git a/modules/rostests/kmtests/kmtest/service.c b/modules/rostests/kmtests/kmtest/service.c index 9fa8785f48..3f617fc302 100644 --- a/modules/rostests/kmtests/kmtest/service.c +++ b/modules/rostests/kmtests/kmtest/service.c @@ -12,6 +12,19 @@ #define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE) +/* + * This is an internal function not meant for use by the kmtests app, + * so we declare it here instead of kmtest.h + */ +DWORD +KmtpCreateService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + IN DWORD ServiceType, + OUT SC_HANDLE *ServiceHandle); + + static SC_HANDLE ScmHandle; /** @@ -80,35 +93,11 @@ KmtCreateService( IN PCWSTR DisplayName OPTIONAL, OUT SC_HANDLE *ServiceHandle) { - DWORD Error = ERROR_SUCCESS; - WCHAR DriverPath[MAX_PATH]; - HRESULT result = S_OK; - - assert(ServiceHandle); - assert(ServiceName && ServicePath); - - if (!GetModuleFileName(NULL, DriverPath, sizeof DriverPath / sizeof DriverPath[0])) - error_goto(Error, cleanup); - - assert(wcsrchr(DriverPath, L'\\') != NULL); - wcsrchr(DriverPath, L'\\')[1] = L'\0'; - - result = StringCbCat(DriverPath, sizeof DriverPath, ServicePath); - if (FAILED(result)) - error_value_goto(Error, result, cleanup); - - if (GetFileAttributes(DriverPath) == INVALID_FILE_ATTRIBUTES) - error_goto(Error, cleanup); - - *ServiceHandle = CreateService(ScmHandle, ServiceName, DisplayName, - SERVICE_ACCESS, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, DriverPath, NULL, NULL, NULL, NULL, NULL); - - if (!*ServiceHandle) - error_goto(Error, cleanup); - -cleanup: - return Error; + return KmtpCreateService(ServiceName, + ServicePath, + DisplayName, + SERVICE_KERNEL_DRIVER, + ServiceHandle); } /** @@ -307,3 +296,47 @@ DWORD KmtCloseService( cleanup: return Error; } + + +/* + * Private function, not meant for use in kmtests + * See KmtCreateService & KmtFltCreateService + */ +DWORD +KmtpCreateService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + IN DWORD ServiceType, + OUT SC_HANDLE *ServiceHandle) +{ + DWORD Error = ERROR_SUCCESS; + WCHAR DriverPath[MAX_PATH]; + HRESULT result = S_OK; + + assert(ServiceHandle); + assert(ServiceName && ServicePath); + + if (!GetModuleFileName(NULL, DriverPath, sizeof DriverPath / sizeof DriverPath[0])) + error_goto(Error, cleanup); + + assert(wcsrchr(DriverPath, L'\\') != NULL); + wcsrchr(DriverPath, L'\\')[1] = L'\0'; + + result = StringCbCat(DriverPath, sizeof DriverPath, ServicePath); + if (FAILED(result)) + error_value_goto(Error, result, cleanup); + + if (GetFileAttributes(DriverPath) == INVALID_FILE_ATTRIBUTES) + error_goto(Error, cleanup); + + *ServiceHandle = CreateService(ScmHandle, ServiceName, DisplayName, + SERVICE_ACCESS, ServiceType, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, DriverPath, NULL, NULL, NULL, NULL, NULL); + + if (!*ServiceHandle) + error_goto(Error, cleanup); + +cleanup: + return Error; +} \ No newline at end of file

7 years, 2 months

[reactos] 01/01: [STORPORT] Get the interrupt from the resource list, connect it and call the miniports HwInterrupt routine. CORE-13866

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cfc1e31527f9e8a56fee… commit 5cfc1e31527f9e8a56fee8b7e2462670f95606b9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Oct 23 23:21:58 2017 +0200 [STORPORT] Get the interrupt from the resource list, connect it and call the miniports HwInterrupt routine. CORE-13866 --- drivers/storage/port/storport/fdo.c | 88 ++++++++++++++++++++++++++++++++ drivers/storage/port/storport/miniport.c | 16 ++++++ drivers/storage/port/storport/misc.c | 49 ++++++++++++++++++ drivers/storage/port/storport/precomp.h | 14 +++++ 4 files changed, 167 insertions(+) diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c index 9072971a91..3c49619b23 100644 --- a/drivers/storage/port/storport/fdo.c +++ b/drivers/storage/port/storport/fdo.c @@ -15,6 +15,90 @@ /* FUNCTIONS ******************************************************************/ +static +BOOLEAN +NTAPI +PortFdoInterruptRoutine( + _In_ PKINTERRUPT Interrupt, + _In_ PVOID ServiceContext) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("PortFdoInterruptRoutine(%p %p)\n", + Interrupt, ServiceContext); + + DeviceExtension = (PFDO_DEVICE_EXTENSION)ServiceContext; + + return MiniportHwInterrupt(&DeviceExtension->Miniport); +} + + +static +NTSTATUS +PortFdoConnectInterrupt( + _In_ PFDO_DEVICE_EXTENSION DeviceExtension) +{ + ULONG Vector; + KIRQL Irql; + KINTERRUPT_MODE InterruptMode; + BOOLEAN ShareVector; + KAFFINITY Affinity; + NTSTATUS Status; + + DPRINT1("PortFdoConnectInterrupt(%p)\n", + DeviceExtension); + + /* No resources, no interrupt. Done! */ + if (DeviceExtension->AllocatedResources == NULL || + DeviceExtension->TranslatedResources == NULL) + { + DPRINT1("Checkpoint\n"); + return STATUS_SUCCESS; + } + + /* Get the interrupt data from the resource list */ + Status = GetResourceListInterrupt(DeviceExtension, + &Vector, + &Irql, + &InterruptMode, + &ShareVector, + &Affinity); + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetResourceListInterrupt() failed (Status 0x%08lx)\n", Status); + return Status; + } + + DPRINT1("Vector: %lu\n", Vector); + DPRINT1("Irql: %lu\n", Irql); + + DPRINT1("Affinity: 0x%08lx\n", Affinity); + + /* Connect the interrupt */ + Status = IoConnectInterrupt(&DeviceExtension->Interrupt, + PortFdoInterruptRoutine, + DeviceExtension, + NULL, + Vector, + Irql, + Irql, + InterruptMode, + ShareVector, + Affinity, + FALSE); + if (NT_SUCCESS(Status)) + { + DeviceExtension->InterruptIrql = Irql; + } + else + { + DPRINT1("IoConnectInterrupt() failed (Status 0x%08lx)\n", Status); + } + + return Status; +} + + static NTSTATUS PortFdoStartMiniport( @@ -55,6 +139,10 @@ PortFdoStartMiniport( return Status; } + + Status = PortFdoConnectInterrupt(DeviceExtension); + + /* Call the miniports HwInitialize function */ Status = MiniportHwInitialize(&DeviceExtension->Miniport); if (!NT_SUCCESS(Status)) diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index c13a3f37a5..815e609031 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -346,4 +346,20 @@ MiniportHwInitialize( return Result ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } + +BOOLEAN +MiniportHwInterrupt( + _In_ PMINIPORT Miniport) +{ + BOOLEAN Result; + + DPRINT1("MiniportHwInterrupt(%p)\n", + Miniport); + + Result = Miniport->InitData->HwInterrupt(&Miniport->MiniportExtension->HwDeviceExtension); + DPRINT1("HwInterrupt() returned %u\n", Result); + + return Result; +} + /* EOF */ diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c index 7710201876..f74fd3516f 100644 --- a/drivers/storage/port/storport/misc.c +++ b/drivers/storage/port/storport/misc.c @@ -287,6 +287,55 @@ TranslateResourceListAddress( } +NTSTATUS +GetResourceListInterrupt( + PFDO_DEVICE_EXTENSION DeviceExtension, + PULONG Vector, + PKIRQL Irql, + KINTERRUPT_MODE *InterruptMode, + PBOOLEAN ShareVector, + PKAFFINITY Affinity) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + INT i, j; + + DPRINT1("GetResourceListInterrupt(%p)\n", + DeviceExtension); + + FullDescriptor = DeviceExtension->TranslatedResources->List; + for (i = 0; i < DeviceExtension->TranslatedResources->Count; i++) + { + for (j = 0; j < FullDescriptor->PartialResourceList.Count; j++) + { + PartialDescriptor = FullDescriptor->PartialResourceList.PartialDescriptors + j; + + switch (PartialDescriptor->Type) + { + case CmResourceTypeInterrupt: + DPRINT1("Interrupt: Level %lu Vector %lu\n", + PartialDescriptor->u.Interrupt.Level, + PartialDescriptor->u.Interrupt.Vector); + + *Vector = PartialDescriptor->u.Interrupt.Vector; + *Irql = (KIRQL)PartialDescriptor->u.Interrupt.Level; + *InterruptMode = (PartialDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) ? Latched : LevelSensitive; + *ShareVector = (PartialDescriptor->ShareDisposition == CmResourceShareShared) ? TRUE : FALSE; + *Affinity = PartialDescriptor->u.Interrupt.Affinity; + + return STATUS_SUCCESS; + } + } + + /* Advance to next CM_FULL_RESOURCE_DESCRIPTOR block in memory. */ + FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptor->PartialResourceList.PartialDescriptors + + FullDescriptor->PartialResourceList.Count); + } + + return STATUS_NOT_FOUND; +} + + NTSTATUS AllocateAddressMapping( PMAPPED_ADDRESS *MappedAddressList, diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index 168c318544..5bd16f338f 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -101,6 +101,8 @@ typedef struct _FDO_DEVICE_EXTENSION PHYSICAL_ADDRESS UncachedExtensionPhysicalBase; ULONG UncachedExtensionSize; PHW_PASSIVE_INITIALIZE_ROUTINE HwPassiveInitRoutine; + PKINTERRUPT Interrupt; + ULONG InterruptIrql; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; @@ -140,6 +142,9 @@ NTSTATUS MiniportHwInitialize( _In_ PMINIPORT Miniport); +BOOLEAN +MiniportHwInterrupt( + _In_ PMINIPORT Miniport); /* misc.c */ @@ -182,6 +187,15 @@ TranslateResourceListAddress( BOOLEAN InIoSpace, PPHYSICAL_ADDRESS TranslatedAddress); +NTSTATUS +GetResourceListInterrupt( + PFDO_DEVICE_EXTENSION DeviceExtension, + PULONG Vector, + PKIRQL Irql, + KINTERRUPT_MODE *InterruptMode, + PBOOLEAN ShareVector, + PKAFFINITY Affinity); + NTSTATUS AllocateAddressMapping( PMAPPED_ADDRESS *MappedAddressList,

7 years, 2 months

[reactos] 01/01: CORE-13048. [I8042PRT] keyboard.c: Restore 1 "Irql =" (which was lost in r30000). (#63)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=deb9c5416f493cdd0de9c… commit deb9c5416f493cdd0de9ce69ff7e39bffe7e34f7 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Oct 23 21:18:27 2017 +0200 CORE-13048. [I8042PRT] keyboard.c: Restore 1 "Irql =" (which was lost in r30000). (#63) [I8042PRT] Restore 1 "Irql =" (which was lost in r30000). CORE-13048 --- drivers/input/i8042prt/keyboard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/input/i8042prt/keyboard.c b/drivers/input/i8042prt/keyboard.c index e007d289b8..198ec8f35d 100644 --- a/drivers/input/i8042prt/keyboard.c +++ b/drivers/input/i8042prt/keyboard.c @@ -369,7 +369,10 @@ i8042KbdDpcRoutine( DeviceExtension->KeyboardBuffer + KeysInBufferCopy, &KeysTransferred); - KeAcquireInterruptSpinLock(PortDeviceExtension->HighestDIRQLInterrupt); + /* Validate that the callback didn't change the Irql. */ + ASSERT(KeGetCurrentIrql() == Irql); + + Irql = KeAcquireInterruptSpinLock(PortDeviceExtension->HighestDIRQLInterrupt); DeviceExtension->KeysInBuffer -= KeysTransferred; KeReleaseInterruptSpinLock(PortDeviceExtension->HighestDIRQLInterrupt, Irql); }

7 years, 2 months

[reactos] 01/01: [CONFIGURE] Add -VS_VER flag (#86)

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b46d3ce5e9cf6b054f9b9… commit b46d3ce5e9cf6b054f9b9f354c74a0cf3fdb729b Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Mon Oct 23 19:28:15 2017 +0300 [CONFIGURE] Add -VS_VER flag (#86) This flag can override the detected version of VS. Usage example: `configure.cmd vssolution -VS_VER 14` --- configure.cmd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.cmd b/configure.cmd index ed19d9f5d9..6b0c5dfbb9 100755 --- a/configure.cmd +++ b/configure.cmd @@ -109,6 +109,11 @@ REM Parse command line parameters set CMAKE_GENERATOR="NMake Makefiles" ) else if /I "%1" == "VSSolution" ( set VS_SOLUTION=1 + REM explicitly set VS version for project generator + if /I "%2" == "-VS_VER" ( + set VS_VERSION=%3 + echo Visual Studio Environment set to !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH! + ) if "!VS_VERSION!" == "9" ( if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"

7 years, 2 months

[reactos] 01/01: [KERNEL32] Fix MSVC build

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0add5d0a79afedbfbfe56… commit 0add5d0a79afedbfbfe568b1ac65c51fb2dd2f86 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 23 17:25:19 2017 +0200 [KERNEL32] Fix MSVC build --- dll/win32/kernel32/client/file/npipe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/kernel32/client/file/npipe.c b/dll/win32/kernel32/client/file/npipe.c index b39982e205..a142cf4537 100644 --- a/dll/win32/kernel32/client/file/npipe.c +++ b/dll/win32/kernel32/client/file/npipe.c @@ -45,9 +45,9 @@ NpGetUserNamep(HANDLE hNamedPipe, } /* Import the three required functions */ - pRevertToSelf = GetProcAddress(hAdvapi, "RevertToSelf"); - pGetUserNameW = GetProcAddress(hAdvapi, "GetUserNameW"); - pImpersonateNamedPipeClient = GetProcAddress(hAdvapi, "ImpersonateNamedPipeClient"); + pRevertToSelf = (BOOL (WINAPI *)(void))GetProcAddress(hAdvapi, "RevertToSelf"); + pGetUserNameW = (BOOL (WINAPI *)(LPWSTR, LPDWORD))GetProcAddress(hAdvapi, "GetUserNameW"); + pImpersonateNamedPipeClient = (BOOL (WINAPI *)(HANDLE))GetProcAddress(hAdvapi, "ImpersonateNamedPipeClient"); /* If any couldn't be found, fail */ if (pRevertToSelf == NULL || pGetUserNameW == NULL || pImpersonateNamedPipeClient == NULL) {

7 years, 2 months

[reactos] 01/01: [KERNEL32] Implement NpGetUserNamep()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34c39a1336e1cf000b015… commit 34c39a1336e1cf000b0159bd47f59ee1b1e9def4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 23 17:08:50 2017 +0200 [KERNEL32] Implement NpGetUserNamep() --- dll/win32/kernel32/client/file/npipe.c | 85 ++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 5 deletions(-) diff --git a/dll/win32/kernel32/client/file/npipe.c b/dll/win32/kernel32/client/file/npipe.c index 3ed0c555e3..b39982e205 100644 --- a/dll/win32/kernel32/client/file/npipe.c +++ b/dll/win32/kernel32/client/file/npipe.c @@ -20,17 +20,92 @@ LONG ProcessPipeId; /* FUNCTIONS ******************************************************************/ +/* + * @implemented + */ static BOOL NpGetUserNamep(HANDLE hNamedPipe, LPWSTR lpUserName, DWORD nMaxUserNameSize) { - /* FIXME - open the thread token, call ImpersonateNamedPipeClient() and - retrieve the user name with GetUserName(), revert the impersonation - and finally restore the thread token */ - UNIMPLEMENTED; - return TRUE; + BOOL Ret; + HANDLE hToken; + HMODULE hAdvapi; + NTSTATUS Status; + BOOL (WINAPI *pRevertToSelf)(void); + BOOL (WINAPI *pGetUserNameW)(LPWSTR lpBuffer, LPDWORD lpnSize); + BOOL (WINAPI *pImpersonateNamedPipeClient)(HANDLE hNamedPipe); + + /* Open advapi, we'll funcs from it */ + hAdvapi = LoadLibraryW(L"advapi32.dll"); + if (hAdvapi == NULL) + { + return FALSE; + } + + /* Import the three required functions */ + pRevertToSelf = GetProcAddress(hAdvapi, "RevertToSelf"); + pGetUserNameW = GetProcAddress(hAdvapi, "GetUserNameW"); + pImpersonateNamedPipeClient = GetProcAddress(hAdvapi, "ImpersonateNamedPipeClient"); + /* If any couldn't be found, fail */ + if (pRevertToSelf == NULL || pGetUserNameW == NULL || pImpersonateNamedPipeClient == NULL) + { + FreeLibrary(hAdvapi); + return FALSE; + } + + /* Now, open the thread token for impersonation */ + Status = NtOpenThreadToken(NtCurrentThread(), TOKEN_IMPERSONATE, TRUE, &hToken); + /* Try to impersonate the pipe client */ + if (pImpersonateNamedPipeClient(hNamedPipe)) + { + DWORD lpnSize; + + /* It worked, get the user name */ + lpnSize = nMaxUserNameSize; + Ret = pGetUserNameW(lpUserName, &lpnSize); + /* Failed to get the thread token? Revert to self */ + if (!NT_SUCCESS(Status)) + { + pRevertToSelf(); + + FreeLibrary(hAdvapi); + return Ret; + } + + /* Restore the thread token */ + Status = NtSetInformationThread(NtCurrentThread(), ThreadImpersonationToken, + &hToken, sizeof(HANDLE)); + /* We cannot fail closing the thread token! */ + if (!CloseHandle(hToken)) + { + ASSERT(FALSE); + } + + /* Set last error if it failed */ + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + } + } + else + { + /* If opening the thread token succeed, close it */ + if (NT_SUCCESS(Status)) + { + /* We cannot fail closing it! */ + if (!CloseHandle(hToken)) + { + ASSERT(FALSE); + } + } + + Ret = FALSE; + } + + FreeLibrary(hAdvapi); + return Ret; }

7 years, 2 months

← Newer
1
2
3
4
5
6
7
8
9
...
28
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 October 2017