Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 58367: [msgina] - Fix a bug in StartupWindowThread that had as a result to close the desktop handle we get from winlogon. The problem is the wrong usage of SetThreadDesktop as it clo...
by gadamopoulos＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: gadamopoulos Date: Sun Feb 24 21:30:30 2013 New Revision: 58367 URL: http://svn.reactos.org/svn/reactos?rev=58367&view=rev Log: [msgina] - Fix a bug in StartupWindowThread that had as a result to close the desktop handle we get from winlogon. The problem is the wrong usage of SetThreadDesktop as it closes the previous desktop, so keeping OldDesk is totally useless and when the thread exits it will close the handle to the current thread desktop which is Session->WinlogonDesktop from winlogon. To solve this issue we have to duplicate the handle we get from winlogon and let it get closed by win32k when the thread exits Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 24 21:30:30 2013 @@ -59,23 +59,35 @@ static DWORD WINAPI StartupWindowThread(LPVOID lpParam) { - HDESK OldDesk; + HDESK hDesk; PDISPLAYSTATUSMSG msg = (PDISPLAYSTATUSMSG)lpParam; - OldDesk = GetThreadDesktop(GetCurrentThreadId()); - - if(!SetThreadDesktop(msg->hDesktop)) + /* When SetThreadDesktop is called the system closes the desktop handle when needed + so we have to create a new handle because this handle may still be in use by winlogon */ + if (!DuplicateHandle ( GetCurrentProcess(), + msg->hDesktop, + GetCurrentProcess(), + &hDesk, + 0, + FALSE, + DUPLICATE_SAME_ACCESS)) { HeapFree(GetProcessHeap(), 0, lpParam); return FALSE; } + + if(!SetThreadDesktop(hDesk)) + { + HeapFree(GetProcessHeap(), 0, lpParam); + return FALSE; + } + DialogBoxParam( hDllInstance, MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG), GetDesktopWindow(), StatusMessageWindowProc, (LPARAM)lpParam); - SetThreadDesktop(OldDesk); HeapFree(GetProcessHeap(), 0, lpParam); return TRUE;

1 0

[ekohl] 58366: [LOGON] Fix formatting. No code changes.
by ekohl＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: ekohl Date: Sun Feb 24 20:27:15 2013 New Revision: 58366 URL: http://svn.reactos.org/svn/reactos?rev=58366&view=rev Log: [LOGON] Fix formatting. No code changes. Modified: trunk/reactos/base/applications/screensavers/logon/logon.c Modified: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.c [iso-8859-1] Sun Feb 24 20:27:15 2013 @@ -31,60 +31,59 @@ #define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) -#define APPNAME _T("Logon") -#define APP_TIMER 1 -#define APP_TIMER_INTERVAL 2000 +#define APPNAME _T("Logon") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 2000 -HBITMAP GetScreenSaverBitmap (void) +HBITMAP +GetScreenSaverBitmap(VOID) { - OSVERSIONINFOEX osvi; + OSVERSIONINFOEX osvi; - ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx ((OSVERSIONINFO *) &osvi); + ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + GetVersionEx ((OSVERSIONINFO *) &osvi); - switch(osvi.wProductType) - { - case VER_NT_WORKSTATION: - return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); - break; - default: - return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_SERVER), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); - break; - } + switch(osvi.wProductType) + { + case VER_NT_WORKSTATION: + return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + break; + default: + return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_SERVER), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + break; + } } -LRESULT CALLBACK +LRESULT +CALLBACK ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - static RECT rect; - static HBITMAP bitmap; + static RECT rect; + static HBITMAP bitmap; - switch (message) - { - case WM_CREATE: - { - bitmap = GetScreenSaverBitmap (); + switch (message) + { + case WM_CREATE: + { + bitmap = GetScreenSaverBitmap (); + if (bitmap == NULL) + { + MessageBox(hWnd, + _T("Fatal Error: Could not load bitmap"), + _T("Error"), + MB_OK | MB_ICONEXCLAMATION); + } - if(bitmap == NULL) - { - MessageBox( - hWnd, - _T("Fatal Error: Could not load bitmap"), - _T("Error"), - MB_OK | MB_ICONEXCLAMATION); - } + SetTimer(hWnd, + APP_TIMER, + APP_TIMER_INTERVAL, + NULL); - SetTimer ( - hWnd, - APP_TIMER, - APP_TIMER_INTERVAL, - NULL); - - break; - } - case WM_PAINT: - { + break; + } + case WM_PAINT: + { BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */ PAINTSTRUCT ps; HDC hdc; @@ -135,36 +134,40 @@ EndPaint(hWnd, &ps); break; - } + } case WM_TIMER: { InvalidateRect(hWnd, NULL, 1); break; } - case WM_DESTROY: - { - KillTimer (hWnd, APP_TIMER); - DeleteObject(bitmap); - PostQuitMessage(0); - break; - } + case WM_DESTROY: + { + KillTimer(hWnd, APP_TIMER); + DeleteObject(bitmap); + PostQuitMessage(0); + break; + } default: // Pass Windows Messages to the default screensaver window procedure return DefScreenSaverProc(hWnd, message, wParam, lParam); } - return 0; + return 0; } -BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +BOOL +WINAPI +ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { return FALSE; } // This function is only called one time before opening the configuration dialog. // Use it to show a message that no configuration is necesssary and return FALSE to indicate that no configuration dialog shall be opened. -BOOL WINAPI RegisterDialogClasses(HANDLE hInst) +BOOL +WINAPI +RegisterDialogClasses(HANDLE hInst) { TCHAR szMessage[256]; TCHAR szTitle[25];

