Ros-diffs

ros-diffs@reactos.org

81390 discussions

[royce] 17937: reformat code
by royce＠svn.reactos.com 19 Sep '05

19 Sep '05

reformat code Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-19 21:11:41 UTC (rev 17936) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-19 22:00:01 UTC (rev 17937) @@ -137,7 +137,7 @@ * * 06-jul-2005 (Magnus Olsen <magnus(a)greatlord.com>) * translate '%errorlevel%' to the internal value. - * Add proper memmory alloc ProcessInput, the error + * Add proper memmory alloc ProcessInput, the error * handling for memmory handling need to be improve */ @@ -199,8 +199,9 @@ return TRUE; } - Status = NtQueryInformationProcessPtr(Process, ProcessBasicInformation, - &Info, sizeof(PROCESS_BASIC_INFORMATION), NULL); + Status = NtQueryInformationProcessPtr ( + Process, ProcessBasicInformation, + &Info, sizeof(PROCESS_BASIC_INFORMATION), NULL); if (! NT_SUCCESS(Status)) { #ifdef _DEBUG @@ -208,8 +209,9 @@ #endif return TRUE; } - Status = NtReadVirtualMemoryPtr(Process, Info.PebBaseAddress, &ProcessPeb, - sizeof(PEB), &BytesRead); + Status = NtReadVirtualMemoryPtr ( + Process, Info.PebBaseAddress, &ProcessPeb, + sizeof(PEB), &BytesRead); if (! NT_SUCCESS(Status) || sizeof(PEB) != BytesRead) { #ifdef _DEBUG @@ -230,24 +232,24 @@ #endif typedef HINSTANCE (WINAPI *MYEX)( - HWND hwnd, - LPCTSTR lpOperation, - LPCTSTR lpFile, - LPCTSTR lpParameters, - LPCTSTR lpDirectory, - INT nShowCmd + HWND hwnd, + LPCTSTR lpOperation, + LPCTSTR lpFile, + LPCTSTR lpParameters, + LPCTSTR lpDirectory, + INT nShowCmd ); static BOOL RunFile(LPTSTR filename) { - HMODULE hShell32; - MYEX hShExt; - HINSTANCE ret; + HMODULE hShell32; + MYEX hShExt; + HINSTANCE ret; #ifdef _DEBUG - DebugPrintf (_T("RunFile(%s)\n"), filename); + DebugPrintf (_T("RunFile(%s)\n"), filename); #endif hShell32 = LoadLibrary(_T("SHELL32.DLL")); if (!hShell32) @@ -297,9 +299,9 @@ { TCHAR *szFullName=NULL; TCHAR *first = NULL; - TCHAR *rest = NULL; - TCHAR *full = NULL; - TCHAR *dot = NULL; + TCHAR *rest = NULL; + TCHAR *full = NULL; + TCHAR *dot = NULL; TCHAR szWindowTitle[MAX_PATH]; DWORD dwExitCode = 0; @@ -307,56 +309,56 @@ DebugPrintf (_T("Execute: \'%s\' \'%s\'\n"), first, rest); #endif - /* we need biger buffer that First, Rest, Full are already - need rewrite some code to use realloc when it need instead + /* we need biger buffer that First, Rest, Full are already + need rewrite some code to use realloc when it need instead of add 512bytes extra */ - first = malloc ( (_tcslen(First) + 512) * sizeof(TCHAR)); + first = malloc ( (_tcslen(First) + 512) * sizeof(TCHAR)); if (first == NULL) { - error_out_of_memory(); - return ; + error_out_of_memory(); + return ; } - rest = malloc ( (_tcslen(Rest) + 512) * sizeof(TCHAR)); + rest = malloc ( (_tcslen(Rest) + 512) * sizeof(TCHAR)); if (rest == NULL) { - free (first); - error_out_of_memory(); - return ; + free (first); + error_out_of_memory(); + return ; } - full = malloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); + full = malloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (full == NULL) { - free (first); - free (rest); - error_out_of_memory(); - return ; + free (first); + free (rest); + error_out_of_memory(); + return ; } szFullName = malloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (full == NULL) { - free (first); - free (rest); - free (full); - error_out_of_memory(); - return ; + free (first); + free (rest); + free (full); + error_out_of_memory(); + return ; } /* Though it was already parsed once, we have a different set of rules for parsing before we pass to CreateProccess */ if(!_tcschr(Full,_T('\"'))) - { + { _tcscpy(first,First); _tcscpy(rest,Rest); _tcscpy(full,Full); } else { - UINT i = 0; + UINT i = 0; BOOL bInside = FALSE; rest[0] = _T('\0'); full[0] = _T('\0'); @@ -409,8 +411,8 @@ if (!working) ConErrResPuts (STRING_FREE_ERROR1); free (first); - free (rest); - free (full); + free (rest); + free (full); free (szFullName); return; @@ -435,7 +437,7 @@ GetConsoleTitle (szWindowTitle, MAX_PATH); /* check if this is a .BAT or .CMD file */ - dot = _tcsrchr (szFullName, _T('.')); + dot = _tcsrchr (szFullName, _T('.')); if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { #ifdef _DEBUG @@ -507,19 +509,20 @@ } } // restore console mode - SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ), - ENABLE_PROCESSED_INPUT ); + SetConsoleMode ( + GetStdHandle( STD_INPUT_HANDLE ), + ENABLE_PROCESSED_INPUT ); } /* Get code page if it has been change */ InputCodePage= GetConsoleCP(); - OutputCodePage = GetConsoleOutputCP(); - SetConsoleTitle (szWindowTitle); + OutputCodePage = GetConsoleOutputCP(); + SetConsoleTitle (szWindowTitle); - free(first); - free(rest); - free(full); - free (szFullName); + free(first); + free(rest); + free(full); + free (szFullName); } @@ -549,11 +552,11 @@ com = malloc( (_tcslen(line) +512)*sizeof(TCHAR) ); if (com == NULL) { - error_out_of_memory(); - return; + error_out_of_memory(); + return; } - cp = com; + cp = com; /* Skip over initial white space */ while (_istspace (*line)) line++; @@ -589,9 +592,9 @@ /* if(_tcslen(com) > MAX_PATH) { - error_bad_command(); - free(com); - return; + error_bad_command(); + free(com); + return; } */ @@ -641,7 +644,7 @@ } } } - free(com); + free(com); } @@ -732,8 +735,8 @@ nRedirFlags |= ERROR_APPEND; _tcscpy(err, bc->Err); } - + /* Set up the initial conditions ... */ /* preserve STDIN, STDOUT and STDERR handles */ hOldConIn = GetStdHandle (STD_INPUT_HANDLE); @@ -746,10 +749,10 @@ HANDLE hFile; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - /* we need make sure the LastError msg is zero before calling CreateFile */ - SetLastError(0); + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); - /* Set up pipe for the standard input handler */ + /* Set up pipe for the standard input handler */ hFile = CreateFile (in, GENERIC_READ, FILE_SHARE_READ, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -760,7 +763,7 @@ } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) - { + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, in); return; @@ -777,19 +780,19 @@ while (num-- > 1) { SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - - /* Create unique temporary file name */ + + /* Create unique temporary file name */ GetTempFileName (szTempPath, _T("CMD"), 0, szFileName[1]); - /* we need make sure the LastError msg is zero before calling CreateFile */ - SetLastError(0); + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); /* Set current stdout to temporary file */ hFile[1] = CreateFile (szFileName[1], GENERIC_WRITE, 0, &sa, TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); - - if (hFile[1] == INVALID_HANDLE_VALUE) - { + + if (hFile[1] == INVALID_HANDLE_VALUE) + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg); return; @@ -822,8 +825,8 @@ _tcscpy (szFileName[0], szFileName[1]); *szFileName[1] = _T('\0'); - /* we need make sure the LastError msg is zero before calling CreateFile */ - SetLastError(0); + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); /* open new stdin file */ hFile[0] = CreateFile (szFileName[0], GENERIC_READ, 0, &sa, @@ -840,37 +843,37 @@ /* Final output to here */ HANDLE hFile; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - - /* we need make sure the LastError msg is zero before calling CreateFile */ - SetLastError(0); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); + + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); - - if (hFile == INVALID_HANDLE_VALUE) + + if (hFile == INVALID_HANDLE_VALUE) { - INT size = _tcslen(out)-1; - - if (out[size] != _T(':')) - { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, out); - return; - } - - out[size]=_T('\0'); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, - (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); + INT size = _tcslen(out)-1; - if (hFile == INVALID_HANDLE_VALUE) - { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, out); - return; - } - + if (out[size] != _T(':')) + { + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, out); + return; + } + + out[size]=_T('\0'); + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, + (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, out); + return; + } + } if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) @@ -1074,7 +1077,7 @@ LPTSTR cp; BOOL bEchoThisLine; - + do { /* if no batch input then... */ @@ -1091,7 +1094,7 @@ cp = commandline; while (*ip) { - if (*ip == _T('%')) + if (*ip == _T('%')) { switch (*++ip) { @@ -1128,134 +1131,131 @@ if ((tp != NULL) && (tp <= _tcschr(ip, _T(' ')) - 1)) { - INT size = 512; + INT size = 512; TCHAR *evar; *tp = _T('\0'); - /* FIXME: Correct error handling when it can not alloc memmory */ - - /* %CD% */ - if (_tcsicmp(ip,_T("cd")) ==0) - { - TCHAR szPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szPath); - cp = _stpcpy (cp, szPath); - } - /* %TIME% */ - else if (_tcsicmp(ip,_T("time")) ==0) - { - TCHAR szTime[40]; - SYSTEMTIME t; - GetSystemTime(&t); + /* FIXME: Correct error handling when it can not alloc memmory */ - _sntprintf(szTime ,40,_T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,t.wSecond , cDecimalSeparator, t.wMilliseconds ); - cp = _stpcpy (cp, szTime); - } - - /* %DATE% */ - else if (_tcsicmp(ip,_T("date")) ==0) - { - TCHAR szDate[40]; + /* %CD% */ + if (_tcsicmp(ip,_T("cd")) ==0) + { + TCHAR szPath[MAX_PATH]; + GetCurrentDirectory (MAX_PATH, szPath); + cp = _stpcpy (cp, szPath); + } + /* %TIME% */ + else if (_tcsicmp(ip,_T("time")) ==0) + { + TCHAR szTime[40]; + SYSTEMTIME t; + GetSystemTime(&t); + + _sntprintf(szTime ,40,_T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,t.wSecond , cDecimalSeparator, t.wMilliseconds ); + cp = _stpcpy (cp, szTime); + } - GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), szDate, sizeof (szDate)); - cp = _stpcpy (cp, szDate); - cp = _stpcpy (cp, _T(" ")); - GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDate, sizeof (szDate)); - cp = _stpcpy (cp, szDate); - } + /* %DATE% */ + else if (_tcsicmp(ip,_T("date")) ==0) + { + TCHAR szDate[40]; - /* %RANDOM% */ - else if (_tcsicmp(ip,_T("random")) ==0) - { - TCHAR szRand[40]; - /* Get random number */ - _itot(rand(),szRand,10); - cp = _stpcpy (cp, szRand); - } - - /* %CMDCMDLINE% */ - else if (_tcsicmp(ip,_T("cmdcmdline")) ==0) - { - TCHAR *pargv; - /* Get random number */ - pargv = GetCommandLine(); - cp = _stpcpy (cp, pargv); - } + GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), szDate, sizeof (szDate)); + cp = _stpcpy (cp, szDate); + cp = _stpcpy (cp, _T(" ")); + GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDate, sizeof (szDate)); + cp = _stpcpy (cp, szDate); + } - /* %CMDEXTVERSION% */ - else if (_tcsicmp(ip,_T("cmdextversion")) ==0) - { - TCHAR szVER[40]; - /* Set version number to 2 */ - _itot(2,szVER,10); - cp = _stpcpy (cp, szVER); - } - - /* %ERRORLEVEL% */ - else if (_tcsicmp(ip,_T("errorlevel")) ==0) - { - evar = malloc ( size * sizeof(TCHAR)); - if (evar==NULL) - return 1; + /* %RANDOM% */ + else if (_tcsicmp(ip,_T("random")) ==0) + { + TCHAR szRand[40]; + /* Get random number */ + _itot(rand(),szRand,10); + cp = _stpcpy (cp, szRand); + } - memset(evar,0,512 * sizeof(TCHAR)); - _itot(nErrorLevel,evar,10); - cp = _stpcpy (cp, evar); + /* %CMDCMDLINE% */ + else if (_tcsicmp(ip,_T("cmdcmdline")) ==0) + { + TCHAR *pargv; + /* Get random number */ + pargv = GetCommandLine(); + cp = _stpcpy (cp, pargv); + } - free(evar); - } - else - { - evar = malloc ( 512 * sizeof(TCHAR)); - if (evar==NULL) - return 1; - SetLastError(0); - size = GetEnvironmentVariable (ip, evar, 512); - if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) - { - /* if no env var is found you must - continue with what was input*/ - cp = _stpcpy (cp, _T("%")); - cp = _stpcpy (cp, ip); - cp = _stpcpy (cp, _T("%")); - } - else - { - if (size > 512) - { - evar = realloc(evar,size * sizeof(TCHAR) ); - if (evar==NULL) - { - return 1; - } - size = GetEnvironmentVariable (ip, evar, size); - } + /* %CMDEXTVERSION% */ + else if (_tcsicmp(ip,_T("cmdextversion")) ==0) + { + TCHAR szVER[40]; + /* Set version number to 2 */ + _itot(2,szVER,10); + cp = _stpcpy (cp, szVER); + } - if (size) - { - cp = _stpcpy (cp, evar); - } - } + /* %ERRORLEVEL% */ + else if (_tcsicmp(ip,_T("errorlevel")) ==0) + { + evar = malloc ( size * sizeof(TCHAR)); + if (evar==NULL) + return 1; - free(evar); - } - + memset(evar,0,512 * sizeof(TCHAR)); + _itot(nErrorLevel,evar,10); + cp = _stpcpy (cp, evar); + + free(evar); + } + else + { + evar = malloc ( 512 * sizeof(TCHAR)); + if (evar==NULL) + return 1; + SetLastError(0); + size = GetEnvironmentVariable (ip, evar, 512); + if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + /* if no env var is found you must + continue with what was input*/ + cp = _stpcpy (cp, _T("%")); + cp = _stpcpy (cp, ip); + cp = _stpcpy (cp, _T("%")); + } + else + { + if (size > 512) + { + evar = realloc(evar,size * sizeof(TCHAR) ); + if (evar==NULL) + { + return 1; + } + size = GetEnvironmentVariable (ip, evar, size); + } + + if (size) + { + cp = _stpcpy (cp, evar); + } + } + + free(evar); + } + ip = tp + 1; } else { *cp++ = _T('%'); - } - + } + break; } continue; } - - - if (_istcntrl (*ip)) *ip = _T(' '); *cp++ = *ip++; @@ -1264,10 +1264,10 @@ *cp = _T('\0'); /* strip trailing spaces */ - while ((--cp >= commandline) && _istspace (*cp)); + while ((--cp >= commandline) && _istspace (*cp)); *(cp + 1) = _T('\0'); - + /* JPP 19980807 */ /* Echo batch file line */ if (bEchoThisLine) @@ -1379,7 +1379,7 @@ //INT len; //TCHAR *ptr, *cmdLine; - + /* get version information */ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx (&osvi); @@ -1421,11 +1421,11 @@ hOut = GetStdHandle (STD_OUTPUT_HANDLE); hIn = GetStdHandle (STD_INPUT_HANDLE); - /* Set EnvironmentVariable PROMPT if it does not exists any env value. - for you can change the EnvirommentVariable for prompt before cmd start + /* Set EnvironmentVariable PROMPT if it does not exists any env value. + for you can change the EnvirommentVariable for prompt before cmd start this patch are not 100% right, if it does not exists a PROMPT value cmd should use $P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */ - if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, 2 * sizeof(TCHAR)) == 0) + if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, 2 * sizeof(TCHAR)) == 0) SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); @@ -1636,45 +1636,45 @@ #ifdef _UNICODE PWCHAR * _CommandLineToArgvW(PWCHAR lpCmdLine, int *pNumArgs) { - PWCHAR * argvw = NULL; - PWCHAR ptr = lpCmdLine; - PWCHAR str; - int len; - int NumArgs; + PWCHAR * argvw = NULL; + PWCHAR ptr = lpCmdLine; + PWCHAR str; + int len; + int NumArgs; - NumArgs = 0; + NumArgs = 0; - while(lpCmdLine && *lpCmdLine) - { - while (iswspace(*lpCmdLine)) lpCmdLine++; - if (*lpCmdLine) - { - if ((NumArgs % 10)==0) - { - PWCHAR * old_argvw = argvw; - argvw = malloc((NumArgs + 10) * sizeof(PWCHAR)); - memcpy(argvw, old_argvw, NumArgs * sizeof(PWCHAR)); - free(old_argvw); - } - ptr = wcschr(lpCmdLine, L' '); - if (ptr) - { - len = ptr - lpCmdLine; - } - else - { - len = wcslen(lpCmdLine); - } - str = malloc((len + 1) * sizeof(WCHAR)); - memcpy(str, lpCmdLine, len * sizeof(WCHAR)); - str[len] = 0; - argvw[NumArgs]=str; - NumArgs++; - lpCmdLine = ptr; - } - } - *pNumArgs = NumArgs; - return argvw; + while(lpCmdLine && *lpCmdLine) + { + while (iswspace(*lpCmdLine)) lpCmdLine++; + if (*lpCmdLine) + { + if ((NumArgs % 10)==0) + { + PWCHAR * old_argvw = argvw; + argvw = malloc((NumArgs + 10) * sizeof(PWCHAR)); + memcpy(argvw, old_argvw, NumArgs * sizeof(PWCHAR)); + free(old_argvw); + } + ptr = wcschr(lpCmdLine, L' '); + if (ptr) + { + len = ptr - lpCmdLine; + } + else + { + len = wcslen(lpCmdLine); + } + str = malloc((len + 1) * sizeof(WCHAR)); + memcpy(str, lpCmdLine, len * sizeof(WCHAR)); + str[len] = 0; + argvw[NumArgs]=str; + NumArgs++; + lpCmdLine = ptr; + } + } + *pNumArgs = NumArgs; + return argvw; } #endif #endif @@ -1688,53 +1688,51 @@ int _main (int argc, char *argv[]) #endif { - TCHAR startPath[MAX_PATH]; - CONSOLE_SCREEN_BUFFER_INFO Info; - INT nExitCode; + TCHAR startPath[MAX_PATH]; + CONSOLE_SCREEN_BUFFER_INFO Info; + INT nExitCode; #ifdef _UNICODE - PWCHAR * argv; - int argc=0; + PWCHAR * argv; + int argc=0; #ifdef __REACTOS__ - argv = _CommandLineToArgvW(GetCommandLineW(), &argc); + argv = _CommandLineToArgvW(GetCommandLineW(), &argc); #else - argv = CommandLineToArgvW(GetCommandLineW(), &argc); + argv = CommandLineToArgvW(GetCommandLineW(), &argc); #endif #endif - - GetCurrentDirectory(MAX_PATH,startPath); - _tchdir(startPath); - SetFileApisToOEM(); - InputCodePage= 0; - OutputCodePage = 0; + GetCurrentDirectory(MAX_PATH,startPath); + _tchdir(startPath); - hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, NULL); - if (GetConsoleScreenBufferInfo(hConsole, &Info) == FALSE) - { - ConErrFormatMessage(GetLastError()); - return(1); - } - wColor = Info.wAttributes; - wDefColor = wColor; + SetFileApisToOEM(); + InputCodePage= 0; + OutputCodePage = 0; - InputCodePage= GetConsoleCP(); - OutputCodePage = GetConsoleOutputCP(); - CMD_ModuleHandle = GetModuleHandle(NULL); - - /* check switches on command-line */ - Initialize(argc, argv); + hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + if (GetConsoleScreenBufferInfo(hConsole, &Info) == FALSE) + { + ConErrFormatMessage(GetLastError()); + return(1); + } + wColor = Info.wAttributes; + wDefColor = wColor; - /* call prompt routine */ - nExitCode = ProcessInput(FALSE); + InputCodePage= GetConsoleCP(); + OutputCodePage = GetConsoleOutputCP(); + CMD_ModuleHandle = GetModuleHandle(NULL); - - /* do the cleanup */ - Cleanup(argc, argv); + /* check switches on command-line */ + Initialize(argc, argv); - - return(nExitCode); + /* call prompt routine */ + nExitCode = ProcessInput(FALSE); + + /* do the cleanup */ + Cleanup(argc, argv); + + return(nExitCode); } /* EOF */

1 0

[gvg] 17936: - Add ctrl support to (most) keyboard layouts. Only tested for kbdus, added
by gvg＠svn.reactos.com 19 Sep '05

19 Sep '05

- Add ctrl support to (most) keyboard layouts. Only tested for kbdus, added to a few other I was confident about. Still to do: kbddv, kbdgr, kbdru, kbdsg - Prevent access outside array in TryToTranslateChar - Revert r17830, it handles ctrl keys at the wrong location This fixes bug 763. Modified: trunk/reactos/lib/keyboard/kbdbe/kbdbe.c Modified: trunk/reactos/lib/keyboard/kbdda/kbdda.c Modified: trunk/reactos/lib/keyboard/kbddv/kbddv.c Modified: trunk/reactos/lib/keyboard/kbdes/kbdes.c Modified: trunk/reactos/lib/keyboard/kbdfr/kbdfr.c Modified: trunk/reactos/lib/keyboard/kbdse/kbdse.c Modified: trunk/reactos/lib/keyboard/kbduk/kbduk.c Modified: trunk/reactos/lib/keyboard/kbdus/kbdus.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/lib/keyboard/kbdbe/kbdbe.c --- trunk/reactos/lib/keyboard/kbdbe/kbdbe.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdbe/kbdbe.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -180,37 +180,6 @@ { '8', NOCAPS, {'!', '8'} }, { VK_OEM_2, NOCAPS, {')', 0xB0} }, - /* First letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'Z', CAPS, {'z', 'Z'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - - /* Second letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - { 'M', CAPS, {'m', 'M'} }, - - /* Third letter row */ - { 'W', CAPS, {'w', 'W'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, - /* Specials */ { VK_OEM_COMMA, CAPS, {',', '?'} }, { VK_OEM_PERIOD, CAPS, {';', '.'} }, @@ -228,6 +197,33 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, /* Legacy (telnet-style) ascii escapes */ { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f} }, //0x1f unit separator { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, @@ -242,6 +238,7 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, Ctrl-Alt */ + /* Legacy Ascii generators */ { '1', NOCAPS, {'&', '1', WCH_NONE, '|' } }, { '2', NOCAPS, {0xE9, '2', WCH_NONE, '@' } }, @@ -257,7 +254,7 @@ { VK_OEM_7, NOCAPS, {0xF9, '%', WCH_NONE, WCH_DEAD} }, { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} }, - { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20ac} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, { VK_EMPTY , NOCAPS, {0xa8, '^', WCH_NONE, '~'} }, { VK_OEM_102, NOCAPS, {'<', '>', 0x001c, '\\'} }, _____ Modified: trunk/reactos/lib/keyboard/kbdda/kbdda.c --- trunk/reactos/lib/keyboard/kbdda/kbdda.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdda/kbdda.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -173,35 +173,7 @@ { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ { VK_OEM_PLUS, NOCAPS, {'+', '?'} }, - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, { VK_OEM_6, CAPS, {0xe5, 0xc5} }, /* ? */ - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, /* Specials */ { VK_OEM_7, CAPS, {0xf8, 0xd8} }, /* Ï */ @@ -222,6 +194,34 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + /* Legacy (telnet-style) ascii escapes */ { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f /* US */} }, { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, @@ -248,11 +248,11 @@ { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_DEAD, '|'} }, { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} }, - { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20ac} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, { VK_OEM_1, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, { VK_EMPTY , NOCAPS, {0xa8, '^', WCH_NONE, '~'} }, - { 'M', CAPS, {'m', 'M', WCH_NONE, 0x00b5} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x00b5} }, { VK_OEM_102, NOCAPS, {'<', '>', 0x001c, '\\'} }, { 0, 0 } }; _____ Modified: trunk/reactos/lib/keyboard/kbddv/kbddv.c --- trunk/reactos/lib/keyboard/kbddv/kbddv.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbddv/kbddv.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -143,35 +143,6 @@ { '8', NOCAPS, {'8', '*'} }, { '9', NOCAPS, {'9', '('} }, { '0', NOCAPS, {'0', ')'} }, - /* First letter row */ - { 'P', CAPS, {'p', 'P'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'L', CAPS, {'l', 'L'} }, - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'E', CAPS, {'e', 'E'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'N', CAPS, {'n', 'N'} }, - { 'S', CAPS, {'s', 'S'} }, - /* Third letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'M', CAPS, {'m', 'M'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'Z', CAPS, {'z', 'Z'} }, /* Specials */ /* Ctrl-_ generates US */ @@ -205,6 +176,35 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x05} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} }, + /* Legacy Ascii generators */ { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, _____ Modified: trunk/reactos/lib/keyboard/kbdes/kbdes.c --- trunk/reactos/lib/keyboard/kbdes/kbdes.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdes/kbdes.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -249,36 +249,7 @@ { '8', NOCAPS, {'8', '('} }, { '9', NOCAPS, {'9', ')'} }, { '0', NOCAPS, {'0', '='} }, - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - //La E tiene 3 estados - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, { VK_OEM_3, CAPS, {0x00F1, 0x00D1} }, // ±Ð - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, - { 'M', CAPS, {'m', 'M'} }, /* Specials */ /* Ctrl-_ generates ES */ @@ -303,6 +274,34 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + /* Legacy (telnet-style) ascii escapes */ { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, { 0,0 } @@ -315,7 +314,7 @@ { '2', NOCAPS, {'2', '"', WCH_NONE, '@'} }, // 2"@ { '3', NOCAPS, {'3', 0x00B7, WCH_NONE, '#'} }, // 3À# { '6', NOCAPS, {'6', '&', WCH_NONE, 0x00AC} }, // 6&¼ - { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20AC} }, // eEÇ + { 'E', CAPS, {'e', 'E', 0x05, 0x20AC} }, // eEÇ { VK_OEM_PLUS, NOCAPS, {'+', '*', WCH_NONE, 0x005d} }, // +*] { VK_OEM_2, NOCAPS, {0x00e7, 0x00c7, WCH_NONE, '}'} }, // þÃ} _____ Modified: trunk/reactos/lib/keyboard/kbdfr/kbdfr.c --- trunk/reactos/lib/keyboard/kbdfr/kbdfr.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdfr/kbdfr.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -162,35 +162,6 @@ //{ '8', NOCAPS, {'_', '8'} }, //{ '9', NOCAPS, {'þ', '9'} }, //{ '0', NOCAPS, {'Ó', '0'} }, - /* First letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'Z', CAPS, {'z', 'Z'} }, - //{ 'E', CAPS, {'e', 'E'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - { 'M', CAPS, {'m', 'M'} }, - /* Third letter row */ - { 'W', CAPS, {'w', 'W'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, /* Specials */ /* Ctrl-_ generates US */ @@ -214,6 +185,34 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + /* Legacy (telnet-style) ascii escapes */ { VK_OEM_102, 0, {'<', '>', 0x1c /* FS */} }, { VK_OEM_6, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE} }, @@ -234,7 +233,7 @@ { '9' , 1, {'þ', '9', WCH_NONE, '^'} }, { '0' , 1, {'Ó', '0', WCH_NONE, '@'} }, { VK_OEM_PLUS,0, {'=', '+', WCH_NONE, '}'} }, - { 'E' , 1, {'e', 'E', WCH_NONE, 'Ç' /* euro */} }, + { 'E' , 1, {'e', 'E', 0x05, 'Ç' /* euro */} }, { VK_OEM_1, 0, {'$', 'ú', WCH_NONE, 'ñ'} }, { VK_OEM_4, 0, {')', '?', WCH_NONE, ']'} }, { 0, 0 } _____ Modified: trunk/reactos/lib/keyboard/kbdse/kbdse.c --- trunk/reactos/lib/keyboard/kbdse/kbdse.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdse/kbdse.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -176,35 +176,6 @@ /* The numbers */ { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ - - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, /* Specials */ { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD} }, @@ -226,6 +197,33 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + /* Legacy (telnet-style) ascii escapes */ {VK_OEM_6, CAPS, {0xe5,0xc5, 0x1d /* GS */} }, { VK_OEM_5, NOCAPS, {0xa7,0xbd, 0x1c /* FS */} }, @@ -253,9 +251,9 @@ { '9', NOCAPS, {'9', ')', WCH_NONE, ']'} }, { '0', NOCAPS, {'0', '=', WCH_NONE, '}'} }, { VK_OEM_PLUS ,NOCAPS, {'+', '?', WCH_NONE, '\\'} }, - { 'E', CAPS, {'e', 'E' , WCH_NONE, 0x00ac} }, + { 'E', CAPS, {'e', 'E' , 0x05, 0x00ac} }, { VK_OEM_1 ,NOCAPS, {0xa8, '^', 0x001d, '~'} }, - { 'M', CAPS, {'m', 'M', WCH_NONE, 0x00b5} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x00b5} }, {VK_OEM_102, NOCAPS, {'<', '>' ,0x001c,'|'} }, { 0, 0 } }; _____ Modified: trunk/reactos/lib/keyboard/kbduk/kbduk.c --- trunk/reactos/lib/keyboard/kbduk/kbduk.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbduk/kbduk.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -146,32 +146,7 @@ { '9', NOCAPS, {'9', '('} }, { '0', NOCAPS, {'0', ')'} }, { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, { VK_OEM_1 ,NOCAPS, {';', ':'} }, - - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, - { 'M', CAPS, {'m', 'M'} }, { VK_OEM_COMMA, NOCAPS, {',', '<'} }, { VK_OEM_PERIOD, NOCAPS, {'.', '>'} }, { VK_OEM_2, NOCAPS, {'/', '?'} }, @@ -201,6 +176,30 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-Shift */ + + /* The alphabet */ + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} }, + /* Legacy Ascii generators */ { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e} }, @@ -220,11 +219,11 @@ ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { /* Normal, Shifted, Ctrl, Sh-Ctrl,Sh-Alt,Ctl-Alt,Ctl-Sh-Alt */ - { 'E', CAPS, {'e', 'E', WCH_NONE, WCH_NONE, 0x00e9, 0x00c9} }, - { 'U', CAPS, {'u', 'U', WCH_NONE, WCH_NONE, 0x00fa, 0x00da} }, - { 'I', CAPS, {'i', 'I', WCH_NONE, WCH_NONE, 0x00ed, 0x00cd} }, - { 'O', CAPS, {'o', 'O', WCH_NONE, WCH_NONE, 0x00f3, 0x00d3} }, - { 'A', CAPS, {'a', 'A', WCH_NONE, WCH_NONE, 0x00e1, 0x00c1} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x05, 0x00e9, 0x00c9} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15, 0x00fa, 0x00da} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09, 0x00ed, 0x00cd} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f, 0x00f3, 0x00d3} }, + { 'A', CAPS, {'a', 'A', 0x01, 0x01, 0x00e1, 0x00c1} }, { 0, 0 } }; _____ Modified: trunk/reactos/lib/keyboard/kbdus/kbdus.c --- trunk/reactos/lib/keyboard/kbdus/kbdus.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdus/kbdus.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -143,35 +143,6 @@ { '8', NOCAPS, {'8', '*'} }, { '9', NOCAPS, {'9', '('} }, { '0', NOCAPS, {'0', ')'} }, - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'E', CAPS, {'e', 'E'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, - { 'M', CAPS, {'m', 'M'} }, /* Specials */ /* Ctrl-_ generates US */ @@ -205,6 +176,35 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x05} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} }, + /* Legacy Ascii generators */ { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -516,7 +516,7 @@ ModifierState |= fsModifiers; if (ModifierState == fsModifiers && - (fsModifiers == MOD_ALT || fsModifiers == MOD_WIN || fsModifiers == MOD_CONTROL)) + (fsModifiers == MOD_ALT || fsModifiers == MOD_WIN)) { /* First send out special notifications * (For alt, the message that turns on accelerator @@ -637,31 +637,7 @@ else msg.message = WM_SYSKEYUP; } - else if (ModifierState & MOD_CONTROL) - { - if(NextKeyInput.MakeCode == 0x2E)/* Ctrl-C */ - { - DPRINT1("Ctrl-C pressed\n"); - /* FIXME: this seems wrong! this bypass hotkeys and all and the winhellos CRTL+C hotkey test - dont work (anymore) */ - co_MsqPostKeyboardMessage(WM_COPY,0,0); - continue; - } - else if(NextKeyInput.MakeCode == 0x2F) /* Ctrl-V */ - { - DPRINT1("Ctrl-V pressed\n"); - co_MsqPostKeyboardMessage(WM_PASTE,0,0); - continue; - } - else - { - DPRINT1("Ctrl with unknown combination %04x\n",NextKeyInput.MakeCode); - if (!(KeyInput.Flags & KEY_BREAK)) - msg.message = WM_KEYDOWN; - else - msg.message = WM_KEYUP; - } - }else + else { if (!(KeyInput.Flags & KEY_BREAK)) msg.message = WM_KEYDOWN; _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -261,7 +261,7 @@ [ModBits ^ ((CapsState & CAPITAL_BIT) ? vkPtr->Attributes : 0)]; - if( CapsMod > keyLayout->pVkToWcharTable[nMod].nModifications ) + if( CapsMod >= keyLayout->pVkToWcharTable[nMod].nModifications ) { DWORD MaxBit = 1; while( MaxBit <

1 0

[hbirr] 17935: - Read more information from the registry about the disks detected by the bios.
by hbirr＠svn.reactos.com 19 Sep '05

19 Sep '05

- Read more information from the registry about the disks detected by the bios. - Fixed the detection of disks with a signature of zero (in AddDiskToList). - Update always the partition table if the modified flag is set. - Create an unique disk signature. - Declared some registry query structures in cmtype.h. Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/subsys/system/usetup/partlist.c Modified: trunk/reactos/subsys/system/usetup/partlist.h _____ Modified: trunk/reactos/include/ndk/cmtypes.h --- trunk/reactos/include/ndk/cmtypes.h 2005-09-19 15:16:00 UTC (rev 17934) +++ trunk/reactos/include/ndk/cmtypes.h 2005-09-19 20:01:29 UTC (rev 17935) @@ -174,6 +174,116 @@ WCHAR Name[1]; } KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION; +#else + +typedef struct _REG_DELETE_KEY_INFORMATION +{ + PVOID Object; +} REG_DELETE_KEY_INFORMATION, *PREG_DELETE_KEY_INFORMATION; + +typedef struct _REG_SET_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; + ULONG TitleIndex; + ULONG Type; + PVOID Data; + ULONG DataSize; +} REG_SET_VALUE_KEY_INFORMATION, *PREG_SET_VALUE_KEY_INFORMATION; + +typedef struct _REG_DELETE_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; +} REG_DELETE_VALUE_KEY_INFORMATION, *PREG_DELETE_VALUE_KEY_INFORMATION; + +typedef struct _REG_SET_INFORMATION_KEY_INFORMATION +{ + PVOID Object; + KEY_SET_INFORMATION_CLASS KeySetInformationClass; + PVOID KeySetInformation; + ULONG KeySetInformationLength; +} REG_SET_INFORMATION_KEY_INFORMATION, *PREG_SET_INFORMATION_KEY_INFORMATION; + +typedef struct _REG_ENUMERATE_KEY_INFORMATION +{ + PVOID Object; + ULONG Index; + KEY_INFORMATION_CLASS KeyInformationClass; + PVOID KeyInformation; + ULONG Length; + PULONG ResultLength; +} REG_ENUMERATE_KEY_INFORMATION, *PREG_ENUMERATE_KEY_INFORMATION; + +typedef struct _REG_ENUMERATE_VALUE_KEY_INFORMATION +{ + PVOID Object; + ULONG Index; + KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass; + PVOID KeyValueInformation; + ULONG Length; + PULONG ResultLength; +} REG_ENUMERATE_VALUE_KEY_INFORMATION, *PREG_ENUMERATE_VALUE_KEY_INFORMATION; + +typedef struct _REG_QUERY_KEY_INFORMATION +{ + PVOID Object; + KEY_INFORMATION_CLASS KeyInformationClass; + PVOID KeyInformation; + ULONG Length; + PULONG ResultLength; +} REG_QUERY_KEY_INFORMATION, *PREG_QUERY_KEY_INFORMATION; + +typedef struct _REG_QUERY_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; + KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass; + PVOID KeyValueInformation; + ULONG Length; + PULONG ResultLength; +} REG_QUERY_VALUE_KEY_INFORMATION, *PREG_QUERY_VALUE_KEY_INFORMATION; + +typedef struct _REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION +{ + PVOID Object; + PKEY_VALUE_ENTRY ValueEntries; + ULONG EntryCount; + PVOID ValueBuffer; + PULONG BufferLength; + PULONG RequiredBufferLength; +} REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION, *PREG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION; + +typedef struct _REG_PRE_CREATE_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; +} REG_PRE_CREATE_KEY_INFORMATION, *PREG_PRE_CREATE_KEY_INFORMATION; + +typedef struct _REG_POST_CREATE_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; + PVOID Object; + NTSTATUS Status; +} REG_POST_CREATE_KEY_INFORMATION, *PREG_POST_CREATE_KEY_INFORMATION; + +typedef struct _REG_PRE_OPEN_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; +} REG_PRE_OPEN_KEY_INFORMATION, *PREG_PRE_OPEN_KEY_INFORMATION; + +typedef struct _REG_POST_OPEN_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; + PVOID Object; + NTSTATUS Status; +} REG_POST_OPEN_KEY_INFORMATION, *PREG_POST_OPEN_KEY_INFORMATION; + +typedef struct _REG_POST_OPERATION_INFORMATION +{ + PVOID Object; + NTSTATUS Status; +} REG_POST_OPERATION_INFORMATION,*PREG_POST_OPERATION_INFORMATION; + #endif typedef struct _PLUGPLAY_EVENT_BLOCK @@ -275,5 +385,151 @@ WCHAR BusName[MAX_BUS_NAME]; } PLUGPLAY_BUS_INSTANCE, *PPLUGPLAY_BUS_INSTANCE; +#ifdef NTOS_MODE_USER + +#include <pshpack1.h> +typedef struct _CM_PARTIAL_RESOURCE_DESCRIPTOR { + UCHAR Type; + UCHAR ShareDisposition; + USHORT Flags; + union { + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Generic; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Port; + struct { + ULONG Level; + ULONG Vector; + ULONG Affinity; + } Interrupt; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Memory; + struct { + ULONG Channel; + ULONG Port; + ULONG Reserved1; + } Dma; + struct { + ULONG Data[3]; + } DevicePrivate; + struct { + ULONG Start; + ULONG Length; + ULONG Reserved; + } BusNumber; + struct { + ULONG DataSize; + ULONG Reserved1; + ULONG Reserved2; + } DeviceSpecificData; + } u; +} CM_PARTIAL_RESOURCE_DESCRIPTOR, *PCM_PARTIAL_RESOURCE_DESCRIPTOR; + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Type */ + +#define CmResourceTypeNull 0 +#define CmResourceTypePort 1 +#define CmResourceTypeInterrupt 2 +#define CmResourceTypeMemory 3 +#define CmResourceTypeDma 4 +#define CmResourceTypeDeviceSpecific 5 +#define CmResourceTypeBusNumber 6 +#define CmResourceTypeMaximum 7 +#define CmResourceTypeNonArbitrated 128 +#define CmResourceTypeConfigData 128 +#define CmResourceTypeDevicePrivate 129 +#define CmResourceTypePcCardConfig 130 +#define CmResourceTypeMfCardConfig 131 + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.ShareDisposition */ + +typedef enum _CM_SHARE_DISPOSITION { + CmResourceShareUndetermined, + CmResourceShareDeviceExclusive, + CmResourceShareDriverExclusive, + CmResourceShareShared +} CM_SHARE_DISPOSITION; + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypePort */ + +#define CM_RESOURCE_PORT_MEMORY 0x0000 +#define CM_RESOURCE_PORT_IO 0x0001 +#define CM_RESOURCE_PORT_10_BIT_DECODE 0x0004 +#define CM_RESOURCE_PORT_12_BIT_DECODE 0x0008 +#define CM_RESOURCE_PORT_16_BIT_DECODE 0x0010 +#define CM_RESOURCE_PORT_POSITIVE_DECODE 0x0020 +#define CM_RESOURCE_PORT_PASSIVE_DECODE 0x0040 +#define CM_RESOURCE_PORT_WINDOW_DECODE 0x0080 + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeInterrupt */ + +#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0x0000 +#define CM_RESOURCE_INTERRUPT_LATCHED 0x0001 + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeMemory */ + +#define CM_RESOURCE_MEMORY_READ_WRITE 0x0000 +#define CM_RESOURCE_MEMORY_READ_ONLY 0x0001 +#define CM_RESOURCE_MEMORY_WRITE_ONLY 0x0002 +#define CM_RESOURCE_MEMORY_PREFETCHABLE 0x0004 +#define CM_RESOURCE_MEMORY_COMBINEDWRITE 0x0008 +#define CM_RESOURCE_MEMORY_24 0x0010 +#define CM_RESOURCE_MEMORY_CACHEABLE 0x0020 + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeDma */ + +#define CM_RESOURCE_DMA_8 0x0000 +#define CM_RESOURCE_DMA_16 0x0001 +#define CM_RESOURCE_DMA_32 0x0002 +#define CM_RESOURCE_DMA_8_AND_16 0x0004 +#define CM_RESOURCE_DMA_BUS_MASTER 0x0008 +#define CM_RESOURCE_DMA_TYPE_A 0x0010 +#define CM_RESOURCE_DMA_TYPE_B 0x0020 +#define CM_RESOURCE_DMA_TYPE_F 0x0040 + +typedef struct _CM_PARTIAL_RESOURCE_LIST { + USHORT Version; + USHORT Revision; + ULONG Count; + CM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptors[1]; +} CM_PARTIAL_RESOURCE_LIST, *PCM_PARTIAL_RESOURCE_LIST; + +typedef struct _CM_FULL_RESOURCE_DESCRIPTOR { + INTERFACE_TYPE InterfaceType; + ULONG BusNumber; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; +} CM_FULL_RESOURCE_DESCRIPTOR, *PCM_FULL_RESOURCE_DESCRIPTOR; + +typedef struct _CM_RESOURCE_LIST { + ULONG Count; + CM_FULL_RESOURCE_DESCRIPTOR List[1]; +} CM_RESOURCE_LIST, *PCM_RESOURCE_LIST; + +typedef struct _CM_INT13_DRIVE_PARAMETER { + USHORT DriveSelect; + ULONG MaxCylinders; + USHORT SectorsPerTrack; + USHORT MaxHeads; + USHORT NumberDrives; +} CM_INT13_DRIVE_PARAMETER, *PCM_INT13_DRIVE_PARAMETER; + +typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA +{ + ULONG BytesPerSector; + ULONG NumberOfCylinders; + ULONG SectorsPerTrack; + ULONG NumberOfHeads; +} CM_DISK_GEOMETRY_DEVICE_DATA, *PCM_DISK_GEOMETRY_DEVICE_DATA; + +#include <poppack.h> + #endif +#endif + _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-09-19 15:16:00 UTC (rev 17934) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-09-19 20:01:29 UTC (rev 17935) @@ -424,28 +424,19 @@ NTSTATUS STDCALL -DiskQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) +DiskIdentifierQueryRoutine(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) { - PLIST_ENTRY ListHead = (PLIST_ENTRY)Context; - PULONG GlobalDiskCount = (PULONG)EntryContext; - PBIOSDISKENTRY BiosDiskEntry; + PBIOSDISKENTRY BiosDiskEntry = (PBIOSDISKENTRY)Context; UNICODE_STRING NameU; if (ValueType == REG_SZ && - ValueLength == 20 * sizeof(WCHAR)) + ValueLength == 20 * sizeof(WCHAR)) { - BiosDiskEntry = RtlAllocateHeap(ProcessHeap, 0, sizeof(BIOSDISKENTRY)); - if (BiosDiskEntry == NULL) - { - return STATUS_NO_MEMORY; - } - BiosDiskEntry->DiskNumber = (*GlobalDiskCount)++; - NameU.Buffer = (PWCHAR)ValueData; NameU.Length = NameU.MaximumLength = 8 * sizeof(WCHAR); RtlUnicodeStringToInteger(&NameU, 16, &BiosDiskEntry->Checksum); @@ -453,38 +444,118 @@ NameU.Buffer = (PWCHAR)ValueData + 9; RtlUnicodeStringToInteger(&NameU, 16, &BiosDiskEntry->Signature); - InsertTailList(ListHead, &BiosDiskEntry->ListEntry); + return STATUS_SUCCESS; } + return STATUS_UNSUCCESSFUL; +} - return STATUS_SUCCESS; +NTSTATUS +STDCALL +DiskConfigurationDataQueryRoutine(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PBIOSDISKENTRY BiosDiskEntry = (PBIOSDISKENTRY)Context; + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; + + if (ValueType == REG_FULL_RESOURCE_DESCRIPTOR && + ValueLength == sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + sizeof(CM_DISK_GEOMETRY_DEVICE_DATA)) + { + FullResourceDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)ValueData; + /* FIXME: + * Is this 'paranoia' check correct ? + */ + if (FullResourceDescriptor->InterfaceType != InterfaceTypeUndefined || + FullResourceDescriptor->BusNumber != 0 || + FullResourceDescriptor->PartialResourceList.Count != 1 || + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type != CmResourceTypeDeviceSpecific || + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.Devi ceSpecificData.DataSize != sizeof(CM_DISK_GEOMETRY_DEVICE_DATA)) + { + return STATUS_UNSUCCESSFUL; + } + DiskGeometry = (PCM_DISK_GEOMETRY_DEVICE_DATA)(FullResourceDescriptor + 1); + BiosDiskEntry->DiskGeometry = *DiskGeometry; + + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; } +NTSTATUS +STDCALL +SystemConfigurationDataQueryRoutine(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_INT13_DRIVE_PARAMETER* Int13Drives = (PCM_INT13_DRIVE_PARAMETER*)Context; + + if (ValueType == REG_FULL_RESOURCE_DESCRIPTOR && + ValueLength >= sizeof (CM_FULL_RESOURCE_DESCRIPTOR) && + (ValueLength - sizeof(CM_FULL_RESOURCE_DESCRIPTOR)) % sizeof(CM_INT13_DRIVE_PARAMETER) == 0) + { + FullResourceDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)ValueData; + if (FullResourceDescriptor->InterfaceType != InterfaceTypeUndefined || + FullResourceDescriptor->BusNumber != -1 || + FullResourceDescriptor->PartialResourceList.Count != 1 || + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type != CmResourceTypeDeviceSpecific) + { + return STATUS_UNSUCCESSFUL; + } + *Int13Drives = RtlAllocateHeap(ProcessHeap, 0, ValueLength - sizeof (CM_FULL_RESOURCE_DESCRIPTOR)); + if (*Int13Drives == NULL) + { + return STATUS_NO_MEMORY; + } + memcpy(*Int13Drives, FullResourceDescriptor + 1, ValueLength - sizeof (CM_FULL_RESOURCE_DESCRIPTOR)); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; + +} #define ROOT_NAME L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapt er" STATIC VOID EnumerateBiosDiskEntries(PPARTLIST PartList) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; WCHAR Name[100]; ULONG AdapterCount; - ULONG ControllerCount; ULONG DiskCount; NTSTATUS Status; - ULONG GlobalDiskCount=0; + PCM_INT13_DRIVE_PARAMETER Int13Drives; + PBIOSDISKENTRY BiosDiskEntry; - memset(QueryTable, 0, sizeof(QueryTable)); - QueryTable[0].Name = L"Identifier"; - QueryTable[0].QueryRoutine = DiskQueryRoutine; - QueryTable[0].EntryContext = (PVOID)&GlobalDiskCount; + QueryTable[1].Name = L"Configuration Data"; + QueryTable[1].QueryRoutine = SystemConfigurationDataQueryRoutine; + Int13Drives = NULL; + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", + &QueryTable[1], + (PVOID)&Int13Drives, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to query the 'Configuration Data' key in '\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System', status=%lx\n", Status); + return; + } + AdapterCount = 0; while (1) { swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, - &QueryTable[1], + &QueryTable[2], NULL, NULL); if (!NT_SUCCESS(Status)) @@ -495,54 +566,93 @@ swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, - &QueryTable[1], + &QueryTable[2], NULL, NULL); if (NT_SUCCESS(Status)) { - ControllerCount = 0; while (1) { - swprintf(Name, L"%s\\%lu\\DiskController\\%lu", ROOT_NAME, AdapterCount, ControllerCount); + swprintf(Name, L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, - &QueryTable[1], + &QueryTable[2], NULL, NULL); if (!NT_SUCCESS(Status)) { - break; + RtlFreeHeap(ProcessHeap, 0, Int13Drives); + return; } - swprintf(Name, L"%s\\%lu\\DiskController\\%lu\\DiskPeripheral", ROOT_NAME, AdapterCount, ControllerCount); + swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, - &QueryTable[1], + &QueryTable[2], NULL, NULL); if (NT_SUCCESS(Status)) { + QueryTable[0].Name = L"Identifier"; + QueryTable[0].QueryRoutine = DiskIdentifierQueryRoutine; + QueryTable[1].Name = L"Configuration Data"; + QueryTable[1].QueryRoutine = DiskConfigurationDataQueryRoutine; DiskCount = 0; while (1) { - swprintf(Name, L"%s\\%lu\\DiskController\\%lu\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, ControllerCount, DiskCount); + BiosDiskEntry = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(BIOSDISKENTRY)); + if (BiosDiskEntry == NULL) + { + break; + } + swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, QueryTable, - (PVOID)&PartList->BiosDiskListHead, + (PVOID)BiosDiskEntry, NULL); if (!NT_SUCCESS(Status)) { + RtlFreeHeap(ProcessHeap, 0, BiosDiskEntry); break; } + BiosDiskEntry->DiskNumber = DiskCount; + BiosDiskEntry->Recognized = FALSE; + + if (DiskCount < Int13Drives[0].NumberDrives) + { + BiosDiskEntry->Int13DiskData = Int13Drives[DiskCount]; + } + else + { + DPRINT1("Didn't find int13 drive datas for disk %u\n", DiskCount); + } + + + InsertTailList(&PartList->BiosDiskListHead, &BiosDiskEntry->ListEntry); + + DPRINT("DiskNumber: %d\n", BiosDiskEntry->DiskNumber); + DPRINT("Signature: %08x\n", BiosDiskEntry->Signature); + DPRINT("Checksum: %08x\n", BiosDiskEntry->Checksum); + DPRINT("BytesPerSector: %d\n", BiosDiskEntry->DiskGeometry.BytesPerSector); + DPRINT("NumberOfCylinders: %d\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders); + DPRINT("NumberOfHeads: %d\n", BiosDiskEntry->DiskGeometry.NumberOfHeads); + DPRINT("DriveSelect: %02x\n", BiosDiskEntry->Int13DiskData.DriveSelect); + DPRINT("MaxCylinders: %d\n", BiosDiskEntry->Int13DiskData.MaxCylinders); + DPRINT("SectorsPerTrack: %d\n", BiosDiskEntry->Int13DiskData.SectorsPerTrack); + DPRINT("MaxHeads: %d\n", BiosDiskEntry->Int13DiskData.MaxHeads); + DPRINT("NumberDrives: %d\n", BiosDiskEntry->Int13DiskData.NumberDrives); + DiskCount++; } } - ControllerCount++; + RtlFreeHeap(ProcessHeap, 0, Int13Drives); + return; } } AdapterCount++; } + RtlFreeHeap(ProcessHeap, 0, Int13Drives); } static VOID @@ -656,19 +766,32 @@ DiskEntry->Checksum = Checksum; DiskEntry->Signature = Signature; + if (Signature == 0) + { + /* If we have no signature, set the disk to dirty. WritePartitionsToDisk creates a new signature */ + DiskEntry->Modified = TRUE; + } DiskEntry->BiosFound = FALSE; ListEntry = List->BiosDiskListHead.Flink; while(ListEntry != &List->BiosDiskListHead) { BiosDiskEntry = CONTAINING_RECORD(ListEntry, BIOSDISKENTRY, ListEntry); + /* FIXME: + * Compare the size from bios and the reported size from driver. + * If we have more than one disk with a zero or with the same signatur + * we must create new signatures and reboot. After the reboot, + * it is possible to identify the disks. + */ if (BiosDiskEntry->Signature == Signature && - BiosDiskEntry->Checksum == Checksum) + BiosDiskEntry->Checksum == Checksum && + !BiosDiskEntry->Recognized) { if (!DiskEntry->BiosFound) { DiskEntry->BiosDiskNumber = BiosDiskEntry->DiskNumber; DiskEntry->BiosFound = TRUE; + BiosDiskEntry->Recognized = TRUE; } else { @@ -2162,7 +2285,8 @@ WCHAR DstPath[MAX_PATH]; UNICODE_STRING Name; HANDLE FileHandle; - PDISKENTRY DiskEntry; + PDISKENTRY DiskEntry1; + PDISKENTRY DiskEntry2; PPARTENTRY PartEntry; PLIST_ENTRY Entry1; PLIST_ENTRY Entry2; @@ -2179,16 +2303,16 @@ Entry1 = List->DiskListHead.Flink; while (Entry1 != &List->DiskListHead) { - DiskEntry = CONTAINING_RECORD (Entry1, - DISKENTRY, - ListEntry); + DiskEntry1 = CONTAINING_RECORD (Entry1, + DISKENTRY, + ListEntry); - if (DiskEntry->Modified == TRUE) + if (DiskEntry1->Modified == TRUE) { /* Count partitioned entries */ PartitionCount = 0; - Entry2 = DiskEntry->PartListHead.Flink; - while (Entry2 != &DiskEntry->PartListHead) + Entry2 = DiskEntry1->PartListHead.Flink; + while (Entry2 != &DiskEntry1->PartListHead) { PartEntry = CONTAINING_RECORD (Entry2, PARTENTRY, @@ -2200,50 +2324,44 @@ Entry2 = Entry2->Flink; } - - if (PartitionCount > 0) - { + if (PartitionCount == 0) + { + DriveLayoutSize = sizeof (DRIVE_LAYOUT_INFORMATION) + + ((4 - 1) * sizeof (PARTITION_INFORMATION)); + } + else + { DriveLayoutSize = sizeof (DRIVE_LAYOUT_INFORMATION) + ((PartitionCount - 1) * sizeof (PARTITION_INFORMATION)); - DriveLayout = (PDRIVE_LAYOUT_INFORMATION)RtlAllocateHeap (ProcessHeap, - 0, - DriveLayoutSize); - if (DriveLayout == NULL) - { - DPRINT1 ("RtlAllocateHeap() failed\n"); - return FALSE; - } + } + DriveLayout = (PDRIVE_LAYOUT_INFORMATION)RtlAllocateHeap (ProcessHeap, + 0, + DriveLayoutSize); + if (DriveLayout == NULL) + { + DPRINT1 ("RtlAllocateHeap() failed\n"); + return FALSE; + } - RtlZeroMemory (DriveLayout, - DriveLayoutSize); + RtlZeroMemory (DriveLayout, + DriveLayoutSize); - DriveLayout->PartitionCount = PartitionCount; - if (DiskEntry->Signature == 0) + if (PartitionCount == 0) + { + /* delete all partitions in the mbr */ + DriveLayout->PartitionCount = 4; + for (Index = 0; Index < 4; Index++) { - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - PUCHAR Buffer; - - NtQuerySystemTime (&SystemTime); - RtlTimeToTimeFields (&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&DiskEntry->Signature; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - /* FIXME: - * check for an existing signature - */ - + DriveLayout->PartitionEntry[Index].RewritePartition = TRUE; } - - DriveLayout->Signature = DiskEntry->Signature; + } + else + { + DriveLayout->PartitionCount = PartitionCount; Index = 0; - Entry2 = DiskEntry->PartListHead.Flink; - while (Entry2 != &DiskEntry->PartListHead) + Entry2 = DiskEntry1->PartListHead.Flink; + while (Entry2 != &DiskEntry1->PartListHead) { PartEntry = CONTAINING_RECORD (Entry2, PARTENTRY, @@ -2258,74 +2376,127 @@ Entry2 = Entry2->Flink; } + } + if (DiskEntry1->Signature == 0) + { + LARGE_INTEGER SystemTime; + TIME_FIELDS TimeFields; + PUCHAR Buffer; + Buffer = (PUCHAR)&DiskEntry1->Signature; - swprintf (DstPath, - L"\\Device\\Harddisk%d\\Partition0", - DiskEntry->DiskNumber); - RtlInitUnicodeString (&Name, - DstPath); - InitializeObjectAttributes (&ObjectAttributes, - &Name, - 0, - NULL, - NULL); + while (1) + { + NtQuerySystemTime (&SystemTime); + RtlTimeToTimeFields (&SystemTime, &TimeFields); - Status = NtOpenFile (&FileHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - 0, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("NtOpenFile() failed (Status %lx)\n", Status); - return FALSE; - } + Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); + Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); + Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); + Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - Status = NtDeviceIoControlFile (FileHandle, - NULL, - NULL, - NULL, - &Iosb, - IOCTL_DISK_SET_DRIVE_LAYOUT, - DriveLayout, - DriveLayoutSize, - NULL, - 0); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("NtDeviceIoControlFile() failed (Status %lx)\n", Status); - NtClose (FileHandle); - return FALSE; - } + if (DiskEntry1->Signature == 0) + { + continue; + } - RtlFreeHeap (ProcessHeap, - 0, - DriveLayout); + /* check if the signature already exist */ + /* FIXME: + * Check also signatures from disks, which are + * not visible (bootable) by the bios. + */ + Entry2 = List->DiskListHead.Flink; + while (Entry2 != &List->DiskListHead) + { + DiskEntry2 = CONTAINING_RECORD(Entry2, DISKENTRY, ListEntry); + if (DiskEntry1 != DiskEntry2 && + DiskEntry1->Signature == DiskEntry2->Signature) + { + break; + } + Entry2 = Entry2->Flink; + } + if (Entry2 == &List->DiskListHead) + { + break; + } + } + + /* set one partition entry to dirty, this will update the signature */ + DriveLayout->PartitionEntry[0].RewritePartition = TRUE; + } + + DriveLayout->Signature = DiskEntry1->Signature; + + + swprintf (DstPath, + L"\\Device\\Harddisk%d\\Partition0", + DiskEntry1->DiskNumber); + RtlInitUnicodeString (&Name, + DstPath); + InitializeObjectAttributes (&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile (&FileHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &Iosb, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("NtOpenFile() failed (Status %lx)\n", Status); + return FALSE; + } + + Status = NtDeviceIoControlFile (FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_SET_DRIVE_LAYOUT, + DriveLayout, + DriveLayoutSize, + NULL, + 0); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("NtDeviceIoControlFile() failed (Status %lx)\n", Status); NtClose (FileHandle); + return FALSE; + } - /* Install MBR code if the disk is new */ - if (DiskEntry->NewDisk == TRUE) - { - wcscpy (SrcPath, SourceRootPath.Buffer); - wcscat (SrcPath, L"\\loader\\dosmbr.bin"); + RtlFreeHeap (ProcessHeap, + 0, + DriveLayout); - DPRINT1 ("Install MBR bootcode: %S ==> %S\n", - SrcPath, DstPath); + NtClose (FileHandle); - /* Install MBR bootcode */ - Status = InstallMbrBootCodeToDisk (SrcPath, - DstPath); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("InstallMbrBootCodeToDisk() failed (Status %lx)\n", - Status); - return FALSE; - } + /* Install MBR code if the disk is new */ + if (DiskEntry1->NewDisk == TRUE && + DiskEntry1->BiosDiskNumber == 0) + { + wcscpy (SrcPath, SourceRootPath.Buffer); + wcscat (SrcPath, L"\\loader\\dosmbr.bin"); - DiskEntry->NewDisk = FALSE; - } + DPRINT ("Install MBR bootcode: %S ==> %S\n", + SrcPath, DstPath); + + /* Install MBR bootcode */ + Status = InstallMbrBootCodeToDisk (SrcPath, + DstPath); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("InstallMbrBootCodeToDisk() failed (Status %lx)\n", + Status); + return FALSE; + } + + DiskEntry1->NewDisk = FALSE; } } _____ Modified: trunk/reactos/subsys/system/usetup/partlist.h --- trunk/reactos/subsys/system/usetup/partlist.h 2005-09-19 15:16:00 UTC (rev 17934) +++ trunk/reactos/subsys/system/usetup/partlist.h 2005-09-19 20:01:29 UTC (rev 17935) @@ -74,6 +74,9 @@ ULONG DiskNumber; ULONG Signature; ULONG Checksum; + BOOLEAN Recognized; + CM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; + CM_INT13_DRIVE_PARAMETER Int13DiskData; } BIOSDISKENTRY, *PBIOSDISKENTRY;

1 0

[navaraf] 17934: Remove accidently commited debug code.
by navaraf＠svn.reactos.com 19 Sep '05

19 Sep '05

Remove accidently commited debug code. Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-19 15:15:22 UTC (rev 17933) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-19 15:16:00 UTC (rev 17934) @@ -136,17 +136,6 @@ //SendMessage(_htoolbar, TB_SETPADDING, 0, MAKELPARAM(8,8)); metrics.cbSize = sizeof(TBMETRICS); - metrics.dwMask = TBMF_PAD | TBMF_BARPAD | TBMF_BUTTONSPACING; - SendMessage(_htoolbar, TB_GETMETRICS, 0, (LPARAM)&metrics); - { - FILE *f = fopen("test.txt", "w"); - fprintf(f, "Pad: %d, %d\nBarPad: %d, %d\nBS: %d, %d\n", - metrics.cxPad, metrics.cyPad, - metrics.cxBarPad, metrics.cyBarPad, - metrics.cxButtonSpacing, metrics.cyButtonSpacing); - fclose(f); - } - metrics.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; metrics.cxBarPad = 0; metrics.cyBarPad = 0;

1 0

[navaraf] 17933: Fix the taskbar button resizing to account for button spacing.
by navaraf＠svn.reactos.com 19 Sep '05

19 Sep '05

Fix the taskbar button resizing to account for button spacing. Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-19 12:21:52 UTC (rev 17932) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-19 15:15:22 UTC (rev 17933) @@ -136,6 +136,17 @@ //SendMessage(_htoolbar, TB_SETPADDING, 0, MAKELPARAM(8,8)); metrics.cbSize = sizeof(TBMETRICS); + metrics.dwMask = TBMF_PAD | TBMF_BARPAD | TBMF_BUTTONSPACING; + SendMessage(_htoolbar, TB_GETMETRICS, 0, (LPARAM)&metrics); + { + FILE *f = fopen("test.txt", "w"); + fprintf(f, "Pad: %d, %d\nBarPad: %d, %d\nBS: %d, %d\n", + metrics.cxPad, metrics.cyPad, + metrics.cxBarPad, metrics.cyBarPad, + metrics.cxButtonSpacing, metrics.cyButtonSpacing); + fclose(f); + } + metrics.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; metrics.cxBarPad = 0; metrics.cyBarPad = 0; @@ -562,7 +573,7 @@ if (btns > 0) { int bar_width = ClientRect(_hwnd).right; - int btn_width = bar_width / btns; + int btn_width = (bar_width / btns) - 3; if (btn_width < TASKBUTTONWIDTH_MIN) btn_width = TASKBUTTONWIDTH_MIN;

1 0

[navaraf] 17932: - Fix region deleting and ownership for DCEs.
by navaraf＠svn.reactos.com 19 Sep '05

19 Sep '05

- Fix region deleting and ownership for DCEs. - Fix uninitialized hDC variable in painting code :) Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-19 12:21:52 UTC (rev 17932) @@ -112,7 +112,7 @@ /*************** WINDC.C ***************/ INT FASTCALL -UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc); +UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint); HDC FASTCALL UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags); _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-19 12:21:52 UTC (rev 17932) @@ -259,11 +259,14 @@ { if (Window->UpdateRegion) { + hDC = UserGetDCEx(Window, Window->UpdateRegion, + DCX_CACHE | DCX_USESTYLE | + DCX_INTERSECTRGN | DCX_KEEPCLIPRGN); if (co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)hDC, 0)) { Window->Flags &= ~WINDOWOBJECT_NEED_ERASEBKGND; } - UserReleaseDC(Window, hDC); + UserReleaseDC(Window, hDC, FALSE); } } } @@ -829,7 +832,7 @@ RETURN(FALSE); } - UserReleaseDC(Window, lPs->hdc); + UserReleaseDC(Window, lPs->hdc, TRUE); UserRefObjectCo(Window); co_UserShowCaret(Window); @@ -1295,7 +1298,7 @@ if (hDC) { UserScrollDC(hDC, dx, dy, &rc, &cliprc, hrgnUpdate, rcUpdate); - UserReleaseDC(Window, hDC); + UserReleaseDC(Window, hDC, FALSE); } /* _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-09-19 12:21:52 UTC (rev 17932) @@ -118,7 +118,7 @@ if (NULL == defaultDCstate) { defaultDCstate = NtGdiGetDCState(Dce->hDC); - GDIOBJ_SetOwnership(defaultDCstate, NULL); + DC_SetOwnership(defaultDCstate, NULL); } GDIOBJ_SetOwnership(Dce->Self, NULL); DC_SetOwnership(Dce->hDC, NULL); @@ -193,7 +193,6 @@ } else if (Dce->hClipRgn != NULL) { - GDIOBJ_SetOwnership(Dce->hClipRgn, PsGetCurrentProcess()); NtGdiDeleteObject(Dce->hClipRgn); } @@ -204,7 +203,7 @@ } STATIC INT FASTCALL -DceReleaseDC(DCE* dce) +DceReleaseDC(DCE* dce, BOOL EndPaint) { if (DCX_DCEBUSY != (dce->DCXFlags & (DCX_DCEEMPTY | DCX_DCEBUSY))) { @@ -214,7 +213,7 @@ /* restore previous visible region */ if ((dce->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) && - (dce->DCXFlags & DCX_CACHE) ) + ((dce->DCXFlags & DCX_CACHE) || EndPaint)) { DceDeleteClipRgn(dce); } @@ -463,23 +462,27 @@ } Dce->hwndCurrent = (Window ? Window->hSelf : NULL); - Dce->DCXFlags = DcxFlags | DCX_DCEBUSY; + Dce->DCXFlags = Flags | DCX_DCEBUSY; if (0 == (Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && NULL != ClipRegion) { - NtGdiDeleteObject(ClipRegion); + if (Flags & DCX_KEEPCLIPRGN) + NtGdiDeleteObject(ClipRegion); ClipRegion = NULL; } +#if 0 if (NULL != Dce->hClipRgn) { DceDeleteClipRgn(Dce); Dce->hClipRgn = NULL; } +#endif if (0 != (Flags & DCX_INTERSECTUPDATE) && NULL == ClipRegion) { Flags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; + Dce->DCXFlags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; ClipRegion = Window->UpdateRegion; } @@ -488,18 +491,15 @@ if (!(Flags & DCX_WINDOW)) { Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); - GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); } else { Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); - GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); } } else if (ClipRegion != NULL) { Dce->hClipRgn = ClipRegion; - GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); } DceSetDrawable(Window, Dce->hDC, Flags, UpdateClipOrigin); @@ -583,7 +583,7 @@ INT FASTCALL -UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc) +UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint) { DCE *dce; INT nRet = 0; @@ -599,7 +599,7 @@ if (dce && (dce->DCXFlags & DCX_DCEBUSY)) { - nRet = DceReleaseDC(dce); + nRet = DceReleaseDC(dce, EndPaint); } return nRet; @@ -615,7 +615,7 @@ DPRINT("Enter NtUserReleaseDC\n"); UserEnterExclusive(); - RETURN(UserReleaseDC(NULL, hDc)); + RETURN(UserReleaseDC(NULL, hDc, FALSE)); CLEANUP: DPRINT("Leave NtUserReleaseDC, ret=%i\n",_ret_); @@ -650,7 +650,6 @@ } NtGdiDeleteDC(dce->hDC); - GDIOBJ_SetOwnership(dce->hClipRgn, PsGetCurrentProcess()); if (dce->hClipRgn && ! (dce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(dce->hClipRgn); @@ -703,7 +702,7 @@ * (for 1.0?). */ DPRINT1("[%p] GetDC() without ReleaseDC()!\n", Window->hSelf); - DceReleaseDC(pDCE); + DceReleaseDC(pDCE, FALSE); } pDCE->DCXFlags &= DCX_CACHE; @@ -715,12 +714,12 @@ } } -void FASTCALL +VOID FASTCALL DceEmptyCache() { while (FirstDce != NULL) { - DceFreeDCE(FirstDce, TRUE); + FirstDce = DceFreeDCE(FirstDce, TRUE); } } _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-19 12:21:52 UTC (rev 17932) @@ -1189,7 +1189,7 @@ CopyRect.bottom - CopyRect.top, Dc, CopyRect.left + (OldWindowRect.left - NewWindowRect.left), CopyRect.top + (OldWindowRect.top - NewWindowRect.top), SRCCOPY); - UserReleaseDC(Window, Dc); + UserReleaseDC(Window, Dc, FALSE); IntValidateParent(Window, CopyRgn); NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); } _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-09-19 12:21:52 UTC (rev 17932) @@ -122,7 +122,7 @@ else DC_UnlockDc(dc); } - UserReleaseDC(Wnd,hDC); + UserReleaseDC(Wnd,hDC, FALSE); } return TRUE; }

1 0

[navaraf] 17931: Partial clean-up of the painting functions:
by navaraf＠svn.reactos.com 19 Sep '05

19 Sep '05

Partial clean-up of the painting functions: - Get rid of the DCX_WINDOWPAINT flag (it wasn't used anyway). - Remove the PaintPosted field from message queue, we don't need it. - Use screen cooridnates for the WindowUpdate region instead of window relative ones. - Fix the algorithm for retrieving paint messages to respect the painting order. - Remove the NCUpdateRegion field from window object and calculate it on demand. - Fix GetDCEx to take region in screen coordinates. Modified: trunk/reactos/subsys/win32k/include/dce.h Modified: trunk/reactos/subsys/win32k/include/msgqueue.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c _____ Modified: trunk/reactos/subsys/win32k/include/dce.h --- trunk/reactos/subsys/win32k/include/dce.h 2005-09-19 10:04:07 UTC (rev 17930) +++ trunk/reactos/subsys/win32k/include/dce.h 2005-09-19 10:39:26 UTC (rev 17931) @@ -39,7 +39,7 @@ #define DCX_DCEEMPTY 0x00000800 #define DCX_DCEBUSY 0x00001000 #define DCX_DCEDIRTY 0x00002000 -#define DCX_WINDOWPAINT 0x00020000 +#define DCX_USESTYLE 0x00010000 #define DCX_KEEPCLIPRGN 0x00040000 #define DCX_NOCLIPCHILDREN 0x00080000 _____ Modified: trunk/reactos/subsys/win32k/include/msgqueue.h --- trunk/reactos/subsys/win32k/include/msgqueue.h 2005-09-19 10:04:07 UTC (rev 17930) +++ trunk/reactos/subsys/win32k/include/msgqueue.h 2005-09-19 10:39:26 UTC (rev 17931) @@ -81,8 +81,6 @@ ULONG LastMsgRead; /* Current window with focus (ie. receives keyboard input) for this queue. */ HWND FocusWindow; - /* True if a window needs painting. */ - BOOLEAN PaintPosted; /* Count of paints pending. */ ULONG PaintCount; /* Current active window for this queue. */ _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-09-19 10:04:07 UTC (rev 17930) +++ trunk/reactos/subsys/win32k/include/window.h 2005-09-19 10:39:26 UTC (rev 17931) @@ -60,7 +60,6 @@ UINT IDMenu; /* Handle of region of the window to be updated. */ HANDLE UpdateRegion; - HANDLE NCUpdateRegion; /* Handle of the window region. */ HANDLE WindowRegion; /* Pointer to the owning thread's message queue. */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-09-19 10:04:07 UTC (rev 17930) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-09-19 10:39:26 UTC (rev 17931) @@ -103,7 +103,6 @@ MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue) { Queue->PaintCount++; - Queue->PaintPosted = TRUE; Queue->QueueBits |= QS_PAINT; Queue->ChangedBits |= QS_PAINT; if (Queue->WakeMask & QS_PAINT) @@ -114,10 +113,6 @@ MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue) { Queue->PaintCount--; - if (Queue->PaintCount == 0) - { - Queue->PaintPosted = FALSE; - } } @@ -1341,7 +1336,6 @@ KeQueryTickCount(&LargeTickCount); MessageQueue->LastMsgRead = LargeTickCount.u.LowPart; MessageQueue->FocusWindow = NULL; - MessageQueue->PaintPosted = FALSE; MessageQueue->PaintCount = 0; MessageQueue->WakeMask = ~0; MessageQueue->NewMessagesHandle = NULL; _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-19 10:04:07 UTC (rev 17930) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-19 10:39:26 UTC (rev 17931) @@ -35,10 +35,52 @@ #define NDEBUG #include <debug.h> -#define DCX_USESTYLE 0x10000 - /* PRIVATE FUNCTIONS **********************************************************/ +/** + * @name IntIntersectWithParents + * + * Intersect window rectangle with all parent client rectangles. + * + * @param Child + * Pointer to child window to start intersecting from. + * @param WindowRect + * Pointer to rectangle that we want to intersect in screen + * coordinates on input and intersected rectangle on output (if TRUE + * is returned). + * + * @return + * If any parent is minimized or invisible or the resulting rectangle + * is empty then FALSE is returned. Otherwise TRUE is returned. + */ + +BOOL FASTCALL +IntIntersectWithParents(PWINDOW_OBJECT Child, PRECT WindowRect) +{ + PWINDOW_OBJECT ParentWindow; + + ParentWindow = Child->Parent; + while (ParentWindow != NULL) + { + if (!(ParentWindow->Style & WS_VISIBLE) || + (ParentWindow->Style & WS_MINIMIZE)) + { + return FALSE; + } + + if (!IntGdiIntersectRect(WindowRect, WindowRect, &ParentWindow->ClientRect)) + { + return FALSE; + } + + /* FIXME: Layered windows. */ + + ParentWindow = ParentWindow->Parent; + } + + return TRUE; +} + VOID FASTCALL IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion) { @@ -46,28 +88,128 @@ while (ParentWindow) { - if (!(ParentWindow->Style & WS_CLIPCHILDREN)) + if (ParentWindow->Style & WS_CLIPCHILDREN) + break; + + if (ParentWindow->UpdateRegion != 0) { - if (ParentWindow->UpdateRegion != 0) + NtGdiCombineRgn(ParentWindow->UpdateRegion, ParentWindow->UpdateRegion, + ValidRegion, RGN_DIFF); + /* FIXME: If the resulting region is empty, remove fake posted paint message */ + } + + ParentWindow = ParentWindow->Parent; + } +} + +/** + * @name IntCalcWindowRgn + * + * Get a window or client region. + */ + +HRGN FASTCALL +IntCalcWindowRgn(PWINDOW_OBJECT Window, BOOL Client) +{ + HRGN hRgnWindow; + UINT RgnType; + + if (Client) + hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); + else + hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + + if (Window->WindowRegion != NULL && !(Window->Style & WS_MINIMIZE)) + { + NtGdiOffsetRgn(hRgnWindow, + -Window->WindowRect.left, + -Window->WindowRect.top); + RgnType = NtGdiCombineRgn(hRgnWindow, hRgnWindow, Window->WindowRegion, RGN_AND); + NtGdiOffsetRgn(hRgnWindow, + Window->WindowRect.left, + Window->WindowRect.top); + } + + return hRgnWindow; +} + +/** + * @name IntGetNCUpdateRgn + * + * Get non-client update region of a window and optionally validate it. + * + * @param Window + * Pointer to window to get the NC update region from. + * @param Validate + * Set to TRUE to force validating the NC update region. + * + * @return + * Handle to NC update region. The caller is responsible for deleting + * it. + */ + +HRGN FASTCALL +IntGetNCUpdateRgn(PWINDOW_OBJECT Window, BOOL Validate) +{ + HRGN hRgnNonClient; + HRGN hRgnWindow; + UINT RgnType; + + if (Window->UpdateRegion != NULL && + Window->UpdateRegion != (HRGN)1) + { + hRgnNonClient = NtGdiCreateRectRgn(0, 0, 0, 0); + hRgnWindow = IntCalcWindowRgn(Window, TRUE); + + /* + * If region creation fails it's safe to fallback to whole + * window region. + */ + + if (hRgnNonClient == NULL) + { + return (HRGN)1; + } + + RgnType = NtGdiCombineRgn(hRgnNonClient, Window->UpdateRegion, + hRgnWindow, RGN_DIFF); + if (RgnType == ERROR) + { + NtGdiDeleteObject(hRgnNonClient); + return (HRGN)1; + } + else if (RgnType == NULLREGION) + { + NtGdiDeleteObject(hRgnNonClient); + return NULL; + } + + /* + * Remove the nonclient region from the standard update region if + * we were asked for it. + */ + + if (Validate) + { + if (NtGdiCombineRgn(Window->UpdateRegion, Window->UpdateRegion, + hRgnWindow, RGN_AND) == NULLREGION) { - INT OffsetX, OffsetY; - - /* - * We must offset the child region by the offset of the - * child rect in the parent. - */ - OffsetX = Child->WindowRect.left - ParentWindow->WindowRect.left; - OffsetY = Child->WindowRect.top - ParentWindow->WindowRect.top; - NtGdiOffsetRgn(ValidRegion, OffsetX, OffsetY); - NtGdiCombineRgn(ParentWindow->UpdateRegion, ParentWindow->UpdateRegion, - ValidRegion, RGN_DIFF); - /* FIXME: If the resulting region is empty, remove fake posted paint message */ - NtGdiOffsetRgn(ValidRegion, -OffsetX, -OffsetY); + GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); + NtGdiDeleteObject(Window->UpdateRegion); + Window->UpdateRegion = NULL; + if (!(Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT)) + MsqDecPaintCountQueue(Window->MessageQueue); } } - ParentWindow = ParentWindow->Parent; + NtGdiDeleteObject(hRgnWindow); + + return hRgnNonClient; } + else + { + return Window->UpdateRegion; + } } /* @@ -85,44 +227,37 @@ if (Flags & (RDW_ERASENOW | RDW_UPDATENOW)) { - if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) + if (Window->UpdateRegion) { - if (Window->NCUpdateRegion) + IntValidateParent(Window, Window->UpdateRegion); + } + + if (Flags & RDW_UPDATENOW) + { + if (Window->UpdateRegion != NULL || + Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) { - IntValidateParent(Window, Window->NCUpdateRegion); + co_IntSendMessage(hWnd, WM_PAINT, 0, 0); } - TempRegion = Window->NCUpdateRegion; - if ((HANDLE) 1 != TempRegion && NULL != TempRegion) + } + else + { + if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) { - GDIOBJ_SetOwnership(TempRegion, PsGetCurrentProcess()); + TempRegion = IntGetNCUpdateRgn(Window, TRUE); + Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; + MsqDecPaintCountQueue(Window->MessageQueue); + co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); + if ((HANDLE) 1 != TempRegion && NULL != TempRegion) + { + /* NOTE: The region can already be deleted! */ + GDIOBJ_FreeObj(TempRegion, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_TYPE_SILENT); + } } - Window->NCUpdateRegion = NULL; - Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; - MsqDecPaintCountQueue(Window->MessageQueue); - co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); - if ((HANDLE) 1 != TempRegion && NULL != TempRegion) - { - /* NOTE: The region can already be deleted! */ - GDIOBJ_FreeObj(TempRegion, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_TYPE_SILENT); - } - } - if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) - { - if (Window->UpdateRegion) + if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) { - /* - * This surely wrong! Why we would want to validate the parent? - * It breaks quite a few things including dummy WM_ERASEBKGND - * implementations that return only TRUE and have corresponding - * WM_PAINT that doesn't paint the whole client area. - * I left the code here so that no one will readd it again! - * - Filip - */ - /* IntValidateParent(Window, Window->UpdateRegion); */ - hDC = UserGetDCEx(Window, 0, DCX_CACHE | DCX_USESTYLE | - DCX_INTERSECTUPDATE); - if (hDC != NULL) + if (Window->UpdateRegion) { if (co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)hDC, 0)) { @@ -132,22 +267,12 @@ } } } - - if (Flags & RDW_UPDATENOW) - { - if (Window->UpdateRegion != NULL || - Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) - { - co_IntSendMessage(hWnd, WM_PAINT, 0, 0); - } - } } /* * Check that the window is still valid at this point */ - - if (! IntIsWindow(hWnd)) + if (!IntIsWindow(hWnd)) { return; } @@ -156,7 +281,7 @@ * Paint child windows. */ if (!(Flags & RDW_NOCHILDREN) && !(Window->Style & WS_MINIMIZE) && - ((Flags & RDW_ALLCHILDREN) || !(Window->Style & WS_CLIPCHILDREN))) + ((Flags & RDW_ALLCHILDREN) || !(Window->Style & WS_CLIPCHILDREN))) { HWND *List, *phWnd; @@ -164,13 +289,11 @@ { for (phWnd = List; *phWnd; ++phWnd) { - Window = UserGetWindowObject(*phWnd); + Window = IntGetWindowObject(*phWnd); if (Window && (Window->Style & WS_VISIBLE)) { - UserRefObjectCo(Window); co_IntPaintWindows(Window, Flags); - UserDerefObjectCo(Window); - + ObmDereferenceObject(Window); } } ExFreePool(List); @@ -200,15 +323,18 @@ HRGN hRgnWindow; hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); - NtGdiOffsetRgn(hRgnWindow, - -Window->WindowRect.left, - -Window->WindowRect.top); RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnWindow, RGN_AND); NtGdiDeleteObject(hRgnWindow); } else { + NtGdiOffsetRgn(hRgn, + -Window->WindowRect.left, + -Window->WindowRect.top); RgnType = NtGdiCombineRgn(hRgn, hRgn, Window->WindowRegion, RGN_AND); + NtGdiOffsetRgn(hRgn, + Window->WindowRect.left, + Window->WindowRect.top); } /* @@ -279,60 +405,6 @@ } /* - * Split the nonclient update region. - */ - - if (NULL != Window->UpdateRegion) - { - HRGN hRgnWindow, hRgnNonClient; - - hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); - NtGdiOffsetRgn(hRgnWindow, - -Window->WindowRect.left, - -Window->WindowRect.top); - - hRgnNonClient = NtGdiCreateRectRgn(0, 0, 0, 0); - if (NtGdiCombineRgn(hRgnNonClient, Window->UpdateRegion, - hRgnWindow, RGN_DIFF) == NULLREGION) - { - NtGdiDeleteObject(hRgnNonClient); - hRgnNonClient = NULL; - } - else - { - GDIOBJ_SetOwnership(hRgnNonClient, NULL); - } - - /* - * Remove the nonclient region from the standard update region. - */ - if (NtGdiCombineRgn(Window->UpdateRegion, Window->UpdateRegion, - hRgnWindow, RGN_AND) == NULLREGION) - { - GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); - NtGdiDeleteObject(Window->UpdateRegion); - Window->UpdateRegion = NULL; - } - - if (Window->NCUpdateRegion == NULL) - { - Window->NCUpdateRegion = hRgnNonClient; - } - else - { - if(NULL != hRgnNonClient) - { - NtGdiCombineRgn(Window->NCUpdateRegion, Window->NCUpdateRegion, - hRgnNonClient, RGN_OR); - GDIOBJ_SetOwnership(hRgnNonClient, PsGetCurrentProcess()); - NtGdiDeleteObject(hRgnNonClient); - } - } - - NtGdiDeleteObject(hRgnWindow); - } - - /* * Process children if needed */ @@ -358,9 +430,6 @@ */ HRGN hRgnTemp = NtGdiCreateRectRgn(0, 0, 0, 0); NtGdiCombineRgn(hRgnTemp, hRgn, 0, RGN_COPY); - NtGdiOffsetRgn(hRgnTemp, - Window->WindowRect.left - Child->WindowRect.left, - Window->WindowRect.top - Child->WindowRect.top); IntInvalidateWindows(Child, hRgnTemp, Flags); NtGdiDeleteObject(hRgnTemp); } @@ -407,20 +476,16 @@ BOOL FASTCALL IntIsWindowDrawable(PWINDOW_OBJECT Window) { - PWINDOW_OBJECT Wnd = Window; + PWINDOW_OBJECT Wnd; - do + for (Wnd = Window; Wnd != NULL; Wnd = Wnd->Parent) { if (!(Wnd->Style & WS_VISIBLE) || ((Wnd->Style & WS_MINIMIZE) && (Wnd != Window))) { return FALSE; } - - Wnd = Wnd->Parent; - } - while(Wnd); return TRUE; } @@ -453,7 +518,7 @@ /* * Step 2. * Transform the parameters UpdateRgn and UpdateRect into - * a region hRgn specified in window coordinates. + * a region hRgn specified in screen coordinates. */ if (Flags & (RDW_INVALIDATE | RDW_VALIDATE)) @@ -461,35 +526,30 @@ if (UpdateRgn != NULL) { hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - NtGdiCombineRgn(hRgn, UpdateRgn, NULL, RGN_COPY); - NtGdiOffsetRgn(hRgn, - Window->ClientRect.left - Window->WindowRect.left, - Window->ClientRect.top - Window->WindowRect.top); + if (NtGdiCombineRgn(hRgn, UpdateRgn, NULL, RGN_COPY) == NULLREGION) + NtGdiDeleteObject(hRgn); + else + NtGdiOffsetRgn(hRgn, Window->ClientRect.left, Window->ClientRect.top); } - else - if (UpdateRect != NULL) + else if (UpdateRect != NULL) + { + if (!IntGdiIsEmptyRect(UpdateRect)) { hRgn = UnsafeIntCreateRectRgnIndirect((RECT *)UpdateRect); - NtGdiOffsetRgn(hRgn, - Window->ClientRect.left - Window->WindowRect.left, - Window->ClientRect.top - Window->WindowRect.top); + NtGdiOffsetRgn(hRgn, Window->ClientRect.left, Window->ClientRect.top); } - else - if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) || - (Flags & (RDW_VALIDATE | RDW_NOFRAME)) == (RDW_VALIDATE | RDW_NOFRAME)) - { - hRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); - NtGdiOffsetRgn(hRgn, - -Window->WindowRect.left, - -Window->WindowRect.top); - } - else - { - hRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); - NtGdiOffsetRgn(hRgn, - -Window->WindowRect.left, - -Window->WindowRect.top); - } + } + else if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) || + (Flags & (RDW_VALIDATE | RDW_NOFRAME)) == (RDW_VALIDATE | RDW_NOFRAME)) + { + if (!IntGdiIsEmptyRect(&Window->WindowRect)) + hRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + } + else + { + if (!IntGdiIsEmptyRect(&Window->ClientRect)) + hRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); + } } /* @@ -497,7 +557,8 @@ * Adjust the window update region depending on hRgn and flags. */ - if (Flags & (RDW_INVALIDATE | RDW_VALIDATE | RDW_INTERNALPAINT | RDW_NOINTERNALPAINT)) + if (Flags & (RDW_INVALIDATE | RDW_VALIDATE | RDW_INTERNALPAINT | RDW_NOINTERNALPAINT) && + hRgn != NULL) { IntInvalidateWindows(Window, hRgn, Flags); } @@ -534,84 +595,55 @@ (Window->Flags & WINDOWOBJECT_NEED_NCPAINT)); } -HWND STDCALL -IntFindWindowToRepaint(HWND hWnd, PW32THREAD Thread) +HWND FASTCALL +IntFindWindowToRepaint(PWINDOW_OBJECT Window, PW32THREAD Thread) { - PWINDOW_OBJECT Window; - PWINDOW_OBJECT Child; - HWND hFoundWnd = NULL; + HWND hChild; - if (!(Window = UserGetWindowObject(hWnd))) - return NULL; - - if (IntIsWindowDirty(Window) && - IntWndBelongsToThread(Window, Thread)) + while (Window != NULL) { - return hWnd; - } - - for (Child = Window->FirstChild; Child; Child = Child->NextSibling) - { - if (IntIsWindowDirty(Child) && - IntWndBelongsToThread(Child, Thread)) + /* FIXME: Transparent windows. */ + if (IntIsWindowDirty(Window) && + IntWndBelongsToThread(Window, Thread)) { - hFoundWnd = Child->hSelf; - break; + return Window->hSelf; } - } - if (hFoundWnd == NULL) - { - HWND *List; - INT i; - - List = IntWinListChildren(Window); - if (List != NULL) + if (Window->FirstChild) { - for (i = 0; List[i]; i++) - { - hFoundWnd = IntFindWindowToRepaint(List[i], Thread); - if (hFoundWnd != NULL) - break; - } - ExFreePool(List); + hChild = IntFindWindowToRepaint(Window->FirstChild, Thread); + if (hChild != NULL) + return hChild; } + + Window = Window->NextSibling; } - return hFoundWnd; + return NULL; } BOOL FASTCALL IntGetPaintMessage(HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, PW32THREAD Thread, MSG *Message, BOOL Remove) { - PWINDOW_OBJECT Window; PUSER_MESSAGE_QUEUE MessageQueue = (PUSER_MESSAGE_QUEUE)Thread->MessageQueue; - if (!MessageQueue->PaintPosted) + if (!MessageQueue->PaintCount) return FALSE; if ((MsgFilterMin != 0 || MsgFilterMax != 0) && (MsgFilterMin > WM_PAINT || MsgFilterMax < WM_PAINT)) return FALSE; - if (hWnd) - Message->hwnd = IntFindWindowToRepaint(hWnd, PsGetWin32Thread()); - else - Message->hwnd = IntFindWindowToRepaint(IntGetDesktopWindow(), PsGetWin32Thread()); + Message->hwnd = IntFindWindowToRepaint(UserGetDesktopWindow(), PsGetWin32Thread()); if (Message->hwnd == NULL) { - if (NULL == hWnd) - { - DPRINT1("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found!\n"); - MessageQueue->PaintPosted = 0; - MessageQueue->PaintCount = 0; - } + DPRINT1("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found!\n"); return FALSE; } - if (!(Window = UserGetWindowObject(Message->hwnd))) + if (hWnd != NULL && Message->hwnd != hWnd) return FALSE; Message->message = WM_PAINT; @@ -700,14 +732,7 @@ { HRGN hRgn; - if (Window->NCUpdateRegion != (HANDLE)1 && - Window->NCUpdateRegion != NULL) - { - GDIOBJ_SetOwnership(Window->NCUpdateRegion, PsGetCurrentProcess()); - } - hRgn = Window->NCUpdateRegion; - IntValidateParent(Window, Window->NCUpdateRegion); - Window->NCUpdateRegion = NULL; + hRgn = IntGetNCUpdateRgn(Window, FALSE); Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; MsqDecPaintCountQueue(Window->MessageQueue); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)hRgn, 0); @@ -720,8 +745,7 @@ RtlZeroMemory(&Ps, sizeof(PAINTSTRUCT)); - Ps.hdc = UserGetDCEx(Window, 0, DCX_INTERSECTUPDATE | DCX_WINDOWPAINT | DCX_USESTYLE); - + Ps.hdc = UserGetDCEx(Window, Window->UpdateRegion, DCX_INTERSECTRGN | DCX_USESTYLE); if (!Ps.hdc) { RETURN( NULL); @@ -730,22 +754,20 @@ if (Window->UpdateRegion != NULL) { MsqDecPaintCountQueue(Window->MessageQueue); - IntValidateParent(Window, Window->UpdateRegion); Rgn = RGNDATA_LockRgn(Window->UpdateRegion); if (NULL != Rgn) { UnsafeIntGetRgnBox(Rgn, &Ps.rcPaint); RGNDATA_UnlockRgn(Rgn); IntGdiOffsetRect(&Ps.rcPaint, - Window->WindowRect.left - Window->ClientRect.left, - Window->WindowRect.top - Window->ClientRect.top); + -Window->ClientRect.left, + -Window->ClientRect.top); } else { IntGetClientRect(Window, &Ps.rcPaint); } GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); - NtGdiDeleteObject(Window->UpdateRegion); Window->UpdateRegion = NULL; } else @@ -755,6 +777,7 @@ IntGetClientRect(Window, &Ps.rcPaint); } + Window->Flags &= ~WINDOWOBJECT_NEED_INTERNALPAINT; if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) @@ -898,10 +921,7 @@ else { RegionType = NtGdiCombineRgn(hRgn, Window->UpdateRegion, hRgn, RGN_COPY); - NtGdiOffsetRgn( - hRgn, - Window->WindowRect.left - Window->ClientRect.left, - Window->WindowRect.top - Window->ClientRect.top); + NtGdiOffsetRgn(hRgn, -Window->ClientRect.left, -Window->ClientRect.top); } if (bErase && RegionType != NULLREGION && RegionType != ERROR) _____ Modified: trunk/reactos/subsys/win32k/ntuser/vis.c --- trunk/reactos/subsys/win32k/ntuser/vis.c 2005-09-19 10:04:07 UTC (rev 17930) +++ trunk/reactos/subsys/win32k/ntuser/vis.c 2005-09-19 10:39:26 UTC (rev 17931) @@ -38,37 +38,30 @@ BOOLEAN ClipSiblings) { HRGN VisRgn, ClipRgn; - INT LeftOffset, TopOffset; PWINDOW_OBJECT PreviousWindow, CurrentWindow, CurrentSibling; if (!(Window->Style & WS_VISIBLE)) { - return NtGdiCreateRectRgn(0, 0, 0, 0); + return NULL; } if (ClientArea) { - if(!(ClipRgn = VIS_ComputeVisibleRegion(Window, FALSE, ClipChildren, ClipSiblings))) + if (!(ClipRgn = VIS_ComputeVisibleRegion(Window, FALSE, ClipChildren, ClipSiblings))) { - return NtGdiCreateRectRgn(0, 0, 0, 0); + return NULL; } - if(!(VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect))) + if (!(VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect))) { NtGdiDeleteObject(VisRgn); - return NtGdiCreateRectRgn(0, 0, 0, 0); + return NULL; } - LeftOffset = Window->ClientRect.left - Window->WindowRect.left; - TopOffset = Window->ClientRect.top - Window->WindowRect.top; - NtGdiOffsetRgn(VisRgn, -Window->WindowRect.left, -Window->WindowRect.top); NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_AND); NtGdiDeleteObject(ClipRgn); - NtGdiOffsetRgn(VisRgn, -LeftOffset, -TopOffset); return VisRgn; } VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); - LeftOffset = Window->WindowRect.left; - TopOffset = Window->WindowRect.top; /* * Walk through all parent windows and for each clip the visble region @@ -83,14 +76,15 @@ if (!(CurrentWindow->Style & WS_VISIBLE)) { NtGdiDeleteObject(VisRgn); - return NtGdiCreateRectRgn(0, 0, 0, 0); + return NULL; } + ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentWindow->ClientRect); NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_AND); NtGdiDeleteObject(ClipRgn); if ((PreviousWindow->Style & WS_CLIPSIBLINGS) || - (PreviousWindow == Window && ClipSiblings)) + (PreviousWindow == Window && ClipSiblings)) { CurrentSibling = CurrentWindow->FirstChild; while (CurrentSibling != NULL && CurrentSibling != PreviousWindow) @@ -99,7 +93,7 @@ { ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentSibling->WindowRect); /* Combine it with the window region if available */ - if(CurrentSibling->WindowRegion && !(CurrentSibling->Style & WS_MINIMIZE)) + if (CurrentSibling->WindowRegion && !(CurrentSibling->Style & WS_MINIMIZE)) { NtGdiOffsetRgn(ClipRgn, -CurrentSibling->WindowRect.left, -CurrentSibling->WindowRect.top); NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentSibling->WindowRegion, RGN_AND); @@ -125,7 +119,7 @@ { ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentWindow->WindowRect); /* Combine it with the window region if available */ - if(CurrentWindow->WindowRegion && !(CurrentWindow->Style & WS_MINIMIZE)) + if (CurrentWindow->WindowRegion && !(CurrentWindow->Style & WS_MINIMIZE)) { NtGdiOffsetRgn(ClipRgn, -CurrentWindow->WindowRect.left, -CurrentWindow->WindowRect.top); NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentWindow->WindowRegion, RGN_AND); @@ -138,15 +132,13 @@ } } - if(Window->WindowRegion && !(Window->Style & WS_MINIMIZE)) + if (Window->WindowRegion && !(Window->Style & WS_MINIMIZE)) { - NtGdiOffsetRgn(VisRgn, -LeftOffset, -TopOffset); + NtGdiOffsetRgn(VisRgn, -Window->WindowRect.left, -Window->WindowRect.top); NtGdiCombineRgn(VisRgn, VisRgn, Window->WindowRegion, RGN_AND); - return VisRgn; + NtGdiOffsetRgn(VisRgn, Window->WindowRect.left, Window->WindowRect.top); } - NtGdiOffsetRgn(VisRgn, -LeftOffset, -TopOffset); - return VisRgn; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-09-19 10:04:07 UTC (rev 17930) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-09-19 10:39:26 UTC (rev 17931) @@ -34,8 +34,6 @@ #define NDEBUG #include <debug.h> -#define DCX_USESTYLE 0x10000 - /* GLOBALS *******************************************************************/ /* NOTE - I think we should store this per window station (including gdi objects) */ @@ -187,7 +185,7 @@ STATIC VOID FASTCALL DceDeleteClipRgn(DCE* Dce) { - Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN | DCX_WINDOWPAINT); + Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN); if (Dce->DCXFlags & DCX_KEEPCLIPRGN ) { @@ -216,7 +214,7 @@ /* restore previous visible region */ if ((dce->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) && - (dce->DCXFlags & (DCX_CACHE | DCX_WINDOWPAINT)) ) + (dce->DCXFlags & DCX_CACHE) ) { DceDeleteClipRgn(dce); } @@ -273,23 +271,6 @@ { hRgnVisible = NtGdiCreateRectRgn(0, 0, 0, 0); } - else - { - if (0 == (Flags & DCX_WINDOW)) - { - NtGdiOffsetRgn( - hRgnVisible, - Parent->ClientRect.left - Window->ClientRect.left, - Parent->ClientRect.top - Window->ClientRect.top); - } - else - { - NtGdiOffsetRgn( - hRgnVisible, - Parent->WindowRect.left - Window->WindowRect.left, - Parent->WindowRect.top - Window->WindowRect.top); - } - } } else if (Window == NULL) { @@ -482,7 +463,7 @@ } Dce->hwndCurrent = (Window ? Window->hSelf : NULL); - Dce->DCXFlags = DcxFlags | (Flags & DCX_WINDOWPAINT) | DCX_DCEBUSY; + Dce->DCXFlags = DcxFlags | DCX_DCEBUSY; if (0 == (Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && NULL != ClipRegion) { @@ -498,21 +479,8 @@ if (0 != (Flags & DCX_INTERSECTUPDATE) && NULL == ClipRegion) { - Dce->hClipRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - if (Dce->hClipRgn && Window->UpdateRegion) - { - GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); - NtGdiCombineRgn(Dce->hClipRgn, Window->UpdateRegion, NULL, RGN_COPY); - if(Window->WindowRegion && !(Window->Style & WS_MINIMIZE)) - NtGdiCombineRgn(Dce->hClipRgn, Dce->hClipRgn, Window->WindowRegion, RGN_AND); - if (!(Flags & DCX_WINDOW)) - { - NtGdiOffsetRgn(Dce->hClipRgn, - Window->WindowRect.left - Window->ClientRect.left, - Window->WindowRect.top - Window->ClientRect.top); - } - } - Flags |= DCX_INTERSECTRGN; + Flags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; + ClipRegion = Window->UpdateRegion; } if (ClipRegion == (HRGN) 1) @@ -521,40 +489,17 @@ { Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); - if(!Window->WindowRegion || (Window->Style & WS_MINIMIZE)) - { - NtGdiOffsetRgn(Dce->hClipRgn, -Window->ClientRect.left, -Window->ClientRect.top); - } - else - { - NtGdiOffsetRgn(Dce->hClipRgn, -Window->WindowRect.left, -Window->WindowRect.top); - NtGdiCombineRgn(Dce->hClipRgn, Dce->hClipRgn, Window->WindowRegion, RGN_AND); - NtGdiOffsetRgn(Dce->hClipRgn, -(Window->ClientRect.left - Window->WindowRect.left), - -(Window->ClientRect.top - Window->WindowRect.top)); - } } else { Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); - NtGdiOffsetRgn(Dce->hClipRgn, -Window->WindowRect.left, - -Window->WindowRect.top); - if(Window->WindowRegion && !(Window->Style & WS_MINIMIZE)) - NtGdiCombineRgn(Dce->hClipRgn, Dce->hClipRgn, Window->WindowRegion, RGN_AND); } } - else if (NULL != ClipRegion) + else if (ClipRegion != NULL) { - Dce->hClipRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - if (Dce->hClipRgn) - { - GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); - if(!Window->WindowRegion || (Window->Style & WS_MINIMIZE)) - NtGdiCombineRgn(Dce->hClipRgn, ClipRegion, NULL, RGN_COPY); - else - NtGdiCombineRgn(Dce->hClipRgn, ClipRegion, Window->WindowRegion, RGN_AND); - } - NtGdiDeleteObject(ClipRegion); + Dce->hClipRgn = ClipRegion; + GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); } DceSetDrawable(Window, Dce->hDC, Flags, UpdateClipOrigin); @@ -705,9 +650,9 @@ } NtGdiDeleteDC(dce->hDC); + GDIOBJ_SetOwnership(dce->hClipRgn, PsGetCurrentProcess()); if (dce->hClipRgn && ! (dce->DCXFlags & DCX_KEEPCLIPRGN)) { - GDIOBJ_SetOwnership(dce->hClipRgn, PsGetCurrentProcess()); NtGdiDeleteObject(dce->hClipRgn); [truncated at 1000 lines; 106 more skipped]

1 0

[hpoussin] 17930: Implement IRP_MN_QUERY_CAPABILITIES, IRP_MN_QUERY_RESOURCES, IRP_MN_QUERY_RESOURCE_REQUIREMENTS, IRP_MN_QUERY_DEVICE_TEXT for USB devices
by hpoussin＠svn.reactos.com 19 Sep '05

19 Sep '05

Implement IRP_MN_QUERY_CAPABILITIES, IRP_MN_QUERY_RESOURCES, IRP_MN_QUERY_RESOURCE_REQUIREMENTS, IRP_MN_QUERY_DEVICE_TEXT for USB devices Fix DeviceID and HardwareIDs identifiers returned for root hub (Vendor and Product IDs are still not initialized by Cromwell code) Fix handling of removal IRPs for USB controller Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/usb/miniport/common/fdo.c Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c Modified: trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/usb/usbport/usbport.def Modified: trunk/reactos/media/inf/usbport.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-09-19 08:11:43 UTC (rev 17929) +++ trunk/reactos/bootdata/hivesys.inf 2005-09-19 10:04:07 UTC (rev 17930) @@ -630,6 +630,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","DisplayName",0x00000000 ,"ReactOS USB HUB cromwell-type driver" ;hard coded values HKLM,"SYSTEM\CurrentControlSet\Enum\USB\ROOT_HUB\0000","Service",0x00000 00,"usbhub" +HKLM,"SYSTEM\CurrentControlSet\Enum\USB\ROOT_HUB20\0000","Service",0x00 00000,"usbhub" ; ReactOS PCNet NIC driver ; To use the AMD supplied driver change the driver name to pcntn5m.sys _____ Modified: trunk/reactos/drivers/usb/miniport/common/fdo.c --- trunk/reactos/drivers/usb/miniport/common/fdo.c 2005-09-19 08:11:43 UTC (rev 17929) +++ trunk/reactos/drivers/usb/miniport/common/fdo.c 2005-09-19 10:04:07 UTC (rev 17930) @@ -190,7 +190,7 @@ switch (MinorFunction) { - case IRP_MN_START_DEVICE: + case IRP_MN_START_DEVICE: /* 0x00 */ { Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) @@ -198,12 +198,15 @@ break; } - case IRP_MN_REMOVE_DEVICE: - case IRP_MN_QUERY_REMOVE_DEVICE: - case IRP_MN_CANCEL_REMOVE_DEVICE: - case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_QUERY_REMOVE_DEVICE: /* 0x01 */ + case IRP_MN_CANCEL_REMOVE_DEVICE: /* 0x03 */ + { + return ForwardIrpAndForget(DeviceObject, Irp); + } - case IRP_MN_STOP_DEVICE: + case IRP_MN_REMOVE_DEVICE: /* 0x02 */ + case IRP_MN_STOP_DEVICE: /* 0x04 */ + case IRP_MN_SURPRISE_REMOVAL: /* 0x17 */ { Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) @@ -211,8 +214,9 @@ IoDeleteDevice(DeviceObject); // just delete device for now break; } - case IRP_MN_QUERY_STOP_DEVICE: - case IRP_MN_CANCEL_STOP_DEVICE: + + case IRP_MN_QUERY_STOP_DEVICE: /* 0x05 */ + case IRP_MN_CANCEL_STOP_DEVICE: /* 0x06 */ { Status = STATUS_SUCCESS; break; @@ -244,7 +248,7 @@ default: { - DPRINT1("USBMP: unknown minor function 0x%lx\n", MinorFunction); + DPRINT1("USBMP: IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } _____ Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c --- trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-09-19 08:11:43 UTC (rev 17929) +++ trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-09-19 10:04:07 UTC (rev 17930) @@ -80,36 +80,49 @@ ULONG IdType; UNICODE_STRING SourceString; UNICODE_STRING String; + struct usb_device *roothub; NTSTATUS Status = STATUS_SUCCESS; IdType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryId.IdType; DeviceExtension = (PUSBMP_DEVICE_EXTENSION)DeviceObject->DeviceExtension; RtlInitUnicodeString(&String, NULL); + DeviceExtension = (PUSBMP_DEVICE_EXTENSION)DeviceExtension->FunctionalDeviceObject->Device Extension; + roothub = ((struct usb_hcd*)DeviceExtension->pdev->data)->self.root_hub; switch (IdType) { case BusQueryDeviceID: { DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); - RtlInitUnicodeString(&SourceString, L"USB\\ROOT_HUB"); + if (roothub->speed == USB_SPEED_LOW || roothub->speed == USB_SPEED_FULL) + RtlInitUnicodeString(&SourceString, L"USB\\ROOT_HUB"); /* USB 1.1 */ + else + RtlInitUnicodeString(&SourceString, L"USB\\ROOT_HUB20"); /* USB 2.0 */ break; } case BusQueryHardwareIDs: { - //CHAR Buffer[2][40]; + CHAR Buffer[2][40]; + PCHAR RootHubName; + USHORT Vendor, Product, Revision; + DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); - /*FIXME: sprintf(Buffer[0], "USB\\VID%04X&PID%04X&REV%04X", - VENDOR, - PRODUCT, - REV); + Vendor = DeviceExtension->pdev->vendor; + Product = DeviceExtension->pdev->device; + Revision = 0; /* FIXME */ + + sprintf(Buffer[0], "USB\\VID%04X&PID%04X&REV%04X", + Vendor, Product, Revision); sprintf(Buffer[1], "USB\\VID%04X&PID%04X", - VENDOR, - PRODUCT); + Vendor, Product); + if (roothub->speed == USB_SPEED_LOW || roothub->speed == USB_SPEED_FULL) + RootHubName = "USB\\ROOT_HUB"; /* USB 1.1 */ + else + RootHubName = "USB\\ROOT_HUB20"; /* USB 2.0 */ Status = UsbMpInitMultiSzString( &SourceString, - Buffer[0], Buffer[1], "USB\\ROOT_HUB", NULL);*/ - Status = UsbMpInitMultiSzString(&SourceString, "USB\\ROOT_HUB", NULL); + Buffer[0], Buffer[1], RootHubName, NULL); break; } case BusQueryCompatibleIDs: _____ Modified: trunk/reactos/drivers/usb/usbhub/pdo.c --- trunk/reactos/drivers/usb/usbhub/pdo.c 2005-09-19 08:11:43 UTC (rev 17929) +++ trunk/reactos/drivers/usb/usbhub/pdo.c 2005-09-19 10:04:07 UTC (rev 17930) @@ -133,6 +133,61 @@ return Status; } +static NTSTATUS +UsbhubPdoQueryDeviceText( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + OUT ULONG_PTR* Information) +{ + PHUB_DEVICE_EXTENSION DeviceExtension; + DEVICE_TEXT_TYPE DeviceTextType; + LCID LocaleId; + + DeviceTextType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.DeviceText Type; + LocaleId = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.LocaleId; + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + switch (DeviceTextType) + { + /*case DeviceTextDescription: + { + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + return STATUS_NOT_IMPLEMENTED; + }*/ + case DeviceTextLocationInformation: + { + int size; + char *buf; + + DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); + if (!DeviceExtension->dev->descriptor.iProduct) + return STATUS_NOT_SUPPORTED; + + size = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, NULL, 0); + if (size < 2) + { + DPRINT("Usbhub: usb_get_string() failed\n"); + return STATUS_IO_DEVICE_ERROR; + } + buf = ExAllocatePool(PagedPool, size); + if (buf == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + size = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, buf, size); + if (size < 0) + { + DPRINT("Usbhub: usb_get_string() failed\n"); + ExFreePool(buf); + return STATUS_IO_DEVICE_ERROR; + } + *Information = (ULONG_PTR)buf; + return STATUS_SUCCESS; + } + default: + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown device text type 0x%lx\n", DeviceTextType); + return STATUS_NOT_SUPPORTED; + } +} + NTSTATUS STDCALL UsbhubPnpPdo( IN PDEVICE_OBJECT DeviceObject, @@ -154,6 +209,82 @@ Status = UsbhubPdoStartDevice(DeviceObject, Irp); break; } + case IRP_MN_QUERY_CAPABILITIES: /* 0x09 */ + { + PDEVICE_CAPABILITIES DeviceCapabilities; + ULONG i; + DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + + DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; + /* FIXME: capabilities can change with connected device */ + DeviceCapabilities->LockSupported = TRUE; + DeviceCapabilities->EjectSupported = FALSE; + DeviceCapabilities->Removable = FALSE; + DeviceCapabilities->DockDevice = FALSE; + DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->SilentInstall = TRUE; + DeviceCapabilities->RawDeviceOK = FALSE; + DeviceCapabilities->SurpriseRemovalOK = FALSE; + DeviceCapabilities->HardwareDisabled = FALSE; /* FIXME */ + //DeviceCapabilities->NoDisplayInUI = FALSE; /* FIXME */ + DeviceCapabilities->DeviceState[0] = PowerDeviceD0; /* FIXME */ + for (i = 0; i < PowerSystemMaximum; i++) + DeviceCapabilities->DeviceState[i] = PowerDeviceD3; /* FIXME */ + //DeviceCapabilities->DeviceWake = PowerDeviceUndefined; /* FIXME */ + DeviceCapabilities->D1Latency = 0; /* FIXME */ + DeviceCapabilities->D2Latency = 0; /* FIXME */ + DeviceCapabilities->D3Latency = 0; /* FIXME */ + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_RESOURCES: /* 0x0a */ + { + PCM_RESOURCE_LIST ResourceList; + + DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); + ResourceList = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST)); + if (!ResourceList) + { + DPRINT("Usbhub: ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + ResourceList->Count = 0; + Information = (ULONG_PTR)ResourceList; + Status = STATUS_SUCCESS; + } + break; + } + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: /* 0x0b */ + { + PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; + + DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + ResourceList = ExAllocatePool(PagedPool, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); + if (!ResourceList) + { + DPRINT("Usbhub: ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + RtlZeroMemory(ResourceList, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); + ResourceList->ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST); + ResourceList->AlternativeLists = 1; + ResourceList->List->Version = 1; + ResourceList->List->Revision = 1; + ResourceList->List->Count = 0; + Information = (ULONG_PTR)ResourceList; + Status = STATUS_SUCCESS; + } + break; + } + case IRP_MN_QUERY_DEVICE_TEXT: /* 0x0c */ + { + Status = UsbhubPdoQueryDeviceText(DeviceObject, Irp, &Information); + break; + } case IRP_MN_QUERY_ID: /* 0x13 */ { Status = UsbhubPdoQueryId(DeviceObject, Irp, &Information); _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.def --- trunk/reactos/drivers/usb/usbport/usbport.def 2005-09-19 08:11:43 UTC (rev 17929) +++ trunk/reactos/drivers/usb/usbport/usbport.def 2005-09-19 10:04:07 UTC (rev 17930) @@ -7,6 +7,7 @@ usb_init_urb@4 usb_alloc_urb@8 usb_free_urb@4 +usb_get_string usb_get_urb@4 usb_get_dev@4 usb_submit_urb@8 _____ Modified: trunk/reactos/media/inf/usbport.inf --- trunk/reactos/media/inf/usbport.inf 2005-09-19 08:11:43 UTC (rev 17929) +++ trunk/reactos/media/inf/usbport.inf 2005-09-19 10:04:07 UTC (rev 17930) @@ -31,6 +31,7 @@ %PCI\CC_0C0310.DeviceDesc%=OHCI_Inst,PCI\CC_0C0310 %PCI\CC_0C0320.DeviceDesc%=EHCI_Inst,PCI\CC_0C0320 %USB\ROOT_HUB.DeviceDesc%=RootHub_Inst,USB\ROOT_HUB +%USB\ROOT_HUB.DeviceDesc%=RootHub_Inst,USB\ROOT_HUB20 [IntelMfg] %PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc%=UHCI_Inst,PCI\VEN_8086&DEV_ 7112&CC_0C0300 @@ -41,7 +42,7 @@ CopyFiles = UHCI_CopyFiles [UHCI_CopyFiles.NT] -usbcore.sys +usbport.sys usbuhci.sys [UHCI_Inst.NT.Services] @@ -60,7 +61,7 @@ CopyFiles = OHCI_CopyFiles [OHCI_CopyFiles.NT] -usbcore.sys +usbport.sys usbohci.sys [OHCI_Inst.NT.Services] @@ -79,7 +80,7 @@ CopyFiles = EHCI_CopyFiles [EHCI_CopyFiles.NT] -usbcore.sys +usbport.sys usbehci.sys [EHCI_Inst.NT.Services] @@ -98,6 +99,7 @@ CopyFiles = RootHub_CopyFiles [RootHub_CopyFiles.NT] +usbport.sys usbhub.sys [RootHub_Inst.NT.Services]

1 0

[hpoussin] 17929: Automagically select computer type (UP/MP) during first stage setup
by hpoussin＠svn.reactos.com 19 Sep '05

19 Sep '05

Automagically select computer type (UP/MP) during first stage setup Modified: trunk/reactos/bootdata/txtsetup.sif Modified: trunk/reactos/subsys/system/usetup/settings.c _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-09-19 07:35:31 UTC (rev 17928) +++ trunk/reactos/bootdata/txtsetup.sif 2005-09-19 08:11:43 UTC (rev 17929) @@ -52,6 +52,11 @@ pci_up = "Standard-PC" pci_mp = "Standard-PC Multiprocessor" +[Map.Computer] +;<id> = <pnp id string> +pci_up = "PC UP" +pci_mp = "PC MP" + [Files.pci_up] ; <filename> = <directory_id>,<new name> hal.dll = 2 _____ Modified: trunk/reactos/subsys/system/usetup/settings.c --- trunk/reactos/subsys/system/usetup/settings.c 2005-09-19 07:35:31 UTC (rev 17928) +++ trunk/reactos/subsys/system/usetup/settings.c 2005-09-19 08:11:43 UTC (rev 17929) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * COPYRIGHT: See COPYING in the top level directory +/* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/settings.c * PURPOSE: Device settings support functions @@ -33,6 +32,90 @@ /* FUNCTIONS ****************************************************************/ +static BOOLEAN +GetComputerIdentifier(PWSTR Identifier, + ULONG IdentifierLength) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + LPCWSTR ComputerIdentifier; + HANDLE ProcessorsKey; + PKEY_FULL_INFORMATION pFullInfo; + ULONG Size, SizeNeeded; + NTSTATUS Status; + + DPRINT("GetComputerIdentifier() called\n"); + + Size = sizeof(KEY_FULL_INFORMATION); + pFullInfo = (PKEY_FULL_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + if (!pFullInfo) + { + DPRINT("RtlAllocateHeap() failed\n"); + return FALSE; + } + + /* Open the processors key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor") ; + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&ProcessorsKey, + KEY_QUERY_VALUE , + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status 0x%lx)\n", Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + /* Get number of subkeys */ + Status = NtQueryKey( + ProcessorsKey, + KeyFullInformation, + pFullInfo, + Size, + &Size); + NtClose(ProcessorsKey); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + /* Find computer identifier */ + if (pFullInfo->SubKeys == 0) + { + /* Something strange happened. No processor detected */ + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + if (pFullInfo->SubKeys == 1) + { + /* Computer is mono-CPU */ + ComputerIdentifier = L"PC UP"; + } + else + { + /* Computer is multi-CPUs */ + ComputerIdentifier = L"PC MP"; + } + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + + /* Copy computer identifier to return buffer */ + SizeNeeded = (wcslen(ComputerIdentifier) + 1) * sizeof(WCHAR); + if (SizeNeeded > IdentifierLength) + return FALSE; + RtlCopyMemory(Identifier, ComputerIdentifier, SizeNeeded); + return TRUE; +} + + PGENERIC_LIST CreateComputerTypeList(HINF InfFile) { @@ -42,7 +125,49 @@ PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; + WCHAR ComputerIdentifier[128]; + WCHAR ComputerKey[32]; + /* Get the computer identification */ + if (!GetComputerIdentifier(ComputerIdentifier, 128)) + { + ComputerIdentifier[0] = 0; + } + + DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); + + /* Search for matching device identifier */ + if (!InfFindFirstLine(InfFile, L"Map.Computer", NULL, &Context)) + { + /* FIXME: error message */ + return NULL; + } + + do + { + if (!InfGetDataField(&Context, 1, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("InfGetDataField() failed\n"); + return NULL; + } + + DPRINT("KeyValue: %S\n", KeyValue); + if (wcsstr(ComputerIdentifier, KeyValue)) + { + if (!InfGetDataField(&Context, 0, &KeyName)) + { + /* FIXME: Handle error! */ + DPRINT("InfGetDataField() failed\n"); + return NULL; + } + + DPRINT("Computer key: %S\n", KeyName); + wcscpy(ComputerKey, KeyName); + } + } + while (InfFindNextLine(&Context, &Context)); + List = CreateGenericList(); if (List == NULL) return NULL; @@ -73,7 +198,8 @@ wcscpy(UserData, KeyName); sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, Buffer, UserData, FALSE); + AppendGenericListEntry(List, Buffer, UserData, + _wcsicmp(KeyName, ComputerKey) ? FALSE : TRUE); } while (InfFindNextLine(&Context, &Context));

1 0

[navaraf] 17928: - Move the window showing/hiding notifications from co_WinPosShowWindow to co_WinPosSetWindowPos and fix up the top-level checks.
by navaraf＠svn.reactos.com 19 Sep '05

19 Sep '05

- Move the window showing/hiding notifications from co_WinPosShowWindow to co_WinPosSetWindowPos and fix up the top-level checks. - Call the redraw routine on parent window if possible in co_WinPosSetWindowPos. Should fix bug #735. Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-19 05:42:01 UTC (rev 17927) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-19 07:35:31 UTC (rev 17928) @@ -1064,10 +1064,20 @@ /* Clear the update region */ co_UserRedrawWindow(Window, NULL, 0, RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_ALLCHILDREN); + if ((Window->Style & WS_VISIBLE) && + Window->Parent == UserGetDesktopWindow()) + { + co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (LPARAM)Window->hSelf); + } Window->Style &= ~WS_VISIBLE; } else if (WinPos.flags & SWP_SHOWWINDOW) { + if (!(Window->Style & WS_VISIBLE) && + Window->Parent == UserGetDesktopWindow()) + { + co_IntShellHookNotify(HSHELL_WINDOWCREATED, (LPARAM)Window->hSelf); + } Window->Style |= WS_VISIBLE; } @@ -1199,11 +1209,22 @@ } if (RgnType != ERROR && RgnType != NULLREGION) { - NtGdiOffsetRgn(DirtyRgn, - Window->WindowRect.left - Window->ClientRect.left, - Window->WindowRect.top - Window->ClientRect.top); - co_UserRedrawWindow(Window, NULL, DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + if (Window->Parent) + { + NtGdiOffsetRgn(DirtyRgn, + Window->WindowRect.left - Window->Parent->ClientRect.left, + Window->WindowRect.top - Window->Parent->ClientRect.top); + co_UserRedrawWindow(Window->Parent, NULL, DirtyRgn, + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + } + else + { + NtGdiOffsetRgn(DirtyRgn, + Window->WindowRect.left - Window->ClientRect.left, + Window->WindowRect.top - Window->ClientRect.top); + co_UserRedrawWindow(Window, NULL, DirtyRgn, + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + } } NtGdiDeleteObject(DirtyRgn); } @@ -1363,14 +1384,6 @@ if (ShowFlag != WasVisible) { co_IntSendMessage(Window->hSelf, WM_SHOWWINDOW, ShowFlag, 0); - /* - * FIXME: Need to check the window wasn't destroyed during the - * window procedure. - */ - if (!(Window->Parent)) - { - co_IntShellHookNotify(HSHELL_WINDOWCREATED, (LPARAM)Window->hSelf); - } } /* We can't activate a child window */ @@ -1409,11 +1422,6 @@ //faxme: as long as we have ref on Window, we also, indirectly, have ref on parent... co_UserSetFocus(Window->Parent); } - - if (!(Window->Parent)) - { - co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (LPARAM)Window->hSelf); - } } /* FIXME: Check for window destruction. */

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