Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 73803: [COMCTL32] - Add and install a manifest for comctl32 version 5.82. - Since our comctl32 tries to imitate both version 5 and version 6, register its classes twice, once while h...
by gadamopoulos＠svn.reactos.org 17 Feb '17

17 Feb '17

Author: gadamopoulos Date: Fri Feb 17 10:04:24 2017 New Revision: 73803 URL: http://svn.reactos.org/svn/reactos?rev=73803&view=rev Log: [COMCTL32] - Add and install a manifest for comctl32 version 5.82. - Since our comctl32 tries to imitate both version 5 and version 6, register its classes twice, once while having the version 6 manifest active and once when having the version 5 active. - Register the themed versions of the built in controls while having the version 6 manifest active (and register them as global classes). This breaks theming of built in controls until versioned classes get implemented. - Do not try to subclass the dialog class. This is incorrect and can lead to problems like in CORE-8534, CORE-12727, CORE-8387. This removes the background texture of the themed tabs which will be implemented in the future in uxtheme using api hooks. This breaks a great deal of theming but keep in mind that it is in the middle of a transition to have them implemented correctly without the terrible side effects (broken ansi conversion, not always using themes for built in controls. However comctl32 is now ready for versioned classes to be enabled. CORE-12285 Added: trunk/reactos/dll/win32/comctl32/comctl32v5.manifest (with props) Modified: trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32.manifest trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/theming.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Fri Feb 17 10:04:24 2017 @@ -165,7 +165,7 @@ int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) DECLSPEC_HIDDEN; -extern void THEMING_Initialize(void) DECLSPEC_HIDDEN; +extern void THEMING_Initialize(HANDLE hActCtx5, HANDLE hActCtx6) DECLSPEC_HIDDEN; extern void THEMING_Uninitialize(void) DECLSPEC_HIDDEN; extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; extern void THEMING_SetSubclassData(HWND, ULONG_PTR) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/comctl32/comctl32.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.manifest [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.manifest [iso-8859-1] Fri Feb 17 10:04:24 2017 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" processorArchitecture="" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass>Button</windowClass> <windowClass>ButtonListBox</windowClass> @@ -12,7 +12,6 @@ <windowClass>NativeFontCtl</windowClass> <windowClass>ReBarWindow32</windowClass> <windowClass>ScrollBar</windowClass> - <windowClass>Static</windowClass> <windowClass>SysAnimate32</windowClass> <windowClass>SysDateTimePick32</windowClass> <windowClass>SysHeader32</windowClass> Added: trunk/reactos/dll/win32/comctl32/comctl32v5.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32v5.manifest (added) +++ trunk/reactos/dll/win32/comctl32/comctl32v5.manifest [iso-8859-1] Fri Feb 17 10:04:24 2017 @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <file name="comctl32.dll"> + <windowClass versioned="no">Button</windowClass> + <windowClass versioned="no">ButtonListBox</windowClass> + <windowClass versioned="no">ComboBoxEx32</windowClass> + <windowClass versioned="no">ComboLBox</windowClass> + <windowClass versioned="no">Combobox</windowClass> + <windowClass versioned="no">Edit</windowClass> + <windowClass versioned="no">Listbox</windowClass> + <windowClass versioned="no">NativeFontCtl</windowClass> + <windowClass versioned="no">ReBarWindow32</windowClass> + <windowClass versioned="no">ScrollBar</windowClass> + <windowClass versioned="no">SysAnimate32</windowClass> + <windowClass versioned="no">SysDateTimePick32</windowClass> + <windowClass versioned="no">SysHeader32</windowClass> + <windowClass versioned="no">SysIPAddress32</windowClass> + <windowClass versioned="no">SysLink</windowClass> + <windowClass versioned="no">SysListView32</windowClass> + <windowClass versioned="no">SysMonthCal32</windowClass> + <windowClass versioned="no">SysPager</windowClass> + <windowClass versioned="no">SysTabControl32</windowClass> + <windowClass versioned="no">SysTreeView32</windowClass> + <windowClass versioned="no">ToolbarWindow32</windowClass> + <windowClass versioned="no">msctls_hotkey32</windowClass> + <windowClass versioned="no">msctls_progress32</windowClass> + <windowClass versioned="no">msctls_statusbar32</windowClass> + <windowClass versioned="no">msctls_trackbar32</windowClass> + <windowClass versioned="no">msctls_updown32</windowClass> + <windowClass versioned="no">tooltips_class32</windowClass> + </file> +</assembly> Propchange: trunk/reactos/dll/win32/comctl32/comctl32v5.manifest ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Fri Feb 17 10:04:24 2017 @@ -60,7 +60,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); +static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +static LPWSTR COMCTL32_wSubclass = NULL; +HMODULE COMCTL32_hModule = 0; +static LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL); +HBRUSH COMCTL32_hPattern55AABrush = NULL; +COMCTL32_SysColor comctl32_color; + +static HBITMAP COMCTL32_hPattern55AABitmap = NULL; + +static const WORD wPattern55AA[] = +{ + 0x5555, 0xaaaa, 0x5555, 0xaaaa, + 0x5555, 0xaaaa, 0x5555, 0xaaaa +}; + +static const WCHAR strCC32SubclassInfo[] = { + 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 +}; + +#ifdef __REACTOS__ + +#include <strsafe.h> + #define NAME L"microsoft.windows.common-controls" +#define VERSION_V5 L"5.82.2600.2982" #define VERSION L"6.0.2600.2982" #define PUBLIC_KEY L"6595b64144ccf1df" @@ -73,38 +98,51 @@ #endif static const WCHAR manifest_filename[] = ARCH L"_" NAME L"_" PUBLIC_KEY L"_" VERSION L"_none_deadbeef.manifest"; - -static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - -static LPWSTR COMCTL32_wSubclass = NULL; -HMODULE COMCTL32_hModule = 0; -static LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL); -HBRUSH COMCTL32_hPattern55AABrush = NULL; -COMCTL32_SysColor comctl32_color; - -static HBITMAP COMCTL32_hPattern55AABitmap = NULL; - -static const WORD wPattern55AA[] = -{ - 0x5555, 0xaaaa, 0x5555, 0xaaaa, - 0x5555, 0xaaaa, 0x5555, 0xaaaa -}; - -static const WCHAR strCC32SubclassInfo[] = { - 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 -}; - -static BOOL create_manifest(BOOL install) +static const WCHAR manifest_filename_v5[] = ARCH L"_" NAME L"_" PUBLIC_KEY L"_" VERSION_V5 L"_none_deadbeef.manifest"; + +static WCHAR* GetManifestPath(BOOL create, BOOL bV6) +{ + WCHAR *pwszBuf; + HRESULT hres; + + pwszBuf = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if (!pwszBuf) + return NULL; + + GetWindowsDirectoryW(pwszBuf, MAX_PATH); + hres = StringCchCatW(pwszBuf, MAX_PATH, L"\\winsxs"); + if (FAILED(hres)) + return NULL; + if (create) + CreateDirectoryW(pwszBuf, NULL); + hres = StringCchCatW(pwszBuf, MAX_PATH, L"\\manifests\\"); + if (FAILED(hres)) + return NULL; + if (create) + CreateDirectoryW(pwszBuf, NULL); + + hres = StringCchCatW(pwszBuf, MAX_PATH, bV6 ? manifest_filename : manifest_filename_v5); + if (FAILED(hres)) + return NULL; + + return pwszBuf; +} + +static BOOL create_manifest(BOOL install, BOOL bV6) { WCHAR *pwszBuf; HRSRC hResInfo; HGLOBAL hResData; PVOID pManifest; - DWORD cchBuf, cbManifest, cbWritten; + DWORD cbManifest, cbWritten; HANDLE hFile; BOOL bRet = FALSE; - hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", (LPWSTR)RT_MANIFEST); + if (bV6) + hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", (LPWSTR)RT_MANIFEST); + else + hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFESTV5", (LPWSTR)RT_MANIFEST); + if (!hResInfo) return FALSE; @@ -120,17 +158,10 @@ if (!pManifest) return FALSE; - cchBuf = GetWindowsDirectoryW(NULL, 0) * sizeof(WCHAR) + sizeof(L"\\winsxs\\manifests\\") + sizeof(manifest_filename); - pwszBuf = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, cchBuf * sizeof(WCHAR)); + pwszBuf = GetManifestPath(TRUE, bV6); if (!pwszBuf) return FALSE; - GetWindowsDirectoryW(pwszBuf, cchBuf); - lstrcatW(pwszBuf, L"\\winsxs"); - CreateDirectoryW(pwszBuf, NULL); - lstrcatW(pwszBuf, L"\\manifests\\"); - CreateDirectoryW(pwszBuf, NULL); - lstrcatW(pwszBuf, manifest_filename); if (install) { hFile = CreateFileW(pwszBuf, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); @@ -155,6 +186,134 @@ return bRet; } +static HANDLE CreateComctl32ActCtx(BOOL bV6) +{ + HANDLE ret; + WCHAR* pwstrSource; + ACTCTXW ActCtx = {sizeof(ACTCTX)}; + + pwstrSource = GetManifestPath(FALSE, bV6); + if (!pwstrSource) + { + ERR("GetManifestPath failed! bV6=%d\n", bV6); + return INVALID_HANDLE_VALUE; + } + ActCtx.lpSource = pwstrSource; + ret = CreateActCtxW(&ActCtx); + HeapFree(GetProcessHeap(), 0, pwstrSource); + if (ret == INVALID_HANDLE_VALUE) + ERR("CreateActCtxW failed! bV6=%d\n", bV6); + return ret; +} + +static void RegisterControls() +{ + ANIMATE_Register (); + COMBOEX_Register (); + DATETIME_Register (); + FLATSB_Register (); + HEADER_Register (); + HOTKEY_Register (); + IPADDRESS_Register (); + LISTVIEW_Register (); + MONTHCAL_Register (); + NATIVEFONT_Register (); + PAGER_Register (); + PROGRESS_Register (); + REBAR_Register (); + STATUS_Register (); + SYSLINK_Register (); + TAB_Register (); + TOOLBAR_Register (); + TOOLTIPS_Register (); + TRACKBAR_Register (); + TREEVIEW_Register (); + UPDOWN_Register (); +} + +static void UnregisterControls() +{ + ANIMATE_Unregister (); + COMBOEX_Unregister (); + DATETIME_Unregister (); + FLATSB_Unregister (); + HEADER_Unregister (); + HOTKEY_Unregister (); + IPADDRESS_Unregister (); + LISTVIEW_Unregister (); + MONTHCAL_Unregister (); + NATIVEFONT_Unregister (); + PAGER_Unregister (); + PROGRESS_Unregister (); + REBAR_Unregister (); + STATUS_Unregister (); + SYSLINK_Unregister (); + TAB_Unregister (); + TOOLBAR_Unregister (); + TOOLTIPS_Unregister (); + TRACKBAR_Unregister (); + TREEVIEW_Unregister (); + UPDOWN_Unregister (); +} + +static void InitializeClasses() +{ + HANDLE hActCtx5, hActCtx6; + BOOL activated; + ULONG_PTR ulCookie; + + /* like comctl32 5.82+ register all the common control classes */ + /* Register the classes once no matter what */ + hActCtx5 = CreateComctl32ActCtx(FALSE); + activated = (hActCtx5 != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx5, &ulCookie) : FALSE); + RegisterControls(); /* Register the classes pretending to be v5 */ + if (activated) DeactivateActCtx(0, ulCookie); + + hActCtx6 = CreateComctl32ActCtx(TRUE); + if (hActCtx6 != INVALID_HANDLE_VALUE) + { + activated = ActivateActCtx(hActCtx6, &ulCookie); + RegisterControls(); /* Register the classes pretending to be v6 */ + if (activated) DeactivateActCtx(0, ulCookie); + + /* Initialize the themed controls only when the v6 manifest is present */ + THEMING_Initialize (hActCtx5, hActCtx6); + } +} + +static void UninitializeClasses() +{ + HANDLE hActCtx5, hActCtx6; + BOOL activated; + ULONG_PTR ulCookie; + + hActCtx5 = CreateComctl32ActCtx(FALSE); + activated = (hActCtx5 != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx5, &ulCookie) : FALSE); + UnregisterControls(); + if (activated) DeactivateActCtx(0, ulCookie); + + hActCtx6 = CreateComctl32ActCtx(TRUE); + if (hActCtx6 != INVALID_HANDLE_VALUE) + { + activated = ActivateActCtx(hActCtx6, &ulCookie); + THEMING_Uninitialize(); + UnregisterControls(); + if (activated) DeactivateActCtx(0, ulCookie); + } +} + +/*********************************************************************** + * RegisterClassNameW [COMCTL32.@] + * + * Register window class again while using as SxS module. + */ +BOOLEAN WINAPI RegisterClassNameW(LPCWSTR className) +{ + InitializeClasses(); + return TRUE; +} + +#endif /*********************************************************************** * DllMain [Internal] @@ -192,6 +351,7 @@ /* Get all the colors at DLL load */ COMCTL32_RefreshSysColors(); +#ifndef __REACTOS__ /* like comctl32 5.82+ register all the common control classes */ ANIMATE_Register (); COMBOEX_Register (); @@ -217,10 +377,15 @@ /* subclass user32 controls */ THEMING_Initialize (); +#else + InitializeClasses(); +#endif + break; case DLL_PROCESS_DETACH: if (lpvReserved) break; +#ifndef __REACTOS__ /* clean up subclassing */ THEMING_Uninitialize(); @@ -246,7 +411,9 @@ TRACKBAR_Unregister (); TREEVIEW_Unregister (); UPDOWN_Unregister (); - +#else + UninitializeClasses(); +#endif /* delete local pattern brush */ DeleteObject (COMCTL32_hPattern55AABrush); DeleteObject (COMCTL32_hPattern55AABitmap); @@ -991,11 +1158,21 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); - if (!create_manifest(bInstall)) + +#ifdef __REACTOS__ + + if (!create_manifest(bInstall, TRUE)) { - ERR("create_manifest failed!\n"); + ERR("Failed to install comctl32 v6 manifest!\n"); return HRESULT_FROM_WIN32(GetLastError()); } + + if (!create_manifest(bInstall, FALSE)) + { + ERR("Failed to install comctl32 v5 manifest!\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } +#endif return S_OK; } @@ -1856,15 +2033,3 @@ return LoadIconWithScaleDown(hinst, name, cx, cy, icon); } - -/*********************************************************************** - * RegisterClassNameW [COMCTL32.@] - * - * Register window class again while using as SxS module. - */ -BOOLEAN WINAPI RegisterClassNameW(LPCWSTR className) -{ - /* FIXME: actually register redirected user32 class, - comctl32 classes are registered by this module anyway */ - return TRUE; -} Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Fri Feb 17 10:04:24 2017 @@ -38,6 +38,7 @@ /* @makedep: comctl32.manifest */ WINE_MANIFEST RT_MANIFEST comctl32.manifest +WINE_MANIFESTV5 RT_MANIFEST comctl32v5.manifest /* @makedep: idt_check.bmp */ IDT_CHECK BITMAP idt_check.bmp Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] Fri Feb 17 10:04:24 2017 @@ -30,8 +30,6 @@ ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_ComboSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; -extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM, - ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_EditSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, @@ -48,7 +46,6 @@ THEMING_SUBCLASSPROC subclassProc; } subclasses[] = { /* Note: list must be sorted by class name */ - {dialogClass, THEMING_DialogSubclassProc}, {WC_BUTTONW, THEMING_ButtonSubclassProc}, {WC_COMBOBOXW, THEMING_ComboSubclassProc}, {comboLboxClass, THEMING_ListBoxSubclassProc}, @@ -90,7 +87,6 @@ MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) MAKE_SUBCLASS_PROC(5) -MAKE_SUBCLASS_PROC(6) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, @@ -98,8 +94,7 @@ subclass_proc2, subclass_proc3, subclass_proc4, - subclass_proc5, - subclass_proc6 + subclass_proc5 }; /*********************************************************************** @@ -108,15 +103,15 @@ * Register classes for standard controls that will shadow the system * classes. */ -void THEMING_Initialize (void) +void THEMING_Initialize (HANDLE hActCtx5, HANDLE hActCtx6) { unsigned int i; static const WCHAR subclassPropName[] = { 'C','C','3','2','T','h','e','m','i','n','g','S','u','b','C','l',0 }; static const WCHAR refDataPropName[] = { 'C','C','3','2','T','h','e','m','i','n','g','D','a','t','a',0 }; - - if (!IsThemeActive()) return; + ULONG_PTR ulCookie; + BOOL ret, bActivated; atSubclassProp = GlobalAddAtomW (subclassPropName); atRefDataProp = GlobalAddAtomW (refDataPropName); @@ -126,7 +121,13 @@ WNDCLASSEXW class; class.cbSize = sizeof(class); - if (!GetClassInfoExW (NULL, subclasses[i].className, &class)) + + bActivated = ActivateActCtx(hActCtx5, &ulCookie); + ret = GetClassInfoExW (NULL, subclasses[i].className, &class); + if (bActivated) + DeactivateActCtx(0, ulCookie); + + if (!ret) { ERR("Could not retrieve information for class %s\n", debugstr_w (subclasses[i].className)); @@ -134,7 +135,9 @@ } originalProcs[i] = class.lpfnWndProc; class.lpfnWndProc = subclassProcs[i]; - + class.style |= CS_GLOBALCLASS; + class.hInstance = COMCTL32_hModule; + if (!class.lpfnWndProc) { ERR("Missing proc for class %s\n", @@ -142,9 +145,11 @@ continue; } + bActivated = ActivateActCtx(hActCtx6, &ulCookie); + if (!RegisterClassExW (&class)) { - ERR("Could not re-register class %s: %x\n", + WARN("Could not re-register class %s: %x\n", debugstr_w (subclasses[i].className), GetLastError ()); } else @@ -152,6 +157,9 @@ TRACE("Re-registered class %s\n", debugstr_w (subclasses[i].className)); } + + if (bActivated) + DeactivateActCtx(0, ulCookie); } }

