Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[tfaber] 68725: [SHELL32] - Only complain about _OpenDirectory failing if it actually failed CORE-1171

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Aug 17 08:03:02 2015 New Revision: 68725 URL: http://svn.reactos.org/svn/reactos?rev=68725&view=rev Log: [SHELL32] - Only complain about _OpenDirectory failing if it actually failed CORE-1171 Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Mon Aug 17 08:03:02 2015 @@ -250,9 +250,18 @@ item->apidl[i].backBuffer = SHAlloc(BUFFER_SIZE); item->apidl[i].overlapped.hEvent = &item->apidl[i]; - if (fSources & SHCNRF_InterruptLevel && _OpenDirectory( &item->apidl[i] )) - QueueUserAPC(_AddDirectoryProc, m_hThread, (ULONG_PTR) &item->apidl[i] ); - else ERR("_OpenDirectory Failed\n"); + if (fSources & SHCNRF_InterruptLevel) + { + if (_OpenDirectory( &item->apidl[i] )) + QueueUserAPC( _AddDirectoryProc, m_hThread, (ULONG_PTR) &item->apidl[i] ); + else + { + CHAR buffer[MAX_PATH]; + if (!SHGetPathFromIDListA( item->apidl[i].pidl, buffer )) + strcpy( buffer, "<unknown>" ); + ERR("_OpenDirectory failed for %s\n", buffer); + } + } #endif } item->hwnd = hwnd;

9 years, 4 months

