Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 23533: A thread may exit with a status code of 0.
by hpoussin＠svn.reactos.org 09 Aug '06

09 Aug '06

Author: hpoussin Date: Wed Aug 9 16:46:41 2006 New Revision: 23533 URL: http://svn.reactos.org/svn/reactos?rev=23533&view=rev Log: A thread may exit with a status code of 0. Modified: trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Wed Aug 9 16:46:41 2006 @@ -921,9 +921,7 @@ _SEH_TRY { /* Write all the information from the ETHREAD/KTHREAD */ - ThreadBasicInfo->ExitStatus = (Thread->ExitStatus == 0) ? - STATUS_PENDING : - Thread->ExitStatus; + ThreadBasicInfo->ExitStatus = Thread->ExitStatus; ThreadBasicInfo->TebBaseAddress = (PVOID)Thread->Tcb.Teb; ThreadBasicInfo->ClientId = Thread->Cid; ThreadBasicInfo->AffinityMask = Thread->Tcb.Affinity; Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Wed Aug 9 16:46:41 2006 @@ -239,6 +239,9 @@ /* Initialize rundown protection */ ExInitializeRundownProtection(&Thread->RundownProtect); + /* Initialize exit code */ + Thread->ExitStatus = STATUS_PENDING; + /* Set the Process CID */ Thread->ThreadsProcess = Process; Thread->Cid.UniqueProcess = Process->UniqueProcessId;

1 0

[hpoussin] 23532: Fix a bug in NtQueryInformationThread, which was leading to its unusability in user mode
by hpoussin＠svn.reactos.org 09 Aug '06

09 Aug '06

Author: hpoussin Date: Wed Aug 9 16:15:18 2006 New Revision: 23532 URL: http://svn.reactos.org/svn/reactos?rev=23532&view=rev Log: Fix a bug in NtQueryInformationThread, which was leading to its unusability in user mode Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Wed Aug 9 16:15:18 2006 @@ -890,12 +890,13 @@ PAGED_CODE(); /* Verify Information Class validity */ - Status = DefaultSetInfoBufferCheck(ThreadInformationClass, - PsThreadInfoClass, - RTL_NUMBER_OF(PsThreadInfoClass), - ThreadInformation, - ThreadInformationLength, - PreviousMode); + Status = DefaultQueryInfoBufferCheck(ThreadInformationClass, + PsThreadInfoClass, + RTL_NUMBER_OF(PsThreadInfoClass), + ThreadInformation, + ThreadInformationLength, + ReturnLength, + PreviousMode); if (!NT_SUCCESS(Status)) return Status; /* Check what class this is */

1 0

[fireball] 23531: - Add tracing to class.c - Slightly change header to match the new style
by fireball＠svn.reactos.org 09 Aug '06

09 Aug '06

Author: fireball Date: Wed Aug 9 14:00:04 2006 New Revision: 23531 URL: http://svn.reactos.org/svn/reactos?rev=23531&view=rev Log: - Add tracing to class.c - Slightly change header to match the new style Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Wed Aug 9 14:00:04 2006 @@ -1,8 +1,8 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/class.c + * COPYRIGHT: GPL - See COPYING in the top level directory + * FILE: dll/win32/user32/windows/class.c * PURPOSE: Window classes * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -27,6 +27,11 @@ { UNICODE_STRING ClassName = {0}; BOOL Ret; + + TRACE("%p class/atom: %s/%04x %p\n", hinst, + IS_ATOM(lpszClass) ? NULL : lpszClass, + IS_ATOM(lpszClass) ? lpszClass : 0, + lpwcx); if (lpszClass == NULL) { @@ -79,6 +84,11 @@ LPWNDCLASSEXW lpwcx) { UNICODE_STRING ClassName = {0}; + + TRACE("%p class/atom: %S/%04x %p\n", hinst, + IS_ATOM(lpszClass) ? NULL : lpszClass, + IS_ATOM(lpszClass) ? lpszClass : 0, + lpwcx); if (lpszClass == NULL) { @@ -182,6 +192,8 @@ DWORD STDCALL GetClassLongA(HWND hWnd, int nIndex) { + TRACE("%p %d\n", hWnd, nIndex); + switch (nIndex) { case GCL_HBRBACKGROUND: @@ -213,6 +225,8 @@ DWORD STDCALL GetClassLongW ( HWND hWnd, int nIndex ) { + TRACE("%p %d\n", hWnd, nIndex); + switch (nIndex) { case GCL_HBRBACKGROUND: @@ -249,13 +263,21 @@ int nMaxCount) { ANSI_STRING ClassName; + int Result; ClassName.MaximumLength = nMaxCount; ClassName.Buffer = lpClassName; - return NtUserGetClassName(hWnd, - (PUNICODE_STRING)&ClassName, - TRUE); + Result = NtUserGetClassName(hWnd, + (PUNICODE_STRING)&ClassName, + TRUE); + + TRACE("%p class/atom: %s/%04x %x\n", hWnd, + IS_ATOM(lpClassName) ? NULL : lpClassName, + IS_ATOM(lpClassName) ? lpClassName : 0, + nMaxCount); + + return Result; } @@ -270,13 +292,21 @@ int nMaxCount) { UNICODE_STRING ClassName; + int Result; ClassName.MaximumLength = nMaxCount; ClassName.Buffer = lpClassName; - return NtUserGetClassName(hWnd, - &ClassName, - FALSE); + Result = NtUserGetClassName(hWnd, + &ClassName, + FALSE); + + TRACE("%p class/atom: %S/%04x %x\n", hWnd, + IS_ATOM(lpClassName) ? NULL : lpClassName, + IS_ATOM(lpClassName) ? lpClassName : 0, + nMaxCount); + + return Result; } @@ -292,6 +322,8 @@ * NOTE: Obsoleted in 32-bit windows */ { + TRACE("%p %x\n", hWnd, nIndex); + if ((nIndex < 0) && (nIndex != GCW_ATOM)) return 0; @@ -614,6 +646,10 @@ REGISTERCLASS_ANSI, hMenu); + TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, + lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); + if (!IS_INTRESOURCE(WndClass.lpszMenuName)) RtlFreeUnicodeString(&MenuName); if (!IS_ATOM(WndClass.lpszClassName)) @@ -628,6 +664,7 @@ ATOM STDCALL RegisterClassExW(CONST WNDCLASSEXW *lpwcx) { + ATOM Atom; WNDCLASSEXW WndClass; UNICODE_STRING ClassName; UNICODE_STRING MenuName = {0}; @@ -695,12 +732,18 @@ RtlInitUnicodeString(&ClassName, WndClass.lpszClassName); } - return (ATOM)NtUserRegisterClassEx(&WndClass, + Atom = (ATOM)NtUserRegisterClassEx(&WndClass, &ClassName, &MenuName, NULL, 0, hMenu); + + TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, + lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); + + return Atom; } /* @@ -752,6 +795,8 @@ UNICODE_STRING Value = {0}; BOOL Allocated = FALSE; DWORD Ret; + + TRACE("%p %d %lx\n", hWnd, nIndex, dwNewLong); /* FIXME - portability!!!! */ @@ -818,6 +863,8 @@ PWSTR lpStr = (PWSTR)dwNewLong; UNICODE_STRING Value = {0}; + TRACE("%p %d %lx\n", hWnd, nIndex, dwNewLong); + /* FIXME - portability!!!! */ if (nIndex == GCL_MENUNAME && lpStr != NULL) @@ -913,6 +960,11 @@ NTSTATUS Status; BOOL Ret; + TRACE("class/atom: %s/%04x %p\n", + IS_ATOM(lpClassName) ? NULL : lpClassName, + IS_ATOM(lpClassName) ? lpClassName : 0, + hInstance); + if (!IS_ATOM(lpClassName)) { Status = HEAP_strdupAtoW(&ClassName.Buffer, lpClassName, NULL); @@ -949,6 +1001,11 @@ { UNICODE_STRING ClassName = {0}; + TRACE("class/atom: %S/%04x %p\n", + IS_ATOM(lpClassName) ? NULL : lpClassName, + IS_ATOM(lpClassName) ? lpClassName : 0, + hInstance); + if (!IS_ATOM(lpClassName)) { RtlInitUnicodeString(&ClassName,

1 0

[hpoussin] 23530: Remove HandleExitWindows, and move its code to HandleLogoff and HandleShutdown Lots of cleanup
by hpoussin＠svn.reactos.org 09 Aug '06