1 0

[khornicek] 73802: [SPIDER] - Make the formatting a bit more consistent. [EVENTVWR] - Remove an useless cast.
by khornicek＠svn.reactos.org 15 Feb '17

15 Feb '17

Author: khornicek Date: Wed Feb 15 10:53:41 2017 New Revision: 73802 URL: http://svn.reactos.org/svn/reactos?rev=73802&view=rev Log: [SPIDER] - Make the formatting a bit more consistent. [EVENTVWR] - Remove an useless cast. Modified: trunk/reactos/base/applications/games/spider/spider.cpp trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Wed Feb 15 10:53:41 2017 @@ -57,21 +57,21 @@ case WM_COMMAND: switch(LOWORD(wParam)) { - case IDOK: - if (IsDlgButtonChecked(hDlg, IDC_DIF_ONECOLOR) == BST_CHECKED) - dwDifficulty = IDC_DIF_ONECOLOR; - else if (IsDlgButtonChecked(hDlg, IDC_DIF_TWOCOLORS) == BST_CHECKED) - dwDifficulty = IDC_DIF_TWOCOLORS; - else if (IsDlgButtonChecked(hDlg, IDC_DIF_FOURCOLORS) == BST_CHECKED) - dwDifficulty = IDC_DIF_FOURCOLORS; - - NewGame(); - EndDialog(hDlg, TRUE); - return TRUE; - - case IDCANCEL: - EndDialog(hDlg, FALSE); - return TRUE; + case IDOK: + if (IsDlgButtonChecked(hDlg, IDC_DIF_ONECOLOR) == BST_CHECKED) + dwDifficulty = IDC_DIF_ONECOLOR; + else if (IsDlgButtonChecked(hDlg, IDC_DIF_TWOCOLORS) == BST_CHECKED) + dwDifficulty = IDC_DIF_TWOCOLORS; + else if (IsDlgButtonChecked(hDlg, IDC_DIF_FOURCOLORS) == BST_CHECKED) + dwDifficulty = IDC_DIF_FOURCOLORS; + + NewGame(); + EndDialog(hDlg, TRUE); + return TRUE; + + case IDCANCEL: + EndDialog(hDlg, FALSE); + return TRUE; } break; } @@ -122,16 +122,16 @@ MakePath(szHelpPath, MAX_PATH, _T(".hlp")); hwnd = CreateWindow(szAppName, - szAppName, - WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, - CW_USEDEFAULT, - 0, /*The real size will be computed in WndProc through WM_GETMINMAXINFO */ - 0, /* The real size will be computed in WndProc through WM_GETMINMAXINFO */ - NULL, - NULL, - hInst, - NULL); + szAppName, + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 0, /*The real size will be computed in WndProc through WM_GETMINMAXINFO */ + 0, /* The real size will be computed in WndProc through WM_GETMINMAXINFO */ + NULL, + NULL, + hInst, + NULL); hwndMain = hwnd; @@ -142,9 +142,9 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_DIFFICULTY), hwnd, DifficultyDlgProc); - while(GetMessage(&msg, NULL,0,0)) - { - if(!TranslateAccelerator(hwnd, hAccelTable, &msg)) + while (GetMessage(&msg, NULL,0,0)) + { + if (!TranslateAccelerator(hwnd, hAccelTable, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); @@ -153,17 +153,12 @@ return msg.wParam; } -LRESULT CALLBACK -CardImageWndProc(HWND hwnd, - UINT msg, - WPARAM wParam, - LPARAM lParam) -{ - PCARDBACK pCardBack = (PCARDBACK)GetWindowLongPtr(hwnd, - GWL_USERDATA); +LRESULT CALLBACK CardImageWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + PCARDBACK pCardBack = (PCARDBACK)GetWindowLongPtr(hwnd, GWL_USERDATA); static WNDPROC hOldProc = NULL; - if(!pCardBack) + if (!pCardBack) return FALSE; if (!hOldProc) @@ -171,55 +166,51 @@ switch (msg) { - case WM_PAINT: - { - HDC hdc; - PAINTSTRUCT ps; - HPEN hPen, hOldPen; - HBRUSH hBrush, hOldBrush; - RECT rc; - - hdc = BeginPaint(hwnd, &ps); - - if (pCardBack->bSelected) - { - hPen = CreatePen(PS_SOLID, 2, RGB(0,0,0)); - } - else - { - DWORD Face = GetSysColor(COLOR_3DFACE); - hPen = CreatePen(PS_SOLID, 2, Face); - } - - GetClientRect(hwnd, &rc); - hBrush = (HBRUSH)GetStockObject(NULL_BRUSH); - hOldPen = (HPEN)SelectObject(hdc, hPen); - hOldBrush = (HBRUSH)SelectObject(hdc, hBrush); - - Rectangle(hdc, - rc.left+1, - rc.top+1, - rc.right, - rc.bottom); - - StretchBlt(hdc, - 2, - 2, - CARDBACK_OPTIONS_WIDTH, - CARDBACK_OPTIONS_HEIGHT, - __hdcCardBitmaps, - pCardBack->hdcNum * __cardwidth, - 0, - __cardwidth, - __cardheight, - SRCCOPY); - - SelectObject(hdc, hOldPen); - SelectObject(hdc, hOldBrush); - - EndPaint(hwnd, &ps); - - break; + case WM_PAINT: + { + HDC hdc; + PAINTSTRUCT ps; + HPEN hPen, hOldPen; + HBRUSH hBrush, hOldBrush; + RECT rc; + + hdc = BeginPaint(hwnd, &ps); + + if (pCardBack->bSelected) + { + hPen = CreatePen(PS_SOLID, 2, RGB(0,0,0)); + } + else + { + DWORD Face = GetSysColor(COLOR_3DFACE); + hPen = CreatePen(PS_SOLID, 2, Face); + } + + GetClientRect(hwnd, &rc); + hBrush = (HBRUSH)GetStockObject(NULL_BRUSH); + hOldPen = (HPEN)SelectObject(hdc, hPen); + hOldBrush = (HBRUSH)SelectObject(hdc, hBrush); + + Rectangle(hdc, rc.left+1, rc.top+1, rc.right, rc.bottom); + + StretchBlt(hdc, + 2, + 2, + CARDBACK_OPTIONS_WIDTH, + CARDBACK_OPTIONS_HEIGHT, + __hdcCardBitmaps, + pCardBack->hdcNum * __cardwidth, + 0, + __cardwidth, + __cardheight, + SRCCOPY); + + SelectObject(hdc, hOldPen); + SelectObject(hdc, hOldBrush); + + EndPaint(hwnd, &ps); + + break; } case WM_LBUTTONDOWN: @@ -227,87 +218,73 @@ break; } - return CallWindowProc(hOldProc, - hwnd, - msg, - wParam, - lParam); -} - - -INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + return CallWindowProc(hOldProc, hwnd, msg, wParam, lParam); +} + + +INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { static PCARDBACK pCardBacks = NULL; switch (uMsg) { - case WM_INITDIALOG: - { - INT i, c; - SIZE_T size = sizeof(CARDBACK) * NUM_CARDBACKS; - - pCardBacks = (PCARDBACK)HeapAlloc(GetProcessHeap(), 0, size); - - if(!pCardBacks) - return FALSE; - - for (i = 0, c = CARDBACK_START; c <= CARDBACK_END; i++, c++) - { - pCardBacks[i].hSelf = GetDlgItem(hDlg, c); - pCardBacks[i].bSelected = FALSE; - pCardBacks[i].hdcNum = CARDBACK_RES_START + i; - pCardBacks[i].imgNum = i + 1; - pCardBacks[i].hOldProc = (WNDPROC)SetWindowLongPtr(pCardBacks[i].hSelf, - GWLP_WNDPROC, - (LONG_PTR)CardImageWndProc); - - SetWindowLongPtr(pCardBacks[i].hSelf, - GWL_USERDATA, - (LONG_PTR)&pCardBacks[i]); - } - - return TRUE; - } - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - INT i, num = 0; - for (i = 0; i < NUM_CARDBACKS; i++) - { - if (pCardBacks[i].bSelected) + case WM_INITDIALOG: + { + INT i, c; + SIZE_T size = sizeof(CARDBACK) * NUM_CARDBACKS; + + pCardBacks = (PCARDBACK)HeapAlloc(GetProcessHeap(), 0, size); + + if (!pCardBacks) + return FALSE; + + for (i = 0, c = CARDBACK_START; c <= CARDBACK_END; i++, c++) + { + pCardBacks[i].hSelf = GetDlgItem(hDlg, c); + pCardBacks[i].bSelected = FALSE; + pCardBacks[i].hdcNum = CARDBACK_RES_START + i; + pCardBacks[i].imgNum = i + 1; + pCardBacks[i].hOldProc = (WNDPROC)SetWindowLongPtr(pCardBacks[i].hSelf, + GWLP_WNDPROC, + (LONG_PTR)CardImageWndProc); + + SetWindowLongPtr(pCardBacks[i].hSelf, GWL_USERDATA, (LONG_PTR)&pCardBacks[i]); + } + + return TRUE; + } + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + INT i, num = 0; + for (i = 0; i < NUM_CARDBACKS; i++) { - num = pCardBacks[i].imgNum; + if (pCardBacks[i].bSelected) + { + num = pCardBacks[i].imgNum; + } } - } - - EndDialog(hDlg, LOWORD(wParam) == IDOK ? num : FALSE); - HeapFree(GetProcessHeap(), 0, pCardBacks); - return TRUE; - } - - if (HIWORD(wParam) == STN_CLICKED) - { - INT i; - RECT rc; - for (i = 0; i < NUM_CARDBACKS; i++) - { - if (pCardBacks[i].hSelf == (HWND)lParam) + + EndDialog(hDlg, LOWORD(wParam) == IDOK ? num : FALSE); + HeapFree(GetProcessHeap(), 0, pCardBacks); + return TRUE; + } + + if (HIWORD(wParam) == STN_CLICKED) + { + INT i; + RECT rc; + for (i = 0; i < NUM_CARDBACKS; i++) { - pCardBacks[i].bSelected = TRUE; + pCardBacks[i].bSelected = pCardBacks[i].hSelf == (HWND)lParam; + + GetClientRect(pCardBacks[i].hSelf, &rc); + InvalidateRect(pCardBacks[i].hSelf, &rc, TRUE); } - else - pCardBacks[i].bSelected = FALSE; - - GetClientRect(pCardBacks[i].hSelf, &rc); - InvalidateRect(pCardBacks[i].hSelf, &rc, TRUE); - } - - break; - } + + break; + } } return FALSE; @@ -318,10 +295,7 @@ { INT cardBack; - if ((cardBack = DialogBox(hInstance, - MAKEINTRESOURCE(IDD_CARDBACK), - hwnd, - CardBackDlgProc))) + if ((cardBack = DialogBox(hInstance, MAKEINTRESOURCE(IDD_CARDBACK), hwnd, CardBackDlgProc))) { SpiderWnd.SetBackCardIdx(CARDBACK_RES_START + (cardBack - 1)); SpiderWnd.Redraw(); @@ -332,7 +306,7 @@ { static int nWidth, nHeight; - switch(iMsg) + switch (iMsg) { case WM_CREATE: { @@ -373,27 +347,27 @@ } case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDM_GAME_NEW: - NewGame(); - return 0; - - case IDM_GAME_DECK: - ShowDeckOptionsDlg(hwnd); - return 0; - - case IDM_HELP_CONTENTS: - WinHelp(hwnd, szHelpPath, HELP_CONTENTS, 0);//HELP_KEY, (DWORD)"How to play"); - return 0; - - case IDM_HELP_ABOUT: - MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION); - return 0; - - case IDM_GAME_EXIT: - PostMessage(hwnd, WM_CLOSE, 0, 0); - return 0; + switch (LOWORD(wParam)) + { + case IDM_GAME_NEW: + NewGame(); + return 0; + + case IDM_GAME_DECK: + ShowDeckOptionsDlg(hwnd); + return 0; + + case IDM_HELP_CONTENTS: + WinHelp(hwnd, szHelpPath, HELP_CONTENTS, 0);//HELP_KEY, (DWORD)"How to play"); + return 0; + + case IDM_HELP_ABOUT: + MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION); + return 0; + + case IDM_GAME_EXIT: + PostMessage(hwnd, WM_CLOSE, 0, 0); + return 0; } return 0; Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Wed Feb 15 10:53:41 2017 @@ -1594,7 +1594,7 @@ goto SkipEvent; /* Get the computer name and filter it */ - lpszComputerName = (LPWSTR)((LPBYTE)pEvlrBuffer + sizeof(EVENTLOGRECORD) + (wcslen(lpszSourceName) + 1) * sizeof(WCHAR)); + lpszComputerName = (LPWSTR)(pEvlrBuffer + sizeof(EVENTLOGRECORD) + (wcslen(lpszSourceName) + 1) * sizeof(WCHAR)); if (!FilterByString(EventLogFilter->ComputerNames, lpszComputerName)) goto SkipEvent;

