Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 23443: - Remove now useless entries about PCI bus, as StartService is now working in 2nd stage setup - Add Netlogon service (lsass.exe)
by hpoussin＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: hpoussin Date: Fri Aug 4 16:01:27 2006 New Revision: 23443 URL: http://svn.reactos.org/svn/reactos?rev=23443&view=rev Log: - Remove now useless entries about PCI bus, as StartService is now working in 2nd stage setup - Add Netlogon service (lsass.exe) Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri Aug 4 16:01:27 2006 @@ -645,23 +645,16 @@ 01,00,00,00,01,00,01,00,01,00,00,00, \ 00,06,00,00,00,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -; We need the PCI bus to be installed at 3rd boot to enumerate display cards and to -; not have the "CsrServerInitialization: failed to initialize video (Status=c0000001)" -; error when a custom driver (as the VMware one) is installed. At the moment, -; StartServiceW is not implemented, so PlugPlay service can't start during -; second stage setup. => We have to code PCI bus parameters it in registry... -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","Service",0x00000000,"pci" -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","ErrorControl",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","ImagePath",0x00020000,"system32\drivers\pci.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Tag",0x00010001,0x00000002 - ; ACPI bus HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","HardwareID",0x00010000,"*PNP0C08" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","DeviceDesc",0x00000000,"ACPI bus" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","Service",0x00000000,"acpi" + +; NetLogon +HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 ; Named Pipe filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000

1 0