09 Aug '06

Author: hpoussin Date: Wed Aug 9 10:31:02 2006 New Revision: 23530 URL: http://svn.reactos.org/svn/reactos?rev=23530&view=rev Log: Remove HandleExitWindows, and move its code to HandleLogoff and HandleShutdown Lots of cleanup Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h 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 (original) +++ trunk/reactos/base/system/winlogon/sas.c Wed Aug 9 10:31:02 2006 @@ -81,32 +81,202 @@ /* FIXME: reverting to lower privileges after creating user shell? */ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - return Session->Gina.Functions.WlxActivateUserShell( + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); + + if (!Session->Gina.Functions.WlxActivateUserShell( Session->Gina.Context, - L"Default",//NULL, /* FIXME */ + L"Default", NULL, /* FIXME */ - lpEnvironment); + lpEnvironment)) + { + return FALSE; + } + /*if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context, + L"WinSta0\\Default", + NULL, + NULL)) + { + LoadString(hAppInstance, IDS_FAILEDACTIVATEUSERSHELL, StatusMsg, 256 * sizeof(WCHAR)); + MessageBox(0, StatusMsg, NULL, MB_ICONERROR); + SetEvent(hShutdownEvent); + } + + WaitForSingleObject(hShutdownEvent, INFINITE); + CloseHandle(hShutdownEvent); + + RemoveStatusMessage(Session); + */ + return TRUE; +} + +#define EWX_ACTION_MASK 0xffffffeb +#define EWX_FLAGS_MASK 0x00000014 + +typedef struct tagLOGOFF_SHUTDOWN_DATA +{ + UINT Flags; + PWLSESSION Session; +} LOGOFF_SHUTDOWN_DATA, *PLOGOFF_SHUTDOWN_DATA; + +static DWORD WINAPI +LogoffShutdownThread(LPVOID Parameter) +{ + PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; + + if (!ImpersonateLoggedOnUser(LSData->Session->UserToken)) + { + ERR("ImpersonateLoggedOnUser failed with error %lu\n", GetLastError()); + return 0; + } + + /* Close processes of the interactive user */ + if (!ExitWindowsEx( + EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | + (EWX_LOGOFF == (LSData->Flags & EWX_ACTION_MASK) ? EWX_INTERNAL_FLAG_LOGOFF : 0), + 0)) + { + ERR("Unable to kill user apps, error %lu\n", GetLastError()); + RevertToSelf(); + return 0; + } + + /* FIXME: Call ExitWindowsEx() to terminate COM processes */ + + RevertToSelf(); + + return 1; +} + +static NTSTATUS +HandleLogoff( + IN OUT PWLSESSION Session, + IN UINT Flags) +{ + PLOGOFF_SHUTDOWN_DATA LSData; + HANDLE hThread; + + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); + + /* Prepare data for logoff thread */ + LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); + if (!LSData) + { + ERR("Failed to allocate mem for thread data\n"); + return STATUS_NO_MEMORY; + } + LSData->Flags = Flags; + LSData->Session = Session; + + /* Run logoff thread */ + hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + if (!hThread) + { + ERR("Unable to create shutdown thread, error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + HeapFree(GetProcessHeap(), 0, LSData); + + Session->LogonStatus = WKSTA_IS_LOGGED_OFF; + return STATUS_SUCCESS; +} + +static INT_PTR CALLBACK +ShutdownComputerWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_BTNSHTDOWNCOMPUTER: + EndDialog(hwndDlg, IDC_BTNSHTDOWNCOMPUTER); + return TRUE; + } + break; + } + case WM_INITDIALOG: + { + RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); + SetFocus(GetDlgItem(hwndDlg, IDC_BTNSHTDOWNCOMPUTER)); + return TRUE; + } + } + return FALSE; } static VOID -HandleLogoff( +UninitializeSAS( IN OUT PWLSESSION Session) { - FIXME("FIXME: HandleLogoff() unimplemented\n"); -} - -static BOOL + if (Session->SASWindow) + { + DestroyWindow(Session->SASWindow); + Session->SASWindow = NULL; + } + UnregisterClassW(WINLOGON_SAS_CLASS, hAppInstance); +} + +BOOL HandleShutdown( IN OUT PWLSESSION Session, IN DWORD wlxAction) { - FIXME("FIXME: HandleShutdown() unimplemented\n"); + PLOGOFF_SHUTDOWN_DATA LSData; + HANDLE hThread; + + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); + + /* Prepare data for shutdown thread */ + LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); + if (!LSData) + { + ERR("Failed to allocate mem for thread data\n"); + return STATUS_NO_MEMORY; + } + if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_POWER_OFF) + LSData->Flags = EWX_POWEROFF; + else if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) + LSData->Flags = EWX_REBOOT; + else + LSData->Flags = EWX_SHUTDOWN; + LSData->Session = Session; + + /* Run shutdown thread */ + hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + if (!hThread) + { + ERR("Unable to create shutdown thread, error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + HeapFree(GetProcessHeap(), 0, LSData); + + /* Destroy SAS window */ + UninitializeSAS(Session); + + FIXME("FIXME: Call SMSS API #1\n"); if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) NtShutdownSystem(ShutdownReboot); - else if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_POWER_OFF) - NtShutdownSystem(ShutdownPowerOff); else + { + if (FALSE) + { + /* FIXME - only show this dialog if it's a shutdown and the computer doesn't support APM */ + DialogBox(hAppInstance, MAKEINTRESOURCE(IDD_SHUTDOWNCOMPUTER), 0, ShutdownComputerWindowProc); + } NtShutdownSystem(ShutdownNoReboot); + } return TRUE; } @@ -144,14 +314,18 @@ break; SwitchDesktop(WLSession->WinlogonDesktop); Session->Gina.Functions.WlxLogoff(Session->Gina.Context); - HandleLogoff(Session); - Session->LogonStatus = WKSTA_IS_LOGGED_OFF; - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + if (!NT_SUCCESS(HandleLogoff(Session, EWX_LOGOFF))) + break; } if (WLX_SHUTTINGDOWN(wlxAction)) { Session->Gina.Functions.WlxShutdown(Session->Gina.Context, wlxAction); HandleShutdown(Session, wlxAction); + } + else + { + RemoveStatusMessage(Session); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } break; case WLX_SAS_ACTION_TASKLIST: /* 0x07 */ @@ -247,47 +421,8 @@ return TRUE; } -#define EWX_ACTION_MASK 0xffffffeb -#define EWX_FLAGS_MASK 0x00000014 - -typedef struct tagLOGOFF_SHUTDOWN_DATA -{ - UINT Flags; - PWLSESSION Session; -} LOGOFF_SHUTDOWN_DATA, *PLOGOFF_SHUTDOWN_DATA; - -static DWORD WINAPI -LogoffShutdownThread(LPVOID Parameter) -{ - PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA) Parameter; - - if (!ImpersonateLoggedOnUser(LSData->Session->UserToken)) - { - ERR("ImpersonateLoggedOnUser failed with error %lu\n", GetLastError()); - return 0; - } - - /* Close processes of the interactive user */ - if (!ExitWindowsEx( - EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | - (EWX_LOGOFF == (LSData->Flags & EWX_ACTION_MASK) ? EWX_INTERNAL_FLAG_LOGOFF : 0), - 0)) - { - ERR("Unable to kill user apps, error %lu\n", GetLastError()); - RevertToSelf(); - return 0; - } - - /* FIXME: Call ExitWindowsEx() to terminate COM processes */ - - RevertToSelf(); - - return 1; -} - static NTSTATUS -CheckPrivilegeForRequestedAction( - IN UINT Action, +CheckForShutdownPrivilege( IN DWORD RequestingProcessId) { HANDLE Process; @@ -295,18 +430,7 @@ BOOL CheckResult; PPRIVILEGE_SET PrivSet; - TRACE("CheckPrivilegeForRequestedAction(%u)\n", Action); - - if (Action == EWX_LOGOFF) - /* No privilege needed to log off */ - return STATUS_SUCCESS; - - /* Check for invalid arguments */ - if (Action != EWX_SHUTDOWN && Action != EWX_REBOOT && Action != EWX_POWEROFF) - { - ERR("Invalid exit action %u\n", Action); - return STATUS_INVALID_PARAMETER; - } + TRACE("CheckForShutdownPrivilege()\n"); Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, RequestingProcessId); if (!Process) @@ -352,71 +476,6 @@ WARN("SE_SHUTDOWN privilege not enabled\n"); return STATUS_ACCESS_DENIED; } -} - -static LRESULT -HandleExitWindows( - IN OUT PWLSESSION Session, - IN DWORD RequestingProcessId, - IN UINT Flags) -{ - UINT Action; - PLOGOFF_SHUTDOWN_DATA LSData; - HANDLE hThread; - NTSTATUS Status; - - /* Check parameters */ - Action = Flags & EWX_ACTION_MASK; - if (Action != EWX_LOGOFF && - Action != EWX_SHUTDOWN && - Action != EWX_REBOOT && - Action != EWX_POWEROFF) - { - ERR("Invalid ExitWindows action 0x%x\n", Action); - return STATUS_INVALID_PARAMETER; - } - - /* Check privilege */ - Status = CheckPrivilegeForRequestedAction(Action, RequestingProcessId); - if (!NT_SUCCESS(Status)) - return Status; - - /* Prepare data for logoff/shutdown thread */ - LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); - if (!LSData) - { - ERR("Failed to allocate mem for thread data\n"); - return STATUS_NO_MEMORY; - } - LSData->Flags = Flags; - LSData->Session = Session; - - /* Run logoff/shutdown thread */ - hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); - if (!hThread) - { - ERR("Unable to create shutdown thread, error %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, LSData); - return STATUS_UNSUCCESSFUL; - } - WaitForSingleObject(hThread, INFINITE); - CloseHandle(hThread); - HeapFree(GetProcessHeap(), 0, LSData); - - Session->LogonStatus = WKSTA_IS_LOGGED_OFF; - if (Action == EWX_LOGOFF) - { - DispatchSAS(Session, WLX_SAS_TYPE_TIMEOUT); - return 1; - } - - /* Handle shutdown */ - FIXME("FIXME: Call ExitWindowEx in SYSTEM process context\n"); - - FIXME("FIXME: Call SMSS API #1\n"); - NtShutdownSystem(ShutdownNoReboot); /* FIXME: should go in smss */ - - return 1; } static LRESULT CALLBACK @@ -468,22 +527,36 @@ } case PM_WINLOGON_EXITWINDOWS: { - return HandleExitWindows(Session, (DWORD) wParam, (UINT) lParam); + UINT Flags = (UINT)lParam; + UINT Action = Flags & EWX_ACTION_MASK; + DWORD wlxAction; + + /* Check parameters */ + switch (Action) + { + case EWX_LOGOFF: wlxAction = WLX_SAS_ACTION_LOGOFF; break; + case EWX_SHUTDOWN: wlxAction = WLX_SAS_ACTION_SHUTDOWN; break; + case EWX_REBOOT: wlxAction = WLX_SAS_ACTION_SHUTDOWN_REBOOT; break; + case EWX_POWEROFF: wlxAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; break; + default: + { + ERR("Invalid ExitWindows action 0x%x\n", Action); + return STATUS_INVALID_PARAMETER; + } + } + + if (WLX_SHUTTINGDOWN(wlxAction)) + { + NTSTATUS Status = CheckForShutdownPrivilege((DWORD)wParam); + if (!NT_SUCCESS(Status)) + return Status; + } + DoGenericAction(Session, wlxAction); + return 1; } } return DefWindowProc(hwndDlg, uMsg, wParam, lParam); -} - -static VOID -UninitializeSAS( - IN OUT PWLSESSION Session) -{ - if (Session->SASWindow) - { - DestroyWindow(Session->SASWindow); - Session->SASWindow = NULL; - } } BOOL @@ -506,10 +579,13 @@ swc.lpszMenuName = NULL; swc.lpszClassName = WINLOGON_SAS_CLASS; swc.hIconSm = NULL; - RegisterClassExW(&swc); /* FIXME: check return code */ + if (RegisterClassExW(&swc) == 0) + { + ERR("WL: Failed to register SAS window class\n"); + return FALSE; + } /* create invisible SAS window */ - DPRINT1("Session %p\n", Session); Session->SASWindow = CreateWindowExW( 0, WINLOGON_SAS_CLASS, @@ -520,6 +596,7 @@ if (!Session->SASWindow) { ERR("WL: Failed to create SAS window\n"); + UninitializeSAS(Session); return FALSE; } 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 (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Wed Aug 9 10:31:02 2006 @@ -21,104 +21,70 @@ /* FUNCTIONS *****************************************************************/ -static INT_PTR CALLBACK -ShutdownComputerWindowProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - switch (uMsg) - { - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_BTNSHTDOWNCOMPUTER: - EndDialog(hwndDlg, IDC_BTNSHTDOWNCOMPUTER); - return TRUE; - } - break; - } - case WM_INITDIALOG: - { - RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); - SetFocus(GetDlgItem(hwndDlg, IDC_BTNSHTDOWNCOMPUTER)); - return TRUE; - } - } - return FALSE; -} - static BOOL StartServicesManager(VOID) { - HANDLE ServicesInitEvent; - BOOLEAN Result; - STARTUPINFOW StartupInfo; - PROCESS_INFORMATION ProcessInformation; - DWORD Count; - WCHAR ServiceString[] = L"services.exe"; - - /* Start the service control manager (services.exe) */ - - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; - -#if 0 - DPRINT1(L"WL: Creating new process - \"services.exe\".\n"); -#endif - - Result = CreateProcessW(NULL, - ServiceString, - NULL, - NULL, - FALSE, - DETACHED_PROCESS, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - if (!Result) - { - DPRINT1("WL: Failed to execute services\n"); - return FALSE; - } - - /* wait for event creation (by SCM) for max. 20 seconds */ - for (Count = 0; Count < 20; Count++) - { - Sleep(1000); - - DPRINT("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); - ServicesInitEvent = OpenEventW(EVENT_ALL_ACCESS, //SYNCHRONIZE, - FALSE, - L"SvcctrlStartEvent_A3725DX"); - if (ServicesInitEvent != NULL) - { - break; - } - } - - if (ServicesInitEvent == NULL) - { - DPRINT1("WL: Failed to open event \"SvcctrlStartEvent_A3725DX\"\n"); - return FALSE; - } - - /* wait for event signalization */ - DPRINT("WL: Waiting forever on event handle: %x\n", ServicesInitEvent); - WaitForSingleObject(ServicesInitEvent, INFINITE); - DPRINT("WL: Closing event object \"SvcctrlStartEvent_A3725DX\"\n"); - CloseHandle(ServicesInitEvent); - DPRINT("WL: StartServicesManager() Done.\n"); - - return TRUE; + HANDLE ServicesInitEvent; + STARTUPINFOW StartupInfo; + PROCESS_INFORMATION ProcessInformation; + DWORD Count; + LPCWSTR ServiceString = L"services.exe"; + BOOL res; + + /* Start the service control manager (services.exe) */ + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpReserved = NULL; + StartupInfo.lpDesktop = NULL; + StartupInfo.lpTitle = NULL; + StartupInfo.dwFlags = 0; + StartupInfo.cbReserved2 = 0; + StartupInfo.lpReserved2 = 0; + + TRACE("WL: Creating new process - %S\n", ServiceString); + + res = CreateProcessW( + ServiceString, + NULL, + NULL, + NULL, + FALSE, + DETACHED_PROCESS, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (!res) + { + ERR("WL: Failed to execute services (error %lu)\n", GetLastError()); + return FALSE; + } + + /* Wait for event creation (by SCM) for max. 20 seconds */ + for (Count = 0; Count < 20; Count++) + { + Sleep(1000); + + TRACE("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); + ServicesInitEvent = OpenEventW( + EVENT_ALL_ACCESS, //SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (ServicesInitEvent) + break; + } + + if (!ServicesInitEvent) + { + ERR("WL: Failed to open event \"SvcctrlStartEvent_A3725DX\"\n"); + return FALSE; + } + + /* Wait for event signalization */ + WaitForSingleObject(ServicesInitEvent, INFINITE); + CloseHandle(ServicesInitEvent); + TRACE("WL: StartServicesManager() done.\n"); + + return TRUE; } static BOOL @@ -428,7 +394,7 @@ } #endif -static BOOL +BOOL DisplayStatusMessage( IN PWLSESSION Session, IN HDESK hDesktop, @@ -436,6 +402,9 @@ { WCHAR StatusMsg[MAX_PATH]; + if (Session->Gina.Version < WLX_VERSION_1_3) + return TRUE; + if (Session->SuppressStatus) return TRUE; @@ -445,66 +414,14 @@ return Session->Gina.Functions.WlxDisplayStatusMessage(Session->Gina.Context, hDesktop, 0, NULL, StatusMsg); } -static VOID -SessionLoop( - IN OUT PWLSESSION Session) -{ - //WCHAR StatusMsg[256]; - //HANDLE hShutdownEvent; - MSG Msg; - - Session->LogonStatus = WKSTA_IS_LOGGED_OFF; - RemoveStatusMessage(Session); - DispatchSAS(Session, WLX_SAS_TYPE_TIMEOUT); - - /* Message loop for the SAS window */ - while (GetMessage(&Msg, WLSession->SASWindow, 0, 0)) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - - /* Don't go there! */ - - /* - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_PREPARENETWORKCONNECTIONS); - Sleep(150); - - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); - Sleep(150); - - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); - Sleep(150); - - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); - Sleep(150); - - RemoveStatusMessage(Session); - - if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context, - L"WinSta0\\Default", - NULL, - NULL)) - { - LoadString(hAppInstance, IDS_FAILEDACTIVATEUSERSHELL, StatusMsg, 256 * sizeof(WCHAR)); - MessageBox(0, StatusMsg, NULL, MB_ICONERROR); - SetEvent(hShutdownEvent); - } - - WaitForSingleObject(hShutdownEvent, INFINITE); - CloseHandle(hShutdownEvent); - - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); - - Sleep(150); - - GinaInst->Functions->WlxShutdown(GinaInst->Context, WLX_SAS_ACTION_SHUTDOWN); - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); - - Sleep(250); - - RemoveStatusMessage(Session); - */ +BOOL +RemoveStatusMessage( + IN PWLSESSION Session) +{ + if (Session->Gina.Version < WLX_VERSION_1_3) + return TRUE; + + return Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); } static INT_PTR CALLBACK @@ -565,20 +482,24 @@ ULONG AuthenticationPackage; NTSTATUS Status; #endif + MSG Msg; hAppInstance = hInstance; if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) { ERR("WL: Could not register logon process\n"); + HandleShutdown(NULL, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); NtShutdownSystem(ShutdownNoReboot); ExitProcess(0); return 0; } - WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WLSESSION)); + WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), 0, sizeof(WLSESSION)); + ZeroMemory(WLSession, sizeof(WLSESSION)); if (!WLSession) { + ERR("WL: Could not allocate memory for winlogon instance\n"); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); ExitProcess(1); return 1; @@ -587,6 +508,7 @@ if (!CreateWindowStationAndDesktops(WLSession)) { + ERR("WL: Could not create window station and desktops\n"); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); ExitProcess(1); return 1; @@ -596,9 +518,9 @@ if (!StartServicesManager()) { ERR("WL: Could not start services.exe\n"); - NtShutdownSystem(ShutdownNoReboot); - ExitProcess(0); - return 0; + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); + ExitProcess(1); + return 1; } /* Check for pending setup */ @@ -610,7 +532,7 @@ SwitchDesktop(WLSession->ApplicationDesktop); RunSetup(); - NtShutdownSystem(ShutdownReboot); + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); ExitProcess(0); return 0; } @@ -618,6 +540,8 @@ if (!StartLsass()) { DPRINT1("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); + ExitProcess(1); return 1; } @@ -626,9 +550,9 @@ { ERR("WL: Failed to initialize Gina\n"); DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), 0, GinaLoadFailedWindowProc, (LPARAM)L""); - NtShutdownSystem(ShutdownReboot); - ExitProcess(0); - return 0; + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + ExitProcess(1); + return 1; } DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); @@ -673,30 +597,22 @@ return 2; } - /* Main loop */ - SessionLoop(WLSession); - - /* FIXME - Flush disks and registry, ... */ - - if(WLSession->LogonStatus == 0) - { - /* FIXME - only show this dialog if it's a shutdown and the computer doesn't support APM */ - switch(DialogBox(hInstance, MAKEINTRESOURCE(IDD_SHUTDOWNCOMPUTER), 0, ShutdownComputerWindowProc)) - { - case IDC_BTNSHTDOWNCOMPUTER: - NtShutdownSystem(ShutdownReboot); - break; - default: - NtShutdownSystem(ShutdownNoReboot); - break; - } - ExitProcess(0); - } - else - { - DPRINT1("WL: LogonStatus != LOGON_SHUTDOWN!!!\n"); - ExitProcess(0); - } - - return 0; -} + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_PREPARENETWORKCONNECTIONS); + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); + + /* Display logged out screen */ + WLSession->LogonStatus = WKSTA_IS_LOGGED_OFF; + RemoveStatusMessage(WLSession); + DispatchSAS(WLSession, WLX_SAS_TYPE_TIMEOUT); + + /* Message loop for the SAS window */ + while (GetMessage(&Msg, WLSession->SASWindow, 0, 0)) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + + /* 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 (original) +++ trunk/reactos/base/system/winlogon/winlogon.h Wed Aug 9 10:31:02 2006 @@ -71,7 +71,7 @@ typedef struct _GINAFUNCTIONS { /* Functions always available for a valid GINA */ - PFWLXNEGOTIATE WlxNegotiate; + PFWLXNEGOTIATE WlxNegotiate; /* optional */ PFWLXINITIALIZE WlxInitialize; /* Functions available if WlxVersion >= WLX_VERSION_1_0 (MS Windows 3.5.0) */ @@ -87,15 +87,15 @@ PFWLXSHUTDOWN WlxShutdown; /* Functions available if WlxVersion >= WLX_VERSION_1_1 (MS Windows 3.5.1) */ - PFWLXSCREENSAVERNOTIFY WlxScreenSaverNotify; - PFWLXSTARTAPPLICATION WlxStartApplication; + PFWLXSCREENSAVERNOTIFY WlxScreenSaverNotify; /* optional, not called ATM */ + PFWLXSTARTAPPLICATION WlxStartApplication; /* optional, not called ATM */ /* Functions available if WlxVersion >= WLX_VERSION_1_2 (MS Windows NT 4.0) */ /* Functions available if WlxVersion >= WLX_VERSION_1_3 (MS Windows 2000) */ - PFWLXNETWORKPROVIDERLOAD WlxNetworkProviderLoad; + PFWLXNETWORKPROVIDERLOAD WlxNetworkProviderLoad; /* not called ATM */ PFWLXDISPLAYSTATUSMESSAGE WlxDisplayStatusMessage; - PFWLXGETSTATUSMESSAGE WlxGetStatusMessage; + PFWLXGETSTATUSMESSAGE WlxGetStatusMessage; /* doesn't need to be called */ PFWLXREMOVESTATUSMESSAGE WlxRemoveStatusMessage; /* Functions available if WlxVersion >= WLX_VERSION_1_4 (MS Windows XP) */ @@ -111,6 +111,7 @@ } GINAINSTANCE, *PGINAINSTANCE; /* FIXME: put in an enum */ +/* See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/secauthn/s… */ #define WKSTA_IS_LOGGED_OFF 0 #define WKSTA_IS_LOGGED_ON 1 #define WKSTA_IS_LOCKED 2 @@ -157,11 +158,6 @@ ((Status) == WLX_SAS_ACTION_SHUTDOWN_HIBERNATE) \ ) -#define RemoveStatusMessage(Session) \ - Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); -#define DisplaySASNotice(Session) \ - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); - /* user32 */ BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwUnknown, @@ -176,6 +172,17 @@ InitializeSAS( IN OUT PWLSESSION Session); +/* winlogon.c */ +BOOL +DisplayStatusMessage( + IN PWLSESSION Session, + IN HDESK hDesktop, + IN UINT ResourceId); + +BOOL +RemoveStatusMessage( + IN PWLSESSION Session); + /* wlx.c */ BOOL GinaInit( @@ -183,6 +190,11 @@ BOOL CreateWindowStationAndDesktops( IN OUT PWLSESSION Session); + +BOOL +HandleShutdown( + IN OUT PWLSESSION Session, + IN DWORD wlxAction); VOID WINAPI WlxUseCtrlAltDel(HANDLE hWlx); VOID WINAPI WlxSetContextPointer(HANDLE hWlx, PVOID pWlxContext);