1 0

[ion] 73801: [BOOTLIB]: Fix assembly file containing Archx86TransferTo32BitApplicationAsm to use assume:nothing, otherwise we end up with SS segment overrides everywhere. [BOOTLIB]: Correctly bias ...
by ion＠svn.reactos.org 15 Feb '17

15 Feb '17

Author: ion Date: Wed Feb 15 00:53:15 2017 New Revision: 73801 URL: http://svn.reactos.org/svn/reactos?rev=73801&view=rev Log: [BOOTLIB]: Fix assembly file containing Archx86TransferTo32BitApplicationAsm to use assume:nothing, otherwise we end up with SS segment overrides everywhere. [BOOTLIB]: Correctly bias access to GDT/IDT registers by 2 bytes since this is a 48-bit instruction. The loaded GDT/IDT was previously invalid and causing random GPFs. [BOOTLIB]: Fix EfiStall in protected mode. It was previously not stalling. [BOOTLIB]: Fix calculation in MmMapPhysicalAddress [BOOTLIB]: Fix missing goto in MmSelectMappingAddress which broke the function in real mode. [BOOTLIB]: Fix incorrect ranges in MmSelectMappingAddress. [BOOTLIB]: Fix incorrect offset calculation in MmSelectMappingAddress. Now hitting (as expected), unimplemented virtual code path in BlMmMapPhysicalAddressEx. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/arch/i386/transfer.s trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/io/display/display.c trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/i386/mmx86.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Wed Feb 15 00:53:15 2017 @@ -2014,6 +2014,11 @@ /* MEMORY DESCRIPTOR ROUTINES ************************************************/ +VOID +MmMdDbgDumpList ( + _In_ PBL_MEMORY_DESCRIPTOR_LIST DescriptorList +); + VOID MmMdInitializeList ( _In_ PBL_MEMORY_DESCRIPTOR_LIST DescriptorList, Modified: trunk/reactos/boot/environ/lib/arch/i386/transfer.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/arch/i386… ============================================================================== --- trunk/reactos/boot/environ/lib/arch/i386/transfer.s [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/arch/i386/transfer.s [iso-8859-1] Wed Feb 15 00:53:15 2017 @@ -21,6 +21,7 @@ /* FUNCTIONS ****************************************************************/ .code +ASSUME nothing PUBLIC _Archx86TransferTo32BitApplicationAsm _Archx86TransferTo32BitApplicationAsm: @@ -39,10 +40,10 @@ mov ebx, esp /* Save current GDT/IDT, then load new one */ - sgdt _GdtRegister - sidt _IdtRegister - lgdt _BootAppGdtRegister - lidt _BootAppIdtRegister + sgdt _GdtRegister+2 + sidt _IdtRegister+2 + lgdt _BootAppGdtRegister+2 + lidt _BootAppIdtRegister+2 /* Load the new stack */ xor ebp, ebp @@ -62,8 +63,8 @@ mov esp, ebx /* Restore old GDT/IDT */ - lgdt _GdtRegister - lidt _IdtRegister + lgdt _GdtRegister+2 + lidt _IdtRegister+2 /* Retore old segments */ pop ds Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Wed Feb 15 00:53:15 2017 @@ -646,8 +646,8 @@ OldMode = CurrentExecutionContext->Mode; if (OldMode != BlRealMode) { - /* FIXME: Not yet implemented */ - return STATUS_NOT_IMPLEMENTED; + /* Switch to real mode */ + BlpArchSwitchContext(BlProtectedMode); } /* Make the EFI call */ @@ -1406,6 +1406,7 @@ /* Initialize EFI memory map attributes */ EfiMemoryMapSize = MapKey = DescriptorSize = DescriptorVersion = 0; + LibraryBuffer = NULL; /* Increment the nesting depth */ MmDescriptorCallTreeCount++; Modified: trunk/reactos/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] Wed Feb 15 00:53:15 2017 @@ -460,7 +460,6 @@ !(GraphicsConsole) || !(((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->IsEnabled(GraphicsConsole))) { - EfiPrintf(L"Nothing to do for re-init\r\n"); return Status; } Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Wed Feb 15 00:53:15 2017 @@ -149,8 +149,8 @@ _In_ ULONG Count ) { - EfiPrintf(L"dynamic switch NOT SUPPORTED!!!\r\n"); - while (1); + EfiPrintf(L"Dynamic switch NOT SUPPORTED!!!\r\n"); + EfiStall(10000000); } NTSTATUS @@ -173,7 +173,8 @@ else { /* It's a dynamic descriptor, so free it */ - EfiPrintf(L"Dynamic descriptors not yet supported\r\n"); + EfiPrintf(L"Freeing dynamic descriptors not yet supported\r\n"); + EfiStall(10000000); Status = STATUS_NOT_IMPLEMENTED; } @@ -1043,7 +1044,6 @@ /* Check for start overflow */ if (BaseMin > BaseMax) { - EfiPrintf(L"Descriptor overflow\r\n"); return FALSE; } @@ -1145,7 +1145,7 @@ /* Loop every current global descriptor */ while (Index < MmGlobalMemoryDescriptorsUsed) { - /* Does it have any valid pageS? */ + /* Does it have any valid pages? */ OldDescriptor = &MmGlobalMemoryDescriptors[Index]; if (OldDescriptor->PageCount) { Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Wed Feb 15 00:53:15 2017 @@ -497,7 +497,7 @@ _In_ ULONG CacheAttributes ) { - ULONGLONG Size, TotalSize; + ULONGLONG Size; ULONGLONG PhysicalAddress; PVOID VirtualAddress; PHYSICAL_ADDRESS TranslatedAddress; @@ -541,13 +541,13 @@ VirtualAddress = (PVOID)PAGE_ROUND_DOWN(VirtualAddress); /* Round up the size */ - TotalSize = ROUND_TO_PAGES(PhysicalAddressPtr->QuadPart - - PhysicalAddress + - Size); + Size = ROUND_TO_PAGES(PhysicalAddressPtr->QuadPart - + PhysicalAddress + + Size); /* Loop every virtual page */ CurrentAddress = (ULONG_PTR)VirtualAddress; - VirtualAddressEnd = CurrentAddress + TotalSize - 1; + VirtualAddressEnd = CurrentAddress + Size - 1; while (CurrentAddress < VirtualAddressEnd) { /* Get the physical page of this virtual page */ @@ -564,6 +564,7 @@ EfiPrintf(L"Existing mapping exists: %lx vs %lx\r\n", TranslatedAddress.QuadPart, PhysicalAddress + (CurrentAddress - (ULONG_PTR)VirtualAddress)); + EfiStall(10000000); return STATUS_INVALID_PARAMETER; } } @@ -636,6 +637,44 @@ /* Return back to caller */ return Status; +} + +VOID +MmMdDbgDumpList ( + _In_ PBL_MEMORY_DESCRIPTOR_LIST DescriptorList + ) +{ + ULONGLONG EndPage, VirtualEndPage; + PBL_MEMORY_DESCRIPTOR MemoryDescriptor; + PLIST_ENTRY NextEntry; + + NextEntry = DescriptorList->First->Flink; + while (NextEntry != DescriptorList->First) + { + MemoryDescriptor = CONTAINING_RECORD(NextEntry, + BL_MEMORY_DESCRIPTOR, + ListEntry); + + EndPage = MemoryDescriptor->BasePage + MemoryDescriptor->PageCount; + if (MemoryDescriptor->VirtualPage != 0) + { + VirtualEndPage = MemoryDescriptor->VirtualPage + MemoryDescriptor->PageCount; + } + else + { + VirtualEndPage = 0; + } + + EfiPrintf(L"%p - [%08llx-%08llx @ %08llx-%08llx]:%x\r\n", + MemoryDescriptor, + MemoryDescriptor->BasePage << PAGE_SHIFT, + (EndPage << PAGE_SHIFT) - 1, + MemoryDescriptor->VirtualPage << PAGE_SHIFT, + VirtualEndPage ? (VirtualEndPage << PAGE_SHIFT) - 1 : 0, + (ULONG)MemoryDescriptor->Type); + + NextEntry = NextEntry->Flink; + } } NTSTATUS @@ -1126,7 +1165,7 @@ MmArchKsegAddressRange.Maximum = (ULONGLONG)~0; /* Set the boot application top maximum */ - MmArchTopOfApplicationAddressSpace = 0x70000000; + MmArchTopOfApplicationAddressSpace = 0x70000000 - 1; // Windows bug /* Initialize virtual address space translation */ Status = MmDefInitializeTranslation(MemoryData, TranslationType); Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Wed Feb 15 00:53:15 2017 @@ -196,7 +196,6 @@ MapSize = Size; CacheAttributes = ((Flags & BlMemoryValidCacheAttributeMask) != 0x20) ? (Flags & BlMemoryValidCacheAttributeMask) : 0; - EfiPrintf(L"Selected address: %p for %lx\r\n", MappingAddress, MappedAddress.LowPart); Status = MmMapPhysicalAddress(&MappedAddress, &MappingAddress, &MapSize, @@ -215,7 +214,7 @@ if (MmTranslationType != BlNone) { /* We don't support virtual memory yet @TODO */ - EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); + EfiPrintf(L"not yet implemented in BlMmMapPhysicalAddressEx\r\n"); EfiStall(1000000); Status = STATUS_NOT_IMPLEMENTED; goto Quickie; Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Wed Feb 15 00:53:15 2017 @@ -126,8 +126,8 @@ FoundDescriptor = CONTAINING_RECORD(NextEntry, BL_MEMORY_DESCRIPTOR, ListEntry); - - /* See if it matches the request */ + + /* See if it matches the request */ if (MmMdFindSatisfyingRegion(FoundDescriptor, &LocalDescriptor, Request->Pages, @@ -1082,7 +1082,7 @@ /* Handle virtual memory scenario */ if (MmTranslationType != BlNone) { - EfiPrintf(L"Unimplemented virtual path\r\n"); + EfiPrintf(L"Unimplemented free virtual path\r\n"); return STATUS_SUCCESS; } @@ -1519,6 +1519,7 @@ { /* Just return the physical address as the mapping address */ PreferredAddress = (PVOID)PhysicalAddress.LowPart; + goto Success; } /* If no physical address, or caller wants a fixed address... */ @@ -1532,14 +1533,15 @@ if (AllocationAttributes & BlMemoryKernelRange) { /* Use kernel range */ - Request.BaseRange = MmArchKsegAddressRange; + Request.BaseRange.Minimum = MmArchKsegAddressRange.Minimum >> PAGE_SHIFT; + Request.BaseRange.Maximum = MmArchKsegAddressRange.Maximum >> PAGE_SHIFT; Request.Type = BL_MM_REQUEST_DEFAULT_TYPE; } else { /* User user/application range */ - Request.BaseRange.Minimum = 0; - Request.BaseRange.Maximum = MmArchTopOfApplicationAddressSpace; + Request.BaseRange.Minimum = 0 >> PAGE_SHIFT; + Request.BaseRange.Maximum = MmArchTopOfApplicationAddressSpace >> PAGE_SHIFT; Request.Type = BL_MM_REQUEST_TOP_DOWN_TYPE; } @@ -1569,8 +1571,7 @@ { /* Add the offset to the returned virtual address */ PreferredAddress = (PVOID)((ULONG_PTR)PreferredAddress + - PhysicalAddress.LowPart - - BYTE_OFFSET(PhysicalAddress.LowPart)); + BYTE_OFFSET(PhysicalAddress.QuadPart)); } Success:

1 0

[akhaldi] 73800: [0.4.4] Update the release type.
by akhaldi＠svn.reactos.org 14 Feb '17

14 Feb '17

Author: akhaldi Date: Tue Feb 14 11:08:16 2017 New Revision: 73800 URL: http://svn.reactos.org/svn/reactos?rev=73800&view=rev Log: [0.4.4] Update the release type. Modified: branches/ros-branch-0_4_4/reactos/sdk/include/reactos/version.cmake Modified: branches/ros-branch-0_4_4/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/sdk/in… ============================================================================== --- branches/ros-branch-0_4_4/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Tue Feb 14 11:08:16 2017 @@ -25,7 +25,7 @@ set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "RC1") +set(KERNEL_VERSION_RELEASE_TYPE "") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

1 0

[gadamopoulos] 73799: [RUNDLL32] -Load and activate the manifest of the hosted dll before loading the library.
by gadamopoulos＠svn.reactos.org 14 Feb '17

14 Feb '17

Author: gadamopoulos Date: Tue Feb 14 09:47:13 2017 New Revision: 73799 URL: http://svn.reactos.org/svn/reactos?rev=73799&view=rev Log: [RUNDLL32] -Load and activate the manifest of the hosted dll before loading the library. Modified: trunk/reactos/base/system/rundll32/rundll32.c Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] Tue Feb 14 09:47:13 2017 @@ -346,6 +346,11 @@ int i; size_t nStrLen; + ACTCTXW ActCtx = {sizeof(ACTCTX), ACTCTX_FLAG_RESOURCE_NAME_VALID}; + HANDLE hActCtx; + ULONG_PTR cookie; + BOOL bActivated; + // Get command-line in argc-argv format argv = CommandLineToArgv(GetCommandLine(),&argc); @@ -380,6 +385,11 @@ lptCmdLine = argv[i]; else lptCmdLine = _T(""); + + ActCtx.lpSource = lptDllName; + ActCtx.lpResourceName = (LPCWSTR)123; + hActCtx = CreateActCtx(&ActCtx); + bActivated = (hActCtx != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx, &cookie) : FALSE); // Everything is all setup, so load the dll now hDll = LoadLibrary(lptDllName); @@ -429,6 +439,8 @@ if (!RegisterBlankClass(hInstance, hPrevInstance)) { FreeLibrary(hDll); + if (bActivated) + DeactivateActCtx(0, cookie); return 0; } // Create a window so we can pass a window handle to @@ -476,6 +488,9 @@ free(lptMsgBuffer); } + if (bActivated) + DeactivateActCtx(0, cookie); + if (argv) free(argv); return 0; /* rundll32 always returns 0! */ }