[bfreisen] 68724: [MSPAINT_NEW] save/restore certain settings to/from registry

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sun Aug 16 19:52:37 2015 New Revision: 68724 URL: http://svn.reactos.org/svn/reactos?rev=68724&view=rev Log: [MSPAINT_NEW] save/restore certain settings to/from registry Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/imgarea.cpp trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/precomp.h trunk/reactos/base/applications/mspaint_new/registry.cpp trunk/reactos/base/applications/mspaint_new/registry.h trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -19,6 +19,9 @@ extern int heightSetInDlg; extern STRETCHSKEW stretchSkew; + +class RegistrySettings; +extern RegistrySettings registrySettings; class ImageModel; extern ImageModel imageModel; Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -29,9 +29,9 @@ redoSteps = 0; imageSaved = TRUE; - // TODO: load dimensions from registry - int imgXRes = 400; - int imgYRes = 300; + // prepare a minimal usable bitmap + int imgXRes = 1; + int imgYRes = 1; hDrawingDC = CreateCompatibleDC(NULL); SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, paletteModel.GetFgColor())); Modified: trunk/reactos/base/applications/mspaint_new/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -12,7 +12,6 @@ #include "precomp.h" #include "dialogs.h" -#include "registry.h" /* FUNCTIONS ********************************************************/ Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -31,6 +31,8 @@ int textToolTextMaxLen = 0; PaletteModel paletteModel; + +RegistrySettings registrySettings; ImageModel imageModel; BOOL askBeforeEnlarging = FALSE; // TODO: initialize from registry @@ -134,13 +136,21 @@ _stprintf(progtitle, resstr, filename); LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, SIZEOF(miniaturetitle)); + /* load settings from registry */ + registrySettings.Load(); + showMiniature = registrySettings.ShowThumbnail; + imageModel.Crop(registrySettings.BMPWidth, registrySettings.BMPHeight); + /* create main window */ RECT mainWindowPos = {0, 0, 544, 375}; // FIXME: use equivalent of CW_USEDEFAULT for position hwnd = mainWindow.Create(HWND_DESKTOP, mainWindowPos, progtitle, WS_OVERLAPPEDWINDOW); - RECT miniaturePos = {180, 200, 180 + 120, 200 + 100}; + RECT miniaturePos = {(LONG) registrySettings.ThumbXPos, (LONG) registrySettings.ThumbYPos, + (LONG) registrySettings.ThumbXPos + (LONG) registrySettings.ThumbWidth, + (LONG) registrySettings.ThumbYPos + (LONG) registrySettings.ThumbHeight}; miniature.Create(hwnd, miniaturePos, miniaturetitle, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, WS_EX_PALETTEWINDOW); + miniature.ShowWindow(showMiniature ? SW_SHOW : SW_HIDE); /* loading and setting the window menu from resource */ menu = LoadMenu(hThisInstance, MAKEINTRESOURCE(ID_MENU)); @@ -276,7 +286,7 @@ imageArea.SendMessage(WM_SIZE, 0, 0); /* by moving the window, the things in WM_SIZE are done */ - MoveWindow(hwnd, 100, 100, 600, 450, TRUE); + mainWindow.SetWindowPlacement(&(registrySettings.WindowPlacement)); /* creating the text editor window for the text tool */ RECT textEditWindowPos = {300, 0, 300 + 300, 0 + 200}; @@ -299,6 +309,12 @@ DispatchMessage(&messages); } + /* write back settings to registry */ + registrySettings.ShowThumbnail = showMiniature; + registrySettings.BMPWidth = imageModel.GetWidth(); + registrySettings.BMPHeight = imageModel.GetHeight(); + registrySettings.Store(); + /* The program return-value is 0 - The value that PostQuitMessage() gave */ return messages.wParam; } Modified: trunk/reactos/base/applications/mspaint_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -28,6 +28,7 @@ #include "mouse.h" #include "palette.h" #include "palettemodel.h" +#include "registry.h" #include "scrollbox.h" #include "selection.h" #include "selectionmodel.h" Modified: trunk/reactos/base/applications/mspaint_new/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/registry.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -14,8 +14,7 @@ /* FUNCTIONS ********************************************************/ -void -SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too +void RegistrySettings::SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too { HKEY hDesktop; TCHAR szStyle[3], szTile[3]; @@ -42,3 +41,85 @@ RegCloseKey(hDesktop); } } + +void RegistrySettings::LoadPresets() +{ + BMPHeight = 300; + BMPWidth = 400; + GridExtent = 1; + NoStretching = 0; + ShowThumbnail = 0; + SnapToGrid = 0; + ThumbHeight = 100; + ThumbWidth = 120; + ThumbXPos = 180; + ThumbYPos = 200; + UnitSetting = 0; + const WINDOWPLACEMENT DefaultWindowPlacement = { + sizeof(WINDOWPLACEMENT), + 0, + SW_SHOWNORMAL, + {0, 0}, + {-1, -1}, + {100, 100, 700, 550} + }; + WindowPlacement = DefaultWindowPlacement; +} + +void RegistrySettings::Load() +{ + HKEY hView; + LoadPresets(); + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\View"), + 0, KEY_READ | KEY_SET_VALUE, &hView) == ERROR_SUCCESS) + { + DWORD cbData; + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("BMPHeight"), 0, NULL, (LPBYTE) &BMPHeight, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("BMPWidth"), 0, NULL, (LPBYTE) &BMPWidth, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("GridExtent"), 0, NULL, (LPBYTE) &GridExtent, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("NoStretching"), 0, NULL, (LPBYTE) &NoStretching, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ShowThumbnail"), 0, NULL, (LPBYTE) &ShowThumbnail, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("SnapToGrid"), 0, NULL, (LPBYTE) &SnapToGrid, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ThumbHeight"), 0, NULL, (LPBYTE) &ThumbHeight, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ThumbWidth"), 0, NULL, (LPBYTE) &ThumbWidth, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ThumbXPos"), 0, NULL, (LPBYTE) &ThumbXPos, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ThumbYPos"), 0, NULL, (LPBYTE) &ThumbYPos, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("UnitSetting"), 0, NULL, (LPBYTE) &UnitSetting, &cbData); + cbData = sizeof(WINDOWPLACEMENT); + RegQueryValueEx(hView, _T("WindowPlacement"), 0, NULL, (LPBYTE) &WindowPlacement, &cbData); + } +} + +void RegistrySettings::Store() +{ + HKEY hView; + if (RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\View"), + 0, NULL, 0, KEY_READ | KEY_SET_VALUE, NULL, &hView, NULL) == ERROR_SUCCESS) + { + RegSetValueEx(hView, _T("BMPHeight"), 0, REG_DWORD, (LPBYTE) &BMPHeight, sizeof(DWORD)); + RegSetValueEx(hView, _T("BMPWidth"), 0, REG_DWORD, (LPBYTE) &BMPWidth, sizeof(DWORD)); + RegSetValueEx(hView, _T("GridExtent"), 0, REG_DWORD, (LPBYTE) &GridExtent, sizeof(DWORD)); + RegSetValueEx(hView, _T("NoStretching"), 0, REG_DWORD, (LPBYTE) &NoStretching, sizeof(DWORD)); + RegSetValueEx(hView, _T("ShowThumbnail"), 0, REG_DWORD, (LPBYTE) &ShowThumbnail, sizeof(DWORD)); + RegSetValueEx(hView, _T("SnapToGrid"), 0, REG_DWORD, (LPBYTE) &SnapToGrid, sizeof(DWORD)); + RegSetValueEx(hView, _T("ThumbHeight"), 0, REG_DWORD, (LPBYTE) &ThumbHeight, sizeof(DWORD)); + RegSetValueEx(hView, _T("ThumbWidth"), 0, REG_DWORD, (LPBYTE) &ThumbWidth, sizeof(DWORD)); + RegSetValueEx(hView, _T("ThumbXPos"), 0, REG_DWORD, (LPBYTE) &ThumbXPos, sizeof(DWORD)); + RegSetValueEx(hView, _T("ThumbYPos"), 0, REG_DWORD, (LPBYTE) &ThumbYPos, sizeof(DWORD)); + RegSetValueEx(hView, _T("UnitSetting"), 0, REG_DWORD, (LPBYTE) &UnitSetting, sizeof(DWORD)); + RegSetValueEx(hView, _T("WindowPlacement"), 0, REG_BINARY, (LPBYTE) &WindowPlacement, sizeof(WINDOWPLACEMENT)); + } +} Modified: trunk/reactos/base/applications/mspaint_new/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/registry.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/registry.h [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -6,4 +6,27 @@ * PROGRAMMERS: Benedikt Freisen */ -void SetWallpaper(TCHAR *szFileName, DWORD dwStyle, DWORD dwTile); +class RegistrySettings +{ +private: + void LoadPresets(); + +public: + DWORD BMPHeight; + DWORD BMPWidth; + DWORD GridExtent; + DWORD NoStretching; + DWORD ShowThumbnail; + DWORD SnapToGrid; + DWORD ThumbHeight; + DWORD ThumbWidth; + DWORD ThumbXPos; + DWORD ThumbYPos; + DWORD UnitSetting; + WINDOWPLACEMENT WindowPlacement; + + static void SetWallpaper(TCHAR *szFileName, DWORD dwStyle, DWORD dwTile); + + void Load(); + void Store(); +}; Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -12,7 +12,6 @@ #include "precomp.h" #include "dialogs.h" -#include "registry.h" /* FUNCTIONS ********************************************************/ @@ -188,6 +187,7 @@ LRESULT CMainWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + GetWindowPlacement(&(registrySettings.WindowPlacement)); PostQuitMessage(0); /* send a WM_QUIT to the message queue */ return 0; } @@ -428,13 +428,13 @@ GlobalFree(pd.hDevNames); break; case IDM_FILEASWALLPAPERPLANE: - SetWallpaper(filepathname, 1, 1); + RegistrySettings::SetWallpaper(filepathname, 1, 1); break; case IDM_FILEASWALLPAPERCENTERED: - SetWallpaper(filepathname, 1, 0); + RegistrySettings::SetWallpaper(filepathname, 1, 0); break; case IDM_FILEASWALLPAPERSTRETCHED: - SetWallpaper(filepathname, 2, 0); + RegistrySettings::SetWallpaper(filepathname, 2, 0); break; case IDM_EDITUNDO: imageModel.Undo();