[hpoussin] 23442: - Specify *W at the end of function calls, and remove the need to define UNICODE - Rename MsGina to Gina - Start services.exe before running 2nd stage setup
by hpoussin＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: hpoussin Date: Fri Aug 4 15:37:18 2006 New Revision: 23442 URL: http://svn.reactos.org/svn/reactos?rev=23442&view=rev Log: - Specify *W at the end of function calls, and remove the need to define UNICODE - Rename MsGina to Gina - Start services.exe before running 2nd stage setup Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/setup.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/winlogon.rbuild trunk/reactos/base/system/winlogon/wlx.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 (original) +++ trunk/reactos/base/system/winlogon/sas.c Fri Aug 4 15:37:18 2006 @@ -28,8 +28,8 @@ StartTaskManager( IN OUT PWLSESSION Session) { - return Session->MsGina.Functions.WlxStartApplication( - Session->MsGina.Context, + return Session->Gina.Functions.WlxStartApplication( + Session->Gina.Context, L"Default", NULL, L"taskmgr.exe"); @@ -81,8 +81,8 @@ /* FIXME: reverting to lower privileges after creating user shell? */ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - return Session->MsGina.Functions.WlxActivateUserShell( - Session->MsGina.Context, + return Session->Gina.Functions.WlxActivateUserShell( + Session->Gina.Context, L"Default",//NULL, /* FIXME */ NULL, /* FIXME */ lpEnvironment); @@ -127,11 +127,11 @@ case WLX_SAS_ACTION_NONE: /* 0x02 */ break; case WLX_SAS_ACTION_LOCK_WKSTA: /* 0x03 */ - if (Session->MsGina.Functions.WlxIsLockOk(Session->MsGina.Context)) + if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) { SwitchDesktop(WLSession->WinlogonDesktop); Session->LogonStatus = WKSTA_IS_LOCKED; - Session->MsGina.Functions.WlxDisplayLockedNotice(Session->MsGina.Context); + Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); } break; case WLX_SAS_ACTION_LOGOFF: /* 0x04 */ @@ -140,13 +140,13 @@ case WLX_SAS_ACTION_SHUTDOWN_REBOOT: /* 0x0b */ if (Session->LogonStatus != WKSTA_IS_LOGGED_OFF) { - if (!Session->MsGina.Functions.WlxIsLogoffOk(Session->MsGina.Context)) + if (!Session->Gina.Functions.WlxIsLogoffOk(Session->Gina.Context)) break; SwitchDesktop(WLSession->WinlogonDesktop); - Session->MsGina.Functions.WlxLogoff(Session->MsGina.Context); + Session->Gina.Functions.WlxLogoff(Session->Gina.Context); HandleLogoff(Session); Session->LogonStatus = WKSTA_IS_LOGGED_OFF; - Session->MsGina.Functions.WlxDisplaySASNotice(Session->MsGina.Context); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } if (WLX_SHUTTINGDOWN(wlxAction)) HandleShutdown(Session, wlxAction); @@ -172,9 +172,9 @@ DWORD wlxAction = WLX_SAS_ACTION_NONE; if (Session->LogonStatus == WKSTA_IS_LOGGED_ON) - wlxAction = Session->MsGina.Functions.WlxLoggedOnSAS(Session->MsGina.Context, dwSasType, NULL); + wlxAction = Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); else if (Session->LogonStatus == WKSTA_IS_LOCKED) - wlxAction = Session->MsGina.Functions.WlxWkstaLockedSAS(Session->MsGina.Context, dwSasType); + wlxAction = Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); else { /* Display a new dialog (if necessary) */ @@ -182,7 +182,7 @@ { case WLX_SAS_TYPE_TIMEOUT: /* 0x00 */ { - Session->MsGina.Functions.WlxDisplaySASNotice(Session->MsGina.Context); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); break; } case WLX_SAS_TYPE_CTRL_ALT_DEL: /* 0x01 */ @@ -192,8 +192,8 @@ ZeroMemory(&Session->Profile, sizeof(Session->Profile)); Session->Options = 0; - wlxAction = Session->MsGina.Functions.WlxLoggedOutSAS( - Session->MsGina.Context, + wlxAction = Session->Gina.Functions.WlxLoggedOutSAS( + Session->Gina.Context, Session->SASAction, &Session->LogonId, LogonSid, @@ -384,6 +384,8 @@ case MAKELONG(MOD_CONTROL | MOD_ALT, VK_DELETE): { TRACE("SAS: CONTROL+ALT+DELETE\n"); + if (!Session->Gina.UseCtrlAltDelete) + break; DispatchSAS(Session, WLX_SAS_TYPE_CTRL_ALT_DEL); return TRUE; } @@ -435,7 +437,7 @@ InitializeSAS( IN OUT PWLSESSION Session) { - WNDCLASSEX swc; + WNDCLASSEXW swc; /* register SAS window class. * WARNING! MAKE SURE WE ARE IN THE WINLOGON DESKTOP! */ @@ -451,11 +453,11 @@ swc.lpszMenuName = NULL; swc.lpszClassName = WINLOGON_SAS_CLASS; swc.hIconSm = NULL; - RegisterClassEx(&swc); /* FIXME: check return code */ + RegisterClassExW(&swc); /* FIXME: check return code */ /* create invisible SAS window */ DPRINT1("Session %p\n", Session); - Session->SASWindow = CreateWindowEx( + Session->SASWindow = CreateWindowExW( 0, WINLOGON_SAS_CLASS, WINLOGON_SAS_TITLE, Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c (original) +++ trunk/reactos/base/system/winlogon/setup.c Fri Aug 4 15:37:18 2006 @@ -43,7 +43,7 @@ DWORD dwSize; DWORD dwSetupType; - dwError = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", //TEXT("SYSTEM\\Setup"), 0, KEY_QUERY_VALUE, @@ -54,7 +54,7 @@ } dwSize = sizeof(DWORD); - dwError = RegQueryValueEx (hKey, + dwError = RegQueryValueExW (hKey, L"SetupType", //TEXT("SetupType"), NULL, &dwType, @@ -76,7 +76,7 @@ DWORD dwError; HKEY hKey; - dwError = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", //TEXT("SYSTEM\\Setup"), 0, KEY_SET_VALUE, @@ -86,7 +86,7 @@ return FALSE; } - dwError = RegSetValueEx (hKey, + dwError = RegSetValueExW (hKey, L"SetupType", //TEXT("SetupType"), 0, REG_DWORD, @@ -106,7 +106,7 @@ RunSetup (VOID) { PROCESS_INFORMATION ProcessInformation; - STARTUPINFO StartupInfo; + STARTUPINFOW StartupInfo; WCHAR Shell[MAX_PATH]; WCHAR CommandLine[MAX_PATH]; BOOLEAN Result; 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 Fri Aug 4 15:37:18 2006 @@ -36,7 +36,7 @@ { case IDC_BTNSHTDOWNCOMPUTER: EndDialog(hwndDlg, IDC_BTNSHTDOWNCOMPUTER); - break; + return TRUE; } break; } @@ -44,10 +44,10 @@ { RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); SetFocus(GetDlgItem(hwndDlg, IDC_BTNSHTDOWNCOMPUTER)); - break; + return TRUE; } } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static BOOL @@ -55,7 +55,7 @@ { HANDLE ServicesInitEvent; BOOLEAN Result; - STARTUPINFO StartupInfo; + STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; DWORD Count; WCHAR ServiceString[] = L"services.exe"; @@ -74,7 +74,7 @@ DPRINT1(L"WL: Creating new process - \"services.exe\".\n"); #endif - Result = CreateProcess(NULL, + Result = CreateProcessW(NULL, ServiceString, NULL, NULL, @@ -96,7 +96,7 @@ Sleep(1000); DPRINT("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); - ServicesInitEvent = OpenEvent(EVENT_ALL_ACCESS, //SYNCHRONIZE, + ServicesInitEvent = OpenEventW(EVENT_ALL_ACCESS, //SYNCHRONIZE, FALSE, L"SvcctrlStartEvent_A3725DX"); if (ServicesInitEvent != NULL) @@ -133,7 +133,7 @@ if (!hSCManager) goto cleanup; - hService = OpenService(hSCManager, ServiceName, SERVICE_START); + hService = OpenServiceW(hSCManager, ServiceName, SERVICE_START); if (!hService) goto cleanup; #if 0 @@ -156,7 +156,7 @@ { HANDLE LsassInitEvent; - LsassInitEvent = CreateEvent( + LsassInitEvent = CreateEventW( NULL, TRUE, FALSE, @@ -393,7 +393,7 @@ DestroyEnvironmentBlock (lpEnvironment); return FALSE; } - /*WLSession->MsGina.Functions.WlxActivateUserShell(WLSession->MsGina.Context, + /*WLSession->Gina.Functions.WlxActivateUserShell(WLSession->Gina.Context, L"WinSta0\\Default", NULL, NULL);*/ @@ -439,10 +439,10 @@ if (Session->SuppressStatus) return TRUE; - if (LoadString(hAppInstance, ResourceId, StatusMsg, MAX_PATH) == 0) + if (LoadStringW(hAppInstance, ResourceId, StatusMsg, MAX_PATH) == 0) return FALSE; - return Session->MsGina.Functions.WlxDisplayStatusMessage(Session->MsGina.Context, hDesktop, 0, NULL, StatusMsg); + return Session->Gina.Functions.WlxDisplayStatusMessage(Session->Gina.Context, hDesktop, 0, NULL, StatusMsg); } static VOID @@ -481,7 +481,7 @@ RemoveStatusMessage(Session); - if(!MsGinaInst->Functions->WlxActivateUserShell(MsGinaInst->Context, + if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context, L"WinSta0\\Default", NULL, NULL)) @@ -498,13 +498,56 @@ Sleep(150); - MsGinaInst->Functions->WlxShutdown(MsGinaInst->Context, WLX_SAS_ACTION_SHUTDOWN); + GinaInst->Functions->WlxShutdown(GinaInst->Context, WLX_SAS_ACTION_SHUTDOWN); DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); Sleep(250); RemoveStatusMessage(Session); */ +} + +static INT_PTR CALLBACK +GinaLoadFailedWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, IDOK); + return TRUE; + } + break; + } + case WM_INITDIALOG: + { + int len; + WCHAR templateText[MAX_PATH], text[MAX_PATH]; + + len = GetDlgItemTextW(hwndDlg, IDC_GINALOADFAILED, templateText, MAX_PATH); + if (len) + { + wsprintfW(text, templateText, (LPWSTR)lParam); + SetDlgItemTextW(hwndDlg, IDC_GINALOADFAILED, text); + } + SetFocus(GetDlgItem(hwndDlg, IDOK)); + return TRUE; + } + case WM_CLOSE: + { + EndDialog(hwndDlg, IDCANCEL); + return TRUE; + } + } + + return FALSE; } int WINAPI @@ -550,31 +593,6 @@ } LockWorkstation(WLSession); - /* Check for pending setup */ - if (GetSetupType() != 0) - { - DPRINT("Winlogon: CheckForSetup() in setup mode\n"); - - /* Run setup and reboot when done */ - SwitchDesktop(WLSession->ApplicationDesktop); - RunSetup(); - - NtShutdownSystem(ShutdownReboot); - ExitProcess(0); - return 0; - } - - /* Load and initialize gina */ - if (!GinaInit(WLSession)) - { - ERR("WL: Failed to initialize Gina\n"); - NtShutdownSystem(ShutdownNoReboot); - ExitProcess(0); - return 0; - } - - DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); - if (!StartServicesManager()) { ERR("WL: Could not start services.exe\n"); @@ -582,6 +600,32 @@ ExitProcess(0); return 0; } + + /* Check for pending setup */ + if (GetSetupType() != 0) + { + TRACE("WL: Setup mode detected\n"); + + /* Run setup and reboot when done */ + SwitchDesktop(WLSession->ApplicationDesktop); + RunSetup(); + + NtShutdownSystem(ShutdownReboot); + ExitProcess(0); + return 0; + } + + /* Load and initialize gina */ + if (!GinaInit(WLSession)) + { + ERR("WL: Failed to initialize Gina\n"); + DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), 0, GinaLoadFailedWindowProc, (LPARAM)L""); + NtShutdownSystem(ShutdownReboot); + ExitProcess(0); + return 0; + } + + DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); if (!StartLsass()) { @@ -597,7 +641,12 @@ if (Status == STATUS_PORT_CONNECTION_REFUSED) { /* Add the 'SeTcbPrivilege' privilege and try again */ - RtlAdjustPrivilege(SE_TCB_PRIVILEGE, TRUE, TRUE, &Old); + Status = RtlAdjustPrivilege(SE_TCB_PRIVILEGE, TRUE, TRUE, &Old); + if (!NT_SUCCESS(Status)) + { + ERR("RtlAdjustPrivilege() failed with error %lu\n", LsaNtStatusToWinError(Status)); + return 1; + } Status = LsaRegisterLogonProcess(&ProcessName, &LsaHandle, &Mode); } if (!NT_SUCCESS(Status)) 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 Fri Aug 4 15:37:18 2006 @@ -68,7 +68,7 @@ typedef BOOL (WINAPI * PFWLXGETSTATUSMESSAGE) (PVOID, DWORD *, PWSTR, DWORD); typedef BOOL (WINAPI * PFWLXREMOVESTATUSMESSAGE) (PVOID); -typedef struct _MSGINAFUNCTIONS +typedef struct _GINAFUNCTIONS { /* Functions always available for a valid GINA */ PFWLXNEGOTIATE WlxNegotiate; @@ -99,15 +99,16 @@ PFWLXREMOVESTATUSMESSAGE WlxRemoveStatusMessage; /* Functions available if WlxVersion >= WLX_VERSION_1_4 (MS Windows XP) */ -} MSGINAFUNCTIONS, *PMSGINAFUNCTIONS; - -typedef struct _MSGINAINSTANCE +} GINAFUNCTIONS, *PGINAFUNCTIONS; + +typedef struct _GINAINSTANCE { HMODULE hDllInstance; - MSGINAFUNCTIONS Functions; + GINAFUNCTIONS Functions; PVOID Context; DWORD Version; -} MSGINAINSTANCE, *PMSGINAINSTANCE; + BOOL UseCtrlAltDelete; +} GINAINSTANCE, *PGINAINSTANCE; /* FIXME: put in an enum */ #define WKSTA_IS_LOGGED_OFF 0 @@ -119,7 +120,7 @@ typedef struct _WLSESSION { - MSGINAINSTANCE MsGina; + GINAINSTANCE Gina; DWORD SASAction; DWORD LogonStatus; BOOL SuppressStatus; @@ -157,9 +158,9 @@ ) #define RemoveStatusMessage(Session) \ - Session->MsGina.Functions.WlxRemoveStatusMessage(Session->MsGina.Context); + Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); #define DisplaySASNotice(Session) \ - Session->MsGina.Functions.WlxDisplaySASNotice(Session->MsGina.Context); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); /* user32 */ BOOL WINAPI Modified: trunk/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rbuild (original) +++ trunk/reactos/base/system/winlogon/winlogon.rbuild Fri Aug 4 15:37:18 2006 @@ -2,8 +2,6 @@ <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <module name="winlogon" type="win32gui" installbase="system32" installname="winlogon.exe"> <include base="winlogon">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Fri Aug 4 15:37:18 2006 @@ -27,35 +27,25 @@ { if (uMsg == WM_TIMER && (UINT_PTR)wParam == IdTimer) { - CHECKPOINT1; EndDialog(hwndDlg, -1); KillTimer(hwndDlg, IdTimer); - CHECKPOINT1; return TRUE; } else if (uMsg == WM_INITDIALOG) { - CHECKPOINT1; - PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); IdTimer = SetTimer(hwndDlg, 0, WLSession->DialogTimeout * 1000, NULL); - CHECKPOINT1; - if (IdTimer == 0) - return FALSE; - return TRUE; + return PreviousWindowProc(hwndDlg, uMsg, wParam, lParam);; } else if (uMsg == WM_NCDESTROY) { - CHECKPOINT1; - PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); - CHECKPOINT1; + BOOL ret; + ret = PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); PreviousWindowProc = NULL; - return TRUE; + return ret; } else { - INT_PTR ret = PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); - ret = PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); - return ret; + return PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); } } @@ -66,7 +56,8 @@ WlxUseCtrlAltDel( HANDLE hWlx) { - WlxSetOption(hWlx, WLX_OPTION_USE_CTRL_ALT_DEL, TRUE, NULL); + ULONG_PTR OldValue; + WlxSetOption(hWlx, WLX_OPTION_USE_CTRL_ALT_DEL, TRUE, &OldValue); } /* @@ -77,7 +68,8 @@ HANDLE hWlx, PVOID pWlxContext) { - WlxSetOption(hWlx, WLX_OPTION_CONTEXT_POINTER, (ULONG_PTR)pWlxContext, NULL); + ULONG_PTR OldValue; + WlxSetOption(hWlx, WLX_OPTION_CONTEXT_POINTER, (ULONG_PTR)pWlxContext, &OldValue); } /* @@ -147,7 +139,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBox(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc); + return (int)DialogBoxW(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc); } /* @@ -165,7 +157,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBoxParam(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); + return (int)DialogBoxParamW(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); } /* @@ -182,7 +174,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBoxIndirect(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc); + return (int)DialogBoxIndirectW(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc); } /* @@ -200,7 +192,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBoxIndirectParam(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); + return (int)DialogBoxIndirectParamW(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); } /* @@ -316,30 +308,27 @@ ULONG_PTR* OldValue) { PWLSESSION Session = (PWLSESSION)hWlx; - UNIMPLEMENTED; - - if (Session || !Value) - { - switch (Option) - { - case WLX_OPTION_USE_CTRL_ALT_DEL: - return TRUE; - case WLX_OPTION_CONTEXT_POINTER: - { - *OldValue = (ULONG_PTR)Session->MsGina.Context; - Session->MsGina.Context = (PVOID)Value; - return TRUE; - } - case WLX_OPTION_USE_SMART_CARD: - return FALSE; - } - } - - return FALSE; -} - -/* - * @unimplemented + + switch (Option) + { + case WLX_OPTION_USE_CTRL_ALT_DEL: + *OldValue = (ULONG_PTR)Session->Gina.UseCtrlAltDelete; + Session->Gina.UseCtrlAltDelete = (BOOL)Value; + return TRUE; + case WLX_OPTION_CONTEXT_POINTER: + *OldValue = (ULONG_PTR)Session->Gina.Context; + Session->Gina.Context = (PVOID)Value; + return TRUE; + case WLX_OPTION_USE_SMART_CARD: + UNIMPLEMENTED; + return FALSE; + } + + return FALSE; +} + +/* + * @implemented */ BOOL WINAPI WlxGetOption( @@ -347,28 +336,26 @@ DWORD Option, ULONG_PTR* Value) { - PMSGINAINSTANCE Instance = (PMSGINAINSTANCE)hWlx; - UNIMPLEMENTED; - - if (Instance || !Value) - { - switch (Option) + PWLSESSION Session = (PWLSESSION)hWlx; + + switch (Option) + { + case WLX_OPTION_USE_CTRL_ALT_DEL: + *Value = (ULONG_PTR)Session->Gina.UseCtrlAltDelete; + return TRUE; + case WLX_OPTION_CONTEXT_POINTER: { - case WLX_OPTION_USE_CTRL_ALT_DEL: - return TRUE; - case WLX_OPTION_CONTEXT_POINTER: - { - *Value = (ULONG_PTR)Instance->Context; - return TRUE; - } - case WLX_OPTION_USE_SMART_CARD: - case WLX_OPTION_SMART_CARD_PRESENT: - case WLX_OPTION_SMART_CARD_INFO: - *Value = 0; - return FALSE; - case WLX_OPTION_DISPATCH_TABLE_SIZE: - { - switch (Instance->Version) + *Value = (ULONG_PTR)Session->Gina.Context; + return TRUE; + } + case WLX_OPTION_USE_SMART_CARD: + case WLX_OPTION_SMART_CARD_PRESENT: + case WLX_OPTION_SMART_CARD_INFO: + UNIMPLEMENTED; + return FALSE; + case WLX_OPTION_DISPATCH_TABLE_SIZE: + { + switch (Session->Gina.Version) { case WLX_VERSION_1_0: *Value = sizeof(WLX_DISPATCH_VERSION_1_0); @@ -387,9 +374,8 @@ break; default: return FALSE; - } - return TRUE; } + return TRUE; } } @@ -516,7 +502,7 @@ DWORD Type, Size; HKEY hKey; - Status = RegOpenKeyEx( + Status = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", 0, @@ -530,7 +516,7 @@ } Size = Len * sizeof(WCHAR); - Status = RegQueryValueEx( + Status = RegQueryValueExW( hKey, L"GinaDLL", NULL, @@ -543,74 +529,30 @@ return TRUE; } -static INT_PTR CALLBACK -GinaLoadFailedWindowProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - switch (uMsg) - { - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: - EndDialog(hwndDlg, IDOK); - break; - } - break; - } - case WM_INITDIALOG: - { - int len; - WCHAR templateText[MAX_PATH], text[MAX_PATH]; - - len = GetDlgItemText(hwndDlg, IDC_GINALOADFAILED, templateText, MAX_PATH); - if (len) - { - wsprintf(text, templateText, (LPWSTR)lParam); - SetDlgItemText(hwndDlg, IDC_GINALOADFAILED, text); - } - SetFocus(GetDlgItem(hwndDlg, IDOK)); - break; - } - case WM_CLOSE: - { - EndDialog(hwndDlg, IDCANCEL); - return TRUE; - } - } - - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); -} - -#define FAIL_AND_RETURN() return DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), 0, GinaLoadFailedWindowProc, (LPARAM)GinaDll) && FALSE static BOOL LoadGina( - IN OUT PMSGINAFUNCTIONS Functions, + IN OUT PGINAFUNCTIONS Functions, OUT DWORD *DllVersion, OUT HMODULE *GinaInstance) { - HMODULE hGina; + HMODULE hGina = NULL; WCHAR GinaDll[MAX_PATH + 1]; + BOOL ret = FALSE; GinaDll[0] = '\0'; if (!GetGinaPath(GinaDll, MAX_PATH)) - FAIL_AND_RETURN(); + goto cleanup; /* Terminate string */ GinaDll[MAX_PATH] = '\0'; - if (!(hGina = LoadLibrary(GinaDll))) - FAIL_AND_RETURN(); - *GinaInstance = hGina; + if (!(hGina = LoadLibraryW(GinaDll))) + goto cleanup; Functions->WlxNegotiate = (PFWLXNEGOTIATE)GetProcAddress(hGina, "WlxNegotiate"); Functions->WlxInitialize = (PFWLXINITIALIZE)GetProcAddress(hGina, "WlxInitialize"); if (!Functions->WlxInitialize) - FAIL_AND_RETURN(); + goto cleanup; if (!Functions->WlxNegotiate) { @@ -618,55 +560,64 @@ *DllVersion = WLX_CURRENT_VERSION; } else if (!Functions->WlxNegotiate(WLX_CURRENT_VERSION, DllVersion)) - FAIL_AND_RETURN(); + goto cleanup; if (*DllVersion >= WLX_VERSION_1_0) { Functions->WlxActivateUserShell = (PFWLXACTIVATEUSERSHELL)GetProcAddress(hGina, "WlxActivateUserShell"); - if (!Functions->WlxActivateUserShell) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxDisplayLockedNotice = (PFWLXDISPLAYLOCKEDNOTICE)GetProcAddress(hGina, "WlxDisplayLockedNotice"); - if (!Functions->WlxDisplayLockedNotice) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxDisplaySASNotice = (PFWLXDISPLAYSASNOTICE)GetProcAddress(hGina, "WlxDisplaySASNotice"); - if (!Functions->WlxDisplaySASNotice) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxIsLockOk = (PFWLXISLOCKOK)GetProcAddress(hGina, "WlxIsLockOk"); - if (!Functions->WlxIsLockOk) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxIsLogoffOk = (PFWLXISLOGOFFOK)GetProcAddress(hGina, "WlxIsLogoffOk"); - if (!Functions->WlxIsLogoffOk) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxLoggedOnSAS = (PFWLXLOGGEDONSAS)GetProcAddress(hGina, "WlxLoggedOnSAS"); - if (!Functions->WlxLoggedOnSAS) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxLoggedOutSAS = (PFWLXLOGGEDOUTSAS)GetProcAddress(hGina, "WlxLoggedOutSAS"); - if (!Functions->WlxLoggedOutSAS) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxLogoff = (PFWLXLOGOFF)GetProcAddress(hGina, "WlxLogoff"); - if (!Functions->WlxLogoff) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxShutdown = (PFWLXSHUTDOWN)GetProcAddress(hGina, "WlxShutdown"); - if (!Functions->WlxShutdown) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxWkstaLockedSAS = (PFWLXWKSTALOCKEDSAS)GetProcAddress(hGina, "WlxWkstaLockedSAS"); - if (!Functions->WlxWkstaLockedSAS) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; } if (*DllVersion >= WLX_VERSION_1_1) { Functions->WlxScreenSaverNotify = (PFWLXSCREENSAVERNOTIFY)GetProcAddress(hGina, "WlxScreenSaverNotify"); - if (!Functions->WlxScreenSaverNotify) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxStartApplication = (PFWLXSTARTAPPLICATION)GetProcAddress(hGina, "WlxStartApplication"); - if (!Functions->WlxStartApplication) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; } if (*DllVersion >= WLX_VERSION_1_3) { Functions->WlxDisplayStatusMessage = (PFWLXDISPLAYSTATUSMESSAGE)GetProcAddress(hGina, "WlxDisplayStatusMessage"); - if (!Functions->WlxDisplayStatusMessage) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxGetStatusMessage = (PFWLXGETSTATUSMESSAGE)GetProcAddress(hGina, "WlxGetStatusMessage"); - if (!Functions->WlxGetStatusMessage) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxNetworkProviderLoad = (PFWLXNETWORKPROVIDERLOAD)GetProcAddress(hGina, "WlxNetworkProviderLoad"); - if (!Functions->WlxNetworkProviderLoad) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxRemoveStatusMessage = (PFWLXREMOVESTATUSMESSAGE)GetProcAddress(hGina, "WlxRemoveStatusMessage"); - if (!Functions->WlxRemoveStatusMessage) FAIL_AND_RETURN(); - } - - return TRUE; -} -#undef FAIL_AND_RETURN + if (!Functions->WlxActivateUserShell) goto cleanup; + } + + ret = TRUE; + +cleanup: + if (!ret) + { + if (hGina) + FreeLibrary(hGina); + } + else + *GinaInstance = hGina; + return ret; +} BOOL GinaInit( @@ -674,20 +625,21 @@ { DWORD GinaDllVersion; - if (!LoadGina(&Session->MsGina.Functions, &GinaDllVersion, &Session->MsGina.hDllInstance)) + if (!LoadGina(&Session->Gina.Functions, &GinaDllVersion, &Session->Gina.hDllInstance)) return FALSE; - Session->MsGina.Context = NULL; - Session->MsGina.Version = GinaDllVersion; + Session->Gina.Context = NULL; + Session->Gina.Version = GinaDllVersion; + Session->Gina.UseCtrlAltDelete = FALSE; Session->SuppressStatus = FALSE; PreviousWindowProc = NULL; - return Session->MsGina.Functions.WlxInitialize( + return Session->Gina.Functions.WlxInitialize( Session->InteractiveWindowStationName, (HANDLE)Session, NULL, (PVOID)&FunctionTable, - &Session->MsGina.Context); + &Session->Gina.Context); } BOOL @@ -698,7 +650,7 @@ * Create the interactive window station */ Session->InteractiveWindowStationName = L"WinSta0"; - Session->InteractiveWindowStation = CreateWindowStation( + Session->InteractiveWindowStation = CreateWindowStationW( Session->InteractiveWindowStationName, 0, WINSTA_CREATEDESKTOP, @@ -713,7 +665,7 @@ /* * Create the application desktop */ - Session->ApplicationDesktop = CreateDesktop( + Session->ApplicationDesktop = CreateDesktopW( L"Default", NULL, NULL, @@ -729,7 +681,7 @@ /* * Create the winlogon desktop */ - Session->WinlogonDesktop = CreateDesktop( + Session->WinlogonDesktop = CreateDesktopW( L"Winlogon", NULL, NULL, @@ -745,7 +697,7 @@ /* * Create the screen saver desktop */ - Session->ScreenSaverDesktop = CreateDesktop( + Session->ScreenSaverDesktop = CreateDesktopW( L"Screen-Saver", NULL, NULL,