1 0

[gadamopoulos] 73798: [NEWDEV] -Use manifest_hosted.rc.
by gadamopoulos＠svn.reactos.org 14 Feb '17

14 Feb '17

Author: gadamopoulos Date: Tue Feb 14 09:41:38 2017 New Revision: 73798 URL: http://svn.reactos.org/svn/reactos?rev=73798&view=rev Log: [NEWDEV] -Use manifest_hosted.rc. Modified: trunk/reactos/dll/win32/newdev/newdev.rc Modified: trunk/reactos/dll/win32/newdev/newdev.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.rc… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.rc [iso-8859-1] Tue Feb 14 09:41:38 2017 @@ -6,7 +6,7 @@ IDB_WATERMARK BITMAP "resources/watermark.bmp" IDB_HEADER BITMAP "resources/header.bmp" -#include <reactos/manifest_dll.rc> +#include <reactos/manifest_hosted.rc> LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

[ion] 73797: [BOOTLIB]: Clarify some attributes now that their meaning is clearer. [BOOTLIB]: Implement MmSelectMappingAddress and fix its prototype. [BOOTLIB]: Implement MmPapPageAllocatorExtend a...
by ion＠svn.reactos.org 13 Feb '17

13 Feb '17

Author: ion Date: Mon Feb 13 23:47:06 2017 New Revision: 73797 URL: http://svn.reactos.org/svn/reactos?rev=73797&view=rev Log: [BOOTLIB]: Clarify some attributes now that their meaning is clearer. [BOOTLIB]: Implement MmSelectMappingAddress and fix its prototype. [BOOTLIB]: Implement MmPapPageAllocatorExtend and fix MmPapAllocatePagesInRange to use it. We are trying to choose VA 0 for PA 0x8000 and currently fail due to conflicts. TBD. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/i386/mmx86.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Feb 13 23:47:06 2017 @@ -362,11 +362,11 @@ // // Memory Allocation Attributes // - BlMemoryUnknown = 0x00010000, - BlMemoryNonFixed = 0x00020000, + BlMemoryLargePages = 0x00010000, + BlMemoryKernelRange = 0x00020000, BlMemoryFixed = 0x00040000, BlMemoryBelow1MB = 0x00080000, - BlMemoryValidAllocationAttributes = BlMemoryNonFixed | BlMemoryFixed | BlMemoryBelow1MB | BlMemoryUnknown, + BlMemoryValidAllocationAttributes = BlMemoryKernelRange | BlMemoryFixed | BlMemoryBelow1MB | BlMemoryLargePages, BlMemoryValidAllocationAttributeMask = 0x00FF0000, // @@ -2194,6 +2194,7 @@ NTSTATUS MmSelectMappingAddress ( _Out_ PVOID* MappingAddress, + _In_ PVOID PreferredAddress, _In_ ULONGLONG Size, _In_ ULONG AllocationAttributes, _In_ ULONG Flags, @@ -2721,5 +2722,7 @@ extern BL_MEMORY_DESCRIPTOR_LIST MmMdlMappingTrackers; extern ULONGLONG BlpTimePerformanceFrequency; extern LIST_ENTRY RegisteredFileSystems; +extern BL_ADDRESS_RANGE MmArchKsegAddressRange; +extern ULONG_PTR MmArchTopOfApplicationAddressSpace; #endif Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Mon Feb 13 23:47:06 2017 @@ -1104,7 +1104,7 @@ } /* Bail out if the allocation flags don't match */ - if (((Flags ^ Descriptor->Flags) & (BlMemoryRuntime | BlMemoryBelow1MB | BlMemoryUnknown))) + if (((Flags ^ Descriptor->Flags) & (BlMemoryRuntime | BlMemoryBelow1MB | BlMemoryLargePages))) { //EfiPrintf(L"Incorrect memory allocation flags\r\n"); return FALSE; Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Mon Feb 13 23:47:06 2017 @@ -490,29 +490,6 @@ } NTSTATUS -MmSelectMappingAddress ( - _Out_ PVOID* MappingAddress, - _In_ ULONGLONG Size, - _In_ ULONG AllocationAttributes, - _In_ ULONG Flags, - _In_ PHYSICAL_ADDRESS PhysicalAddress - ) -{ - /* Are we in physical mode? */ - if (MmTranslationType == BlNone) - { - /* Just return the physical address as the mapping address */ - *MappingAddress = (PVOID)PhysicalAddress.LowPart; - return STATUS_SUCCESS; - } - - /* We don't support virtual memory yet @TODO */ - EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); - EfiStall(1000000); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS MmMapPhysicalAddress ( _Inout_ PPHYSICAL_ADDRESS PhysicalAddressPtr, _Inout_ PVOID* VirtualAddressPtr, Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Mon Feb 13 23:47:06 2017 @@ -164,7 +164,7 @@ /* Check for invalid requirement flag, if one is present */ if (((Flags & BlMemoryValidAllocationAttributes) != BlMemoryFixed) && - ((Flags & BlMemoryValidAllocationAttributes) != BlMemoryNonFixed) && + ((Flags & BlMemoryValidAllocationAttributes) != BlMemoryKernelRange) && (Flags & BlMemoryValidAllocationAttributes)) { Status = STATUS_INVALID_PARAMETER; @@ -181,6 +181,7 @@ /* Select an address to map this at */ Status = MmSelectMappingAddress(&MappingAddress, + *VirtualAddress, Size, Flags & BlMemoryValidAllocationAttributes, Flags, @@ -195,6 +196,7 @@ MapSize = Size; CacheAttributes = ((Flags & BlMemoryValidCacheAttributeMask) != 0x20) ? (Flags & BlMemoryValidCacheAttributeMask) : 0; + EfiPrintf(L"Selected address: %p for %lx\r\n", MappingAddress, MappedAddress.LowPart); Status = MmMapPhysicalAddress(&MappedAddress, &MappingAddress, &MapSize, Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Mon Feb 13 23:47:06 2017 @@ -23,6 +23,8 @@ } BL_PA_REQUEST, *PBL_PA_REQUEST; /* DATA VARIABLES ************************************************************/ + +extern ULONG MmArchLargePageSize; ULONGLONG PapMaximumPhysicalPage, PapMinimumPhysicalPage; @@ -419,6 +421,168 @@ } NTSTATUS +MmPapPageAllocatorExtend ( + _In_ ULONG Attributes, + _In_ ULONG Alignment, + _In_ ULONGLONG PageCount, + _In_ ULONGLONG VirtualPage, + _In_opt_ PBL_ADDRESS_RANGE Range, + _In_opt_ ULONG Type + ) +{ + BL_PA_REQUEST Request; + ULONGLONG PageRange; + BL_MEMORY_DESCRIPTOR NewDescriptor; + ULONG AllocationFlags, CacheAttributes, AddFlags; + NTSTATUS Status; + PBL_MEMORY_DESCRIPTOR_LIST MdList; + PBL_MEMORY_DESCRIPTOR Descriptor; + PVOID VirtualAddress; + PHYSICAL_ADDRESS PhysicalAddress; + + /* Is the caller requesting less pages than allowed? */ + if (!(Attributes & BlMemoryFixed) && + !(Range) && + (PageCount < PapMinimumAllocationCount)) + { + /* Unless this is a fixed request, then adjust the original requirements */ + PageCount = PapMinimumAllocationCount; + Alignment = PapMinimumAllocationCount; + } + + /* Extract only the allocation attributes */ + AllocationFlags = Attributes & BlMemoryValidAllocationAttributeMask; + + /* Check if the caller wants large pages */ + if ((AllocationFlags & BlMemoryLargePages) && (MmArchLargePageSize != 1)) + { + EfiPrintf(L"Large pages not supported!\r\n"); + EfiStall(10000000); + return STATUS_NOT_IMPLEMENTED; + } + + /* Set an emty virtual range */ + Request.VirtualRange.Minimum = 0; + Request.VirtualRange.Maximum = 0; + + /* Check if the caller requested a range */ + if (Range) + { + /* Calculate it size in pages, minus a page as this is a 0-based range */ + PageRange = ((Range->Maximum - Range->Minimum) >> PAGE_SHIFT) - 1; + + /* Set the minimum and maximum, in pages */ + Request.BaseRange.Minimum = Range->Minimum >> PAGE_SHIFT; + Request.BaseRange.Maximum = Request.BaseRange.Minimum + PageRange; + } + else + { + /* Initialize a range from the smallest page to the biggest */ + Request.BaseRange.Minimum = PapMinimumPhysicalPage; + Request.BaseRange.Maximum = 0xFFFFFFFF / PAGE_SIZE; + } + + /* Get the cache attributes */ + CacheAttributes = Attributes & BlMemoryValidCacheAttributeMask; + + /* Check if the caller requested a valid allocation type */ + if ((Type) && !(Type & ~(BL_MM_REQUEST_DEFAULT_TYPE | + BL_MM_REQUEST_TOP_DOWN_TYPE))) + { + /* Use what the caller wanted */ + Request.Type = Type; + } + else + { + /* Use the default bottom-up type */ + Request.Type = BL_MM_REQUEST_DEFAULT_TYPE; + } + + /* Use the original protection and type, but ignore other attributes */ + Request.Flags = Attributes & ~(BlMemoryValidAllocationAttributeMask | + BlMemoryValidCacheAttributeMask); + Request.Alignment = Alignment; + Request.Pages = PageCount; + + /* Allocate some free pages */ + Status = MmPaAllocatePages(NULL, + &NewDescriptor, + &MmMdlUnmappedUnallocated, + &Request, + BlConventionalMemory); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Failed to get unmapped,unallocated memory!\r\n"); + EfiStall(10000000); + return Status; + } + + /* Initialize a descriptor for these pages, adding in the allocation flags */ + Descriptor = MmMdInitByteGranularDescriptor(AllocationFlags | + NewDescriptor.Flags, + BlConventionalMemory, + NewDescriptor.BasePage, + NewDescriptor.VirtualPage, + NewDescriptor.PageCount); + + /* Now map a virtual address for these physical pages */ + VirtualAddress = (PVOID)((ULONG_PTR)VirtualPage << PAGE_SHIFT); + PhysicalAddress.QuadPart = NewDescriptor.BasePage << PAGE_SHIFT; + Status = BlMmMapPhysicalAddressEx(&VirtualAddress, + AllocationFlags | CacheAttributes, + NewDescriptor.PageCount << PAGE_SHIFT, + PhysicalAddress); + EfiPrintf(L"MAP status: %lx\r\n", Status); + if (Status == STATUS_SUCCESS) + { + /* Add the cache attributes now that the mapping worked */ + Descriptor->Flags |= CacheAttributes; + + /* Update the virtual page now that we mapped it */ + Descriptor->VirtualPage = (ULONG_PTR)VirtualAddress >> PAGE_SHIFT; + + /* Add this as a mapped region */ + Status = MmMdAddDescriptorToList(&MmMdlMappedUnallocated, + Descriptor, + BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG); + + /* Make new descriptor that we'll add in firmware allocation tracker */ + MdList = &MmMdlFwAllocationTracker; + Descriptor = MmMdInitByteGranularDescriptor(0, + BlConventionalMemory, + NewDescriptor.BasePage, + 0, + NewDescriptor.PageCount); + + /* Do not coalesce */ + AddFlags = 0; + } + else + { + /* We failed, free the physical pages */ + Status = MmFwFreePages(NewDescriptor.BasePage, NewDescriptor.PageCount); + if (!NT_SUCCESS(Status)) + { + /* We failed to free the pages, so this is still around */ + MdList = &MmMdlUnmappedAllocated; + } + else + { + /* This is now back to unmapped/unallocated memory */ + Descriptor->Flags = 0; + MdList = &MmMdlUnmappedUnallocated; + } + + /* Coalesce the free descriptor */ + AddFlags = BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG; + } + + /* Either add to firmware list, or to unmapped list, then return result */ + MmMdAddDescriptorToList(MdList, Descriptor, AddFlags); + return Status; +} + +NTSTATUS MmPapAllocatePagesInRange ( _Inout_ PVOID* PhysicalAddress, _In_ BL_MEMORY_TYPE MemoryType, @@ -470,8 +634,9 @@ } else { + /* Use the entire range that's possible */ Request.BaseRange.Minimum = PapMinimumPhysicalPage; - Request.BaseRange.Maximum = (4 * 1024 * 1024) >> PAGE_SHIFT; + Request.BaseRange.Maximum = 0xFFFFFFFF >> PAGE_SHIFT; } /* Check if a fixed allocation was requested */ @@ -486,7 +651,7 @@ else { /* Check if non-fixed was specifically requested */ - if (Attributes & BlMemoryNonFixed) + if (Attributes & BlMemoryKernelRange) { /* We don't support virtual memory yet @TODO */ EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); @@ -497,20 +662,15 @@ /* Set the virtual address range */ Request.VirtualRange.Minimum = 0; - Request.VirtualRange.Maximum = (4 * 1024 * 1024) >> PAGE_SHIFT; + Request.VirtualRange.Maximum = 0xFFFFFFFF >> PAGE_SHIFT; } /* Check what type of allocation was requested */ - if (Type) - { - /* Save it */ + if ((Type) && !(Type & ~(BL_MM_REQUEST_DEFAULT_TYPE | + BL_MM_REQUEST_TOP_DOWN_TYPE))) + { + /* Save it if it was valid */ Request.Type = Type; - - /* If it was invalid, set the default */ - if (Type & ~(BL_MM_REQUEST_DEFAULT_TYPE | BL_MM_REQUEST_TOP_DOWN_TYPE)) - { - Request.Type = BL_MM_REQUEST_DEFAULT_TYPE; - } } else { @@ -531,11 +691,34 @@ MemoryType); if (!NT_SUCCESS(Status)) { - /* We don't support virtual memory yet @TODO */ - EfiPrintf(L"Need to extend PA allocator\r\n"); - EfiStall(1000000); - Status = STATUS_NOT_IMPLEMENTED; - goto Exit; + /* Extend the physical allocator */ + Status = MmPapPageAllocatorExtend(Attributes, + Alignment, + Pages, + ((ULONG_PTR)*PhysicalAddress) >> + PAGE_SHIFT, + Range, + Type); + if (!NT_SUCCESS(Status)) + { + /* Fail since we're out of memory */ + EfiPrintf(L"OUT OF MEMORY: %lx\r\n", Status); + Status = STATUS_NO_MEMORY; + goto Exit; + } + + /* Try the allocation again now */ + Status = MmPaAllocatePages(&MmMdlMappedAllocated, + &Descriptor, + &MmMdlMappedUnallocated, + &Request, + MemoryType); + if (!NT_SUCCESS(Status)) + { + /* Fail since we're out of memory */ + EfiPrintf(L"OUT OF MEMORY: %lx\r\n", Status); + goto Exit; + } } /* Return the allocated address */ @@ -544,7 +727,8 @@ else { /* Check if this is a fixed allocation */ - BaseAddress.QuadPart = (Attributes & BlMemoryFixed) ? (ULONG_PTR)*PhysicalAddress : 0; + BaseAddress.QuadPart = (Attributes & BlMemoryFixed) ? + (ULONG_PTR)*PhysicalAddress : 0; /* Allocate the pages */ Status = MmPapAllocatePhysicalPagesInRange(&BaseAddress, @@ -1316,3 +1500,81 @@ return Status; } +NTSTATUS +MmSelectMappingAddress ( + _Out_ PVOID* MappingAddress, + _In_ PVOID PreferredAddress, + _In_ ULONGLONG Size, + _In_ ULONG AllocationAttributes, + _In_ ULONG Flags, + _In_ PHYSICAL_ADDRESS PhysicalAddress + ) +{ + BL_PA_REQUEST Request; + NTSTATUS Status; + BL_MEMORY_DESCRIPTOR NewDescriptor; + + /* Are we in physical mode? */ + if (MmTranslationType == BlNone) + { + /* Just return the physical address as the mapping address */ + PreferredAddress = (PVOID)PhysicalAddress.LowPart; + } + + /* If no physical address, or caller wants a fixed address... */ + if ((PhysicalAddress.QuadPart == -1) || (Flags & BlMemoryFixed)) + { + /* Then just return the preferred address */ + goto Success; + } + + /* Check which range of virtual memory should be used */ + if (AllocationAttributes & BlMemoryKernelRange) + { + /* Use kernel range */ + Request.BaseRange = MmArchKsegAddressRange; + Request.Type = BL_MM_REQUEST_DEFAULT_TYPE; + } + else + { + /* User user/application range */ + Request.BaseRange.Minimum = 0; + Request.BaseRange.Maximum = MmArchTopOfApplicationAddressSpace; + Request.Type = BL_MM_REQUEST_TOP_DOWN_TYPE; + } + + /* Build a request */ + Request.VirtualRange.Minimum = 0; + Request.VirtualRange.Maximum = 0; + Request.Flags = AllocationAttributes & BlMemoryLargePages; + Request.Alignment = 1; + Request.Pages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(PhysicalAddress.LowPart, Size); + + /* Allocate the physical pages */ + Status = MmPaAllocatePages(NULL, + &NewDescriptor, + &MmMdlFreeVirtual, + &Request, + BlConventionalMemory); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Return the address we got back */ + PreferredAddress = (PVOID)((ULONG_PTR)NewDescriptor.BasePage << PAGE_SHIFT); + + /* Check if the existing physical address was not aligned */ + if (PhysicalAddress.QuadPart != -1) + { + /* Add the offset to the returned virtual address */ + PreferredAddress = (PVOID)((ULONG_PTR)PreferredAddress + + PhysicalAddress.LowPart - + BYTE_OFFSET(PhysicalAddress.LowPart)); + } + +Success: + /* Return the mapping address and success */ + *MappingAddress = PreferredAddress; + return STATUS_SUCCESS; +}