1 0

[amunger] 23529: Update the hardcoded ViewCVS URL. Now packmgr works on the bootcd.
by amunger＠svn.reactos.org 08 Aug '06

08 Aug '06

Author: amunger Date: Wed Aug 9 01:19:11 2006 New Revision: 23529 URL: http://svn.reactos.org/svn/reactos?rev=23529&view=rev Log: Update the hardcoded ViewCVS URL. Now packmgr works on the bootcd. Modified: trunk/rosapps/packmgr/lib/options.cpp trunk/rosapps/packmgr/lib/options.xml Modified: trunk/rosapps/packmgr/lib/options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/options.cpp?re… ============================================================================== --- trunk/rosapps/packmgr/lib/options.cpp (original) +++ trunk/rosapps/packmgr/lib/options.cpp Wed Aug 9 01:19:11 2006 @@ -83,7 +83,7 @@ { Log("* Load options.xml from the Internet (Temporary Hack)"); - CopyFileA( PML_Download(tree, "http://svn.reactos.org/viewcvs/*checkout*/trunk/rosapps/packmgr/lib/options…", NULL, "options.xml"), "options.xml", TRUE); + CopyFileA( PML_Download(tree, "http://svn.reactos.org/svn/*checkout*/reactos/trunk/rosapps/packmgr/lib/opt…", NULL, "options.xml"), "options.xml", TRUE); return ERR_OK; } Modified: trunk/rosapps/packmgr/lib/options.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/options.xml?re… ============================================================================== --- trunk/rosapps/packmgr/lib/options.xml (original) +++ trunk/rosapps/packmgr/lib/options.xml Wed Aug 9 01:19:11 2006 @@ -1,3 +1,3 @@ <options> - <source>http://svn.reactos.org/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/</source> -</options> + <source>http://svn.reactos.org/svn/*checkout*/reactos/trunk/rosapps/packmgr/tree/</source> +</options>