9 years, 5 months

[ekohl] 68723: [WLNOTIFY] Register the notification functions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 16 19:27:11 2015 New Revision: 68723 URL: http://svn.reactos.org/svn/reactos?rev=68723&view=rev Log: [WLNOTIFY] Register the notification functions. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Aug 16 19:27:11 2015 @@ -1103,6 +1103,11 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomain",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logoff",0x00000000,"TestLogoffEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logon",0x00000000,"TestLogonEvent" ; Time Zone Servers HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org"

9 years, 5 months

[ekohl] 68722: [WLNOTIFY] Add the winlogon notification dll. Right now it exports only test functions for the winlogon notifications.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 16 19:11:21 2015 New Revision: 68722 URL: http://svn.reactos.org/svn/reactos?rev=68722&view=rev Log: [WLNOTIFY] Add the winlogon notification dll. Right now it exports only test functions for the winlogon notifications. Added: trunk/reactos/dll/win32/wlnotify/ (with props) trunk/reactos/dll/win32/wlnotify/CMakeLists.txt (with props) trunk/reactos/dll/win32/wlnotify/precomp.h (with props) trunk/reactos/dll/win32/wlnotify/test.c (with props) trunk/reactos/dll/win32/wlnotify/wlnotify.c (with props) trunk/reactos/dll/win32/wlnotify/wlnotify.rc (with props) trunk/reactos/dll/win32/wlnotify/wlnotify.spec (with props) Modified: trunk/reactos/cmake/baseaddress.cmake trunk/reactos/cmake/baseaddress_dwarf.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -40,6 +40,7 @@ set(baseaddress_cabinet 0x75ac0000) set(baseaddress_dsound 0x75a50000) set(baseaddress_glu32 0x75950000) +set(baseaddress_wlnotify 0x758f0000) set(baseaddress_opengl32 0x75720000) set(baseaddress_riched20 0x75690000) set(baseaddress_smdll 0x75670000) Modified: trunk/reactos/cmake/baseaddress_dwarf.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress_dwarf.cm… ============================================================================== --- trunk/reactos/cmake/baseaddress_dwarf.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress_dwarf.cmake [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -40,6 +40,7 @@ set(baseaddress_cabinet 0x75290000) set(baseaddress_dsound 0x751f0000) set(baseaddress_glu32 0x750a0000) +set(baseaddress_wlnotify 0x75040000) set(baseaddress_opengl32 0x74d90000) set(baseaddress_riched20 0x74cd0000) set(baseaddress_smdll 0x74cb0000) Propchange: trunk/reactos/dll/win32/wlnotify/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 16 19:11:21 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/wlnotify/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/wlnotify/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/wlnotify/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/wlnotify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/wlnotify/CMakeLists.txt [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,17 @@ + +spec2def(wlnotify.dll wlnotify.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + test.c + wlnotify.c + precomp.h) + +add_library(wlnotify SHARED + ${SOURCE} + wlnotify.rc + ${CMAKE_CURRENT_BINARY_DIR}/wlnotify.def) + +set_module_type(wlnotify win32dll UNICODE ENTRYPOINT DllMain 12) +add_importlibs(wlnotify kernel32 ntdll) +add_pch(wlnotify precomp.h SOURCE) +add_cd_file(TARGET wlnotify DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/wlnotify/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/precomp… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/precomp.h (added) +++ trunk/reactos/dll/win32/wlnotify/precomp.h [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,3 @@ +/**/ +#include <windows.h> +#include <winwlx.h> Propchange: trunk/reactos/dll/win32/wlnotify/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/test.c?… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/test.c (added) +++ trunk/reactos/dll/win32/wlnotify/test.c [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,48 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/wlnotify/test.c + * PURPOSE: Winlogon notifications + * PROGRAMMER: Eric Kohl + */ + +#include "precomp.h" + +#define _NDEBUG +#include <debug.h> + + +VOID +WINAPI +TestLogonEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT1("TestLogonEvent\n"); + DPRINT1("Size: %lu\n", pInfo->Size); + DPRINT1("Flags: %lx\n", pInfo->Flags); + DPRINT1("UserName: %S\n", pInfo->UserName); + DPRINT1("Domain: %S\n", pInfo->Domain); + DPRINT1("WindowStation: %S\n", pInfo->WindowStation); + DPRINT1("hToken: %p\n", pInfo->hToken); + DPRINT1("hDesktop: %p\n", pInfo->hDesktop); + DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestLogoffEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT1("TestLogoffEvent\n"); + DPRINT1("Size: %lu\n", pInfo->Size); + DPRINT1("Flags: %lx\n", pInfo->Flags); + DPRINT1("UserName: %S\n", pInfo->UserName); + DPRINT1("Domain: %S\n", pInfo->Domain); + DPRINT1("WindowStation: %S\n", pInfo->WindowStation); + DPRINT1("hToken: %p\n", pInfo->hToken); + DPRINT1("hDesktop: %p\n", pInfo->hDesktop); + DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/wlnotify/test.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/wlnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.c (added) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.c [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/wlnotify/wlnotify.c + * PURPOSE: Winlogon notifications + * PROGRAMMER: Eric Kohl + */ + +#include "precomp.h" + +#define _NDEBUG +#include <debug.h> + + +BOOL +WINAPI +DllMain( + HINSTANCE hInstance, + DWORD dwReason, + LPVOID lpReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstance); + break; + } + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/wlnotify/wlnotify.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/wlnotify.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.rc (added) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.rc [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Common DLL to receive Winlogon notifications" +#define REACTOS_STR_INTERNAL_NAME "wlnotify" +#define REACTOS_STR_ORIGINAL_FILENAME "wlnotify.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/wlnotify/wlnotify.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/wlnotify.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.spec (added) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.spec [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,2 @@ +@ stdcall TestLogonEvent(ptr) +@ stdcall TestLogoffEvent(ptr) Propchange: trunk/reactos/dll/win32/wlnotify/wlnotify.spec ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 5 months