1 0

[ekohl] 73796: [UMPNPMGR] PNP_GetDeviceList and PNP_GetDeviceListSize: - Do not return CR_CALL_NOT_IMPLEMENTED by default. - pulLength is counted in characters, not in bytes! - Use the correct Rela...
by ekohl＠svn.reactos.org 13 Feb '17

13 Feb '17

Author: ekohl Date: Mon Feb 13 22:59:40 2017 New Revision: 73796 URL: http://svn.reactos.org/svn/reactos?rev=73796&view=rev Log: [UMPNPMGR] PNP_GetDeviceList and PNP_GetDeviceListSize: - Do not return CR_CALL_NOT_IMPLEMENTED by default. - pulLength is counted in characters, not in bytes! - Use the correct Relations value for PowerRelations. [NDK] Add the PowerRelations value to a comment. [DEVMGR] CM_Get_Device_ID_List_Size_ExW and CM_Get_Device_ID_List_ExW count the buffer length in characters, not in bytes! Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/devmgr/properties/advprop.cpp trunk/reactos/sdk/include/ndk/cmtypes.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Feb 13 22:59:40 2017 @@ -489,7 +489,7 @@ DWORD ulFlags) { PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData; - CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; DPRINT("PNP_GetDeviceList() called\n"); @@ -501,9 +501,7 @@ return CR_INVALID_POINTER; // if (Buffer == NULL) -// return - - *pulLength = 0; +// return CR_INVALID_POINTER; if (ulFlags & (CM_GETIDLIST_FILTER_BUSRELATIONS | @@ -519,19 +517,18 @@ } else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS) { - /* FIXME */ + PlugPlayData.Relations = 2; + } + else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) + { + PlugPlayData.Relations = 1; + } + else if (ulFlags & CM_GETIDLIST_FILTER_EJECTRELATIONS) + { PlugPlayData.Relations = 0; } - else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) - { - PlugPlayData.Relations = 1; - } - else if (ulFlags & CM_GETIDLIST_FILTER_EJECTRELATIONS) - { - PlugPlayData.Relations = 0; - } - - PlugPlayData.BufferSize = *pulLength; + + PlugPlayData.BufferSize = *pulLength * sizeof(WCHAR); PlugPlayData.Buffer = Buffer; Status = NtPlugPlayControl(PlugPlayControlQueryDeviceRelations, @@ -539,7 +536,7 @@ sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA)); if (NT_SUCCESS(Status)) { - *pulLength = PlugPlayData.BufferSize; + *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR); } else { @@ -548,15 +545,15 @@ } else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE) { - + ret = CR_CALL_NOT_IMPLEMENTED; } else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR) { - + ret = CR_CALL_NOT_IMPLEMENTED; } else /* CM_GETIDLIST_FILTER_NONE */ { - + ret = CR_CALL_NOT_IMPLEMENTED; } return ret; @@ -573,7 +570,7 @@ DWORD ulFlags) { PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData; - CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; DPRINT("PNP_GetDeviceListSize() called\n"); @@ -600,8 +597,7 @@ } else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS) { - /* FIXME */ - PlugPlayData.Relations = 0; + PlugPlayData.Relations = 2; } else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) { @@ -620,7 +616,7 @@ sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA)); if (NT_SUCCESS(Status)) { - *pulLength = PlugPlayData.BufferSize; + *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR); } else { @@ -629,15 +625,15 @@ } else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE) { - + ret = CR_CALL_NOT_IMPLEMENTED; } else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR) { - + ret = CR_CALL_NOT_IMPLEMENTED; } else /* CM_GETIDLIST_FILTER_NONE */ { - + ret = CR_CALL_NOT_IMPLEMENTED; } return ret; @@ -994,7 +990,7 @@ done: - if(pulTransferLen) + if (pulTransferLen) *pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0; if (hKey != NULL) Modified: trunk/reactos/dll/win32/devmgr/properties/advprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] Mon Feb 13 22:59:40 2017 @@ -1339,7 +1339,6 @@ ULONG ulLength = 0; LPWSTR pszBuffer = NULL, pszStr; INT index = 0, len; - CONFIGRET ret; ret = CM_Get_Device_ID_List_Size_ExW(&ulLength, @@ -1351,7 +1350,7 @@ pszBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - ulLength); + ulLength * sizeof(WCHAR)); if (pszBuffer == NULL) return; Modified: trunk/reactos/sdk/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/cmtypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/cmtypes.h [iso-8859-1] Mon Feb 13 22:59:40 2017 @@ -466,7 +466,7 @@ typedef struct _PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA { UNICODE_STRING DeviceInstance; - ULONG Relations; // 0:EjectRelations, 1:RemovalRelations, 3:BusRelations + ULONG Relations; // 0:EjectRelations, 1:RemovalRelations, 2:PowerRelations, 3:BusRelations ULONG BufferSize; PWCHAR Buffer; } PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA, *PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA;