1 0

[jimtabor] 23528: Fix build, for NDEBUG.
by jimtabor＠svn.reactos.org 08 Aug '06

08 Aug '06

Author: jimtabor Date: Wed Aug 9 00:51:59 2006 New Revision: 23528 URL: http://svn.reactos.org/svn/reactos?rev=23528&view=rev Log: Fix build, for NDEBUG. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Wed Aug 9 00:51:59 2006 @@ -1430,9 +1430,8 @@ COLORREF OldTextColor; NONCLIENTMETRICS nclm; NTSTATUS Status; + #ifndef NDEBUG INT i; - - #ifndef NDEBUG DPRINT("%s:", __FUNCTION__); for(i = 0; i < Text->Length/sizeof(WCHAR); i++) DbgPrint("%C", Text->Buffer[i]);

1 0

[amunger] 23527: Merge 23526 from trunk.
by amunger＠svn.reactos.org 08 Aug '06

08 Aug '06

Author: amunger Date: Wed Aug 9 00:14:51 2006 New Revision: 23527 URL: http://svn.reactos.org/svn/reactos?rev=23527&view=rev Log: Merge 23526 from trunk. Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff (original) +++ branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff Wed Aug 9 00:14:51 2006 @@ -398,7 +398,7 @@ modules\rosapps\notevil\notevil.exe 1 optional modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\dll\win32\package.dll 1 optional +modules\rosapps\packmgr\lib\package.dll 1 optional modules\rosapps\sysutils\ctm\ctm.exe 1 optional modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional modules\rosapps\sysutils\man\man.exe 1 optional