[hbelusca] 68721: Fix build (addendum to r68719).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 16 19:04:16 2015 New Revision: 68721 URL: http://svn.reactos.org/svn/reactos?rev=68721&view=rev Log: Fix build (addendum to r68719). Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sun Aug 16 19:04:16 2015 @@ -441,7 +441,7 @@ if (!NT_SUCCESS(Status)) DPRINT1("CSR: NtClose failed, we are going to ASSERT, Status = 0x%08lx; [%02x,%02x] Process: 0x%p; ThreadHandle: 0x%p\n", - Status, CsrThread->ClientId->UniqueProcess, CsrThread->ClientId->UniqueThread, CsrProcess, CsrThread->ThreadHandle); + Status, CsrThread->ClientId.UniqueProcess, CsrThread->ClientId.UniqueThread, CsrProcess, CsrThread->ThreadHandle); ASSERT(NT_SUCCESS(Status)); }

9 years, 5 months

[hbelusca] 68720: [NTVDM] Restore the correct screen buffer when reattaching the video to the console. WIP

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 16 19:00:21 2015 New Revision: 68720 URL: http://svn.reactos.org/svn/reactos?rev=68720&view=rev Log: [NTVDM] Restore the correct screen buffer when reattaching the video to the console. WIP Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sun Aug 16 19:00:21 2015 @@ -3863,17 +3863,20 @@ Attached = TRUE; } + /* Refresh display */ VgaRefreshDisplay(); VidBiosSyncCursorPosition(); } VOID VidBiosDetachFromConsole(VOID) { - /* Perform another screen refresh */ + if (!Attached) return; + + /* Refresh display */ VgaRefreshDisplay(); /* Detach from the console */ - VgaDetachFromConsole(FALSE); + VgaDetachFromConsole(); Attached = FALSE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sun Aug 16 19:00:21 2015 @@ -209,6 +209,7 @@ /* * Console interface -- VGA-mode-agnostic */ +// WARNING! This structure *MUST BE* in sync with the one in consrv/include/conio_winsrv.h typedef struct _CHAR_CELL { CHAR Char; @@ -228,6 +229,9 @@ static CONSOLE_CURSOR_INFO OrgConsoleCursorInfo; static CONSOLE_SCREEN_BUFFER_INFO OrgConsoleBufferInfo; + + +static HANDLE ScreenBufferHandle = NULL; /* @@ -473,7 +477,7 @@ * Windows 2k3 winsrv.dll calls NtVdmControl(VdmQueryVdmProcess == 14, &ConsoleHandle); * in the two following APIs: * SrvRegisterConsoleVDM (corresponding Win32 API: RegisterConsoleVDM) - * SrvVDMConsoleOperation (corresponding Win32 API: ) + * SrvVDMConsoleOperation (corresponding Win32 API: ??) * to check whether the current process is a VDM process, and fails otherwise * with the error 0xC0000022 (STATUS_ACCESS_DENIED). * @@ -481,6 +485,7 @@ * BaseSrvIsFirstVDM API... */ + /* Register with the console server */ Success = __RegisterConsoleVDM(1, StartEvent, @@ -577,6 +582,28 @@ return TRUE; } +static VOID VgaDetachFromConsoleInternal(VOID) +{ + ULONG dummyLength; + PVOID dummyPtr; + COORD dummySize = {0}; + + /* Deregister with the console server */ + __RegisterConsoleVDM(0, + NULL, + NULL, + NULL, + 0, + &dummyLength, + &dummyPtr, + NULL, + 0, + dummySize, + &dummyPtr); + + TextFramebuffer = NULL; +} + static BOOL IsConsoleHandle(HANDLE hHandle) { DWORD dwMode; @@ -1023,7 +1050,7 @@ if (TextResolution.X != Resolution->X || TextResolution.Y != Resolution->Y) { - VgaDetachFromConsole(TRUE); + VgaDetachFromConsoleInternal(); /* * VgaAttachToConsoleInternal sets TextResolution to the @@ -1047,7 +1074,7 @@ /* * Set the text mode palette. * - * WARNING: This call should fail on Windows (and therefore + * INFORMATION: This call should fail on Windows (and therefore * we get the default palette and our external behaviour is * just like Windows' one), but it should success on ReactOS * (so that we get console palette changes even for text-mode @@ -1077,25 +1104,20 @@ : GRAPHICS_MODE; /* - * No need to switch to a different screen mode + resolution - * if the new ones are the same as the old ones. + * Do not switch to a different screen mode + resolution if the new settings + * are the same as the old ones. Just repaint the full screen. */ - if ((ScreenMode == NewScreenMode) && + if ((ScreenMode == NewScreenMode) && // CurrResolution == NewResolution (CurrResolution.X == NewResolution.X && CurrResolution.Y == NewResolution.Y)) { goto Quit; } + /* Leave the current video mode */ if (ScreenMode == GRAPHICS_MODE) - { - /* Leave the current graphics mode */ VgaLeaveGraphicsMode(); - } else - { - /* Leave the current text mode */ VgaLeaveTextMode(); - } /* Update the current resolution */ CurrResolution = NewResolution; @@ -2270,91 +2292,90 @@ BOOL VgaAttachToConsole(VOID) { - // - // FIXME: We should go back to the saved screen state - // if (TextResolution.X == 0 || TextResolution.Y == 0) DPRINT1("VgaAttachToConsole -- TextResolution uninitialized\n"); if (TextResolution.X == 0) TextResolution.X = 80; if (TextResolution.Y == 0) TextResolution.Y = 25; - return VgaAttachToConsoleInternal(&TextResolution); -} - -VOID VgaDetachFromConsole(BOOL ChangingMode) -{ - ULONG dummyLength; - PVOID dummyPtr; - COORD dummySize = {0}; - - // - // FIXME: We should save the screen state - // - - __RegisterConsoleVDM(0, - NULL, - NULL, - NULL, - 0, - &dummyLength, - &dummyPtr, - NULL, - 0, - dummySize, - &dummyPtr); - - TextFramebuffer = NULL; - - if (!ChangingMode) - { - SMALL_RECT ConRect; - - /* Restore the old screen buffer */ - VgaSetActiveScreenBuffer(TextConsoleBuffer); - - /* Restore the original console size */ - ConRect.Left = 0; - ConRect.Top = 0; - ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; - ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; - /* - * See the following trick explanation in VgaAttachToConsoleInternal. - */ - SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); - SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); - SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); - - /* Restore the original cursor shape */ - SetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo); - } + // VgaDetachFromConsoleInternal(); + + /* + * VgaAttachToConsoleInternal sets TextResolution to the + * new resolution and updates ConsoleInfo. + */ + if (!VgaAttachToConsoleInternal(&TextResolution)) + { + DisplayMessage(L"An unexpected error occurred!\n"); + EmulatorTerminate(); + return FALSE; + } + + /* Restore the screen state */ + /* Restore the original screen buffer */ + ASSERT(ScreenBufferHandle); + VgaSetActiveScreenBuffer(ScreenBufferHandle); + ScreenBufferHandle = NULL; + + return TRUE; +} + +VOID VgaDetachFromConsole(VOID) +{ + SMALL_RECT ConRect; + + VgaDetachFromConsoleInternal(); + + /* Save the screen state */ + if (ScreenMode == TEXT_MODE) + ScreenBufferHandle = TextConsoleBuffer; + else + ScreenBufferHandle = GraphicsConsoleBuffer; + + /* Restore the old text-mode screen buffer */ + VgaSetActiveScreenBuffer(TextConsoleBuffer); + + /* Restore the original console size */ + ConRect.Left = 0; + ConRect.Top = 0; + ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; + ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; + /* + * See the following trick explanation in VgaAttachToConsoleInternal. + */ + SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); + SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); + + /* Restore the original cursor shape */ + SetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo); } BOOLEAN VgaInitialize(HANDLE TextHandle) { + /* Save the default text-mode console output handle */ + if (!IsConsoleHandle(TextHandle)) return FALSE; + TextConsoleBuffer = TextHandle; + + /* Save the original cursor and console screen buffer information */ + if (!GetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo) || + !GetConsoleScreenBufferInfo(TextConsoleBuffer, &OrgConsoleBufferInfo)) + { + return FALSE; + } + ConsoleInfo = OrgConsoleBufferInfo; + /* Clear the SEQ, GC, CRTC and AC registers */ RtlZeroMemory(VgaSeqRegisters, sizeof(VgaSeqRegisters)); RtlZeroMemory(VgaGcRegisters, sizeof(VgaGcRegisters)); RtlZeroMemory(VgaCrtcRegisters, sizeof(VgaCrtcRegisters)); RtlZeroMemory(VgaAcRegisters, sizeof(VgaAcRegisters)); - /* Save the default text-mode console output handle */ - if (!IsConsoleHandle(TextHandle)) return FALSE; - TextConsoleBuffer = TextHandle; - - /* Save the original cursor and console screen buffer information */ - if (!GetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo) || - !GetConsoleScreenBufferInfo(TextConsoleBuffer, &OrgConsoleBufferInfo)) - { - return FALSE; - } - ConsoleInfo = OrgConsoleBufferInfo; - /* Initialize the VGA palette and fail if it isn't successfully created */ if (!VgaInitializePalette()) return FALSE; /***/ VgaResetPalette(); /***/ - /* Switch to the text buffer */ + /* Switch to the text buffer, but do not enter into a text mode */ VgaSetActiveScreenBuffer(TextConsoleBuffer); /* Reset the sequencer */ @@ -2391,21 +2412,19 @@ VOID VgaCleanup(VOID) { + /* Do a final display refresh */ + VgaRefreshDisplay(); + DestroyHardwareTimer(VSyncTimer); DestroyHardwareTimer(HSyncTimer); + /* Leave the current video mode */ if (ScreenMode == GRAPHICS_MODE) - { - /* Leave the current graphics mode */ VgaLeaveGraphicsMode(); - } else - { - /* Leave the current text mode */ VgaLeaveTextMode(); - } - - VgaDetachFromConsole(FALSE); + + VgaDetachFromConsole(); MemRemoveFastMemoryHook((PVOID)0xA0000, 0x20000); CloseHandle(AnotherEvent); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] Sun Aug 16 19:00:21 2015 @@ -372,7 +372,7 @@ VOID ScreenEventHandler(PWINDOW_BUFFER_SIZE_RECORD ScreenEvent); BOOL VgaAttachToConsole(VOID); -VOID VgaDetachFromConsole(BOOL ChangeMode); +VOID VgaDetachFromConsole(VOID); COORD VgaGetDisplayResolution(VOID); VOID VgaRefreshDisplay(VOID);