1 0

[gedmurphy] 23441: fix loading of current values for ip and dhcp
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Fri Aug 4 02:20:44 2006 New Revision: 23441 URL: http://svn.reactos.org/svn/reactos?rev=23441&view=rev Log: fix loading of current values for ip and dhcp Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Fri Aug 4 02:20:44 2006 @@ -61,25 +61,35 @@ static void -ManualDNS(HWND Dlg, BOOL Enabled) { +ManualDNS(HWND Dlg, BOOL Enabled, UINT uCmd) { PTCPIP_PROPERTIES_DATA DlgData = (PTCPIP_PROPERTIES_DATA) GetWindowLongPtrW(Dlg, GWL_USERDATA); - if (! DlgData->OldDhcpEnabled) - { - if (INADDR_NONE != DlgData->OldIpAddress) { - SendDlgItemMessage(Dlg, IDC_IPADDR, IPM_SETADDRESS, 0, - ntohl(DlgData->OldIpAddress)); - } - if (INADDR_NONE != DlgData->OldSubnetMask) { - SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, - ntohl(DlgData->OldSubnetMask)); - } - if (INADDR_NONE != DlgData->OldGateway) { - SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, - ntohl(DlgData->OldGateway)); - } - } + if (! DlgData->OldDhcpEnabled && + (uCmd == IDC_USEDHCP || uCmd == IDC_NODHCP)) { + if (INADDR_NONE != DlgData->OldIpAddress) { + SendDlgItemMessage(Dlg, IDC_IPADDR, IPM_SETADDRESS, 0, + ntohl(DlgData->OldIpAddress)); + } + if (INADDR_NONE != DlgData->OldSubnetMask) { + SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, + ntohl(DlgData->OldSubnetMask)); + } + if (INADDR_NONE != DlgData->OldGateway) { + SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, + ntohl(DlgData->OldGateway)); + } + } + + if (INADDR_NONE != DlgData->OldDns1 && + (uCmd == IDC_FIXEDDNS || uCmd == IDC_AUTODNS || IDC_NODHCP)) { + SendDlgItemMessage(Dlg, IDC_DNS1, IPM_SETADDRESS, 0, + ntohl(DlgData->OldDns1)); + if (INADDR_NONE != DlgData->OldDns2) { + SendDlgItemMessage(Dlg, IDC_DNS2, IPM_SETADDRESS, 0, + ntohl(DlgData->OldDns2)); + } + } CheckDlgButton(Dlg, IDC_FIXEDDNS, Enabled ? BST_CHECKED : BST_UNCHECKED); @@ -95,7 +105,7 @@ } static void -EnableDHCP(HWND Dlg, BOOL Enabled) { +EnableDHCP(HWND Dlg, BOOL Enabled, UINT uCmd) { CheckDlgButton(Dlg, IDC_USEDHCP, Enabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(Dlg, IDC_NODHCP, Enabled ? BST_UNCHECKED : BST_CHECKED); EnableWindow(GetDlgItem(Dlg, IDC_IPADDR), ! Enabled); @@ -107,7 +117,7 @@ SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_CLEARADDRESS, 0, 0); SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_CLEARADDRESS, 0, 0); } else { - ManualDNS(Dlg, TRUE); + ManualDNS(Dlg, TRUE, uCmd); } } @@ -354,7 +364,7 @@ EnableWindow(GetDlgItem(Dlg, IDC_ADVANCED), FALSE); - EnableDHCP(Dlg, DlgData->OldDhcpEnabled); + EnableDHCP(Dlg, DlgData->OldDhcpEnabled, 0); if (! DlgData->OldDhcpEnabled) { @@ -380,25 +390,25 @@ ntohl(DlgData->OldDns2)); } } - ManualDNS(Dlg, INADDR_NONE != DlgData->OldDns1); + ManualDNS(Dlg, INADDR_NONE != DlgData->OldDns1, 0); break; case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_FIXEDDNS: - ManualDNS(Dlg, TRUE); + ManualDNS(Dlg, TRUE, LOWORD(wParam)); return TRUE; case IDC_AUTODNS: - ManualDNS(Dlg, FALSE); + ManualDNS(Dlg, FALSE, LOWORD(wParam)); return TRUE; case IDC_USEDHCP: - EnableDHCP(Dlg, TRUE); + EnableDHCP(Dlg, TRUE, LOWORD(wParam)); return TRUE; case IDC_NODHCP: - EnableDHCP(Dlg, FALSE); + EnableDHCP(Dlg, FALSE, LOWORD(wParam)); return TRUE; } break;