1 0

[amunger] 23526: Correct the path to the package.dll for packmgr.
by amunger＠svn.reactos.org 08 Aug '06

08 Aug '06

Author: amunger Date: Wed Aug 9 00:13:27 2006 New Revision: 23526 URL: http://svn.reactos.org/svn/reactos?rev=23526&view=rev Log: Correct the path to the package.dll for packmgr. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Aug 9 00:13:27 2006 @@ -423,7 +423,7 @@ modules\rosapps\notevil\notevil.exe 1 optional modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\dll\win32\package.dll 1 optional +modules\rosapps\packmgr\lib\package.dll 1 optional modules\rosapps\sysutils\ctm\ctm.exe 1 optional modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional modules\rosapps\sysutils\man\man.exe 1 optional

1 0

[jimtabor] 23525: - DrawCaption - Patch by Saveliy Tretiakov, new NtUserDrawCaption implementation. See URL for more details, http://www.reactos.org/archives/public/ros-dev/2006-July/008575.html
by jimtabor＠svn.reactos.org 08 Aug '06

08 Aug '06

Author: jimtabor Date: Wed Aug 9 00:00:53 2006 New Revision: 23525 URL: http://svn.reactos.org/svn/reactos?rev=23525&view=rev Log: - DrawCaption - Patch by Saveliy Tretiakov, new NtUserDrawCaption implementation. See URL for more details, http://www.reactos.org/archives/public/ros-dev/2006-July/008575.html Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Wed Aug 9 00:00:53 2006 @@ -1097,230 +1097,8 @@ BOOL WINAPI DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags) { - NONCLIENTMETRICSW nclm; - BOOL result = FALSE; - RECT r = *lprc; - UINT VCenter = 0, Padding = 0, Height; - ULONG Style; - WCHAR buffer[256]; - HFONT hFont = NULL; - HFONT hOldFont = NULL; - HBRUSH OldBrush = NULL; - HDC MemDC = NULL; - int ButtonWidth; - COLORREF OldTextColor; - -#ifdef DOUBLE_BUFFER_CAPTION - HBITMAP MemBMP = NULL, OldBMP = NULL; - - MemDC = CreateCompatibleDC(hDC); - if (! MemDC) goto cleanup; - MemBMP = CreateCompatibleBitmap(hDC, lprc->right - lprc->left, lprc->bottom - lprc->top); - if (! MemBMP) goto cleanup; - OldBMP = SelectObject(MemDC, MemBMP); - if (! OldBMP) goto cleanup; -#else - MemDC = hDC; - - OffsetViewportOrgEx(MemDC, lprc->left, lprc->top, NULL); -#endif - - Style = GetWindowLongW(hWnd, GWL_STYLE); - - /* Windows behaves like this */ - Height = GetSystemMetrics(SM_CYCAPTION) - 1; - - VCenter = (lprc->bottom - lprc->top) / 2; - Padding = VCenter - (Height / 2); - - r.left = Padding; - r.right = r.left + (lprc->right - lprc->left); - r.top = Padding; - r.bottom = r.top + (Height / 2); - - // Draw the caption background - if (uFlags & DC_INBUTTON) - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_BTNFACE : COLOR_BTNSHADOW) ); - if (! OldBrush) goto cleanup; - if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup; - } - else - { - if (uFlags & DC_GRADIENT) - { - static GRADIENT_RECT gcap = {0, 1}; - TRIVERTEX vert[2]; - COLORREF Colors[2]; - LONG xx; - - r.right = (lprc->right - lprc->left); - if (uFlags & DC_SMALLCAP) - ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2; - else - ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - - //if (Style & WS_SYSMENU) - //{ - // r.right -= 3 + ButtonWidth; - // if (! (uFlags & DC_SMALLCAP)) - // { - // if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - // r.right -= 2 + 2 * ButtonWidth; - // else - // r.right -= 2; - // r.right -= 2; - // } - //} - - Colors[0] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); - Colors[1] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); - - vert[0].x = r.left; - vert[0].y = 0; - vert[0].Red = GetRValue(Colors[0]) << 8; - vert[0].Green = GetGValue(Colors[0]) << 8; - vert[0].Blue = GetBValue(Colors[0]) << 8; - vert[0].Alpha = 0; - - vert[1].x = r.right; - vert[1].y = lprc->bottom - lprc->top; - vert[1].Red = GetRValue(Colors[1]) << 8; - vert[1].Green = GetGValue(Colors[1]) << 8; - vert[1].Blue = GetBValue(Colors[1]) << 8; - vert[1].Alpha = 0; - - GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); - - if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) - { - r.top --; - SetBkMode( MemDC, TRANSPARENT ); - xx = GetSystemMetrics(SM_CXSIZE) + Padding; - if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) - r.left += xx; - r.top ++; - } - - if(OldBrush) - { - SelectObject(MemDC, OldBrush); - OldBrush = NULL; - } - //xx = lprc->right - lprc->left - r.right; - //if(xx > 0) - //{ - // OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION)); - // if (!OldBrush) goto cleanup; - // PatBlt(MemDC, r.right, 0, xx, lprc->bottom - lprc->top, PATCOPY); - //} - } - else - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) ); - if (! OldBrush) goto cleanup; - if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup; - } - } - - if ((uFlags & DC_ICON) && !(uFlags & DC_GRADIENT) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) - { - /* For some reason the icon isn't centered correctly... */ - r.top --; - if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) - r.left += GetSystemMetrics(SM_CXSIZE) + Padding; - r.top ++; - } - r.top ++; - r.left += 2; - - r.bottom = r.top + Height; - - if ((uFlags & DC_TEXT) && (NtUserInternalGetWindowText( hWnd, buffer, sizeof(buffer)/sizeof(buffer[0]) ))) - { - if(!(uFlags & DC_GRADIENT)) - { - r.right = (lprc->right - lprc->left); - if (uFlags & DC_SMALLCAP) - ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2; - else - ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - - if (Style & WS_SYSMENU) - { - r.right -= 3 + ButtonWidth; - if (! (uFlags & DC_SMALLCAP)) - { - if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - r.right -= 2 + 2 * ButtonWidth; - else - r.right -= 2; - r.right -= 2; - } - } - } - - nclm.cbSize = sizeof(nclm); - if (! SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &nclm, 0)) goto cleanup; - - SetBkMode( MemDC, TRANSPARENT ); - if (uFlags & DC_SMALLCAP) - hFont = CreateFontIndirectW(&nclm.lfSmCaptionFont); - else - hFont = CreateFontIndirectW(&nclm.lfCaptionFont); - - if (! hFont) goto cleanup; - - hOldFont = SelectObject(MemDC, hFont); - if (! hOldFont) goto cleanup; - - if (uFlags & DC_INBUTTON) - OldTextColor = SetTextColor(MemDC, GetSysColor(uFlags & DC_ACTIVE ? COLOR_BTNTEXT : COLOR_GRAYTEXT)); - else - OldTextColor = SetTextColor(MemDC, GetSysColor(uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); - - DrawTextW(MemDC, buffer, wcslen(buffer), &r, DT_VCENTER | DT_END_ELLIPSIS); - - SetTextColor(MemDC, OldTextColor); - } - -#if 0 - if (uFlags & DC_BUTTONS) - { - // Windows XP draws the caption buttons with DC_BUTTONS -// r.left += GetSystemMetrics(SM_CXSIZE) + 1; -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONCLOSE); -// r.right -= GetSystemMetrics(SM_CXSMSIZE) + 1; -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONMIN); -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONMAX); - } -#endif - -#ifdef DOUBLE_BUFFER_CAPTION - if (! BitBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, lprc->bottom - lprc->top, - MemDC, 0, 0, SRCCOPY)) goto cleanup; -#endif - - result = TRUE; - - cleanup : - if (MemDC) - { - if (OldBrush) SelectObject(MemDC, OldBrush); - if (hOldFont) SelectObject(MemDC, hOldFont); - if (hFont) DeleteObject(hFont); -#ifdef DOUBLE_BUFFER_CAPTION - if (OldBMP) SelectObject(MemDC, OldBMP); - if (MemBMP) DeleteObject(MemBMP); - DeleteDC(MemDC); -#else - OffsetViewportOrgEx(MemDC, -lprc->left, -lprc->top, NULL); -#endif - } - - return result; -} - + return NtUserDrawCaption(hWnd, hDC, lprc, uFlags); +} /* * @unimplemented Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Aug 9 00:00:53 2006 @@ -689,12 +689,11 @@ DWORD NTAPI NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 - ); + HWND hwnd1, + HWND hwnd2, + UINT u1, + DWORD dw1, + HCURSOR hc1); DWORD NTAPI @@ -704,24 +703,24 @@ DWORD Unknown2, DWORD Unknown3); -DWORD +BOOL NTAPI NtUserDrawCaption( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); - -DWORD -NTAPI + HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags); + +DWORD +STDCALL NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Wed Aug 9 00:00:53 2006 @@ -188,11 +188,17 @@ BOOL FASTCALL IntGetSysColorBrushes(HBRUSH *Brushes, UINT nBrushes); +HGDIOBJ FASTCALL +IntGetSysColorBrush(INT Object); + BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens); BOOL FASTCALL IntGetSysColors(COLORREF *Colors, UINT nColors); + +DWORD FASTCALL +IntGetSysColor(INT nIndex); /* Other Stuff */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Wed Aug 9 00:00:53 2006 @@ -72,7 +72,6 @@ } -static PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon) { PCURICON_OBJECT CurIcon; @@ -1346,6 +1345,191 @@ (Rop3), 0) #endif /* STRETCH_CAN_SRCCOPY_ONLY */ +BOOL +UserDrawIconEx( + HDC hDc, + INT xLeft, + INT yTop, + PCURICON_OBJECT pIcon, + INT cxWidth, + INT cyHeight, + UINT istepIfAniCur, + HBRUSH hbrFlickerFreeDraw, + UINT diFlags) +{ + BOOL Ret = FALSE; + HBITMAP hbmMask, hbmColor; + BITMAP bmpMask, bmpColor; + COLORREF oldFg, oldBg; + BOOL DoFlickerFree; + INT nStretchMode; + SIZE IconSize; + + HDC hdcOff; + HGDIOBJ hOldOffBrush = 0; + HGDIOBJ hOldOffBmp = 0; + HBITMAP hbmOff = 0; + HDC hdcMem = 0; + HGDIOBJ hOldMem; + + hbmMask = pIcon->IconInfo.hbmMask; + hbmColor = pIcon->IconInfo.hbmColor; + + if(istepIfAniCur) + DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); + + if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) + { + return FALSE; + } + + if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) + { + return FALSE; + } + + if(hbmColor) + { + IconSize.cx = bmpColor.bmWidth; + IconSize.cy = bmpColor.bmHeight; + } + else + { + IconSize.cx = bmpMask.bmWidth; + IconSize.cy = bmpMask.bmHeight / 2; + } + + if(!diFlags) + diFlags = DI_NORMAL; + + if(!cxWidth) + cxWidth = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CXICON) : IconSize.cx); + + if(!cyHeight) + cyHeight = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CYICON) : IconSize.cy); + + DoFlickerFree = (hbrFlickerFreeDraw && + (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); + + if(DoFlickerFree) + { + RECT r; + r.right = cxWidth; + r.bottom = cyHeight; + + hdcOff = NtGdiCreateCompatibleDC(hDc); + if(!hdcOff) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + return FALSE; + } + + hbmOff = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); + if(!hbmOff) + { + DPRINT1("NtGdiCreateCompatibleBitmap() failed!\n"); + goto cleanup; + } + + hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); + if(!hOldOffBrush) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + + hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); + if(!hOldOffBmp) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + + NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); + } + else hdcOff = hDc; + + hdcMem = NtGdiCreateCompatibleDC(hDc); + if(!hdcMem) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + goto cleanup; + } + + nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); + + oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); + oldBg = NtGdiSetBkColor(hdcOff, RGB(255, 255, 255)); + + if(diFlags & DI_MASK) + { + hOldMem = NtGdiSelectObject(hdcMem, hbmMask); + if(!hOldMem) + { + DPRINT("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, 0, IconSize.cx, IconSize.cy, + ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); + + if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) + && (diFlags & DI_IMAGE)) + { + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, IconSize.cy, IconSize.cx, IconSize.cy, SRCINVERT, + FALSE); + + diFlags &= ~DI_IMAGE; + } + + NtGdiSelectObject(hdcMem, hOldMem); + } + + if(diFlags & DI_IMAGE) + { + hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); + + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, (hbmColor ? 0 : IconSize.cy), IconSize.cx, IconSize.cy, + ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), + NULL != hbmColor); + + NtGdiSelectObject(hdcMem, hOldMem); + } + + if(DoFlickerFree) + { + NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, + cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); + } + + NtGdiSetTextColor(hdcOff, oldFg); + NtGdiSetBkColor(hdcOff, oldBg); + NtGdiSetStretchBltMode(hdcOff, nStretchMode); + + Ret = TRUE; + +cleanup: + if(DoFlickerFree) + { + + if(hOldOffBmp) NtGdiSelectObject(hdcOff, hOldOffBmp); + if(hOldOffBrush) NtGdiSelectObject(hdcOff, hOldOffBrush); + if(hbmOff) NtGdiDeleteObject(hbmOff); + if(hdcOff) NtGdiDeleteObjectApp(hdcOff); + } + + if(hdcMem) NtGdiDeleteObjectApp(hdcMem); + return Ret; +} + /* * @implemented */ @@ -1364,167 +1548,29 @@ DWORD Unknown0, DWORD Unknown1) { - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; - HBITMAP hbmMask, hbmColor; - BITMAP bmpMask, bmpColor; - BOOL DoFlickerFree; - SIZE IconSize; - COLORREF oldFg, oldBg; - HDC hdcMem, hdcOff = (HDC)0; - HBITMAP hbmOff = (HBITMAP)0; - HGDIOBJ hOldOffBrush = 0, hOldOffBmp = 0, hOldMem; - BOOL Ret = FALSE; - INT nStretchMode; - - DECLARE_RETURN(BOOL); + PCURICON_OBJECT pIcon; + BOOL Ret; DPRINT("Enter NtUserDrawIconEx\n"); UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( FALSE); - } - - if (!(CurIcon = UserGetCurIconObject(hIcon))) - { - ObDereferenceObject(WinSta); - RETURN(FALSE); - } - - hbmMask = CurIcon->IconInfo.hbmMask; - hbmColor = CurIcon->IconInfo.hbmColor; - - if(istepIfAniCur) - DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - - if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) - goto done; - - if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) - goto done; - - if(hbmColor) - { - IconSize.cx = bmpColor.bmWidth; - IconSize.cy = bmpColor.bmHeight; - } - else - { - IconSize.cx = bmpMask.bmWidth; - IconSize.cy = bmpMask.bmHeight / 2; - } - - if(!diFlags) - diFlags = DI_NORMAL; - - if(!cxWidth) - cxWidth = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CXICON) : IconSize.cx); - if(!cyHeight) - cyHeight = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CYICON) : IconSize.cy); - - DoFlickerFree = (hbrFlickerFreeDraw && (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); - - if(DoFlickerFree) - { - RECT r; - r.right = cxWidth; - r.bottom = cyHeight; - - hdcOff = NtGdiCreateCompatibleDC(hdc); - if(!hdcOff) - goto done; - - hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight); - if(!hbmOff) - { - NtGdiDeleteObjectApp(hdcOff); - goto done; - } - hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); - hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); - NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); - NtGdiSelectObject(hdcOff, hbmOff); - } - - hdcMem = NtGdiCreateCompatibleDC(hdc); - if(!hdcMem) - goto cleanup; - - if(!DoFlickerFree) - hdcOff = hdc; - - nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); - - oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); - oldBg = NtGdiSetBkColor(hdcOff, RGB(255, 255, 255)); - - if(diFlags & DI_MASK) - { - hOldMem = NtGdiSelectObject(hdcMem, hbmMask); - - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, 0, IconSize.cx, IconSize.cy, - ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); - - if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) && (diFlags & DI_IMAGE)) - { - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, IconSize.cy, IconSize.cx, IconSize.cy, SRCINVERT, - FALSE); - - diFlags &= ~DI_IMAGE; - } - NtGdiSelectObject(hdcMem, hOldMem); - } - - if(diFlags & DI_IMAGE) - { - hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); - - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, (hbmColor ? 0 : IconSize.cy), IconSize.cx, IconSize.cy, - ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), - NULL != hbmColor); - - NtGdiSelectObject(hdcMem, hOldMem); - } - - if(DoFlickerFree) - NtGdiBitBlt(hdc, xLeft, yTop, cxWidth, cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); - - NtGdiSetTextColor(hdcOff, oldFg); - NtGdiSetBkColor(hdcOff, oldBg); - - NtGdiSetStretchBltMode(hdcOff, nStretchMode); - - Ret = TRUE; - -cleanup: - if(DoFlickerFree) - { - - NtGdiSelectObject(hdcOff, hOldOffBmp); - NtGdiSelectObject(hdcOff, hOldOffBrush); - NtGdiDeleteObject(hbmOff); - NtGdiDeleteObjectApp(hdcOff); - } - if(hdcMem) - NtGdiDeleteObjectApp(hdcMem); - -done: - ObDereferenceObject(WinSta); - - RETURN( Ret); - -CLEANUP: - DPRINT("Leave NtUserDrawIconEx, ret=%i\n",_ret_); + + if(!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + UserLeave(); + return FALSE; + } + + Ret = UserDrawIconEx(hdc, + xLeft, + yTop, + pIcon, + cxWidth, + cyHeight, + istepIfAniCur, + hbrFlickerFreeDraw, + diFlags); + UserLeave(); - END_CLEANUP; -} - + return Ret; +} Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Wed Aug 9 00:00:53 2006 @@ -181,19 +181,6 @@ DWORD STDCALL NtUserDrawAnimatedRects( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDrawCaption( DWORD Unknown0, DWORD Unknown1, DWORD Unknown2, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Wed Aug 9 00:00:53 2006 @@ -1372,4 +1372,392 @@ END_CLEANUP; } +/* Don't know where to put this */ +BOOL FASTCALL IntGdiGradientFill(DC *dc, PTRIVERTEX pVertex, ULONG uVertex, PVOID pMesh, ULONG uMesh, ULONG ulMode); +ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); +BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, + INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); +PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); + +BOOL +IntDrawSysMenuButton( + PWINDOW_OBJECT pWnd, + HDC hDc, + LPRECT lpRc, + BOOL Down) +{ + HICON hIcon; + PCURICON_OBJECT pIcon; + + ASSERT(pWnd && lpRc); + + /* Get the icon to draw. We don't care about WM_GETICON here. */ + + hIcon = pWnd->Class->hIconSm; + + if(!hIcon) + { + DPRINT("Wnd class has no small icon.\n"); + hIcon = pWnd->Class->hIcon; + } + + if(!hIcon) + { + DPRINT("Wnd class hasn't any icon.\n"); + //FIXME: Draw "winlogo" icon. + return FALSE; + } + + if(!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + return FALSE; + } + + return UserDrawIconEx(hDc, lpRc->left, lpRc->top, pIcon, + UserGetSystemMetrics(SM_CXSMICON), + UserGetSystemMetrics(SM_CYSMICON), + 0, NULL, DI_NORMAL); +} + +BOOL +IntDrawCaptionText(HDC hDc, + const PUNICODE_STRING Text, + const LPRECT lpRc, + UINT uFlags) +{ + HFONT hOldFont = NULL, hFont = NULL; + COLORREF OldTextColor; + NONCLIENTMETRICS nclm; + NTSTATUS Status; + INT i; + + #ifndef NDEBUG + DPRINT("%s:", __FUNCTION__); + for(i = 0; i < Text->Length/sizeof(WCHAR); i++) + DbgPrint("%C", Text->Buffer[i]); + DbgPrint(", %d\n", Text->Length/sizeof(WCHAR)); + #endif + + nclm.cbSize = sizeof(nclm); + if(!IntSystemParametersInfo(SPI_GETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICS), &nclm, 0)) + { + DPRINT1("%s: IntSystemParametersInfo() failed!\n", __FUNCTION__); + return FALSE; + } + + NtGdiSetBkMode(hDc, TRANSPARENT); + + if(uFlags & DC_SMALLCAP) + Status = TextIntCreateFontIndirect(&nclm.lfSmCaptionFont, &hFont); + else Status = TextIntCreateFontIndirect(&nclm.lfCaptionFont, &hFont); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("%s: TextIntCreateFontIndirect() failed! Status: 0x%x\n", + __FUNCTION__, Status); + return FALSE; + } + + hOldFont = NtGdiSelectObject(hDc, hFont); + if(!hOldFont) + { + DPRINT1("%s: SelectObject() failed!\n", __FUNCTION__); + NtGdiDeleteObject(hFont); + return FALSE; + } + + if(uFlags & DC_INBUTTON) + OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); + else OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE + ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); + + //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. + + NtGdiTextOut(hDc, lpRc->left, + lpRc->top, Text->Buffer, + Text->Length/sizeof(WCHAR)); + + NtGdiSetTextColor(hDc, OldTextColor); + NtGdiSelectObject(hDc, hOldFont); + NtGdiDeleteObject(hFont); + + return TRUE; +} + +BOOL UserDrawCaption( + PWINDOW_OBJECT pWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags) +{ + BOOL Ret = FALSE; + HBITMAP hMemBmp = NULL, hOldBmp = NULL; + HBRUSH hOldBrush = NULL; + HDC hMemDc = NULL; + ULONG Height; + UINT VCenter = 0, Padding = 0; + RECT r = *lpRc; + LONG ButtonWidth, IconWidth; + BOOL HasIcon; + + ASSERT(pWnd != NULL); + + hMemBmp = NtGdiCreateCompatibleBitmap(hDc, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top); + + if(!hMemBmp) + { + DPRINT1("%s: NtGdiCreateCompatibleBitmap() failed!\n", __FUNCTION__); + return FALSE; + } + + hMemDc = NtGdiCreateCompatibleDC(hDc); + if(!hMemDc) + { + DPRINT1("%s: NtGdiCreateCompatibleDC() failed!\n", __FUNCTION__); + goto cleanup; + } + + hOldBmp = NtGdiSelectObject(hMemDc, hMemBmp); + if(!hOldBmp) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + Height = UserGetSystemMetrics(SM_CYCAPTION) - 1; + VCenter = (lpRc->bottom - lpRc->top) / 2; + Padding = VCenter - (Height / 2); + HasIcon = (uFlags & DC_ICON) && (pWnd->Style & WS_SYSMENU) + && !(uFlags & DC_SMALLCAP); + IconWidth = UserGetSystemMetrics(SM_CXSIZE) + Padding; + + r.left = Padding; + r.right = r.left + (lpRc->right - lpRc->left); + r.top = Padding; + r.bottom = r.top + (Height / 2); + + // Draw the caption background + if(uFlags & DC_INBUTTON) + { + hOldBrush = NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_BTNFACE : COLOR_BTNSHADOW)); + + if(!hOldBrush) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(!NtGdiPatBlt(hMemDc, 0, 0, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top, + PATCOPY)) + { + DPRINT1("%s: NtGdiPatBlt() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(HasIcon) r.left+=IconWidth; + } + else + { + r.right = (lpRc->right - lpRc->left); + if(uFlags & DC_SMALLCAP) + ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; + else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; + + hOldBrush = NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION)); + + if(!hOldBrush) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(HasIcon && (uFlags & DC_GRADIENT)) + { + NtGdiPatBlt(hMemDc, 0, 0, + IconWidth+1, + lpRc->bottom - lpRc->top, + PATCOPY); + r.left+=IconWidth; + } + else + { + NtGdiPatBlt(hMemDc, 0, 0, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top, + PATCOPY); + } + + if(uFlags & DC_GRADIENT) + { + static GRADIENT_RECT gcap = {0, 1}; + TRIVERTEX vert[2]; + COLORREF Colors[2]; + PDC pMemDc; + + if(pWnd->Style & WS_SYSMENU) + { + r.right -= 3 + ButtonWidth; + if(!(uFlags & DC_SMALLCAP)) + { + if(pWnd->Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + r.right -= 2 + 2 * ButtonWidth; + else r.right -= 2; + r.right -= 2; + } + + //Draw buttons background + if(!NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_GRADIENTACTIVECAPTION:COLOR_GRADIENTINACTIVECAPTION))) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + NtGdiPatBlt(hMemDc, + r.right, + 0, + lpRc->right - lpRc->left - r.right, + lpRc->bottom - lpRc->top, + PATCOPY); + } + + Colors[0] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); + + Colors[1] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); + + vert[0].x = r.left; + vert[0].y = 0; + vert[0].Red = (WORD)Colors[0]<<8; + vert[0].Green = (WORD)Colors[0] & 0xFF00; + vert[0].Blue = (WORD)(Colors[0]>>8) & 0xFF00; + vert[0].Alpha = 0; + + vert[1].x = r.right; + vert[1].y = lpRc->bottom - lpRc->top; + vert[1].Red = (WORD)Colors[1]<<8; + vert[1].Green = (WORD)Colors[1] & 0xFF00; + vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00; + vert[1].Alpha = 0; + + pMemDc = DC_LockDc(hMemDc); + if(!pMemDc) + { + DPRINT1("%s: Can't lock dc!\n", __FUNCTION__); + goto cleanup; + } + + if(!IntGdiGradientFill(pMemDc, vert, 2, &gcap, + 1, GRADIENT_FILL_RECT_H)) + { + DPRINT1("%s: IntGdiGradientFill() failed!\n", __FUNCTION__); + } + + DC_UnlockDc(pMemDc); + } //if(uFlags & DC_GRADIENT) + } + + if(HasIcon) + { + r.top ++; + r.left -= --IconWidth; + IntDrawSysMenuButton(pWnd, hMemDc, &r, FALSE); + r.left += IconWidth; + r.top --; + } + + r.top ++; + r.left += 2; + + r.bottom = r.top + Height; + + if((uFlags & DC_TEXT) && pWnd->WindowName.Length) + { + if(!(uFlags & DC_GRADIENT)) + { + r.right = (lpRc->right - lpRc->left); + + if(uFlags & DC_SMALLCAP) + ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; + else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; + + if(pWnd->Style & WS_SYSMENU) + { + r.right -= 3 + ButtonWidth; + if(! (uFlags & DC_SMALLCAP)) + { + if(pWnd->Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + r.right -= 2 + 2 * ButtonWidth; + else r.right -= 2; + r.right -= 2; + } + } + } + + IntDrawCaptionText(hMemDc, &pWnd->WindowName, &r, uFlags); + } + + if(!NtGdiBitBlt(hDc, lpRc->left, lpRc->top, + lpRc->right - lpRc->left, lpRc->bottom - lpRc->top, + hMemDc, 0, 0, SRCCOPY, 0, 0)) + { + DPRINT1("%s: NtGdiBitBlt() failed!\n", __FUNCTION__); + goto cleanup; + } + + Ret = TRUE; + +cleanup: + if (hOldBrush) NtGdiSelectObject(hMemDc, hOldBrush); + if (hOldBmp) NtGdiSelectObject(hMemDc, hOldBmp); + if (hMemBmp) NtGdiDeleteObject(hMemBmp); + if (hMemDc) NtGdiDeleteObjectApp(hMemDc); + + return Ret; +} + + +BOOL +STDCALL +NtUserDrawCaption(HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags) +{ + PWINDOW_OBJECT pWnd; + RECT SafeRect; + BOOL Ret; + + if(!NT_SUCCESS(MmCopyFromCaller(&SafeRect, lpRc, sizeof(RECT)))) + { + DPRINT1("%s: MmCopyFromCaller failed!", __FUNCTION__); + return FALSE; + } + + UserEnterExclusive(); + + if(!(pWnd = UserGetWindowObject(hWnd))) + { + UserLeave(); + return FALSE; + } + + Ret = UserDrawCaption(pWnd, hDc, &SafeRect, uFlags); + + UserLeave(); + return Ret; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Wed Aug 9 00:00:53 2006 @@ -210,6 +210,12 @@ return nBrushes > 0; } +HGDIOBJ FASTCALL +IntGetSysColorBrush(INT Object) +{ + return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : SysColorBrushes[Object]; +} + BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens) { @@ -252,6 +258,12 @@ } return nColors > 0; +} + +DWORD FASTCALL +IntGetSysColor(INT nIndex) +{ + return ((nIndex < 0) || (NUM_SYSCOLORS <= nIndex)) ? 0 : SysColors[nIndex]; } VOID FASTCALL