9 years, 5 months

[hbelusca] 68719: [CSRSRV]: Add a diagnostic DPRINT in order to better understand on which situations some NtClose call fails on a thread handle when closing it, and leads to a failed assertion in ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 16 16:00:08 2015 New Revision: 68719 URL: http://svn.reactos.org/svn/reactos?rev=68719&view=rev Log: [CSRSRV]: Add a diagnostic DPRINT in order to better understand on which situations some NtClose call fails on a thread handle when closing it, and leads to a failed assertion in CSR. CORE-9742 Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sun Aug 16 16:00:08 2015 @@ -438,6 +438,11 @@ { UnProtectHandle(CsrThread->ThreadHandle); Status = NtClose(CsrThread->ThreadHandle); + + if (!NT_SUCCESS(Status)) + DPRINT1("CSR: NtClose failed, we are going to ASSERT, Status = 0x%08lx; [%02x,%02x] Process: 0x%p; ThreadHandle: 0x%p\n", + Status, CsrThread->ClientId->UniqueProcess, CsrThread->ClientId->UniqueThread, CsrProcess, CsrThread->ThreadHandle); + ASSERT(NT_SUCCESS(Status)); }

9 years, 5 months

[ekohl] 68718: [SFC][SFC_OS] Add logon notification functions to sfc.dll and sfc_os.dll.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 16 15:44:01 2015 New Revision: 68718 URL: http://svn.reactos.org/svn/reactos?rev=68718&view=rev Log: [SFC][SFC_OS] Add logon notification functions to sfc.dll and sfc_os.dll. Modified: trunk/reactos/dll/win32/sfc/sfc.spec trunk/reactos/dll/win32/sfc_os/sfc_os.c trunk/reactos/dll/win32/sfc_os/sfc_os.spec Modified: trunk/reactos/dll/win32/sfc/sfc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] Sun Aug 16 15:44:01 2015 @@ -12,6 +12,6 @@ @ stdcall SRSetRestorePointW (ptr ptr) @ stdcall SfcGetNextProtectedFile (ptr ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected (ptr wstr) sfc_os.SfcIsFileProtected -@ stub SfcWLEventLogoff -@ stub SfcWLEventLogon +@ stdcall SfcWLEventLogoff (ptr) sfc_os.SfcWLEventLogoff +@ stdcall SfcWLEventLogon (ptr) sfc_os.SfcWLEventLogon @ stdcall SfpVerifyFile (str str long) Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.c?… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] Sun Aug 16 15:44:01 2015 @@ -25,6 +25,8 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <winuser.h> +#include <winwlx.h> #define NDEBUG #include <debug.h> @@ -171,3 +173,43 @@ /* Always return success */ return 0; } + +/****************************************************************** + * SfcWLEventLogoff [sfc_os.@] + * + * Logoff notification function + * + * PARAMS + * pInfo [I] Pointer to logoff notification information + * + * RETURNS + * nothing + * + */ +VOID +WINAPI +SfcWLEventLogoff( + PWLX_NOTIFICATION_INFO pInfo) +{ + UNIMPLEMENTED; +} + +/****************************************************************** + * SfcWLEventLogon [sfc_os.@] + * + * Logon notification function + * + * PARAMS + * pInfo [I] Pointer to logon notification information + * + * RETURNS + * nothing + * + */ +VOID +WINAPI +SfcWLEventLogon( + PWLX_NOTIFICATION_INFO pInfo) +{ + UNIMPLEMENTED; +} Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.sp… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] Sun Aug 16 15:44:01 2015 @@ -8,5 +8,5 @@ @ stdcall SfcGetNextProtectedFile(ptr ptr) @ stdcall SfcIsFileProtected(ptr wstr) @ stdcall SfcIsKeyProtected(long wstr long) -@ stub SfcWLEventLogoff -@ stub SfcWLEventLogon +@ stdcall SfcWLEventLogoff(ptr) +@ stdcall SfcWLEventLogon(ptr)