1 0

[tkreuzer] 58365: [FREELDR] Fix formatting
by tkreuzer＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: tkreuzer Date: Sun Feb 24 20:18:57 2013 New Revision: 58365 URL: http://svn.reactos.org/svn/reactos?rev=58365&view=rev Log: [FREELDR] Fix formatting Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inffi… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…

1 0

[gadamopoulos] 58364: [win32k] - Fix a nasty bug in IntTrackMouseMove that prevented us from stopping the ID_EVENT_SYSTIMER_MOUSEHOVER timer. - IntKillTimer requires a PWND as first argument but we...
by gadamopoulos＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: gadamopoulos Date: Sun Feb 24 20:03:48 2013 New Revision: 58364 URL: http://svn.reactos.org/svn/reactos?rev=58364&view=rev Log: [win32k] - Fix a nasty bug in IntTrackMouseMove that prevented us from stopping the ID_EVENT_SYSTIMER_MOUSEHOVER timer. - IntKillTimer requires a PWND as first argument but we were passing an HWND and as a result the timer was never stopped - Fixes the remaining failed tests for TrackMouseEvent (besides queue state tests) Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sun Feb 24 20:03:48 2013 @@ -1352,7 +1352,7 @@ 0, 0); if ( pDesk->dwDTFlags & DF_TME_HOVER ) - IntKillTimer(UserHMGetHandle(pDesk->spwndTrack), ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); + IntKillTimer(pDesk->spwndTrack, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); /* Clear the flags to sign a change. */ pDesk->dwDTFlags &= ~(DF_TME_LEAVE|DF_TME_HOVER);

1 0