1 0

[gedmurphy] 23440: - load the current IP address when switching from dhcp to manual. - this isn't how Windows behaves, but it should be as it makes life slightly easier in most cases
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Fri Aug 4 01:29:09 2006 New Revision: 23440 URL: http://svn.reactos.org/svn/reactos?rev=23440&view=rev Log: - load the current IP address when switching from dhcp to manual. - this isn't how Windows behaves, but it should be as it makes life slightly easier in most cases Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Fri Aug 4 01:29:09 2006 @@ -62,6 +62,25 @@ static void ManualDNS(HWND Dlg, BOOL Enabled) { + PTCPIP_PROPERTIES_DATA DlgData = + (PTCPIP_PROPERTIES_DATA) GetWindowLongPtrW(Dlg, GWL_USERDATA); + + if (! DlgData->OldDhcpEnabled) + { + if (INADDR_NONE != DlgData->OldIpAddress) { + SendDlgItemMessage(Dlg, IDC_IPADDR, IPM_SETADDRESS, 0, + ntohl(DlgData->OldIpAddress)); + } + if (INADDR_NONE != DlgData->OldSubnetMask) { + SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, + ntohl(DlgData->OldSubnetMask)); + } + if (INADDR_NONE != DlgData->OldGateway) { + SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, + ntohl(DlgData->OldGateway)); + } + } + CheckDlgButton(Dlg, IDC_FIXEDDNS, Enabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(Dlg, IDC_AUTODNS,