9 years, 5 months

[ekohl] 68717: [WINLOGON] Add logon notification package registration.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 16 14:39:44 2015 New Revision: 68717 URL: http://svn.reactos.org/svn/reactos?rev=68717&view=rev Log: [WINLOGON] Add logon notification package registration. Added: trunk/reactos/base/system/winlogon/notify.c (with props) Modified: trunk/reactos/base/system/winlogon/CMakeLists.txt trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/CMake… ============================================================================== --- trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] Sun Aug 16 14:39:44 2015 @@ -7,6 +7,7 @@ list(APPEND SOURCE environment.c + notify.c rpcserver.c sas.c screensaver.c Added: trunk/reactos/base/system/winlogon/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/notif… ============================================================================== --- trunk/reactos/base/system/winlogon/notify.c (added) +++ trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] Sun Aug 16 14:39:44 2015 @@ -0,0 +1,231 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Winlogon + * FILE: base/system/winlogon/notify.c + * PURPOSE: Logon notifications + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "winlogon.h" + +/* GLOBALS ******************************************************************/ + + +// void Event_Handler_Function_Name(PWLX_NOTIFICATION_INFO pInfo); +typedef VOID (WINAPI *PWLX_NOTIFY_HANDLER)(PWLX_NOTIFICATION_INFO pInfo); + +typedef enum _NOTIFICATION_TYPE +{ + LogonHandler, + LogoffHandler, + LockHandler, + UnlockHandler, + StartupHandler, + ShutdownHandler, + StartScreenSaverHandler, + StopScreenSaverHandler, + DisconnectHandler, + ReconnectHandler, + StartShellHandler, + PostShellHandler, + LastHandler +} NOTIFICATION_TYPE, *PNOTIFICATION_TYPE; + +static PSTR FuncNames[LastHandler] = +{ + "Logon", + "Logoff", + "Lock", + "Unlock", + "Startup", + "Shutdown", + "StartScreenSaver", + "StopScreenSaver", + "Disconnect", + "Reconnect", + "StartShell", + "PostShell" +}; + +typedef struct _NOTIFICATION_ITEM +{ + LIST_ENTRY ListEntry; + + HINSTANCE hInstance; + PWLX_NOTIFY_HANDLER Handler[LastHandler]; +} NOTIFICATION_ITEM, *PNOTIFICATION_ITEM; + + +static LIST_ENTRY NotificationDllListHead; + + +/* FUNCTIONS *****************************************************************/ + +PWLX_NOTIFY_HANDLER +GetNotificationHandler( + HKEY hDllKey, + HINSTANCE hInstance, + PSTR pNotification) +{ + CHAR szFuncBuffer[128]; + DWORD dwSize; + DWORD dwType; + LONG lError; + + dwSize = 128; + lError = RegQueryValueExA(hDllKey, + pNotification, + NULL, + &dwType, + (PBYTE)szFuncBuffer, + &dwSize); + if (lError == ERROR_SUCCESS) + { + return (PWLX_NOTIFY_HANDLER)GetProcAddress(hInstance, szFuncBuffer); + } + + return NULL; +} + + +static +VOID +LoadNotificationDll( + HKEY hNotifyKey, + PWSTR pKeyName) +{ + HKEY hDllKey = NULL; + PNOTIFICATION_ITEM NotificationDll = NULL; + LONG lError; + WCHAR szBuffer[80]; + DWORD dwSize; + DWORD dwType; + HINSTANCE hInstance; + NOTIFICATION_TYPE i; + + TRACE("LoadNotificationDll(%p %S)\n", hNotifyKey, pKeyName); + + lError = RegOpenKeyExW(hNotifyKey, + pKeyName, + 0, + KEY_READ, + &hDllKey); + if (lError != ERROR_SUCCESS) + return; + + dwSize = 80 * sizeof(WCHAR); + lError = RegQueryValueExW(hDllKey, + L"DllName", + NULL, + &dwType, + (PBYTE)szBuffer, + &dwSize); + if (lError == ERROR_SUCCESS) + { + hInstance = LoadLibraryW(szBuffer); + if (hInstance == NULL) + return; + + NotificationDll = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(NOTIFICATION_ITEM)); + if (NotificationDll == NULL) + return; + + NotificationDll->hInstance = hInstance; + + for (i = LogonHandler; i < LastHandler; i++) + { + NotificationDll->Handler[i] = GetNotificationHandler(hDllKey, hInstance, FuncNames[i]); + TRACE("%s: %p\n", FuncNames[i], NotificationDll->Handler[i]); + } + + InsertHeadList(&NotificationDllListHead, + &NotificationDll->ListEntry); + } + + RegCloseKey(hDllKey); +} + + +BOOL +InitNotifications(VOID) +{ + HKEY hNotifyKey = NULL; + LONG lError; + DWORD dwIndex; + WCHAR szKeyName[80]; + DWORD dwKeyName; + + TRACE("InitNotifications()\n"); + + InitializeListHead(&NotificationDllListHead); + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\Notify", + 0, + KEY_READ | KEY_ENUMERATE_SUB_KEYS, + &hNotifyKey); + if (lError != ERROR_SUCCESS) + { + TRACE("RegOpenKeyExW()\n"); + return TRUE; + } + + dwIndex = 0; + for(;;) + { + dwKeyName = 80 * sizeof(WCHAR); + lError = RegEnumKeyExW(hNotifyKey, + dwIndex, + szKeyName, + &dwKeyName, + NULL, + NULL, + NULL, + NULL); + if (lError != ERROR_SUCCESS) + break; + + TRACE("Notification DLL: %S\n", szKeyName); + LoadNotificationDll(hNotifyKey, szKeyName); + + dwIndex++; + } + + RegCloseKey(hNotifyKey); + + TRACE("InitNotifications() done\n"); + + return TRUE; +} + + +VOID +CleanupNotifications(VOID) +{ + PLIST_ENTRY ListEntry; + PNOTIFICATION_ITEM NotificationDll; + + ListEntry = NotificationDllListHead.Flink; + while (ListEntry != &NotificationDllListHead) + { + NotificationDll = CONTAINING_RECORD(ListEntry, + NOTIFICATION_ITEM, + ListEntry); + if (NotificationDll != NULL) + { + + + + } + + ListEntry = ListEntry->Flink; + + RemoveEntryList(&NotificationDll->ListEntry); + } +} + +/* EOF */ Propchange: trunk/reactos/base/system/winlogon/notify.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Aug 16 14:39:44 2015 @@ -384,6 +384,9 @@ /* Wait for the LSA server */ WaitForLsass(); + /* Init Notifications */ + InitNotifications(); + /* Load and initialize gina */ if (!GinaInit(WLSession)) { @@ -470,6 +473,8 @@ DispatchMessageW(&Msg); } + CleanupNotifications(); + /* We never go there */ return 0; Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sun Aug 16 14:39:44 2015 @@ -258,6 +258,13 @@ /* environment.c */ BOOL CreateUserEnvironment(IN PWLSESSION Session); + +/* notifiy.c */ +BOOL +InitNotifications(VOID); + +VOID +CleanupNotifications(VOID); /* rpcserver.c */ BOOL

