Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[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

[hpoussin] 23433: Implement shutdown and unlocking Remove some useless code Implement Timeout for dialogs
by hpoussin＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: hpoussin Date: Thu Aug 3 17:50:40 2006 New Revision: 23433 URL: http://svn.reactos.org/svn/reactos?rev=23433&view=rev Log: Implement shutdown and unlocking Remove some useless code Implement Timeout for dialogs Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h 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 Thu Aug 3 17:50:40 2006 @@ -28,35 +28,11 @@ StartTaskManager( IN OUT PWLSESSION Session) { - STARTUPINFO StartupInfo; - PROCESS_INFORMATION ProcessInformation; - - if (Session->LogonStatus == WKSTA_IS_LOGGED_OFF) - return FALSE; - - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; - - CreateProcessW( - L"taskmgr.exe", + return Session->MsGina.Functions.WlxStartApplication( + Session->MsGina.Context, + L"Default", NULL, - NULL, - NULL, - FALSE, - CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - - CloseHandle (ProcessInformation.hProcess); - CloseHandle (ProcessInformation.hThread); - return TRUE; + L"taskmgr.exe"); } static BOOL @@ -107,25 +83,31 @@ return Session->MsGina.Functions.WlxActivateUserShell( Session->MsGina.Context, - L"WinSta0\\Default",//NULL, /* FIXME */ + L"Default",//NULL, /* FIXME */ NULL, /* FIXME */ lpEnvironment); } -static BOOL +static VOID HandleLogoff( IN OUT PWLSESSION Session) { FIXME("FIXME: HandleLogoff() unimplemented\n"); - return FALSE; } static BOOL HandleShutdown( - IN OUT PWLSESSION Session) + IN OUT PWLSESSION Session, + IN DWORD wlxAction) { FIXME("FIXME: HandleShutdown() unimplemented\n"); - return FALSE; + if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) + NtShutdownSystem(ShutdownReboot); + else if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_POWER_OFF) + NtShutdownSystem(ShutdownPowerOff); + else + NtShutdownSystem(ShutdownNoReboot); + return TRUE; } static VOID @@ -138,8 +120,8 @@ case WLX_SAS_ACTION_LOGON: /* 0x01 */ if (HandleLogon(Session)) { + SwitchDesktop(Session->ApplicationDesktop); Session->LogonStatus = WKSTA_IS_LOGGED_ON; - SwitchDesktop(WLSession->ApplicationDesktop); } break; case WLX_SAS_ACTION_NONE: /* 0x02 */ @@ -154,6 +136,8 @@ break; case WLX_SAS_ACTION_LOGOFF: /* 0x04 */ case WLX_SAS_ACTION_SHUTDOWN: /* 0x05 */ + case WLX_SAS_ACTION_SHUTDOWN_POWER_OFF: /* 0x0a */ + case WLX_SAS_ACTION_SHUTDOWN_REBOOT: /* 0x0b */ if (Session->LogonStatus != WKSTA_IS_LOGGED_OFF) { if (!Session->MsGina.Functions.WlxIsLogoffOk(Session->MsGina.Context)) @@ -165,10 +149,15 @@ Session->MsGina.Functions.WlxDisplaySASNotice(Session->MsGina.Context); } if (WLX_SHUTTINGDOWN(wlxAction)) - HandleShutdown(Session); + HandleShutdown(Session, wlxAction); break; case WLX_SAS_ACTION_TASKLIST: /* 0x07 */ + SwitchDesktop(WLSession->ApplicationDesktop); StartTaskManager(Session); + break; + case WLX_SAS_ACTION_UNLOCK_WKSTA: /* 0x08 */ + SwitchDesktop(WLSession->ApplicationDesktop); + Session->LogonStatus = WKSTA_IS_LOGGED_ON; break; default: WARN("Unknown SAS action 0x%lx\n", wlxAction); 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 17:50:40 2006 @@ -51,7 +51,7 @@ } static BOOL -StartServicesManager(void) +StartServicesManager(VOID) { HANDLE ServicesInitEvent; BOOLEAN Result; @@ -182,6 +182,7 @@ return TRUE; } +#if 0 static BOOL OpenRegistryKey( OUT HKEY *WinLogonKey) @@ -192,6 +193,7 @@ KEY_QUERY_VALUE, WinLogonKey); } +#endif #if 0 static BOOL @@ -228,7 +230,8 @@ #endif /* -static BOOL RestartShell(void) +static BOOL RestartShell( + IN OUT PWLSESSION Session) { HKEY WinLogonKey; DWORD Type, Size, Value; @@ -255,6 +258,7 @@ } */ +#if 0 static PWCHAR GetUserInit( OUT WCHAR *CommandLine, @@ -300,8 +304,7 @@ return CommandLine; } - -BOOL +static BOOL DoBrokenLogonUser( IN PWLSESSION WLSession, IN PWLX_MPR_NOTIFY_INFO pMprNotifyInfo) @@ -423,6 +426,7 @@ return TRUE; } +#endif static BOOL DisplayStatusMessage( @@ -441,70 +445,6 @@ return Session->MsGina.Functions.WlxDisplayStatusMessage(Session->MsGina.Context, hDesktop, 0, NULL, StatusMsg); } -#if 0 -static BOOL -InitServices(VOID) -{ - /*WCHAR StatusMsg[256]; - - LoadString(hAppInstance, IDS_REACTOSISSTARTINGUP, StatusMsg, 256 * sizeof(WCHAR)); - DisplayStatusMessage(WLSession, WLSession->ApplicationDesktop, 0, NULL, StatusMsg);*/ - - /* start system processes (services.exe & lsass.exe) */ - if(StartProcess(L"StartServices")) - { - if(!StartServicesManager()) - { - DPRINT1("WL: Failed to start Services (0x%X)\n", GetLastError()); - } - } - else - { - DPRINT1("WL: StartProcess() failed!\n"); - } - - return TRUE; -} -#endif - -#if 0 -static DWORD -DoLogin( - IN OUT PWLSESSION Session) -{ - DWORD WlxAction, Options; - WLX_MPR_NOTIFY_INFO MprNotifyInfo; - PWLX_PROFILE_V2_0 Profile; - PSID LogonSid = NULL; - HANDLE Token; - - /* FIXME - Create a Logon Sid - if(!(LogonSid = CreateUserLogonSid(NULL))) - { - return WLX_SAS_ACTION_NONE; - } - */ - - Options = 0; - WlxAction = Session->MsGina.Functions.WlxLoggedOutSAS(Session->MsGina.Context, - Session->SASAction, - &Session->LogonId, - LogonSid, - &Options, - &Token, - &MprNotifyInfo, - (PVOID*)&Profile); - - if (WlxAction == WLX_SAS_ACTION_LOGON) - { - Session->UserToken = Token; - if (!DoBrokenLogonUser(Session, &MprNotifyInfo)) - WlxAction = WLX_SAS_ACTION_NONE; - } - return WlxAction; -} -#endif - static VOID SessionLoop( IN OUT PWLSESSION Session) @@ -526,73 +466,20 @@ /* Don't go there! */ -#if 0 - /* FIXME - don't leave the loop when suspending the computer */ - if(WLX_SUSPENDING(WlxAction)) - { - Session->LogonStatus = LOGON_NONE; - WlxAction = WLX_SAS_ACTION_NONE; - /* don't leave the loop */ - continue; - } - - if(WLX_SHUTTINGDOWN(WlxAction)) - { - Session->LogonStatus = LOGON_SHUTDOWN; - /* leave the loop here */ - break; - } - -#endif /* - LoadString(hAppInstance, IDS_PREPARENETWORKCONNECTIONS, StatusMsg, 256 * sizeof(WCHAR)); - MsGinaInst->Functions->WlxDisplayStatusMessage(MsGinaInst->Context, - ApplicationDesktop, - 0, - NULL, - StatusMsg); - - + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_PREPARENETWORKCONNECTIONS); Sleep(150); - LoadString(hAppInstance, IDS_APPLYINGCOMPUTERSETTINGS, StatusMsg, 256 * sizeof(WCHAR)); - MsGinaInst->Functions->WlxDisplayStatusMessage(MsGinaInst->Context, - ApplicationDesktop, - 0, - NULL, - StatusMsg); - - + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); Sleep(150); - MsGinaInst->Functions->WlxRemoveStatusMessage(MsGinaInst->Context); - MsGinaInst->Functions->WlxRemoveStatusMessage(MsGinaInst->Context); - MsGinaInst->Functions->WlxRemoveStatusMessage(MsGinaInst->Context); - - - Sleep(250); - - LoadString(hAppInstance, IDS_LOADINGYOURPERSONALSETTINGS, StatusMsg, 256 * sizeof(WCHAR)); - MsGinaInst->Functions->WlxDisplayStatusMessage(MsGinaInst->Context, - ApplicationDesktop, - 0, - NULL, - StatusMsg); - + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); Sleep(150); - LoadString(hAppInstance, IDS_APPLYINGYOURPERSONALSETTINGS, StatusMsg, 256 * sizeof(WCHAR)); - MsGinaInst->Functions->WlxDisplayStatusMessage(MsGinaInst->Context, - ApplicationDesktop, - 0, - NULL, - StatusMsg); - - + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); Sleep(150); - MsGinaInst->Functions->WlxRemoveStatusMessage(MsGinaInst->Context); - MsGinaInst->Functions->WlxRemoveStatusMessage(MsGinaInst->Context); + RemoveStatusMessage(Session); if(!MsGinaInst->Functions->WlxActivateUserShell(MsGinaInst->Context, L"WinSta0\\Default", @@ -604,34 +491,19 @@ SetEvent(hShutdownEvent); } - WaitForSingleObject(hShutdownEvent, INFINITE); CloseHandle(hShutdownEvent); - LoadString(hAppInstance, IDS_SAVEYOURSETTINGS, StatusMsg, 256 * sizeof(WCHAR)); - MsGinaInst->Functions->WlxDisplayStatusMessage(MsGinaInst->Context, - ApplicationDesktop, - 0, - NULL, - StatusMsg); - + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); Sleep(150); MsGinaInst->Functions->WlxShutdown(MsGinaInst->Context, WLX_SAS_ACTION_SHUTDOWN); - - LoadString(hAppInstance, IDS_REACTOSISSHUTTINGDOWN, StatusMsg, 256 * sizeof(WCHAR)); - MsGinaInst->Functions->WlxDisplayStatusMessage(MsGinaInst->Context, - ApplicationDesktop, - 0, - NULL, - StatusMsg); - + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); Sleep(250); - MsGinaInst->Functions->WlxRemoveStatusMessage(MsGinaInst->Context); - MsGinaInst->Functions->WlxRemoveStatusMessage(MsGinaInst->Context); + RemoveStatusMessage(Session); */ } @@ -668,6 +540,7 @@ ExitProcess(1); return 1; } + WLSession->DialogTimeout = 120; /* 2 minutes */ if (!CreateWindowStationAndDesktops(WLSession)) { @@ -675,6 +548,7 @@ ExitProcess(1); return 1; } + LockWorkstation(WLSession); /* Check for pending setup */ if (GetSetupType() != 0) @@ -682,6 +556,7 @@ DPRINT("Winlogon: CheckForSetup() in setup mode\n"); /* Run setup and reboot when done */ + RemoveStatusMessage(WLSession); SwitchDesktop(WLSession->ApplicationDesktop); RunSetup(); 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 Thu Aug 3 17:50:40 2006 @@ -114,6 +114,9 @@ #define WKSTA_IS_LOGGED_ON 1 #define WKSTA_IS_LOCKED 2 +#define LockWorkstation(Session) +#define UnlockWorkstation(Session) + typedef struct _WLSESSION { MSGINAINSTANCE MsGina; @@ -129,6 +132,8 @@ HDESK ScreenSaverDesktop; LUID LogonId; HANDLE UserToken; + + DWORD DialogTimeout; /* Timeout for dialog boxes, in seconds */ /* Logon informations */ DWORD Options; 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 Thu Aug 3 17:50:40 2006 @@ -15,9 +15,49 @@ #define YDEBUG #include <wine/debug.h> -//#define UNIMPLEMENTED DbgPrint("WL: %S() at %S:%i unimplemented!\n", __FUNCTION__, __FILE__, __LINE__) - -#define WINLOGON_DESKTOP L"Winlogon" +static DLGPROC PreviousWindowProc; +static UINT_PTR IdTimer; + +static INT_PTR CALLBACK +DefaultWlxWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + 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; + } + else if (uMsg == WM_NCDESTROY) + { + CHECKPOINT1; + PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); + CHECKPOINT1; + PreviousWindowProc = NULL; + return TRUE; + } + else + { + INT_PTR ret = PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); + ret = PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); + return ret; + } +} /* * @implemented @@ -52,15 +92,16 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI WlxSetTimeout( HANDLE hWlx, DWORD Timeout) { - UNIMPLEMENTED; - return FALSE; + PWLSESSION Session = (PWLSESSION)hWlx; + Session->DialogTimeout = Timeout; + return TRUE; } /* @@ -88,6 +129,7 @@ LPWSTR lpszTitle, UINT fuStyle) { + /* FIXME: Provide a custom window proc to be able to handle timeout */ return MessageBoxW(hwndOwner, lpszText, lpszTitle, fuStyle); } @@ -102,7 +144,10 @@ HWND hwndOwner, DLGPROC dlgprc) { - return (int)DialogBox(hInst, lpszTemplate, hwndOwner, dlgprc); + if (PreviousWindowProc != NULL) + return -1; + PreviousWindowProc = dlgprc; + return (int)DialogBox(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc); } /* @@ -117,7 +162,10 @@ DLGPROC dlgprc, LPARAM dwInitParam) { - return (int)DialogBoxParam(hInst, lpszTemplate, hwndOwner, dlgprc, dwInitParam); + if (PreviousWindowProc != NULL) + return -1; + PreviousWindowProc = dlgprc; + return (int)DialogBoxParam(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); } /* @@ -131,7 +179,10 @@ HWND hwndOwner, DLGPROC dlgprc) { - return (int)DialogBoxIndirect(hInst, hDialogTemplate, hwndOwner, dlgprc); + if (PreviousWindowProc != NULL) + return -1; + PreviousWindowProc = dlgprc; + return (int)DialogBoxIndirect(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc); } /* @@ -146,7 +197,10 @@ DLGPROC dlgprc, LPARAM dwInitParam) { - return (int)DialogBoxIndirectParam(hInst, hDialogTemplate, hwndOwner, dlgprc, dwInitParam); + if (PreviousWindowProc != NULL) + return -1; + PreviousWindowProc = dlgprc; + return (int)DialogBoxIndirectParam(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); } /* @@ -626,6 +680,7 @@ Session->MsGina.Context = NULL; Session->MsGina.Version = GinaDllVersion; Session->SuppressStatus = FALSE; + PreviousWindowProc = NULL; return Session->MsGina.Functions.WlxInitialize( Session->InteractiveWindowStationName, @@ -675,7 +730,7 @@ * Create the winlogon desktop */ Session->WinlogonDesktop = CreateDesktop( - WINLOGON_DESKTOP, + L"Winlogon", NULL, NULL, 0, /* FIXME: Set some flags */

1 0

[jimtabor] 23432: Fix build
by jimtabor＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: jimtabor Date: Thu Aug 3 05:30:40 2006 New Revision: 23432 URL: http://svn.reactos.org/svn/reactos?rev=23432&view=rev Log: Fix build Added: trunk/reactos/dll/win32/msgina/En.rc - copied unchanged from r23431, trunk/reactos/dll/win32/msgina/en.rc Removed: trunk/reactos/dll/win32/msgina/en.rc Removed: 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 (removed) @@ -1,50 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 -STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Please wait..." -FONT 8,"MS Shell Dlg 2",400,0,1 -BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS -END - -IDD_NOTICE_DLG DIALOGEX 0,0,186,59 -STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Welcome to ReactOS" -FONT 8,"MS Shell Dlg 2",400,0,1 -BEGIN - LTEXT "Press Control-Alt-Delete key combination",IDC_STATIC,16,18,144,14 -END - -IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 -STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Logon" -FONT 8,"MS Shell Dlg 2",400,0,1 -BEGIN - PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel",IDCANCEL,115,122,50,14 - PUSHBUTTON "Shutdown",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Username:",IDC_STATIC,36,75,40,8 - 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 -END - -IDD_LOGGEDON_DLG DIALOGEX 0,0,186,52 -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 -END - -STRINGTABLE -BEGIN - IDS_PRESSCTRLALTDELETE "Press CONTROL+ALT+DELETE key combination\n" - IDS_ASKFORUSER "User name: " - IDS_ASKFORPASSWORD "Password: " -END -

1 0

[jimtabor] 23431: - Win32k, Merge from head - CreateWindowsEx: Patch based on janderwald patch. 1. Reading and following wine source (user/win.c & winex11.drv/window.c), I noticed that cs->hwndParent is unmodified when passed to the children via WM_NC/CREATE. This fixes edit control wine tests. Reduces the number to 14 failed. 2. Reordered the "fine the parent" code, based on wine. I've tested this change for last two weeks.
by jimtabor＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: jimtabor Date: Thu Aug 3 04:50:59 2006 New Revision: 23431 URL: http://svn.reactos.org/svn/reactos?rev=23431&view=rev Log: - Win32k, Merge from head - CreateWindowsEx: Patch based on janderwald patch. 1. Reading and following wine source (user/win.c & winex11.drv/window.c), I noticed that cs->hwndParent is unmodified when passed to the children via WM_NC/CREATE. This fixes edit control wine tests. Reduces the number to 14 failed. 2. Reordered the "fine the parent" code, based on wine. I've tested this change for last two weeks. Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Thu Aug 3 04:50:59 2006 @@ -1439,16 +1439,14 @@ } else if (hWndParent) { - if (((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) || - (dwExStyle & WS_EX_MDICHILD)) - ParentWindowHandle = hWndParent; - else - { - //temp hack + if ((dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) + { //temp hack PWINDOW_OBJECT Par = UserGetWindowObject(hWndParent), Root; if (Par && (Root = UserGetAncestor(Par, GA_ROOT))) OwnerWindowHandle = Root->hSelf; } + else + ParentWindowHandle = hWndParent; } else if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) { @@ -1685,7 +1683,7 @@ Cs.lpCreateParams = lpParam; Cs.hInstance = hInstance; Cs.hMenu = hMenu; - Cs.hwndParent = ParentWindowHandle; + Cs.hwndParent = hWndParent; //Pass the original Parent handle! Cs.cx = Size.cx; Cs.cy = Size.cy; Cs.x = Pos.x;

1 0

[cwittich] 23430: -splitted resource file into en.rc and msgina.rc -prettyfied msgina a bit -fixed line endings
by cwittich＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: cwittich Date: Thu Aug 3 04:32:32 2006 New Revision: 23430 URL: http://svn.reactos.org/svn/reactos?rev=23430&view=rev Log: -splitted resource file into en.rc and msgina.rc -prettyfied msgina a bit -fixed line endings Added: trunk/reactos/dll/win32/msgina/en.rc trunk/reactos/dll/win32/msgina/resources/reactos.bmp (with props) Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.rbuild trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msgina/resource.h trunk/reactos/dll/win32/msgina/tui.c Added: 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 (added) +++ trunk/reactos/dll/win32/msgina/en.rc Thu Aug 3 04:32:32 2006 @@ -1,0 +1,50 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Welcome to ReactOS" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "Press Control-Alt-Delete key combination",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Logon" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,115,122,50,14 + PUSHBUTTON "Shutdown",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Username:",IDC_STATIC,36,75,40,8 + 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 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,186,52 +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 +END + +STRINGTABLE +BEGIN + IDS_PRESSCTRLALTDELETE "Press CONTROL+ALT+DELETE key combination\n" + 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 04:32:32 2006 @@ -13,6 +13,9 @@ #define WARN DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #undef DPRINT #undef DPRINT1 + +static HBITMAP hBitmap = NULL; +static int cxSource, cySource; typedef struct _DISPLAYSTATUSMSG { @@ -46,7 +49,7 @@ PDISPLAYSTATUSMSG msg = (PDISPLAYSTATUSMSG)lParam; if (!msg) return FALSE; - + msg->Context->hStatusWindow = hwndDlg; if (msg->pTitle) @@ -207,6 +210,8 @@ IN WPARAM wParam, IN LPARAM lParam) { + BITMAP bitmap; + switch (uMsg) { case WM_INITDIALOG: @@ -214,6 +219,31 @@ /* FIXME: take care of DontDisplayLastUserName, NoDomainUI, ShutdownWithoutLogon */ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)lParam); SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); + + hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDC_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (hBitmap != NULL) + { + GetObject(hBitmap, sizeof(BITMAP), &bitmap); + cxSource = bitmap.bmWidth; + cySource = bitmap.bmHeight; + } + 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); break; } case WM_COMMAND: Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rbuild (original) +++ trunk/reactos/dll/win32/msgina/msgina.rbuild Thu Aug 3 04:32:32 2006 @@ -10,6 +10,7 @@ <library>kernel32</library> <library>advapi32</library> <library>user32</library> + <library>gdi32</library> <file>gui.c</file> <file>msgina.c</file> <file>stubs.c</file> 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 04:32:32 2006 @@ -7,53 +7,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "msgina.dll\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 -STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Please wait..." -FONT 8,"MS Shell Dlg 2",400,0,1 -BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS -END +IDC_ROSLOGO BITMAP "resources/reactos.bmp" -IDD_NOTICE_DLG DIALOGEX 0,0,186,59 -STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Welcome to ReactOS" -FONT 8,"MS Shell Dlg 2",400,0,1 -BEGIN - LTEXT "Press Control-Alt-Delete key combination",IDC_STATIC,16,18,144,14 -END +#include "En.rc" -IDD_LOGGEDOUT_DLG DIALOGEX 0,0,245,77 -STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Logon" -FONT 8,"MS Shell Dlg 2",400,0,1 -BEGIN - PUSHBUTTON "OK",IDOK,31,52,50,14,BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel",IDCANCEL,95,52,50,14 - PUSHBUTTON "Shutdown",IDC_SHUTDOWN,159,52,50,14 - LTEXT "User name:",IDC_STATIC,16,15,40,8 - LTEXT "Password:",IDC_STATIC,16,33,42,8 - EDITTEXT IDC_USERNAME,64,12,169,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,64,31,169,14,ES_AUTOHSCROLL | ES_PASSWORD -END - -IDD_LOGGEDON_DLG DIALOGEX 0,0,186,52 -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 -END - -STRINGTABLE -BEGIN - IDS_PRESSCTRLALTDELETE "Press CONTROL+ALT+DELETE key combination\n" - IDS_ASKFORUSER "User name: " - IDS_ASKFORPASSWORD "Password: " -END - 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 04:32:32 2006 @@ -11,6 +11,7 @@ #define IDC_PASSWORD 1003 #define IDC_SHUTDOWN 1004 #define IDC_STATUSLABEL 1005 +#define IDC_ROSLOGO 1006 #define IDS_ASKFORUSER 40000 #define IDS_PRESSCTRLALTDELETE 40001 #define IDS_ASKFORPASSWORD 40002 Added: trunk/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msgina/resources/reactos.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream 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 04:32:32 2006 @@ -88,7 +88,7 @@ IN OUT PWSTR Buffer, IN DWORD BufferLength, IN BOOL ShowString) -{ +{ WCHAR Prompt[256]; DWORD count, i;

1 0

[jimtabor] 23429: Fixed typo, btw this fixes most of the edit tests.
by jimtabor＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: jimtabor Date: Thu Aug 3 04:01:05 2006 New Revision: 23429 URL: http://svn.reactos.org/svn/reactos?rev=23429&view=rev Log: Fixed typo, btw this fixes most of the edit tests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Thu Aug 3 04:01:05 2006 @@ -1439,7 +1439,7 @@ } else if (hWndParent) { - if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) + if ((dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) { //temp hack PWINDOW_OBJECT Par = UserGetWindowObject(hWndParent), Root; if (Par && (Root = UserGetAncestor(Par, GA_ROOT)))

1 0

[jimtabor] 23428: - Win32k - CreateWindowsEx: Patch based on janderwald patch. 1. Reading and follow wine source (user/win.c & winex11.drv/window.c), I noticed that cs->hwndParent is unmodified when passed to the children via WM_NC/CREATE. 2. Reordered the "fine the parent" code, based on wine. I've tested this change for last two weeks.
by jimtabor＠svn.reactos.org 02 Aug '06

02 Aug '06

Author: jimtabor Date: Thu Aug 3 03:39:53 2006 New Revision: 23428 URL: http://svn.reactos.org/svn/reactos?rev=23428&view=rev Log: - Win32k - CreateWindowsEx: Patch based on janderwald patch. 1. Reading and follow wine source (user/win.c & winex11.drv/window.c), I noticed that cs->hwndParent is unmodified when passed to the children via WM_NC/CREATE. 2. Reordered the "fine the parent" code, based on wine. I've tested this change for last two weeks. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Thu Aug 3 03:39:53 2006 @@ -1439,16 +1439,14 @@ } else if (hWndParent) { - if (((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) || - (dwExStyle & WS_EX_MDICHILD)) - ParentWindowHandle = hWndParent; - else - { - //temp hack + if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) + { //temp hack PWINDOW_OBJECT Par = UserGetWindowObject(hWndParent), Root; if (Par && (Root = UserGetAncestor(Par, GA_ROOT))) OwnerWindowHandle = Root->hSelf; } + else + ParentWindowHandle = hWndParent; } else if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) { @@ -1685,7 +1683,7 @@ Cs.lpCreateParams = lpParam; Cs.hInstance = hInstance; Cs.hMenu = hMenu; - Cs.hwndParent = ParentWindowHandle; + Cs.hwndParent = hWndParent; //Pass the original Parent handle! Cs.cx = Size.cx; Cs.cy = Size.cy; Cs.x = Pos.x;

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 August 2006