1 0

[ekohl] 73795: [NTOSKRNL] Implement IopGetDeviceRelations().
by ekohl＠svn.reactos.org 13 Feb '17

13 Feb '17

Author: ekohl Date: Mon Feb 13 22:38:11 2017 New Revision: 73795 URL: http://svn.reactos.org/svn/reactos?rev=73795&view=rev Log: [NTOSKRNL] Implement IopGetDeviceRelations(). Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Mon Feb 13 22:38:11 2017 @@ -163,7 +163,6 @@ } return IopTraverseDeviceNode(IopRootDeviceNode, DeviceInstance); - } static NTSTATUS @@ -357,7 +356,7 @@ { _SEH2_TRY { - memcpy(PropertyData->Buffer, Buffer, BufferSize); + RtlCopyMemory(PropertyData->Buffer, Buffer, BufferSize); PropertyData->BufferSize = BufferSize; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -645,11 +644,160 @@ NTSTATUS IopGetDeviceRelations(PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA RelationsData) { + UNICODE_STRING DeviceInstance; + PDEVICE_OBJECT DeviceObject = NULL; + IO_STACK_LOCATION Stack; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_RELATIONS DeviceRelations = NULL; + PDEVICE_OBJECT ChildDeviceObject; + PDEVICE_NODE ChildDeviceNode; + ULONG i; + ULONG Relations; + ULONG BufferSize, RequiredSize; + ULONG BufferLeft; + PWCHAR Buffer, Ptr; + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("IopGetDeviceRelations() called\n"); DPRINT("Device name: %wZ\n", &RelationsData->DeviceInstance); - DPRINT("Relations: %lu\n", &RelationsData->Relations); - - return STATUS_NOT_IMPLEMENTED; + DPRINT("Relations: %lu\n", RelationsData->Relations); + DPRINT("BufferSize: %lu\n", RelationsData->BufferSize); + DPRINT("Buffer: %p\n", RelationsData->Buffer); + + _SEH2_TRY + { + Relations = RelationsData->Relations; + BufferSize = RelationsData->BufferSize; + Buffer = RelationsData->Buffer; + + ProbeForWrite(RelationsData->Buffer, + RelationsData->BufferSize, + sizeof(CHAR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + Status = IopCaptureUnicodeString(&DeviceInstance, &RelationsData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopCaptureUnicodeString() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Get the device object */ + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); + if (DeviceObject == NULL) + { + DPRINT1("IopGetDeviceObjectFromDeviceInstance() returned NULL\n"); + Status = STATUS_NO_SUCH_DEVICE; + goto done; + } + + switch (Relations) + { + case 0: /* EjectRelations */ + Stack.Parameters.QueryDeviceRelations.Type = EjectionRelations; + break; + + case 1: /* RemovalRelations */ + Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; + break; + + case 2: /* PowerRelations */ + Stack.Parameters.QueryDeviceRelations.Type = PowerRelations; + break; + + case 3: /* BusRelations */ + Stack.Parameters.QueryDeviceRelations.Type = BusRelations; + break; + + default: + Status = STATUS_INVALID_PARAMETER; + goto done; + } + + Status = IopInitiatePnpIrp(DeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_DEVICE_RELATIONS, + &Stack); + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + DPRINT1("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status); + goto done; + } + + DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; + + DPRINT("Found %d device relations\n", DeviceRelations->Count); + + _SEH2_TRY + { + RequiredSize = 0; + BufferLeft = BufferSize; + Ptr = Buffer; + + for (i = 0; i < DeviceRelations->Count; i++) + { + ChildDeviceObject = DeviceRelations->Objects[i]; + + ChildDeviceNode = IopGetDeviceNode(ChildDeviceObject); + if (ChildDeviceNode) + { + DPRINT("Device instance: %wZ\n", &ChildDeviceNode->InstancePath); + DPRINT("RequiredSize: %hu\n", ChildDeviceNode->InstancePath.Length + sizeof(WCHAR)); + + if (Ptr != NULL) + { + if (BufferLeft < ChildDeviceNode->InstancePath.Length + 2 * sizeof(WCHAR)) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + RtlCopyMemory(Ptr, + ChildDeviceNode->InstancePath.Buffer, + ChildDeviceNode->InstancePath.Length); + Ptr = (PWCHAR)((ULONG_PTR)Ptr + ChildDeviceNode->InstancePath.Length); + *Ptr = UNICODE_NULL; + Ptr = (PWCHAR)((ULONG_PTR)Ptr + sizeof(WCHAR)); + + BufferLeft -= (ChildDeviceNode->InstancePath.Length + sizeof(WCHAR)); + } + + RequiredSize += (ChildDeviceNode->InstancePath.Length + sizeof(WCHAR)); + } + } + + if (Ptr != NULL && BufferLeft >= sizeof(WCHAR)) + *Ptr = UNICODE_NULL; + + if (RequiredSize > 0) + RequiredSize += sizeof(WCHAR); + + DPRINT("BufferSize: %lu RequiredSize: %lu\n", RelationsData->BufferSize, RequiredSize); + + RelationsData->BufferSize = RequiredSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + +done: + if (DeviceRelations != NULL) + ExFreePool(DeviceRelations); + + if (DeviceObject != NULL) + ObDereferenceObject(DeviceObject); + + if (DeviceInstance.Buffer != NULL) + ExFreePool(DeviceInstance.Buffer); + + return Status; } static NTSTATUS