[ekohl] 58363: [MSGINA] - Implement WlxScreenSaverNotify. I decided to return a hardcoded FALSE because RegQueryValueExW always reads "1", although there is a "0" written in the registry. Will fix ...
by ekohl＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: ekohl Date: Sun Feb 24 19:44:41 2013 New Revision: 58363 URL: http://svn.reactos.org/svn/reactos?rev=58363&view=rev Log: [MSGINA] - Implement WlxScreenSaverNotify. I decided to return a hardcoded FALSE because RegQueryValueExW always reads "1", although there is a "0" written in the registry. Will fix it later. Modified: trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/stubs.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Feb 24 19:44:41 2013 @@ -184,6 +184,67 @@ ChooseGinaUI(); return pGinaUI->Initialize(pgContext); +} + +/* + * @implemented + */ +BOOL +WINAPI +WlxScreenSaverNotify( + PVOID pWlxContext, + BOOL *pSecure) +{ +#if 0 + WCHAR szBuffer[2]; + HKEY hKey; + DWORD bufferSize = sizeof(szBuffer); + DWORD varType = REG_SZ; + LONG rc; + + TRACE("(%p %p)\n", pWlxContext, pSecure); + + *pSecure = TRUE; + + /* + * Policy setting: + * HKLM\Software\Policies\Microsoft\Windows\Control Panel\Desktop : ScreenSaverIsSecure + * User setting: + * HKCU\Control Panel\Desktop : ScreenSaverIsSecure + */ + + rc = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Control Panel\\Desktop", + 0, + KEY_QUERY_VALUE, + &hKey); + TRACE("RegOpenKeyExW: %ld\n", rc); + if (rc == ERROR_SUCCESS) + { + rc = RegQueryValueExW(hKey, + L"ScreenSaverIsSecure", + NULL, + &varType, + (LPBYTE)szBuffer, + &bufferSize); + + TRACE("RegQueryValueExW: %ld\n", rc); + + if (rc == ERROR_SUCCESS) + { + TRACE("szBuffer: \"%S\"\n", szBuffer); + *pSecure = _wtoi(szBuffer); + } + + RegCloseKey(hKey); + } + + TRACE("*pSecure: %ld\n", *pSecure); +#endif + + *pSecure = FALSE; + + return TRUE; } /* Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Feb 24 19:44:41 2013 @@ -1,6 +1,7 @@ #define WIN32_NO_STATUS #include <stdarg.h> +#include <stdlib.h> #include <windef.h> #include <winbase.h> #include <wincon.h> Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Sun Feb 24 19:44:41 2013 @@ -86,23 +86,6 @@ * @unimplemented */ BOOL WINAPI -WlxScreenSaverNotify( - PVOID pWlxContext, - BOOL *pSecure) -{ - UNREFERENCED_PARAMETER(pWlxContext); - UNREFERENCED_PARAMETER(pSecure); - - //HKLM\Software\Policies\Microsoft\Windows\Control Panel\Desktop : ScreenSaverIsSecure - UNIMPLEMENTED; - return TRUE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI WlxGetStatusMessage( PVOID pWlxContext, DWORD *pdwOptions,

1 0