1 0

[fireball] 23524: Force -fno-sibling-call-optimisation to every module's CFLAGs. This fixes *numerous* bugs (thanks to a bug in GCC itself), even in DBG=1 builds! Just an example, comctl32.dll doesn't crash anymore in LISTVIEW_Callback(). Thanks to Dmitriy Philippov (aka Shedon) for encountering the comctl32 bug and investigating it!
by fireball＠svn.reactos.org 08 Aug '06

08 Aug '06

Author: fireball Date: Tue Aug 8 16:41:56 2006 New Revision: 23524 URL: http://svn.reactos.org/svn/reactos?rev=23524&view=rev Log: Force -fno-sibling-call-optimisation to every module's CFLAGs. This fixes *numerous* bugs (thanks to a bug in GCC itself), even in DBG=1 builds! Just an example, comctl32.dll doesn't crash anymore in LISTVIEW_Callback(). Thanks to Dmitriy Philippov (aka Shedon) for encountering the comctl32 bug and investigating it! Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Aug 8 16:41:56 2006 @@ -1885,6 +1885,10 @@ globalCflags += " -pipe"; if ( !module.allowWarnings ) globalCflags += " -Werror"; + + // Always force disabling of sibling calls optimisation for GCC + // (TODO: Move to version-specific once this bug is fixed in GCC) + globalCflags += " -fno-optimize-sibling-calls"; fprintf ( fMakefile,

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