1 0

[gedmurphy] 23439: doh, rushed code leads to leaked resources. thanks lkjasa for pointing it out.
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Fri Aug 4 00:32:10 2006 New Revision: 23439 URL: http://svn.reactos.org/svn/reactos?rev=23439&view=rev Log: doh, rushed code leads to leaked resources. thanks lkjasa for pointing it out. Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Fri Aug 4 00:32:10 2006 @@ -516,5 +516,8 @@ ShowError(hParent, IDS_CANNOT_CREATE_PROPSHEET); } + if (tpszCaption != NULL) + HeapFree(GetProcessHeap(), 0, tpszCaption); + return; }

1 0

[gedmurphy] 23438: size the buffer dynamically to avoid potentially overflowing it
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Thu Aug 3 23:06:12 2006 New Revision: 23438 URL: http://svn.reactos.org/svn/reactos?rev=23438&view=rev Log: size the buffer dynamically to avoid potentially overflowing it Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Thu Aug 3 23:06:12 2006 @@ -466,14 +466,25 @@ PROPSHEETHEADERW psh; INITCOMMONCONTROLSEX cce; TCPIP_PROPERTIES_DATA DlgData; - TCHAR tpszCaption[MAX_PATH]; - HWND hListBox = GetDlgItem(hParent,IDC_COMPONENTSLIST); - int iListBoxIndex = (int) SendMessage(hListBox,LB_GETCURSEL,0,0); + LPTSTR tpszCaption = NULL; + INT StrLen; + + HWND hListBox = GetDlgItem(hParent, IDC_COMPONENTSLIST); + int iListBoxIndex = (int) SendMessage(hListBox, LB_GETCURSEL, 0, 0); + if(iListBoxIndex != LB_ERR) - SendMessage(hListBox,LB_GETTEXT,iListBoxIndex,(LPARAM)tpszCaption); - else - _stprintf(tpszCaption,_T("[ERROR]")); - _tcscat(tpszCaption,_T(" Properties")); + { + StrLen = SendMessage(hListBox, LB_GETTEXTLEN, iListBoxIndex, 0); + + if (StrLen != LB_ERR) + { + TCHAR suffix[] = _T(" Properties"); + INT HeapSize = ((StrLen + 1) + (_tcslen(suffix) + 1)) * sizeof(TCHAR); + tpszCaption = (LPTSTR)HeapAlloc(GetProcessHeap(), 0, HeapSize); + SendMessage(hListBox, LB_GETTEXT, iListBoxIndex, (LPARAM)tpszCaption); + _tcscat(tpszCaption, suffix); + } + } if (! LoadDataFromInfo(&DlgData, pInfo)) {

1 0

[gedmurphy] 23437: Add a header to the prop sheet and correct a variable spelling fixes bug 1731 patch from itay.perl@gmail.com
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Thu Aug 3 22:01:47 2006 New Revision: 23437 URL: http://svn.reactos.org/svn/reactos?rev=23437&view=rev Log: Add a header to the prop sheet and correct a variable spelling fixes bug 1731 patch from itay.perl(a)gmail.com Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=23… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Thu Aug 3 22:01:47 2006 @@ -338,10 +338,10 @@ tpszCfgInstanceID = (TCHAR*)pPage->lParam; while(pAdapter) { - TCHAR tpszAdatperName[MAX_PATH]; - swprintf(tpszAdatperName,L"%S",pAdapter->AdapterName); - DPRINT("IPHLPAPI returned: %S\n", tpszAdatperName); - if(_tcscmp(tpszAdatperName,tpszCfgInstanceID)==0) + TCHAR tpszAdapterName[MAX_PATH]; + swprintf(tpszAdapterName,L"%S",pAdapter->AdapterName); + DPRINT("IPHLPAPI returned: %S\n", tpszAdapterName); + if(_tcscmp(tpszAdapterName,tpszCfgInstanceID)==0) { DisplayTCPIPProperties(hwndDlg,pAdapter); break; Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Thu Aug 3 22:01:47 2006 @@ -466,7 +466,15 @@ PROPSHEETHEADERW psh; INITCOMMONCONTROLSEX cce; TCPIP_PROPERTIES_DATA DlgData; - + TCHAR tpszCaption[MAX_PATH]; + HWND hListBox = GetDlgItem(hParent,IDC_COMPONENTSLIST); + int iListBoxIndex = (int) SendMessage(hListBox,LB_GETCURSEL,0,0); + if(iListBoxIndex != LB_ERR) + SendMessage(hListBox,LB_GETTEXT,iListBoxIndex,(LPARAM)tpszCaption); + else + _stprintf(tpszCaption,_T("[ERROR]")); + _tcscat(tpszCaption,_T(" Properties")); + if (! LoadDataFromInfo(&DlgData, pInfo)) { ShowError(hParent, IDS_CANNOT_LOAD_CONFIG); @@ -483,7 +491,7 @@ psh.hwndParent = hParent; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); - psh.pszCaption = NULL;//Caption; + psh.pszCaption = tpszCaption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp;

1 0

[cwittich] 23436: -removed DefWindowProc from the Dialog WndProcs
by cwittich＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: cwittich Date: Thu Aug 3 19:57:10 2006 New Revision: 23436 URL: http://svn.reactos.org/svn/reactos?rev=23436&view=rev Log: -removed DefWindowProc from the Dialog WndProcs 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 (original) +++ trunk/reactos/dll/win32/msgina/gui.c Thu Aug 3 19:57:10 2006 @@ -226,7 +226,7 @@ SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - break; + return TRUE; } case WM_PAINT: { @@ -238,12 +238,12 @@ DrawState(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); EndPaint(hwndDlg, &ps); } - break; + return TRUE; } case WM_DESTROY: { DeleteObject(pgContext->hBitmap); - break; + return TRUE; } case WM_COMMAND: { @@ -281,7 +281,7 @@ } } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -318,7 +318,7 @@ case WM_INITDIALOG: { SetFocus(GetDlgItem(hwndDlg, IDNO)); - break; + return TRUE; } case WM_CLOSE: { @@ -327,7 +327,7 @@ } } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT

1 0

[hpoussin] 23435: Don't try to remove a status message if none have been displayed and GINA has not been initialized
by hpoussin＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: hpoussin Date: Thu Aug 3 19:14:14 2006 New Revision: 23435 URL: http://svn.reactos.org/svn/reactos?rev=23435&view=rev Log: Don't try to remove a status message if none have been displayed and GINA has not been initialized Modified: trunk/reactos/base/system/winlogon/winlogon.c 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 Thu Aug 3 19:14:14 2006 @@ -556,7 +556,6 @@ DPRINT("Winlogon: CheckForSetup() in setup mode\n"); /* Run setup and reboot when done */ - RemoveStatusMessage(WLSession); SwitchDesktop(WLSession->ApplicationDesktop); RunSetup();

1 0

[hpoussin] 23434: Simplify management of loggedout window Implement locking/unlocking of the workstation (only by code, not the associated dialogs)
by hpoussin＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: hpoussin Date: Thu Aug 3 17:54:44 2006 New Revision: 23434 URL: http://svn.reactos.org/svn/reactos?rev=23434&view=rev Log: Simplify management of loggedout window Implement locking/unlocking of the workstation (only by code, not the associated dialogs) Modified: trunk/reactos/dll/win32/msgina/En.rc trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msgina/resource.h trunk/reactos/dll/win32/msgina/stubs.c trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/dll/win32/msgina/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/En.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/En.rc (original) +++ trunk/reactos/dll/win32/msgina/En.rc Thu Aug 3 17:54:44 2006 @@ -28,17 +28,21 @@ LTEXT "Password:",IDC_STATIC,36,93,42,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,186,52 +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Security" FONT 8,"MS Shell Dlg 2",400,0,1 BEGIN - PUSHBUTTON "Cancel",IDCANCEL,125,31,50,14 - PUSHBUTTON "Log off",IDC_LOGOFF,11,31,50,14 - PUSHBUTTON "Shutdown",IDC_SHUTDOWN,69,31,50,14 - LTEXT "What do you want to do?",IDC_STATIC,50,18,87,8 + PUSHBUTTON "Cancel",IDCANCEL,170,95,70,14 + PUSHBUTTON "Log off",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Shutdown",IDC_SHUTDOWN,170,76,70,14 + LTEXT "What do you want to do?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Lock computer",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 END STRINGTABLE @@ -47,4 +51,3 @@ IDS_ASKFORUSER "User name: " IDS_ASKFORPASSWORD "Password: " END - 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 (original) +++ trunk/reactos/dll/win32/msgina/gui.c Thu Aug 3 17:54:44 2006 @@ -7,15 +7,8 @@ #include "msgina.h" -#include <debug.h> -#define TRACE DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint -#define FIXME DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint -#define WARN DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint -#undef DPRINT -#undef DPRINT1 - -static HBITMAP hBitmap = NULL; -static int cxSource, cySource; +#define YDEBUG +#include <wine/debug.h> typedef struct _DISPLAYSTATUSMSG { @@ -155,21 +148,30 @@ return TRUE; } +static INT_PTR CALLBACK +DisplaySASNoticeWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); +} + static VOID GUIDisplaySASNotice( IN OUT PGINA_CONTEXT pgContext) { - int result; + INT result; TRACE("GUIDisplaySASNotice()\n"); /* Display the notice window */ - result = pgContext->pWlxFuncs->WlxDialogBoxParam( - pgContext->hWlx, + result = DialogBoxParam( pgContext->hDllInstance, MAKEINTRESOURCE(IDD_NOTICE_DLG), NULL, - (DLGPROC)DefWindowProc, + DisplaySASNoticeWindowProc, (LPARAM)NULL); if (result == -1) { @@ -210,40 +212,37 @@ IN WPARAM wParam, IN LPARAM lParam) { - BITMAP bitmap; + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); switch (uMsg) { case WM_INITDIALOG: { /* FIXME: take care of DontDisplayLastUserName, NoDomainUI, ShutdownWithoutLogon */ - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)lParam); + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); - hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDC_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - if (hBitmap != NULL) + pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + break; + } + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc; + if (pgContext->hBitmap) { - GetObject(hBitmap, sizeof(BITMAP), &bitmap); - cxSource = bitmap.bmWidth; - cySource = bitmap.bmHeight; + hdc = BeginPaint(hwndDlg, &ps); + DrawState(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + EndPaint(hwndDlg, &ps); } break; } - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hdc, hdcMem; - hdc = BeginPaint(hwndDlg, &ps); - hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, hBitmap); - BitBlt(hdc, 0, 0, cxSource, cySource, hdcMem, 0, 0, SRCCOPY); - DeleteDC(hdcMem); - EndPaint(hwndDlg, &ps); - break; - } case WM_DESTROY: { - DeleteObject(hBitmap); + DeleteObject(pgContext->hBitmap); break; } case WM_COMMAND: @@ -252,10 +251,8 @@ { case IDOK: { - PGINA_CONTEXT pgContext; LPWSTR UserName = NULL, Password = NULL; INT result = WLX_SAS_ACTION_NONE; - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0') break; @@ -300,14 +297,23 @@ { switch (LOWORD(wParam)) { - case IDYES: - case IDNO: - { - EndDialog(hwndDlg, LOWORD(wParam)); - break; - } + case IDC_LOCK: + EndDialog(hwndDlg, WLX_SAS_ACTION_LOCK_WKSTA); + return TRUE; + case IDC_LOGOFF: + EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); + return TRUE; + case IDC_SHUTDOWN: + EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); + return TRUE; + case IDC_TASKMGR: + EndDialog(hwndDlg, WLX_SAS_ACTION_TASKLIST); + return TRUE; + case IDCANCEL: + EndDialog(hwndDlg, WLX_SAS_ACTION_NONE); + return TRUE; } - return TRUE; + break; } case WM_INITDIALOG: { @@ -329,50 +335,30 @@ IN OUT PGINA_CONTEXT pgContext, IN DWORD dwSasType) { - INT SasAction = WLX_SAS_ACTION_NONE; + INT result; TRACE("GUILoggedOnSAS()\n"); - switch (dwSasType) - { - case WLX_SAS_TYPE_CTRL_ALT_DEL: - { - INT result; - /* Display "Are you sure you want to log off?" dialog */ - result = pgContext->pWlxFuncs->WlxDialogBoxParam( - pgContext->hWlx, - pgContext->hDllInstance, - MAKEINTRESOURCE(IDD_LOGGEDON_DLG), - NULL, - LoggedOnWindowProc, - (LPARAM)pgContext); - if (result == IDOK) - SasAction = WLX_SAS_ACTION_LOCK_WKSTA; - break; - } - case WLX_SAS_TYPE_SC_INSERT: - { - FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_INSERT not supported!\n"); - break; - } - case WLX_SAS_TYPE_SC_REMOVE: - { - FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_REMOVE not supported!\n"); - break; - } - case WLX_SAS_TYPE_TIMEOUT: - { - FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_TIMEOUT not supported!\n"); - break; - } - default: - { - WARN("WlxLoggedOnSAS: Unknown SasType: 0x%x\n", dwSasType); - break; - } - } - - return SasAction; + if (dwSasType != WLX_SAS_TYPE_CTRL_ALT_DEL) + { + /* Nothing to do for WLX_SAS_TYPE_TIMEOUT ; the dialog will + * close itself thanks to the use of WlxDialogBoxParam */ + return WLX_SAS_ACTION_NONE; + } + + result = pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCE(IDD_LOGGEDON_DLG), + NULL, + LoggedOnWindowProc, + (LPARAM)pgContext); + if (result >= WLX_SAS_ACTION_LOGON && + result <= WLX_SAS_ACTION_SWITCH_CONSOLE) + { + return result; + } + return WLX_SAS_ACTION_NONE; } static INT 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 (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Thu Aug 3 17:54:44 2006 @@ -42,7 +42,7 @@ IN DWORD dwWinlogonVersion, OUT PDWORD pdwDllVersion) { - DPRINT1("WlxNegotiate(%lx, %p)\n", dwWinlogonVersion, pdwDllVersion); + TRACE("WlxNegotiate(%lx, %p)\n", dwWinlogonVersion, pdwDllVersion); if(!pdwDllVersion || (dwWinlogonVersion < WLX_VERSION_1_3)) return FALSE; @@ -147,20 +147,22 @@ PWSTR pszCmdLine) { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - STARTUPINFO si; - PROCESS_INFORMATION pi; + STARTUPINFO StartupInfo; + PROCESS_INFORMATION ProcessInformation; + WCHAR CurrentDirectory[MAX_PATH]; BOOL Ret; - si.cb = sizeof(STARTUPINFO); - si.lpReserved = NULL; - si.lpTitle = pszCmdLine; - si.dwX = si.dwY = si.dwXSize = si.dwYSize = 0L; - si.dwFlags = 0; - si.wShowWindow = SW_SHOW; - si.lpReserved2 = NULL; - si.cbReserved2 = 0; - si.lpDesktop = pszDesktopName; - + StartupInfo.cb = sizeof(STARTUPINFO); + StartupInfo.lpReserved = NULL; + StartupInfo.lpTitle = pszCmdLine; + StartupInfo.dwX = StartupInfo.dwY = StartupInfo.dwXSize = StartupInfo.dwYSize = 0L; + StartupInfo.dwFlags = 0; + StartupInfo.wShowWindow = SW_SHOW; + StartupInfo.lpReserved2 = NULL; + StartupInfo.cbReserved2 = 0; + StartupInfo.lpDesktop = pszDesktopName; + + GetWindowsDirectoryW (CurrentDirectory, MAX_PATH); Ret = CreateProcessAsUser(pgContext->UserToken, NULL, pszCmdLine, @@ -169,11 +171,11 @@ FALSE, CREATE_UNICODE_ENVIRONMENT, pEnvironment, - NULL, - &si, - &pi); - - VirtualFree(pEnvironment, 0, MEM_RELEASE); + CurrentDirectory, + &StartupInfo, + &ProcessInformation); + + //VirtualFree(pEnvironment, 0, MEM_RELEASE); return Ret; } @@ -188,15 +190,10 @@ PWSTR pszMprLogonScript, PVOID pEnvironment) { - PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - STARTUPINFO StartupInfo; - PROCESS_INFORMATION ProcessInformation; HKEY hKey; DWORD BufSize, ValueType; WCHAR pszUserInitApp[MAX_PATH]; WCHAR pszExpUserInitApp[MAX_PATH]; - BOOL Ret; - WCHAR CurrentDirectory[MAX_PATH]; /* get the path of userinit */ if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -216,38 +213,12 @@ return FALSE; } RegCloseKey(hKey); - - /* start userinit */ + ExpandEnvironmentStrings(pszUserInitApp, pszExpUserInitApp, MAX_PATH); + + /* Start userinit */ /* FIXME - allow to start more applications that are comma-separated */ - StartupInfo.cb = sizeof(STARTUPINFO); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = pszDesktopName; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.lpReserved2 = NULL; - StartupInfo.cbReserved2 = 0; - StartupInfo.dwX = StartupInfo.dwY = StartupInfo.dwXSize = StartupInfo.dwYSize = 0; - StartupInfo.wShowWindow = SW_SHOW; - - ExpandEnvironmentStrings(pszUserInitApp, pszExpUserInitApp, MAX_PATH); - - GetWindowsDirectoryW (CurrentDirectory, MAX_PATH); - Ret = CreateProcessAsUser(pgContext->UserToken, - NULL, - pszExpUserInitApp, - NULL, - NULL, - FALSE, - CREATE_UNICODE_ENVIRONMENT, - pEnvironment, - CurrentDirectory, - &StartupInfo, - &ProcessInformation); - if(!Ret) ERR("GINA: Failed: 3, error %lu\n", GetLastError()); - VirtualFree(pEnvironment, 0, MEM_RELEASE); - Ret = pgContext->pWlxFuncs->WlxSwitchDesktopToUser(pgContext->hWlx); - if(!Ret) ERR("GINA: Failed: 4, error %lu\n", GetLastError()); - return Ret; + /* FIXME: Call VirtualFree(pEnvironment, 0, MEM_RELEASE); ? */ + return WlxStartApplication(pWlxContext, pszDesktopName, pEnvironment, pszExpUserInitApp); } @@ -261,10 +232,36 @@ PVOID pReserved) { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - - DPRINT1("WlxLoggedOnSAS(0x%lx)\n", dwSasType); - - return pGinaUI->LoggedOnSAS(pgContext, dwSasType); + INT SasAction = WLX_SAS_ACTION_NONE; + + TRACE("WlxLoggedOnSAS(0x%lx)\n", dwSasType); + + switch (dwSasType) + { + case WLX_SAS_TYPE_CTRL_ALT_DEL: + case WLX_SAS_TYPE_TIMEOUT: + { + SasAction = pGinaUI->LoggedOnSAS(pgContext, dwSasType); + break; + } + case WLX_SAS_TYPE_SC_INSERT: + { + FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_INSERT not supported!\n"); + break; + } + case WLX_SAS_TYPE_SC_REMOVE: + { + FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_REMOVE not supported!\n"); + break; + } + default: + { + WARN("WlxLoggedOnSAS: Unknown SasType: 0x%x\n", dwSasType); + break; + } + } + + return SasAction; } /* @@ -280,7 +277,7 @@ { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - DPRINT1("WlxDisplayStatusMessage(\"%S\")\n", pMessage); + TRACE("WlxDisplayStatusMessage(\"%S\")\n", pMessage); return pGinaUI->DisplayStatusMessage(pgContext, hDesktop, dwOptions, pTitle, pMessage); } @@ -363,13 +360,13 @@ LOGON32_PROVIDER_DEFAULT, pgContext->phToken)) { - WARN("GINA: Logonuser() failed\n"); + WARN("LogonUserW() failed\n"); return FALSE; } - if(!(*pgContext->phToken)) - { - WARN("GINA: *phToken == NULL!\n"); + if(!*pgContext->phToken) + { + WARN("*phToken == NULL!\n"); return FALSE; } @@ -384,7 +381,7 @@ sizeof(TOKEN_STATISTICS), &cbStats)) { - WARN("GINA: Couldn't get Authentication id from user token!\n"); + WARN("Couldn't get Authentication id from user token!\n"); return FALSE; } *pgContext->pAuthenticationId = Stats.AuthenticationId; @@ -482,7 +479,7 @@ { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - DPRINT1("WlxDisplaySASNotice(%p)\n", pWlxContext); + TRACE("WlxDisplaySASNotice(%p)\n", pWlxContext); if (GetSystemMetrics(SM_REMOTESESSION)) { @@ -501,7 +498,7 @@ pGinaUI->DisplaySASNotice(pgContext); - DPRINT1("WlxDisplaySASNotice() done\n"); + TRACE("WlxDisplaySASNotice() done\n"); } /* @@ -520,7 +517,7 @@ { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - DPRINT1("WlxLoggedOutSAS()\n"); + TRACE("WlxLoggedOutSAS()\n"); pgContext->pAuthenticationId = pAuthenticationId; pgContext->pdwOptions = pdwOptions; 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 (original) +++ trunk/reactos/dll/win32/msgina/msgina.h Thu Aug 3 17:54:44 2006 @@ -21,6 +21,9 @@ PHANDLE phToken; PWLX_MPR_NOTIFY_INFO pNprNotifyInfo; PVOID *pProfile; + + /* Current logo to display */ + HBITMAP hBitmap; } GINA_CONTEXT, *PGINA_CONTEXT; HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Thu Aug 3 17:54:44 2006 @@ -7,8 +7,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "msgina.dll\0" #include <reactos/version.rc> - -IDC_ROSLOGO BITMAP "resources/reactos.bmp" +IDI_ROSLOGO BITMAP "resources/reactos.bmp" #include "En.rc" Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h (original) +++ trunk/reactos/dll/win32/msgina/resource.h Thu Aug 3 17:54:44 2006 @@ -11,10 +11,14 @@ #define IDC_PASSWORD 1003 #define IDC_SHUTDOWN 1004 #define IDC_STATUSLABEL 1005 -#define IDC_ROSLOGO 1006 +#define IDC_LOCK 1006 +#define IDC_ROSLOGO 1007 +#define IDI_ROSLOGO 1008 #define IDS_ASKFORUSER 40000 #define IDS_PRESSCTRLALTDELETE 40001 +#define IDC_TASKMGR 40002 #define IDS_ASKFORPASSWORD 40002 + #endif /* __MSGINA_RESOURCE_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 (original) +++ trunk/reactos/dll/win32/msgina/stubs.c Thu Aug 3 17:54:44 2006 @@ -56,7 +56,7 @@ PVOID pWlxContext) { UNIMPLEMENTED; - return FALSE; + return TRUE; } @@ -68,7 +68,7 @@ PVOID pWlxContext) { UNIMPLEMENTED; - return FALSE; + return TRUE; } @@ -106,7 +106,7 @@ DWORD dwSasType) { UNIMPLEMENTED; - return 0; + return WLX_SAS_ACTION_UNLOCK_WKSTA; } Modified: trunk/reactos/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/tui.c (original) +++ trunk/reactos/dll/win32/msgina/tui.c Thu Aug 3 17:54:44 2006 @@ -7,12 +7,8 @@ #include "msgina.h" -#include <debug.h> -#define TRACE DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint -#define FIXME DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint -#define WARN DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint -#undef DPRINT -#undef DPRINT1 +#define YDEBUG +#include <wine/debug.h> static BOOL TUIInitialize( @@ -77,8 +73,15 @@ IN DWORD dwSasType) { TRACE("TUILoggedOnSAS()\n"); - for (;;) FIXME("FIXME!\n"); - return 0; + + if (dwSasType != WLX_SAS_TYPE_CTRL_ALT_DEL) + { + /* Nothing to do for WLX_SAS_TYPE_TIMEOUT */ + return WLX_SAS_ACTION_NONE; + } + + FIXME("FIXME: TUILoggedOnSAS(): Let's suppose the user wants to log off...\n"); + return WLX_SAS_ACTION_LOGOFF; } static BOOL @@ -122,18 +125,18 @@ TUILoggedOutSAS( IN OUT PGINA_CONTEXT pgContext) { - WCHAR User[256]; + WCHAR UserName[256]; WCHAR Password[256]; TRACE("TUILoggedOutSAS()\n"); /* Ask the user for credentials */ - if (!ReadString(pgContext, IDS_ASKFORUSER, User, 256, TRUE)) + if (!ReadString(pgContext, IDS_ASKFORUSER, UserName, 256, TRUE)) return WLX_SAS_ACTION_NONE; if (!ReadString(pgContext, IDS_ASKFORPASSWORD, Password, 256, FALSE)) return WLX_SAS_ACTION_NONE; - if (DoLoginTasks(pgContext, User, NULL, Password)) + if (DoLoginTasks(pgContext, UserName, NULL, Password)) return WLX_SAS_ACTION_LOGON; else return WLX_SAS_ACTION_NONE;

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