[hbelusca] 58362: [USETUP-BOOTDATA-FONTS] - Use the "Fixedsys Excelsior 3.01-L2" font instead of "Fixedsys Excelsior 3.01" for the Fixedsys font substitution (the *-L2 version corrects a bug when d...
by hbelusca＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: hbelusca Date: Sun Feb 24 15:36:49 2013 New Revision: 58362 URL: http://svn.reactos.org/svn/reactos?rev=58362&view=rev Log: [USETUP-BOOTDATA-FONTS] - Use the "Fixedsys Excelsior 3.01-L2" font instead of "Fixedsys Excelsior 3.01" for the Fixedsys font substitution (the *-L2 version corrects a bug when displaying the letter 'A'-upper-case). - Add the font-substitute "Lucida Console" to "DejaVu Sans Mono". Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/boot/bootdata/livecd.inf trunk/reactos/media/inf/font.inf Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Sun Feb 24 15:36:49 2013 @@ -7,9 +7,10 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -24,9 +25,10 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -41,9 +43,10 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, @@ -58,9 +61,10 @@ { L"Arial", L"DejaVu Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, @@ -75,9 +79,10 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, @@ -94,9 +99,10 @@ { L"Arial", L"DejaVu Sans" }, { L"Courier", L"DejaVu Sans Mono" }, { L"Courier New", L"DejaVu Sans Mono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, Modified: trunk/reactos/boot/bootdata/livecd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] Sun Feb 24 15:36:49 2013 @@ -43,9 +43,10 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" Modified: trunk/reactos/media/inf/font.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=583… ============================================================================== Binary files - no diff available.

1 0

[tkreuzer] 58361: [FREELDR] When processing forwarders and the target image was not yet loaded, try to load it (using .dll extension if no extension is given)
by tkreuzer＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: tkreuzer Date: Sun Feb 24 14:40:21 2013 New Revision: 58361 URL: http://svn.reactos.org/svn/reactos?rev=58361&view=rev Log: [FREELDR] When processing forwarders and the target image was not yet loaded, try to load it (using .dll extension if no extension is given) Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Sun Feb 24 14:40:21 2013 @@ -30,7 +30,8 @@ IN PIMAGE_THUNK_DATA ThunkData, IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, IN ULONG ExportSize, - IN BOOLEAN ProcessForwards); + IN BOOLEAN ProcessForwards, + IN PCSTR DirectoryPath); static BOOLEAN WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, @@ -42,7 +43,8 @@ WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, IN PVOID DllBase, IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData); + IN PIMAGE_THUNK_DATA ThunkData, + IN PCSTR DirectoryPath); @@ -57,8 +59,7 @@ PLDR_DATA_TABLE_ENTRY DataTableEntry; LIST_ENTRY *ModuleEntry; - TRACE("WinLdrCheckForLoadedDll: DllName %s, LoadedEntry: %X\n", - DllName, LoadedEntry); + TRACE("WinLdrCheckForLoadedDll: DllName %s\n", DllName); /* Just go through each entry in the LoadOrderList and compare loaded module's name with a given name */ @@ -70,9 +71,9 @@ LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - TRACE("WinLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%ws'\n", + TRACE("WinLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%.*ws'\n", DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, - VaToPa(DataTableEntry->BaseDllName.Buffer)); + DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); /* Compare names */ if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) @@ -152,7 +153,8 @@ ModuleListHead, DataTableEntry->DllBase, ScanDTE->DllBase, - (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk)); + (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk), + DirectoryPath); if (!Status) { @@ -241,8 +243,10 @@ /* Insert this DTE to a list in the LPB */ InsertTailList(ModuleListHead, &DataTableEntry->InLoadOrderLinks); - TRACE("Inserting DTE %p, name='%S' DllBase=%p \n", DataTableEntry, - DataTableEntry->BaseDllName.Buffer, DataTableEntry->DllBase); + TRACE("Inserting DTE %p, name='%.*S' DllBase=%p \n", DataTableEntry, + DataTableEntry->BaseDllName.Length / 2, + VaToPa(DataTableEntry->BaseDllName.Buffer), + DataTableEntry->DllBase); /* Save pointer to a newly allocated and initialized entry */ *NewEntry = DataTableEntry; @@ -293,7 +297,6 @@ /* Now read the MZ header to get the offset to the PE Header */ NtHeaders = RtlImageNtHeader(HeadersBuffer); - if (!NtHeaders) { //Print(L"Error - no NT header found in %s\n", FileName); @@ -501,7 +504,8 @@ IN PIMAGE_THUNK_DATA ThunkData, IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, IN ULONG ExportSize, - IN BOOLEAN ProcessForwards) + IN BOOLEAN ProcessForwards, + IN PCSTR DirectoryPath) { ULONG Ordinal; PULONG NameTable, FunctionTable; @@ -509,7 +513,7 @@ LONG High, Low, Middle, Result; ULONG Hint; PIMAGE_IMPORT_BY_NAME ImportData; - PCHAR ExportName; + PCHAR ExportName, ForwarderName; //TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); @@ -646,28 +650,44 @@ /* Save a pointer to the function */ ThunkData->u1.Function = (ULONG_PTR)RVA(DllBase, FunctionTable[Ordinal]); - /* Is it a forwarder? (function pointer isn't within the export directory) */ - if (((ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function) > (ULONG_PTR)ExportDirectory) && - ((ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function) < ((ULONG_PTR)ExportDirectory + ExportSize))) + /* Is it a forwarder? (function pointer is within the export directory) */ + ForwarderName = (PCHAR)VaToPa((PVOID)ThunkData->u1.Function); + if (((ULONG_PTR)ForwarderName > (ULONG_PTR)ExportDirectory) && + ((ULONG_PTR)ForwarderName < ((ULONG_PTR)ExportDirectory + ExportSize))) { PLDR_DATA_TABLE_ENTRY DataTableEntry; CHAR ForwardDllName[255]; PIMAGE_EXPORT_DIRECTORY RefExportDirectory; ULONG RefExportSize; + NTSTATUS Status; + TRACE("WinLdrpBindImportName(): ForwarderName %s\n", ForwarderName); /* Save the name of the forward dll */ - RtlCopyMemory(ForwardDllName, (PCHAR)VaToPa((PVOID)ThunkData->u1.Function), sizeof(ForwardDllName)); - - /* Strip out its extension */ - *strchr(ForwardDllName,'.') = '\0'; - - TRACE("WinLdrpBindImportName(): ForwardDllName %s\n", ForwardDllName); + RtlCopyMemory(ForwardDllName, ForwarderName, sizeof(ForwardDllName)); + + /* Strip out the symbol name */ + *strrchr(ForwardDllName,'.') = '\0'; + + /* Check if the target image is already loaded */ if (!WinLdrCheckForLoadedDll(ModuleListHead, ForwardDllName, &DataTableEntry)) { - /* We can't continue if DLL couldn't be loaded, so bomb out with an error */ - //Print(L"Error loading DLL!\n"); - ERR("Error loading DLL!\n"); - return FALSE; + /* Check if the forward dll name has an extension */ + if (strchr(ForwardDllName, '.') == NULL) + { + /* Name does not have an extension, append '.dll' */ + strcat(ForwardDllName, ".dll"); + } + + /* Now let's try to load it! */ + Status = WinLdrpLoadAndScanReferencedDll(ModuleListHead, + DirectoryPath, + ForwardDllName, + &DataTableEntry); + if (!Status) + { + ERR("WinLdrpLoadAndScanReferencedDll() failed to load forwarder dll.\n"); + return Status; + } } /* Get pointer to the export directory of loaded DLL */ @@ -687,7 +707,7 @@ BOOLEAN Status; /* Get pointer to the import name */ - ImportName = strchr((PCHAR)VaToPa((PVOID)ThunkData->u1.Function), '.') + 1; + ImportName = strrchr(ForwarderName, '.') + 1; /* Create a IMAGE_IMPORT_BY_NAME structure, pointing to the local Buffer */ ImportByName = (PIMAGE_IMPORT_BY_NAME)Buffer; @@ -709,7 +729,8 @@ &RefThunkData, RefExportDirectory, RefExportSize, - TRUE); + TRUE, + DirectoryPath); /* Fill out the ThunkData with data from RefThunkData */ ThunkData->u1 = RefThunkData.u1; @@ -747,7 +768,6 @@ /* Load the image */ Status = WinLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); - if (!Status) { ERR("WinLdrLoadImage() failed\n"); @@ -760,7 +780,6 @@ FullDllName, BasePA, DataTableEntry); - if (!Status) { ERR("WinLdrAllocateDataTableEntry() failed with Status=0x%X\n", Status); @@ -771,7 +790,6 @@ TRACE("WinLdrScanImportDescriptorTable() calling ourselves for %S\n", VaToPa((*DataTableEntry)->BaseDllName.Buffer)); Status = WinLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); - if (!Status) { ERR("WinLdrScanImportDescriptorTable() failed with Status=0x%X\n", Status); @@ -785,7 +803,8 @@ WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, IN PVOID DllBase, IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData) + IN PIMAGE_THUNK_DATA ThunkData, + IN PCSTR DirectoryPath) { PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL; BOOLEAN Status; @@ -829,7 +848,8 @@ ThunkData, ExportDirectory, ExportSize, - FALSE); + FALSE, + DirectoryPath); /* Move to the next entry */ ThunkData++;

1 0

[ekohl] 58360: [DESK] - Remove the SCRNSAVE.EXE value from the registry and set ScreenSaveActive to "0" as this is the setting for "None" screen saver. - Change screen saver settings the way Window...
by ekohl＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: ekohl Date: Sun Feb 24 08:58:05 2013 New Revision: 58360 URL: http://svn.reactos.org/svn/reactos?rev=58360&view=rev Log: [DESK] - Remove the SCRNSAVE.EXE value from the registry and set ScreenSaveActive to "0" as this is the setting for "None" screen saver. - Change screen saver settings the way Windows XP does it. Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sun Feb 24 08:58:05 2013 @@ -91,8 +91,7 @@ HKCU,"Control Panel\Desktop","DragWidth",0x00000000,"4" HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0" HKCU,"Control Panel\Desktop","HungAppTimeout",2,"5000" -HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0,"" -HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"1" +HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"0" HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sun Feb 24 08:58:05 2013 @@ -473,7 +473,7 @@ { INT Time; BOOL bRet; - TCHAR szTime[256], Sec; + TCHAR Sec; UINT Ret; /* Set the screensaver */ @@ -485,35 +485,17 @@ REG_SZ, (PBYTE)pData->ScreenSaverItems[pData->Selection].szFilename, _tcslen(pData->ScreenSaverItems[pData->Selection].szFilename) * sizeof(TCHAR)); + + SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_UPDATEINIFILE); } else { /* Windows deletes the value if no screensaver is set */ RegDeleteValue(regKey, _T("SCRNSAVE.EXE")); DeleteMode = TRUE; - } - - /* set the screensaver time delay */ - Time = GetDlgItemInt(hwndDlg, - IDC_SCREENS_TIMEDELAY, - &bRet, - FALSE); - if (Time == 0) - Time = 60; - else - Time *= 60; - - _itot(Time, szTime, 10); - RegSetValueEx(regKey, - _T("ScreenSaveTimeOut"), - 0, - REG_SZ, - (PBYTE)szTime, - _tcslen(szTime) * sizeof(TCHAR)); - - if (DeleteMode) Time = 0; - - SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE); + + SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, 0, SPIF_UPDATEINIFILE); + } /* Set the secure value */ Ret = SendDlgItemMessage(hwndDlg, @@ -529,6 +511,18 @@ (PBYTE)&Sec, sizeof(TCHAR)); + /* Set the screensaver time delay */ + Time = GetDlgItemInt(hwndDlg, + IDC_SCREENS_TIMEDELAY, + &bRet, + FALSE); + if (Time == 0) + Time = 60; + else + Time *= 60; + + SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + RegCloseKey(regKey); } } @@ -735,7 +729,6 @@ { if (command == BN_CLICKED) { - MessageBox(NULL, TEXT("Feature not yet implemented"), TEXT("Sorry"), MB_OK); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break;

1 0

[ekohl] 58359: [WINLOGON] - Call DispatchSAS when the screen saver is started by a WM_LOGONNOTIFY message. - Lock the workstation after the screen saver was terminated.
by ekohl＠svn.reactos.org 23 Feb '13

23 Feb '13

Author: ekohl Date: Sat Feb 23 19:48:22 2013 New Revision: 58359 URL: http://svn.reactos.org/svn/reactos?rev=58359&view=rev Log: [WINLOGON] - Call DispatchSAS when the screen saver is started by a WM_LOGONNOTIFY message. - Lock the workstation after the screen saver was terminated. Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Feb 23 19:48:22 2013 @@ -22,8 +22,6 @@ #define HK_CTRL_ALT_DEL 0 #define HK_CTRL_SHIFT_ESC 1 - -static BOOL inScrn = FALSE; /* FUNCTIONS ****************************************************************/ @@ -940,9 +938,9 @@ } else { + StartScreenSaver(Session); if (bSecure) DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); - StartScreenSaver(Session); } } else if (dwSasType == WLX_SAS_TYPE_SCRNSVR_ACTIVITY) @@ -1154,24 +1152,7 @@ } case LN_START_SCREENSAVE: { - BOOL bSecure = FALSE; - - if (inScrn) - break; - - inScrn = TRUE; - - // lParam 1 == Secure - if (lParam) - { - if (Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure)) - { - if (bSecure) DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); - } - } - - StartScreenSaver(Session); - inScrn = FALSE; + DispatchSAS(Session, WLX_SAS_TYPE_SCRNSVR_TIMEOUT); break; } case LN_LOCK_WORKSTATION:

1 0

[ekohl] 58358: [DESK] Remove calls to SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, ... as it does not make sense to activate and deactivate screen savers when activating or deactivating the screen...
by ekohl＠svn.reactos.org 23 Feb '13

23 Feb '13

Author: ekohl Date: Sat Feb 23 18:52:13 2013 New Revision: 58358 URL: http://svn.reactos.org/svn/reactos?rev=58358&view=rev Log: [DESK] Remove calls to SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE,... as it does not make sense to activate and deactivate screen savers when activating or deactivating the screen saver page. The screen saver should be activated when the user chooses a screen saver and it should be deactivated when the user chooses the "None" option. CORE-6963#resolve Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sat Feb 23 18:52:13 2013 @@ -758,16 +758,14 @@ case PSN_SETACTIVE: { - /* Activate screen saver support */ - SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_SENDCHANGE); + /* Enable screensaver preview support */ SetScreenSaverPreviewBox(hwndDlg, pData); break; } case PSN_KILLACTIVE: { - /* Disable screensaver support */ - SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, 0, SPIF_SENDCHANGE); + /* Kill running preview screensaver */ if (pData->PrevWindowPi.hProcess) { TerminateProcess(pData->PrevWindowPi.hProcess, 0);

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