9 years, 5 months

[hbelusca] 68716: [CONSRV] Change console processes priority when the console gains or loses focus. FIXME: Win2k3 backtraces show that we should call NtUserSetInformationProcess(unimplemented in RO...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 15 17:05:13 2015 New Revision: 68716 URL: http://svn.reactos.org/svn/reactos?rev=68716&view=rev Log: [CONSRV] Change console processes priority when the console gains or loses focus. FIXME: Win2k3 backtraces show that we should call NtUserSetInformationProcess(unimplemented in ROS) to set some win32 process foreground flags. CORE-9911 Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sat Aug 15 17:05:13 2015 @@ -689,6 +689,7 @@ InitializeListHead(&Console->ProcessList); Console->NotifiedLastCloseProcess = NULL; Console->NotifyLastClose = FALSE; + Console->HasFocus = FALSE; /* Initialize pausing support */ Console->PauseFlags = 0; @@ -939,6 +940,46 @@ } return Status; +} + +VOID +ConSrvSetProcessFocus(IN PCSR_PROCESS CsrProcess, + IN BOOLEAN SetForeground) +{ + // FIXME: Call NtUserSetInformationProcess (currently unimplemented!) + // for setting Win32 foreground/background flags. + + if (SetForeground) + CsrSetForegroundPriority(CsrProcess); + else + CsrSetBackgroundPriority(CsrProcess); +} + +NTSTATUS NTAPI +ConSrvSetConsoleProcessFocus(IN PCONSRV_CONSOLE Console, + IN BOOLEAN SetForeground) +{ + PLIST_ENTRY current_entry; + PCONSOLE_PROCESS_DATA current; + + /* If the console is already being destroyed, just return */ + if (!ConDrvValidateConsoleState((PCONSOLE)Console, CONSOLE_RUNNING)) + return STATUS_UNSUCCESSFUL; + + /* + * Loop through the process list, from the most recent process + * to the oldest one, and for each, set its foreground priority. + */ + current_entry = Console->ProcessList.Flink; + while (current_entry != &Console->ProcessList) + { + current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); + current_entry = current_entry->Flink; + + ConSrvSetProcessFocus(current->Process, SetForeground); + } + + return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sat Aug 15 17:05:13 2015 @@ -290,6 +290,7 @@ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; + /* Send a menu event */ er.EventType = MENU_EVENT; er.Event.MenuEvent.dwCommandId = CmdId; ConioProcessInputEvent(Console, &er); @@ -755,6 +756,16 @@ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; + /* Set console focus state */ + Console->HasFocus = SetFocus; + + /* + * Set the priority of the processes of this console + * in accordance with the console focus state. + */ + ConSrvSetConsoleProcessFocus(Console, SetFocus); + + /* Send a focus event */ er.EventType = FOCUS_EVENT; er.Event.FocusEvent.bSetFocus = SetFocus; ConioProcessInputEvent(Console, &er); @@ -1855,6 +1866,7 @@ if (lParam & 0x01000000) dwControlKeyState |= ENHANCED_KEY; + /* Send a mouse event */ er.EventType = MOUSE_EVENT; er.Event.MouseEvent.dwMousePosition = PointToCoord(GuiData, lParam); er.Event.MouseEvent.dwButtonState = dwButtonState; Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Sat Aug 15 17:05:13 2015 @@ -579,8 +579,12 @@ /* Return the console handle to the caller */ ConsoleInitInfo->ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; - /* Insert the process into the processes list of the console */ + /* + * Insert the process into the processes list of the console, + * and set its foreground priority. + */ InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); + ConSrvSetProcessFocus(ProcessData->Process, Console->HasFocus); /* Add a reference count because the process is tied to the console */ _InterlockedIncrement(&Console->ReferenceCount); @@ -694,8 +698,12 @@ /* Return the console handle to the caller */ ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; - /* Insert the process into the processes list of the console */ + /* + * Insert the process into the processes list of the console, + * and set its foreground priority. + */ InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); + ConSrvSetProcessFocus(ProcessData->Process, Console->HasFocus); /* Add a reference count because the process is tied to the console */ _InterlockedIncrement(&Console->ReferenceCount); Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Sat Aug 15 17:05:13 2015 @@ -148,6 +148,7 @@ LIST_ENTRY ProcessList; /* List of processes owning the console. The first one is the so-called "Console Leader Process" */ PCONSOLE_PROCESS_DATA NotifiedLastCloseProcess; /* Pointer to the unique process that needs to be notified when the console leader process is killed */ BOOLEAN NotifyLastClose; /* TRUE if the console should send a control event when the console leader process is killed */ + BOOLEAN HasFocus; /* TRUE if the console has focus (is in the foreground) */ /******************************* Pausing support ******************************/ BYTE PauseFlags; @@ -206,6 +207,12 @@ ConSrvConsoleProcessCtrlEvent(IN PCONSRV_CONSOLE Console, IN ULONG ProcessGroupId, IN ULONG CtrlEvent); +VOID +ConSrvSetProcessFocus(IN PCSR_PROCESS CsrProcess, + IN BOOLEAN SetForeground); +NTSTATUS NTAPI +ConSrvSetConsoleProcessFocus(IN PCONSRV_CONSOLE Console, + IN BOOLEAN SetForeground); /* coninput.c */ VOID NTAPI ConioProcessKey(PCONSRV_CONSOLE Console, MSG* msg);

9 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015