1 0

[gadamopoulos] 73794: [SHELL32] -Call CPlApplet export of control panel applets with the correct activation context.
by gadamopoulos＠svn.reactos.org 13 Feb '17

13 Feb '17

Author: gadamopoulos Date: Mon Feb 13 22:09:14 2017 New Revision: 73794 URL: http://svn.reactos.org/svn/reactos?rev=73794&view=rev Log: [SHELL32] -Call CPlApplet export of control panel applets with the correct activation context. Modified: trunk/reactos/dll/win32/shell32/wine/control.c trunk/reactos/dll/win32/shell32/wine/cpanel.h Modified: trunk/reactos/dll/win32/shell32/wine/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/con… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] Mon Feb 13 22:09:14 2017 @@ -53,6 +53,11 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) { +#ifdef __REACTOS__ + ACTCTXW ActCtx = {sizeof(ACTCTX), ACTCTX_FLAG_RESOURCE_NAME_VALID}; + ULONG_PTR cookie; + BOOL bActivated; +#endif CPlApplet* applet; DWORD len; unsigned i; @@ -79,6 +84,13 @@ } applet->hWnd = hWnd; + +#ifdef __REACTOS__ + ActCtx.lpSource = applet->cmd; + ActCtx.lpResourceName = (LPCWSTR)123; + applet->hActCtx = CreateActCtx(&ActCtx); + bActivated = (applet->hActCtx != INVALID_HANDLE_VALUE ? ActivateActCtx(applet->hActCtx, &cookie) : FALSE); +#endif if (!(applet->hModule = LoadLibraryW(applet->cmd))) { WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); @@ -171,6 +183,11 @@ } } +#ifdef __REACTOS__ + if (bActivated) + DeactivateActCtx(0, cookie); +#endif + #ifndef __REACTOS__ list_add_head( &panel->applets, &applet->entry ); #endif @@ -805,6 +822,10 @@ applet = Control_LoadApplet(hWnd, buffer, panel); if (applet) { +#ifdef __REACTOS__ + ULONG_PTR cookie; + BOOL bActivated; +#endif /* we've been given a textual parameter (or none at all) */ if (sp == -1) { while ((++sp) != applet->count) { @@ -820,10 +841,20 @@ sp = 0; } +#ifdef __REACTOS__ + bActivated = (applet->hActCtx != INVALID_HANDLE_VALUE ? ActivateActCtx(applet->hActCtx, &cookie) : FALSE); +#endif + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].data); Control_UnloadApplet(applet); + +#ifdef __REACTOS__ + if (bActivated) + DeactivateActCtx(0, cookie); +#endif + } HeapFree(GetProcessHeap(), 0, buffer); Modified: trunk/reactos/dll/win32/shell32/wine/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cpa… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/cpanel.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/cpanel.h [iso-8859-1] Mon Feb 13 22:09:14 2017 @@ -41,6 +41,8 @@ typedef struct CPlApplet { #ifndef __REACTOS__ struct list entry; +#else + HANDLE hActCtx; #endif HWND hWnd; LPWSTR cmd; /* path to applet */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs