Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 65335: [NTVDM:DOS] - Use the correct environment strings block when starting DOS programs. - When building the DOS master env block, remove the current directory env strings (they start ...
by hbelusca＠svn.reactos.org 09 Nov '14

09 Nov '14

Author: hbelusca Date: Sun Nov 9 00:49:17 2014 New Revision: 65335 URL: http://svn.reactos.org/svn/reactos?rev=65335&view=rev Log: [NTVDM:DOS] - Use the correct environment strings block when starting DOS programs. - When building the DOS master env block, remove the current directory env strings (they start with '='), upcase the environment names (not their values) and remove the WINDIR environment that we inherited when we started NTVDM DOS. Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Sun Nov 9 00:49:17 2014 @@ -462,7 +462,7 @@ DPRINT1("Starting '%s' ('%s')...\n", ApplicationName, CommandLine); Result = DosStartProcess(ApplicationName, CommandLine, - GetEnvironmentStrings()); + SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0)); if (Result != ERROR_SUCCESS) { DisplayMessage(L"Could not start '%S'. Error: %u", ApplicationName, Result); Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Sun Nov 9 00:49:17 2014 @@ -14,8 +14,18 @@ #include "int32.h" #include "dos.h" - #include "bios/bios.h" + +// This is needed because on UNICODE this symbol is redirected to +// GetEnvironmentStringsW whereas on ANSI it corresponds to the real +// "ANSI" function (and GetEnvironmentStringsA is aliased to it). +#undef GetEnvironmentStrings + +// Symmetrize the dumbness of the previous symbol: on UNICODE +// FreeEnvironmentStrings aliases to FreeEnvironmentStringsW but +// on "ANSI" FreeEnvironmentStrings aliases to FreeEnvironmentStringsA +#undef FreeEnvironmentStrings +#define FreeEnvironmentStrings FreeEnvironmentStringsA /* PRIVATE VARIABLES **********************************************************/ @@ -81,9 +91,7 @@ { PDOS_MCB Mcb = SEGMENT_TO_MCB(FIRST_MCB_SEGMENT); - LPWSTR SourcePtr, Environment; - LPSTR AsciiString; - DWORD AsciiSize; + LPSTR SourcePtr, Environment; LPSTR DestPtr = (LPSTR)SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0); #if 0 @@ -114,55 +122,46 @@ Mcb->OwnerPsp = 0; /* Get the environment strings */ - SourcePtr = Environment = GetEnvironmentStringsW(); + SourcePtr = Environment = GetEnvironmentStrings(); if (Environment == NULL) return FALSE; /* Fill the DOS system environment block */ while (*SourcePtr) { - /* Get the size of the ASCII string */ - AsciiSize = WideCharToMultiByte(CP_ACP, - 0, - SourcePtr, - -1, - NULL, - 0, - NULL, - NULL); - - /* Allocate memory for the ASCII string */ - AsciiString = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, AsciiSize); - if (AsciiString == NULL) + /* + * - Ignore environment strings starting with a '=', + * they describe current directories. + * - Ignore also the WINDIR environment variable since + * DOS apps should ignore that we started from ReactOS. + * - Upper-case the environment names, not their values. + */ + if (*SourcePtr != '=' && _strnicmp(SourcePtr, "WINDIR", 6) != 0) { - FreeEnvironmentStringsW(Environment); - return FALSE; + PCHAR Delim = NULL; + + /* Copy the environment string */ + strcpy(DestPtr, SourcePtr); + + /* Upper-case the environment name */ + Delim = strchr(DestPtr, '='); // Find the '=' delimiter + if (Delim) *Delim = '\0'; // Temporarily replace it by NULL + _strupr(DestPtr); // Upper-case + if (Delim) *Delim = '='; // Restore the delimiter + + DestPtr += strlen(SourcePtr); + + /* NULL-terminate the environment string */ + *(DestPtr++) = '\0'; } - /* Convert to ASCII */ - WideCharToMultiByte(CP_ACP, - 0, - SourcePtr, - -1, - AsciiString, - AsciiSize, - NULL, - NULL); - - /* Copy the string into DOS memory */ - strcpy(DestPtr, AsciiString); - /* Move to the next string */ - SourcePtr += wcslen(SourcePtr) + 1; - DestPtr += strlen(AsciiString); - *(DestPtr++) = 0; - - /* Free the memory */ - HeapFree(GetProcessHeap(), 0, AsciiString); - } - *DestPtr = 0; + SourcePtr += strlen(SourcePtr) + 1; + } + /* NULL-terminate the environment block */ + *DestPtr = '\0'; /* Free the memory allocated for environment strings */ - FreeEnvironmentStringsW(Environment); + FreeEnvironmentStrings(Environment); #if 0 Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Nov 9 00:49:17 2014 @@ -403,7 +403,7 @@ Mcb->OwnerPsp = NewOwner; } -static WORD DosCopyEnvironmentBlock(LPCVOID Environment, LPCSTR ProgramName) +static WORD DosCopyEnvironmentBlock(LPCSTR Environment, LPCSTR ProgramName) { PCHAR Ptr, DestBuffer = NULL; ULONG TotalSize = 0; @@ -412,12 +412,8 @@ Ptr = (PCHAR)Environment; /* Calculate the size of the environment block */ - while (*Ptr) - { - TotalSize += strlen(Ptr) + 1; - Ptr += strlen(Ptr) + 1; - } - TotalSize++; + while (*Ptr) Ptr += strlen(Ptr) + 1; + TotalSize = (ULONG_PTR)Ptr - (ULONG_PTR)Environment + 1; // Add final NULL-terminator /* Add the string buffer size */ TotalSize += strlen(ProgramName) + 1; @@ -434,19 +430,16 @@ DestBuffer = (PCHAR)SEG_OFF_TO_PTR(DestSegment, 0); while (*Ptr) { - /* Copy the string */ + /* Copy the string and NULL-terminate it */ strcpy(DestBuffer, Ptr); - - /* Advance to the next string */ DestBuffer += strlen(Ptr); + *(DestBuffer++) = '\0'; + + /* Move to the next string */ Ptr += strlen(Ptr) + 1; - - /* Put a zero after the string */ - *(DestBuffer++) = 0; - } - - /* Set the final zero */ - *(DestBuffer++) = 0; + } + /* NULL-terminate the environment block */ + *(DestBuffer++) = '\0'; /* Store the special program name tag */ *(DestBuffer++) = LOBYTE(DOS_PROGRAM_NAME_TAG); @@ -907,7 +900,7 @@ DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType, IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, - IN PVOID Environment, + IN LPCSTR Environment, OUT PDWORD StackLocation OPTIONAL, OUT PDWORD EntryPoint OPTIONAL) { @@ -1151,7 +1144,7 @@ DWORD DosStartProcess(IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, - IN PVOID Environment) + IN LPCSTR Environment) { DWORD Result; Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Sun Nov 9 00:49:17 2014 @@ -224,7 +224,7 @@ IN DOS_EXEC_TYPE LoadType, IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, - IN PVOID Environment, + IN LPCSTR Environment, OUT PDWORD StackLocation OPTIONAL, OUT PDWORD EntryPoint OPTIONAL ); @@ -233,9 +233,11 @@ LPCSTR ProgramName, PDOS_EXEC_PARAM_BLOCK Parameters ); -DWORD DosStartProcess(IN LPCSTR ExecutablePath, - IN LPCSTR CommandLine, - IN PVOID Environment); +DWORD DosStartProcess( + IN LPCSTR ExecutablePath, + IN LPCSTR CommandLine, + IN LPCSTR Environment +); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle);

1 0

[tkreuzer] 65334: [DPRINT12345] Silence more annoying DPRINTs, and add one that hopefully helps to debug a problem.
by tkreuzer＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: tkreuzer Date: Sat Nov 8 22:19:07 2014 New Revision: 65334 URL: http://svn.reactos.org/svn/reactos?rev=65334&view=rev Log: [DPRINT12345] Silence more annoying DPRINTs, and add one that hopefully helps to debug a problem. Modified: trunk/reactos/dll/win32/kernel32/client/console/alias.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/user/winsrv/consrv/alias.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/history.c Modified: trunk/reactos/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/alias.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/alias.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -124,7 +124,7 @@ USHORT SourceBufferLength = (USHORT)wcslen(lpSource) * sizeof(WCHAR); USHORT TargetBufferLength = (USHORT)(lpTarget ? wcslen(lpTarget) * sizeof(WCHAR) : 0); - DPRINT1("AddConsoleAliasW entered with lpSource '%S' lpTarget '%S' lpExeName '%S'\n", + DPRINT("AddConsoleAliasW entered with lpSource '%S' lpTarget '%S' lpExeName '%S'\n", lpSource, lpTarget, lpExeName); return IntAddConsoleAlias(lpSource, @@ -149,7 +149,7 @@ USHORT SourceBufferLength = (USHORT)strlen(lpSource) * sizeof(CHAR); USHORT TargetBufferLength = (USHORT)(lpTarget ? strlen(lpTarget) * sizeof(CHAR) : 0); - DPRINT1("AddConsoleAliasA entered with lpSource '%s' lpTarget '%s' lpExeName '%s'\n", + DPRINT("AddConsoleAliasA entered with lpSource '%s' lpTarget '%s' lpExeName '%s'\n", lpSource, lpTarget, lpExeName); return IntAddConsoleAlias(lpSource, @@ -262,7 +262,7 @@ DWORD TargetBufferLength, LPWSTR lpExeName) { - DPRINT1("GetConsoleAliasW entered with lpSource '%S' lpExeName '%S'\n", + DPRINT("GetConsoleAliasW entered with lpSource '%S' lpExeName '%S'\n", lpSource, lpExeName); return IntGetConsoleAlias(lpSource, @@ -285,7 +285,7 @@ DWORD TargetBufferLength, LPSTR lpExeName) { - DPRINT1("GetConsoleAliasA entered with lpSource '%s' lpExeName '%s'\n", + DPRINT("GetConsoleAliasA entered with lpSource '%s' lpExeName '%s'\n", lpSource, lpExeName); return IntGetConsoleAlias(lpSource, @@ -377,7 +377,7 @@ DWORD AliasBufferLength, LPWSTR ExeName) { - DPRINT1("GetConsoleAliasesW entered with lpExeName '%S'\n", + DPRINT("GetConsoleAliasesW entered with lpExeName '%S'\n", ExeName); return IntGetConsoleAliases(AliasBuffer, @@ -397,7 +397,7 @@ DWORD AliasBufferLength, LPSTR ExeName) { - DPRINT1("GetConsoleAliasesA entered with lpExeName '%s'\n", + DPRINT("GetConsoleAliasesA entered with lpExeName '%s'\n", ExeName); return IntGetConsoleAliases(AliasBuffer, @@ -535,7 +535,7 @@ GetConsoleAliasExesW(LPWSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { - DPRINT1("GetConsoleAliasExesW called\n"); + DPRINT("GetConsoleAliasExesW called\n"); return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, TRUE); } @@ -549,7 +549,7 @@ GetConsoleAliasExesA(LPSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { - DPRINT1("GetConsoleAliasExesA called\n"); + DPRINT("GetConsoleAliasExesA called\n"); return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, FALSE); } @@ -585,7 +585,7 @@ DECLSPEC_HOTPATCH GetConsoleAliasExesLengthW(VOID) { - DPRINT1("GetConsoleAliasExesLengthW called\n"); + DPRINT("GetConsoleAliasExesLengthW called\n"); return IntGetConsoleAliasExesLength(TRUE); } @@ -598,7 +598,7 @@ DECLSPEC_HOTPATCH GetConsoleAliasExesLengthA(VOID) { - DPRINT1("GetConsoleAliasExesLengthA called\n"); + DPRINT("GetConsoleAliasExesLengthA called\n"); return IntGetConsoleAliasExesLength(FALSE); } Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -4035,7 +4035,7 @@ if (lpCurrentDirectory) { /* Allocate a buffer so we can keep a Unicode copy */ - DPRINT1("Current directory: %S\n", lpCurrentDirectory); + DPRINT("Current directory: %S\n", lpCurrentDirectory); CurrentDirectory = RtlAllocateHeap(RtlGetProcessHeap(), 0, (MAX_PATH * sizeof(WCHAR)) + Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -2175,7 +2175,7 @@ break; if (needed > cjBuf) return GDI_ERROR; - + get_bezier_glyph_outline(outline, cjBuf, pvBuf); break; } @@ -3367,7 +3367,7 @@ psurf = dc->dclevel.pSurface; - if(!psurf) + if(!psurf) psurf = psurfDefaultBitmap; if ((fuOptions & ETO_OPAQUE) && lprc) @@ -3719,7 +3719,7 @@ DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; } MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - IntEngMaskBlt( + if (!IntEngMaskBlt( SurfObj, SourceGlyphSurf, &dc->co.ClipObj, @@ -3728,7 +3728,11 @@ &DestRect, (PPOINTL)&MaskRect, &dc->eboText.BrushObject, - &BrushOrigin); + &BrushOrigin)) + { + DPRINT1("Failed to MaskBlt a glyph!\n"); + } + MouseSafetyOnDrawEnd(dc->ppdev) ; EngUnlockSurface(SourceGlyphSurf); @@ -3750,7 +3754,7 @@ Scale = pdcattr->mxWorldToDevice.efM11; if (_FLOATOBJ_Equal0(&Scale)) FLOATOBJ_Set1(&Scale); - + FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6); // do the shift before multiplying to preserve precision TextLeft += FLOATOBJ_GetLong(&Scale); DPRINT("New TextLeft2: %I64d\n", TextLeft); Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -454,7 +454,7 @@ PALIAS_ENTRY Entry; PVOID lpTarget; - DPRINT1("SrvAddConsoleAlias entered ApiMessage %p\n", ApiMessage); + DPRINT("SrvAddConsoleAlias entered ApiMessage %p\n", ApiMessage); if ( !CsrValidateMessageBuffer(ApiMessage, (PVOID*)&ConsoleAliasRequest->Source, @@ -545,7 +545,7 @@ UINT Length; PVOID lpTarget; - DPRINT1("SrvGetConsoleAlias entered ApiMessage %p\n", ApiMessage); + DPRINT("SrvGetConsoleAlias entered ApiMessage %p\n", ApiMessage); if ( !CsrValidateMessageBuffer(ApiMessage, (PVOID*)&ConsoleAliasRequest->Source, @@ -635,7 +635,7 @@ ULONG BytesWritten = 0; PALIAS_HEADER Header; - DPRINT1("SrvGetConsoleAliases entered ApiMessage %p\n", ApiMessage); + DPRINT("SrvGetConsoleAliases entered ApiMessage %p\n", ApiMessage); if ( !CsrValidateMessageBuffer(ApiMessage, (PVOID)&GetAllAliasesRequest->ExeName, @@ -740,7 +740,7 @@ PCONSRV_CONSOLE Console; PALIAS_HEADER Header; - DPRINT1("SrvGetConsoleAliasesLength entered ApiMessage %p\n", ApiMessage); + DPRINT("SrvGetConsoleAliasesLength entered ApiMessage %p\n", ApiMessage); if (!CsrValidateMessageBuffer(ApiMessage, (PVOID)&GetAllAliasesLengthRequest->ExeName, @@ -781,7 +781,7 @@ PCONSRV_CONSOLE Console; UINT BytesWritten = 0; - DPRINT1("SrvGetConsoleAliasExes entered\n"); + DPRINT("SrvGetConsoleAliasExes entered\n"); if (!CsrValidateMessageBuffer(ApiMessage, (PVOID*)&GetAliasesExesRequest->ExeNames, @@ -867,7 +867,7 @@ PCONSOLE_GETALIASESEXESLENGTH GetAliasesExesLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesLengthRequest; PCONSRV_CONSOLE Console; - DPRINT1("SrvGetConsoleAliasExesLength entered ApiMessage %p\n", ApiMessage); + DPRINT("SrvGetConsoleAliasExesLength entered ApiMessage %p\n", ApiMessage); Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -44,7 +44,7 @@ /* All went right, so add the console to the list */ ConDrvLockConsoleListExclusive(); - DPRINT1("Insert in the list\n"); + DPRINT("Insert in the list\n"); InsertTailList(&ConsoleList, &Console->ListEntry); // FIXME: Move this code to the caller function!! Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -294,7 +294,7 @@ Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, Size.X * Size.Y * sizeof(CHAR_INFO)); if (!Buffer) return STATUS_NO_MEMORY; - DPRINT1("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y); + DPRINT("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y); OldBuffer = ScreenBuffer->Buffer; for (CurrentY = 0; CurrentY < ScreenBuffer->ScreenBufferSize.Y && CurrentY < Size.Y; CurrentY++) Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -363,7 +363,7 @@ Buffer = ReadConsoleRequest->Buffer; } - DPRINT1("Calling ConDrvReadConsole(%wZ)\n", &ExeName); + DPRINT("Calling ConDrvReadConsole(%wZ)\n", &ExeName); Status = ConDrvReadConsole(InputBuffer->Header.Console, InputBuffer, &ExeName, @@ -372,7 +372,7 @@ &ReadControl, ReadConsoleRequest->NumBytes / CharSize, // NrCharactersToRead &NrCharactersRead); - DPRINT1("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n", + DPRINT("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n", NrCharactersRead, Status); // ReadConsoleRequest->ControlKeyState = ReadControl.dwControlKeyState; Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -61,7 +61,7 @@ /* All went right, so add the console to the list */ ConSrvLockConsoleListExclusive(); - DPRINT1("Insert in the list\n"); + DPRINT("Insert in the list\n"); if (ConsoleList) { @@ -73,7 +73,7 @@ if (i >= ConsoleListSize) { - DPRINT1("Creation of a new handles table\n"); + DPRINT("Creation of a new handles table\n"); /* Allocate a new handles table */ Block = ConsoleAllocHeap(HEAP_ZERO_MEMORY, (ConsoleListSize + @@ -393,7 +393,7 @@ /* Get a pointer to the IShellLink interface */ IShellLinkW* pshl = NULL; hRes = CoCreateInstance(&CLSID_ShellLink, - NULL, + NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&pshl); @@ -476,8 +476,8 @@ // ConsoleInitInfo->ConsoleStartInfo->IconIndex = 0; } - DPRINT1("IconPath = '%S' ; IconIndex = %lu\n", - IconPath, ConsoleInitInfo->ConsoleStartInfo->IconIndex); + DPRINT("IconPath = '%S' ; IconIndex = %lu\n", + IconPath, ConsoleInitInfo->ConsoleStartInfo->IconIndex); if (IconPath && *IconPath) { HICON hIcon = NULL, hIconSm = NULL; @@ -486,7 +486,7 @@ &hIcon, &hIconSm, 1); - DPRINT1("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm); + DPRINT("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm); if (hIcon != NULL) ConsoleInitInfo->ConsoleStartInfo->hIcon = hIcon; if (hIconSm != NULL) ConsoleInitInfo->ConsoleStartInfo->hIconSm = hIconSm; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -286,7 +286,7 @@ { INPUT_RECORD er; - DPRINT1("Menu item ID: %d\n", CmdId); + DPRINT("Menu item ID: %d\n", CmdId); if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -181,7 +181,7 @@ /* Switch to full-screen or to windowed mode */ FullScreen = !GuiData->GuiInfo.FullScreen; - DPRINT1("GuiConsoleSwitchFullScreen - Switch to %s ...\n", + DPRINT("GuiConsoleSwitchFullScreen - Switch to %s ...\n", (FullScreen ? "full-screen" : "windowed mode")); SwitchFullScreen(GuiData, FullScreen); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -675,7 +675,7 @@ hPalette = ActiveBuffer->PaletteHandle; } - DPRINT1("GuiSetActiveScreenBuffer using palette 0x%p\n", hPalette); + DPRINT("GuiSetActiveScreenBuffer using palette 0x%p\n", hPalette); /* Set the new palette for the framebuffer */ SelectPalette(GuiData->hMemDC, hPalette, FALSE); Modified: trunk/reactos/win32ss/user/winsrv/consrv/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/history.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/history.c [iso-8859-1] Sat Nov 8 22:19:07 2014 @@ -587,7 +587,7 @@ PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryModeRequest; PCONSRV_CONSOLE Console; - DPRINT1("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n", + DPRINT("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n", SetHistoryModeRequest->Mode); Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),

1 0

[hbelusca] 65333: [NTVDM] - For the BIOS wait hack, use the NT API instead of the Win32 one. - Remove unneeded DOS-exported functions. - Use a PitGetReloadValue function for retrieving the reload v...
by hbelusca＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: hbelusca Date: Sat Nov 8 21:45:20 2014 New Revision: 65333 URL: http://svn.reactos.org/svn/reactos?rev=65333&view=rev Log: [NTVDM] - For the BIOS wait hack, use the NT API instead of the Win32 one. - Remove unneeded DOS-exported functions. - Use a PitGetReloadValue function for retrieving the reload value of a given PIT channel, instead of directly reading the reload value member, for functions *outside* of the PIT module. - Implement basic Pulse-Width Modulation code for the PC speaker emulation. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/hardware/speaker.c trunk/reactos/subsystems/ntvdm/hardware/speaker.h trunk/reactos/subsystems/ntvdm/hardware/timer.c trunk/reactos/subsystems/ntvdm/hardware/timer.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat Nov 8 21:45:20 2014 @@ -30,6 +30,9 @@ #include "hardware/cmos.h" #include "hardware/pic.h" #include "hardware/timer.h" + +/* Extra PSDK/NDK Headers */ +#include <ndk/kefuncs.h> /* PRIVATE VARIABLES **********************************************************/ @@ -166,9 +169,11 @@ * See Ralf Brown: http://www.ctyme.com/intr/rb-1525.htm * for more information. */ - - // HACK: For now, use the Win32 API (that takes time in milliseconds). - Sleep(MAKELONG(getDX(), getCX()) / 1000); + LARGE_INTEGER TimeOut; + TimeOut.QuadPart = MAKELONG(getDX(), getCX()) * -10LL; + + // HACK: For now, use the NT API (time in hundreds of nanoseconds). + NtDelayExecution(FALSE, &TimeOut); /* Clear CF */ Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Sat Nov 8 21:45:20 2014 @@ -239,11 +239,6 @@ VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle); -VOID WINAPI DosInt20h(LPWORD Stack); -VOID WINAPI DosInt21h(LPWORD Stack); -VOID WINAPI DosBreakInterrupt(LPWORD Stack); -VOID WINAPI DosInt2Fh(LPWORD Stack); - BOOLEAN DosKRNLInitialize(VOID); #endif // _DOS_H_ Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Nov 8 21:45:20 2014 @@ -293,8 +293,8 @@ DPRINT("Speaker %s\n", Port61hState & 0x02 ? "on" : "off"); // SpeakerStateChange = TRUE; } - // if (SpeakerStateChange) SpeakerChange(); - SpeakerChange(); + // if (SpeakerStateChange) SpeakerChange(Port61hState); + SpeakerChange(Port61hState); } static VOID WINAPI PitChan0Out(LPVOID Param, BOOLEAN State) @@ -347,7 +347,7 @@ if ((OldPort61hState ^ Port61hState) & 0x20) { DPRINT("PitChan2Out -- Port61hState changed\n"); - SpeakerChange(); + SpeakerChange(Port61hState); } } Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] Sat Nov 8 21:45:20 2014 @@ -12,7 +12,6 @@ #include "emulator.h" #include "speaker.h" -#include "io.h" #include "timer.h" /* Extra PSDK/NDK Headers */ @@ -20,6 +19,9 @@ #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> +/* Extra PSDK/NDK Headers */ +#include <ndk/kefuncs.h> + /* DDK Driver Headers */ #include <ntddbeep.h> @@ -27,26 +29,56 @@ static HANDLE hBeep = NULL; +static LARGE_INTEGER FreqCount, CountStart; +static ULONG PulseTickCount = 0, FreqPulses = 0; + +#define SPEAKER_RESPONSE 200 // in milliseconds + +#define MIN_AUDIBLE_FREQ 20 // BEEP_FREQUENCY_MINIMUM +#define MAX_AUDIBLE_FREQ 20000 // BEEP_FREQUENCY_MAXIMUM +#define CLICK_FREQ 100 + + /* PRIVATE FUNCTIONS **********************************************************/ -static DWORD OldReloadValue = 0; -static PIT_MODE OldMode = 0; - -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID PlaySound(DWORD Frequency, - DWORD Duration) -{ - /* Adapted from kernel32:Beep() */ +static +VOID +MakeBeep(ULONG Frequency, + ULONG Duration) +{ + static ULONG LastFrequency = 0, LastDuration = 0; IO_STATUS_BLOCK IoStatusBlock; BEEP_SET_PARAMETERS BeepSetParameters; - /* Set beep data */ + /* + * Do nothing if we are replaying exactly the same sound + * (this avoids hiccups due to redoing the same beeps). + */ + if (Frequency == LastFrequency && Duration == LastDuration) return; + + /* A null frequency means we stop beeping */ + if (Frequency == 0) Duration = 0; + + /* + * For small durations we automatically reset the beep so + * that we can replay short beeps like clicks immediately. + */ + if (Duration < 10) + { + LastFrequency = 0; + LastDuration = 0; + } + else + { + LastFrequency = Frequency; + LastDuration = Duration; + } + + /* Set the data and do the beep */ BeepSetParameters.Frequency = Frequency; BeepSetParameters.Duration = Duration; - /* Send the beep */ NtDeviceIoControlFile(hBeep, NULL, NULL, @@ -59,44 +91,173 @@ 0); } -VOID SpeakerChange(VOID) -{ - BYTE Port61hState = IOReadB(CONTROL_SYSTEM_PORT61H); - BOOLEAN IsConnectedToPITChannel2 = !!(Port61hState & 0x01); - BOOLEAN SpeakerDataOn = !!(Port61hState & 0x02); - - if (PitChannel2 && IsConnectedToPITChannel2 && SpeakerDataOn) - { - /* Start beeping */ - - DWORD Frequency, Duration; - - DWORD PitChannel2ReloadValue = PitChannel2->ReloadValue; - if (PitChannel2ReloadValue == 0) PitChannel2ReloadValue = 65536; - - DPRINT("(1) PitChannel2(Mode = %d ; ReloadValue = %d)\n", PitChannel2->Mode, PitChannel2ReloadValue); - - if (OldMode == PitChannel2->Mode && OldReloadValue == PitChannel2ReloadValue) - return; - - OldMode = PitChannel2->Mode; - OldReloadValue = PitChannel2ReloadValue; - - DPRINT("(2) PitChannel2(Mode = %d ; ReloadValue = %d)\n", PitChannel2->Mode, PitChannel2ReloadValue); - - Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue); - Duration = INFINITE; - - PlaySound(Frequency, Duration); +static +VOID PulseSample(VOID) +{ + static ULONG Pulses = 0, CountStartTick = 0, LastPulsesFreq = 0; + ULONG LastPulseTickCount, CurrPulsesFreq; + LARGE_INTEGER Counter; + LONGLONG Elapsed; + + /* + * Check how far away was the previous pulse and + * if it was >= 200ms away then restart counting. + */ + LastPulseTickCount = PulseTickCount; + PulseTickCount = GetTickCount(); + if (PulseTickCount - LastPulseTickCount >= SPEAKER_RESPONSE) + { + CountStart.QuadPart = 0; + Pulses = 0; + FreqPulses = 0; + return; + } + + /* We have closely spaced pulses. Start counting. */ + if (CountStart.QuadPart == 0) + { + NtQueryPerformanceCounter(&CountStart, NULL); + CountStartTick = PulseTickCount; + Pulses = 0; + FreqPulses = 0; + return; + } + + /* A pulse is ongoing */ + ++Pulses; + + /* We require some pulses to have some statistics */ + if (PulseTickCount - CountStartTick <= (SPEAKER_RESPONSE >> 1)) return; + + /* Get count time */ + NtQueryPerformanceCounter(&Counter, NULL); + + /* + * Get the number of speaker hundreds of microseconds that have passed + * since we started counting. + */ + Elapsed = (Counter.QuadPart - CountStart.QuadPart) * 10000 / FreqCount.QuadPart; + if (Elapsed == 0) ++Elapsed; + + /* Update counting for next pulses */ + CountStart = Counter; + CountStartTick = PulseTickCount; + + // HACKHACK!! I need to check why we need to double the number + // of pulses in order to have the correct frequency... + Pulses <<= 1; + + /* Get the current pulses frequency */ + CurrPulsesFreq = 10000 * Pulses / Elapsed; + + /* Round the current pulses frequency up and align */ + if ((CurrPulsesFreq & 0x0F) > 7) CurrPulsesFreq += 0x10; + CurrPulsesFreq &= ~0x0F; + + /* Reinitialize frequency counters if necessary */ + if (LastPulsesFreq == 0) LastPulsesFreq = CurrPulsesFreq; + if (FreqPulses == 0) FreqPulses = LastPulsesFreq; + + /* Fix up the current pulses frequency if needed */ + if (LastPulsesFreq != 0 && CurrPulsesFreq == 0) + CurrPulsesFreq = LastPulsesFreq; + + /* + * Magic begins there... + */ +#ifndef ABS +#define ABS(x) ((x) < 0 ? -(x) : (x)) +#endif + if (ABS(CurrPulsesFreq - LastPulsesFreq) > 7) + { + /* + * This can be a "large" fluctuation so ignore it for now, but take + * it into account if it happens to be a real frequency change. + */ + CurrPulsesFreq = (CurrPulsesFreq + LastPulsesFreq) >> 1; } else { - /* Stop beeping */ - - OldMode = 0; - OldReloadValue = 0; - - PlaySound(0x00, 0x00); + // FreqPulses = ((FreqPulses << 2) + LastPulsesFreq + CurrPulsesFreq) / 6; + FreqPulses = ((FreqPulses << 1) + LastPulsesFreq + CurrPulsesFreq) >> 2; + } + + /* Round the pulses frequency up and align */ + if ((FreqPulses & 0x0F) > 7) FreqPulses += 0x10; + FreqPulses &= ~0x0F; + + DPRINT("FreqPulses = %d, LastPulsesFreq = %d, CurrPulsesFreq = %d, Pulses = %d, Elapsed = %d\n", + FreqPulses, LastPulsesFreq, CurrPulsesFreq, Pulses, Elapsed); + + LastPulsesFreq = CurrPulsesFreq; + Pulses = 0; +} + + +/* PUBLIC FUNCTIONS ***********************************************************/ + +// SpeakerPulse +VOID SpeakerChange(UCHAR Port61hValue) +{ + static BOOLEAN OldSpeakerOff = TRUE; + + BOOLEAN Timer2Gate = !!(Port61hValue & 0x01); + BOOLEAN SpeakerOn = !!(Port61hValue & 0x02); + + DPRINT("SpeakerChange -- Timer2Gate == %s ; SpeakerOn == %s\n", + Timer2Gate ? "true" : "false", SpeakerOn ? "true" : "false"); + + if (Timer2Gate) + { + if (SpeakerOn) + { + /* Start beeping */ + ULONG Frequency = (PIT_BASE_FREQUENCY / PitGetReloadValue(2)); + if (Frequency < MIN_AUDIBLE_FREQ || MAX_AUDIBLE_FREQ < Frequency) + Frequency = 0; + + MakeBeep(Frequency, INFINITE); + } + else + { + /* Stop beeping */ + MakeBeep(0, 0); + } + } + else + { + if (SpeakerOn) + { + if (OldSpeakerOff) + { + OldSpeakerOff = FALSE; + PulseSample(); + } + + if (FreqPulses >= MIN_AUDIBLE_FREQ) + MakeBeep(FreqPulses, INFINITE); + else if (CountStart.QuadPart != 0) + MakeBeep(CLICK_FREQ, 1); /* Click */ + else + MakeBeep(0, 0); /* Stop beeping */ + } + else + { + OldSpeakerOff = TRUE; + + /* + * Check how far away was the previous pulse and if + * it was >= (200 + eps) ms away then stop beeping. + */ + if (GetTickCount() - PulseTickCount >= SPEAKER_RESPONSE + (SPEAKER_RESPONSE >> 3)) + { + CountStart.QuadPart = 0; + FreqPulses = 0; + + /* Stop beeping */ + MakeBeep(0, 0); + } + } } } @@ -107,9 +268,14 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - /* Adapted from kernel32:Beep() */ - - /* Open the device */ + /* Retrieve the performance frequency and initialize the timer ticks */ + NtQueryPerformanceCounter(&CountStart, &FreqCount); + if (FreqCount.QuadPart == 0) + { + wprintf(L"FATAL: Performance counter not available\n"); + } + + /* Open the BEEP device */ RtlInitUnicodeString(&BeepDevice, L"\\Device\\Beep"); InitializeObjectAttributes(&ObjectAttributes, &BeepDevice, 0, NULL, NULL); Status = NtCreateFile(&hBeep, @@ -125,7 +291,8 @@ 0); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open Beep driver, Status 0x%08lx\n", Status); + DPRINT1("Failed to open the Beep driver, Status 0x%08lx\n", Status); + // hBeep = INVALID_HANDLE_VALUE; } } Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/speaker.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/speaker.h [iso-8859-1] Sat Nov 8 21:45:20 2014 @@ -17,7 +17,7 @@ /* FUNCTIONS ******************************************************************/ -VOID SpeakerChange(VOID); +VOID SpeakerChange(UCHAR Port61hValue); VOID SpeakerInitialize(VOID); VOID SpeakerCleanup(VOID); Modified: trunk/reactos/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/timer.c [iso-8859-1] Sat Nov 8 21:45:20 2014 @@ -20,7 +20,6 @@ /* PRIVATE VARIABLES **********************************************************/ static PIT_CHANNEL PitChannels[PIT_CHANNELS]; -PPIT_CHANNEL PitChannel2 = &PitChannels[2]; /* PRIVATE FUNCTIONS **********************************************************/ @@ -471,9 +470,38 @@ PitChannels[Channel].Gate = State; } +WORD PitGetReloadValue(BYTE Channel) +{ + if (Channel >= PIT_CHANNELS) return 0xFFFF; + + if (PitChannels[Channel].ReloadValue == 0) + return 0xFFFF; + else + return PitChannels[Channel].ReloadValue; +} + +DWORD PitGetResolution(VOID) +{ + UCHAR i; + DWORD MinReloadValue = 65536; + + for (i = 0; i < PIT_CHANNELS; i++) + { + DWORD ReloadValue = PitChannels[i].ReloadValue; + + /* 0 means 65536 */ + if (ReloadValue == 0) ReloadValue = 65536; + + if (ReloadValue < MinReloadValue) MinReloadValue = ReloadValue; + } + + /* Return the frequency resolution */ + return PIT_BASE_FREQUENCY / MinReloadValue; +} + VOID PitClock(DWORD Count) { - UINT i; + UCHAR i; if (Count == 0) return; @@ -482,25 +510,6 @@ // if (!PitChannels[i].Counting) continue; PitDecrementCount(&PitChannels[i], Count); } -} - -DWORD PitGetResolution(VOID) -{ - INT i; - DWORD MinReloadValue = 65536; - - for (i = 0; i < PIT_CHANNELS; i++) - { - DWORD ReloadValue = PitChannels[i].ReloadValue; - - /* 0 means 65536 */ - if (ReloadValue == 0) ReloadValue = 65536; - - if (ReloadValue < MinReloadValue) MinReloadValue = ReloadValue; - } - - /* Return the frequency resolution */ - return PIT_BASE_FREQUENCY / MinReloadValue; } VOID PitInitialize(VOID) Modified: trunk/reactos/subsystems/ntvdm/hardware/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/timer.h [iso-8859-1] Sat Nov 8 21:45:20 2014 @@ -73,15 +73,14 @@ } PIT_CHANNEL, *PPIT_CHANNEL; -extern PPIT_CHANNEL PitChannel2; // Needed for PC Speaker - /* FUNCTIONS ******************************************************************/ VOID PitSetOutFunction(BYTE Channel, LPVOID Param, PIT_OUT_FUNCTION OutFunction); VOID PitSetGate(BYTE Channel, BOOLEAN State); +WORD PitGetReloadValue(BYTE Channel); +DWORD PitGetResolution(VOID); VOID PitClock(DWORD Count); -DWORD PitGetResolution(VOID); VOID PitInitialize(VOID);

1 0

[ekohl] 65332: [NET] USER command: - Replace stings by resource strings. - Add a function to print padded resource strings. - Fix the password input routine. Repeat if the passwords don't match.
by ekohl＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: ekohl Date: Sat Nov 8 21:44:32 2014 New Revision: 65332 URL: http://svn.reactos.org/svn/reactos?rev=65332&view=rev Log: [NET] USER command: - Replace stings by resource strings. - Add a function to print padded resource strings. - Fix the password input routine. Repeat if the passwords don't match. Modified: trunk/reactos/base/applications/network/net/cmdUser.c trunk/reactos/base/applications/network/net/lang/en-US.rc trunk/reactos/base/applications/network/net/lang/ro-RO.rc trunk/reactos/base/applications/network/net/lang/ru-RU.rc trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h trunk/reactos/base/applications/network/net/resource.h Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Sat Nov 8 21:44:32 2014 @@ -173,13 +173,25 @@ if (Status != NERR_Success) goto done; - PrintToConsole(L"User name %s\n", pUserInfo->usri4_name); - PrintToConsole(L"Full name %s\n", pUserInfo->usri4_full_name); - PrintToConsole(L"Comment %s\n", pUserInfo->usri4_comment); - PrintToConsole(L"User comment %s\n", pUserInfo->usri4_usr_comment); - PrintToConsole(L"Country code %03ld ()\n", pUserInfo->usri4_country_code); - PrintToConsole(L"Account active %s\n", (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE)? L"No" : ((pUserInfo->usri4_flags & UF_LOCKOUT) ? L"Locked" : L"Yes")); - PrintToConsole(L"Account expires "); + PrintPaddedResourceString(IDS_USER_NAME); + PrintToConsole(L"%s\n", pUserInfo->usri4_name); + + PrintPaddedResourceString(IDS_USER_FULL_NAME); + PrintToConsole(L"%s\n", pUserInfo->usri4_full_name); + + PrintPaddedResourceString(IDS_USER_COMMENT); + PrintToConsole(L"%s\n", pUserInfo->usri4_comment); + + PrintPaddedResourceString(IDS_USER_USER_COMMENT); + PrintToConsole(L"%s\n", pUserInfo->usri4_usr_comment); + + PrintPaddedResourceString(IDS_USER_COUNTRY_CODE); + PrintToConsole(L"%03ld ()\n", pUserInfo->usri4_country_code); + + PrintPaddedResourceString(IDS_USER_ACCOUNT_ACTIVE); + PrintToConsole(L"%s\n", (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE)? L"No" : ((pUserInfo->usri4_flags & UF_LOCKOUT) ? L"Locked" : L"Yes")); + + PrintPaddedResourceString(IDS_USER_ACCOUNT_EXPIRES); if (pUserInfo->usri4_acct_expires == TIMEQ_FOREVER) PrintToConsole(L"Never\n"); else @@ -187,40 +199,55 @@ PrintToConsole(L"\n"); - PrintToConsole(L"Password last set "); + PrintPaddedResourceString(IDS_USER_PW_LAST_SET); dwLastSet = GetTimeInSeconds() - pUserInfo->usri4_password_age; PrintDateTime(dwLastSet); - PrintToConsole(L"Password expires "); + PrintPaddedResourceString(IDS_USER_PW_EXPIRES); if ((pUserInfo->usri4_flags & UF_DONT_EXPIRE_PASSWD) || pUserModals->usrmod0_max_passwd_age == TIMEQ_FOREVER) PrintToConsole(L"Never\n"); else PrintDateTime(dwLastSet + pUserModals->usrmod0_max_passwd_age); - PrintToConsole(L"Password changeable "); + PrintPaddedResourceString(IDS_USER_PW_CHANGEABLE); PrintDateTime(dwLastSet + pUserModals->usrmod0_min_passwd_age); - PrintToConsole(L"Password required %s\n", (pUserInfo->usri4_flags & UF_PASSWD_NOTREQD) ? L"No" : L"Yes"); - PrintToConsole(L"User may change password %s\n", (pUserInfo->usri4_flags & UF_PASSWD_CANT_CHANGE) ? L"No" : L"Yes"); + PrintPaddedResourceString(IDS_USER_PW_REQUIRED); + PrintToConsole(L"%s\n", (pUserInfo->usri4_flags & UF_PASSWD_NOTREQD) ? L"No" : L"Yes"); + + PrintPaddedResourceString(IDS_USER_CHANGE_PW); + PrintToConsole(L"%s\n", (pUserInfo->usri4_flags & UF_PASSWD_CANT_CHANGE) ? L"No" : L"Yes"); PrintToConsole(L"\n"); - PrintToConsole(L"Workstations allowed %s\n", (pUserInfo->usri4_workstations == NULL || wcslen(pUserInfo->usri4_workstations) == 0) ? L"All" : pUserInfo->usri4_workstations); - PrintToConsole(L"Logon script %s\n", pUserInfo->usri4_script_path); - PrintToConsole(L"User profile %s\n", pUserInfo->usri4_profile); - PrintToConsole(L"Home directory %s\n", pUserInfo->usri4_home_dir); - PrintToConsole(L"Last logon "); + + PrintPaddedResourceString(IDS_USER_WORKSTATIONS); + PrintToConsole(L"%s\n", (pUserInfo->usri4_workstations == NULL || wcslen(pUserInfo->usri4_workstations) == 0) ? L"All" : pUserInfo->usri4_workstations); + + PrintPaddedResourceString(IDS_USER_LOGON_SCRIPT); + PrintToConsole(L"%s\n", pUserInfo->usri4_script_path); + + PrintPaddedResourceString(IDS_USER_PROFILE); + PrintToConsole(L"%s\n", pUserInfo->usri4_profile); + + PrintPaddedResourceString(IDS_USER_HOME_DIR); + PrintToConsole(L"%s\n", pUserInfo->usri4_home_dir); + + PrintPaddedResourceString(IDS_USER_LAST_LOGON); if (pUserInfo->usri4_last_logon == 0) PrintToConsole(L"Never\n"); else PrintDateTime(pUserInfo->usri4_last_logon); + PrintToConsole(L"\n"); - PrintToConsole(L"Logon hours allowed "); + + PrintPaddedResourceString(IDS_USER_LOGON_HOURS); if (pUserInfo->usri4_logon_hours == NULL) PrintToConsole(L"All\n"); + PrintToConsole(L"\n"); PrintToConsole(L"\n"); - PrintToConsole(L"Local group memberships "); + PrintPaddedResourceString(IDS_USER_LOCAL_GROUPS); if (dwLocalGroupTotal != 0 && pLocalGroupInfo != NULL) { for (i = 0; i < dwLocalGroupTotal; i++) @@ -235,7 +262,7 @@ PrintToConsole(L"\n"); } - PrintToConsole(L"Global group memberships "); + PrintPaddedResourceString(IDS_USER_GLOBAL_GROUPS); if (dwGroupTotal != 0 && pGroupInfo != NULL) { for (i = 0; i < dwGroupTotal; i++) @@ -279,31 +306,35 @@ *lpAllocated = FALSE; - printf("Enter the password for user xxx: "); - ReadFromConsole(szPassword1, PWLEN + 1, FALSE); - printf("\n"); - - printf("Enter the password again: "); - ReadFromConsole(szPassword2, PWLEN + 1, FALSE); - printf("\n"); - - if (wcslen(szPassword1) == wcslen(szPassword2) && - wcscmp(szPassword1, szPassword2) == 0) - { - ptr = HeapAlloc(GetProcessHeap(), - 0, - (wcslen(szPassword1) + 1) * sizeof(WCHAR)); - if (ptr != NULL) - { - wcscpy(ptr, szPassword1); - *lpPassword = ptr; - *lpAllocated = TRUE; - } - } - else - { - printf("The passwords do not match!"); - *lpPassword = NULL; + while (TRUE) + { + PrintResourceString(IDS_USER_ENTER_PASSWORD1); + ReadFromConsole(szPassword1, PWLEN + 1, FALSE); + printf("\n"); + + PrintResourceString(IDS_USER_ENTER_PASSWORD2); + ReadFromConsole(szPassword2, PWLEN + 1, FALSE); + printf("\n"); + + if (wcslen(szPassword1) == wcslen(szPassword2) && + wcscmp(szPassword1, szPassword2) == 0) + { + ptr = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(szPassword1) + 1) * sizeof(WCHAR)); + if (ptr != NULL) + { + wcscpy(ptr, szPassword1); + *lpPassword = ptr; + *lpAllocated = TRUE; + return; + } + } + else + { + PrintResourceString(IDS_USER_NO_PASSWORD_MATCH); + *lpPassword = NULL; + } } } Modified: trunk/reactos/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] Sat Nov 8 21:44:32 2014 @@ -65,6 +65,31 @@ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" + IDS_USER_NAME "User name" + IDS_USER_FULL_NAME "Full name" + IDS_USER_COMMENT "Comment" + IDS_USER_USER_COMMENT "User comment" + IDS_USER_COUNTRY_CODE "Country code" + IDS_USER_ACCOUNT_ACTIVE "Account active" + IDS_USER_ACCOUNT_EXPIRES "Account expires" + IDS_USER_PW_LAST_SET "Password last set" + IDS_USER_PW_EXPIRES "Password expires" + IDS_USER_PW_CHANGEABLE "Password changeable" + IDS_USER_PW_REQUIRED "Password required" + IDS_USER_CHANGE_PW "User may change password" + IDS_USER_WORKSTATIONS "Workstations allowed" + IDS_USER_LOGON_SCRIPT "Logon script" + IDS_USER_PROFILE "User profile" + IDS_USER_HOME_DIR "Home directory" + IDS_USER_LAST_LOGON "Last logon" + IDS_USER_LOGON_HOURS "Logon hours allowed" + IDS_USER_LOCAL_GROUPS "Local group memberships" + IDS_USER_GLOBAL_GROUPS "Global group memberships" + + IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: " + IDS_USER_ENTER_PASSWORD2 "Enter the password again: " + IDS_USER_NO_PASSWORD_MATCH "\nThe passwords do not match!\n" + IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" END Modified: trunk/reactos/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] Sat Nov 8 21:44:32 2014 @@ -71,6 +71,31 @@ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" + IDS_USER_NAME "User name" + IDS_USER_FULL_NAME "Full name" + IDS_USER_COMMENT "Comment" + IDS_USER_USER_COMMENT "User comment" + IDS_USER_COUNTRY_CODE "Country code" + IDS_USER_ACCOUNT_ACTIVE "Account active" + IDS_USER_ACCOUNT_EXPIRES "Account expires" + IDS_USER_PW_LAST_SET "Password last set" + IDS_USER_PW_EXPIRES "Password expires" + IDS_USER_PW_CHANGEABLE "Password changeable" + IDS_USER_PW_REQUIRED "Password required" + IDS_USER_CHANGE_PW "User may change password" + IDS_USER_WORKSTATIONS "Workstations allowed" + IDS_USER_LOGON_SCRIPT "Logon script" + IDS_USER_PROFILE "User profile" + IDS_USER_HOME_DIR "Home directory" + IDS_USER_LAST_LOGON "Last logon" + IDS_USER_LOGON_HOURS "Logon hours allowed" + IDS_USER_LOCAL_GROUPS "Local group memberships" + IDS_USER_GLOBAL_GROUPS "Global group memberships" + + IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: " + IDS_USER_ENTER_PASSWORD2 "Enter the password again: " + IDS_USER_NO_PASSWORD_MATCH "\nThe passwords do not match!\n" + IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" END Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Sat Nov 8 21:44:32 2014 @@ -67,6 +67,31 @@ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" + IDS_USER_NAME "User name" + IDS_USER_FULL_NAME "Full name" + IDS_USER_COMMENT "Comment" + IDS_USER_USER_COMMENT "User comment" + IDS_USER_COUNTRY_CODE "Country code" + IDS_USER_ACCOUNT_ACTIVE "Account active" + IDS_USER_ACCOUNT_EXPIRES "Account expires" + IDS_USER_PW_LAST_SET "Password last set" + IDS_USER_PW_EXPIRES "Password expires" + IDS_USER_PW_CHANGEABLE "Password changeable" + IDS_USER_PW_REQUIRED "Password required" + IDS_USER_CHANGE_PW "User may change password" + IDS_USER_WORKSTATIONS "Workstations allowed" + IDS_USER_LOGON_SCRIPT "Logon script" + IDS_USER_PROFILE "User profile" + IDS_USER_HOME_DIR "Home directory" + IDS_USER_LAST_LOGON "Last logon" + IDS_USER_LOGON_HOURS "Logon hours allowed" + IDS_USER_LOCAL_GROUPS "Local group memberships" + IDS_USER_GLOBAL_GROUPS "Global group memberships" + + IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: " + IDS_USER_ENTER_PASSWORD2 "Enter the password again: " + IDS_USER_NO_PASSWORD_MATCH "\nThe passwords do not match!\n" + IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" END Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Sat Nov 8 21:44:32 2014 @@ -65,6 +65,25 @@ VOID +PrintPaddedResourceString( + INT resID) +{ + WCHAR szMsgBuffer[MAX_BUFFER_SIZE]; + INT nLength, nPaddedLength = 29, i; + + nLength = LoadStringW(GetModuleHandle(NULL), resID, szMsgBuffer, MAX_BUFFER_SIZE); + if (nLength < nPaddedLength) + { + for (i = nLength; i < nPaddedLength; i++) + szMsgBuffer[i] = L' '; + szMsgBuffer[nPaddedLength] = UNICODE_NULL; + } + + WriteToConsole(szMsgBuffer); +} + + +VOID PrintToConsole( LPWSTR lpFormat, ...) Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Sat Nov 8 21:44:32 2014 @@ -31,6 +31,10 @@ ...); VOID +PrintPaddedResourceString( + INT resID); + +VOID PrintToConsole( LPWSTR lpFormat, ...); Modified: trunk/reactos/base/applications/network/net/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] Sat Nov 8 21:44:32 2014 @@ -45,5 +45,30 @@ #define IDS_HELP_SYNTAX 142 #define IDS_NET_SYNTAX 143 +#define IDS_USER_NAME 450 +#define IDS_USER_FULL_NAME 451 +#define IDS_USER_COMMENT 452 +#define IDS_USER_USER_COMMENT 453 +#define IDS_USER_COUNTRY_CODE 454 +#define IDS_USER_ACCOUNT_ACTIVE 455 +#define IDS_USER_ACCOUNT_EXPIRES 456 +#define IDS_USER_PW_LAST_SET 457 +#define IDS_USER_PW_EXPIRES 458 +#define IDS_USER_PW_CHANGEABLE 459 +#define IDS_USER_PW_REQUIRED 460 +#define IDS_USER_CHANGE_PW 461 +#define IDS_USER_WORKSTATIONS 462 +#define IDS_USER_LOGON_SCRIPT 463 +#define IDS_USER_PROFILE 464 +#define IDS_USER_HOME_DIR 465 +#define IDS_USER_LAST_LOGON 466 +#define IDS_USER_LOGON_HOURS 467 +#define IDS_USER_LOCAL_GROUPS 468 +#define IDS_USER_GLOBAL_GROUPS 469 + +#define IDS_USER_ENTER_PASSWORD1 490 +#define IDS_USER_ENTER_PASSWORD2 491 +#define IDS_USER_NO_PASSWORD_MATCH 492 + #define IDS_ERROR_OPTION_NOT_SUPPORTED 500 #define IDS_ERROR_INVALID_OPTION_VALUE 501

1 0

[janderwald] 65331: [USBHUB] - it makes sense to also activate the device interface
by janderwald＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: janderwald Date: Sat Nov 8 21:00:37 2014 New Revision: 65331 URL: http://svn.reactos.org/svn/reactos?rev=65331&view=rev Log: [USBHUB] - it makes sense to also activate the device interface Modified: trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Nov 8 21:00:37 2014 @@ -414,6 +414,7 @@ // register device interface // IoRegisterDeviceInterface(DeviceObject, &GUID_DEVINTERFACE_USB_DEVICE, NULL, &ChildDeviceExtension->SymbolicLinkName); + IoSetDeviceInterfaceState(&ChildDeviceExtension->SymbolicLinkName, TRUE); UNIMPLEMENTED return STATUS_SUCCESS;

1 0

[janderwald] 65330: [NTOS] - implement PlugPlayControlGetInterfaceDeviceList class for NtPlugPlayControl
by janderwald＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: janderwald Date: Sat Nov 8 20:58:57 2014 New Revision: 65330 URL: http://svn.reactos.org/svn/reactos?rev=65330&view=rev Log: [NTOS] - implement PlugPlayControlGetInterfaceDeviceList class for NtPlugPlayControl Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Sat Nov 8 20:58:57 2014 @@ -206,6 +206,70 @@ _SEH2_END; return Status; +} + +static NTSTATUS +IopGetInterfaceDeviceList(PPLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA DeviceList) +{ + NTSTATUS Status; + UNICODE_STRING DeviceInstance; + PDEVICE_OBJECT DeviceObject = NULL; + ULONG BufferSize = 0; + GUID FilterGuid; + PZZWSTR SymbolicLinkList = NULL, LinkList; + ULONG TotalLength = 0; + + _SEH2_TRY + { + ProbeForRead(DeviceList->FilterGuid, sizeof(GUID), sizeof(UCHAR)); + RtlCopyMemory(&FilterGuid, DeviceList->FilterGuid, sizeof(GUID)); + + if (DeviceList->Buffer != NULL && DeviceList->BufferSize != 0) + { + BufferSize = DeviceList->BufferSize; + ProbeForWrite(DeviceList->Buffer, BufferSize, sizeof(UCHAR)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePool(DeviceInstance.Buffer); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + + Status = IopCaptureUnicodeString(&DeviceInstance, &DeviceList->DeviceInstance); + if (NT_SUCCESS(Status)) + { + /* Get the device object */ + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); + ExFreePool(DeviceInstance.Buffer); + } + + Status = IoGetDeviceInterfaces(&FilterGuid, DeviceObject, DeviceList->Flags, &SymbolicLinkList); + ObDereferenceObject(DeviceObject); + + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + LinkList = SymbolicLinkList; + while (*SymbolicLinkList != UNICODE_NULL) + { + TotalLength += (wcslen(SymbolicLinkList) + 1) * sizeof(WCHAR); + SymbolicLinkList += wcslen(SymbolicLinkList) + (sizeof(UNICODE_NULL) / sizeof(WCHAR)); + } + TotalLength += sizeof(UNICODE_NULL); + + if (BufferSize >= TotalLength) + { + RtlCopyMemory(DeviceList->Buffer, SymbolicLinkList, TotalLength * sizeof(WCHAR)); + } + DeviceList->BufferSize = TotalLength; + ExFreePool(LinkList); + return STATUS_SUCCESS; } static NTSTATUS @@ -865,6 +929,11 @@ return STATUS_INVALID_PARAMETER; return IopRemovePlugPlayEvent(); + case PlugPlayControlGetInterfaceDeviceList: + if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA)) + return STATUS_INVALID_PARAMETER; + return IopGetInterfaceDeviceList((PPLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA)Buffer); + case PlugPlayControlProperty: if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_PROPERTY_DATA)) return STATUS_INVALID_PARAMETER;

1 0

[janderwald] 65329: [UMPNPMGR] - pass flags to NtPlugPlayControl
by janderwald＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: janderwald Date: Sat Nov 8 20:54:40 2014 New Revision: 65329 URL: http://svn.reactos.org/svn/reactos?rev=65329&view=rev Log: [UMPNPMGR] - pass flags to NtPlugPlayControl Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat Nov 8 20:54:40 2014 @@ -1230,11 +1230,11 @@ DWORD ret = CR_SUCCESS; UNREFERENCED_PARAMETER(hBinding); - UNREFERENCED_PARAMETER(ulFlags); RtlInitUnicodeString(&PlugPlayData.DeviceInstance, pszDeviceID); + PlugPlayData.Flags = ulFlags; PlugPlayData.FilterGuid = InterfaceGuid; PlugPlayData.Buffer = Buffer; PlugPlayData.BufferSize = *pulLength; @@ -1271,7 +1271,6 @@ DWORD ret = CR_SUCCESS; UNREFERENCED_PARAMETER(hBinding); - UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetInterfaceDeviceListSize() called\n"); @@ -1281,6 +1280,7 @@ PlugPlayData.FilterGuid = InterfaceGuid; PlugPlayData.Buffer = NULL; PlugPlayData.BufferSize = 0; + PlugPlayData.Flags = ulFlags; Status = NtPlugPlayControl(PlugPlayControlGetInterfaceDeviceList, (PVOID)&PlugPlayData,

1 0

[janderwald] 65328: [NDK] - add flags member
by janderwald＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: janderwald Date: Sat Nov 8 20:51:57 2014 New Revision: 65328 URL: http://svn.reactos.org/svn/reactos?rev=65328&view=rev Log: [NDK] - add flags member Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Sat Nov 8 20:51:57 2014 @@ -423,6 +423,7 @@ { UNICODE_STRING DeviceInstance; LPGUID FilterGuid; + ULONG Flags; PVOID Buffer; ULONG BufferSize; } PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA, *PPLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA;

1 0

[tkreuzer] 65327: [FREELDR] Tabs -> spaces!
by tkreuzer＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: tkreuzer Date: Sat Nov 8 19:11:47 2014 New Revision: 65327 URL: http://svn.reactos.org/svn/reactos?rev=65327&view=rev Log: [FREELDR] Tabs -> spaces! Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Sat Nov 8 19:11:47 2014 @@ -37,8 +37,8 @@ TRACE("BootMain() called.\n"); - /* Check if the CPU is new enough */ - FrLdrCheckCpuCompatiblity(); + /* Check if the CPU is new enough */ + FrLdrCheckCpuCompatiblity(); if (!UiInitialize(FALSE)) {

1 0

[tkreuzer] 65326: [FREELDR] Check for CPU compatibility early and bugcheck if the CPU is too old. Based on patch by winocm. CORE-6427
by tkreuzer＠svn.reactos.org 08 Nov '14

08 Nov '14

Author: tkreuzer Date: Sat Nov 8 19:05:22 2014 New Revision: 65326 URL: http://svn.reactos.org/svn/reactos?rev=65326&view=rev Log: [FREELDR] Check for CPU compatibility early and bugcheck if the CPU is too old. Based on patch by winocm. CORE-6427 Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sat Nov 8 19:05:22 2014 @@ -59,6 +59,12 @@ }; /* FUNCTIONS ******************************************************************/ + +VOID +FrLdrCheckCpuCompatiblity(VOID) +{ + /* Nothing for now */ +} VOID ArmInit(IN PARM_BOARD_CONFIGURATION_BLOCK BootContext) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sat Nov 8 19:05:22 2014 @@ -1788,7 +1788,51 @@ /* * No futher processing here. * Optionally implement HLT instruction handling. - */ -} + */ +} + +VOID +FrLdrCheckCpuCompatiblity(VOID) +{ + INT CpuInformation[4] = {-1}; + ULONG NumberOfIds; + + /* Check if the processor first supports ID 1 */ + __cpuid(CpuInformation, 0); + + NumberOfIds = CpuInformation[0]; + + if (NumberOfIds == 0) + { + FrLdrBugCheckWithMessage(MISSING_HARDWARE_REQUIREMENTS, + __FILE__, + __LINE__, + "ReactOS requires the CPUID instruction to return " + "more than one supported ID.\n\n"); + } + + /* NumberOfIds will be greater than 1 if the processor is new enough. */ + if (NumberOfIds == 1) + { + INT ProcessorFamily; + + /* Get information. */ + __cpuid(CpuInformation, 1); + + ProcessorFamily = (CpuInformation[0] >> 8) & 0xF; + + /* If it's Family 4 or lower, bugcheck. */ + if(ProcessorFamily < 5) + { + FrLdrBugCheckWithMessage(MISSING_HARDWARE_REQUIREMENTS, + __FILE__, + __LINE__, + "Processor is too old (family %u < 5)\n" + "ReactOS requires a Pentium-level processor or newer.", + ProcessorFamily); + } + } +} + /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Sat Nov 8 19:05:22 2014 @@ -37,6 +37,9 @@ TRACE("BootMain() called.\n"); + /* Check if the CPU is new enough */ + FrLdrCheckCpuCompatiblity(); + if (!UiInitialize(FALSE)) { UiMessageBoxCritical("Unable to initialize UI.\n"); @@ -50,10 +53,10 @@ } #ifdef _M_IX86 - HalpInitializePciStubs(); - HalpInitBusHandler(); + HalpInitializePciStubs(); + HalpInitBusHandler(); #endif - RunLoader(); + RunLoader(); quit: /* If we reach this point, something went wrong before, therefore reboot */ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sat Nov 8 19:05:22 2014 @@ -121,5 +121,6 @@ VOID BootMain(LPSTR CmdLine); VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem); VOID RunLoader(VOID); +VOID FrLdrCheckCpuCompatiblity(VOID); #endif /* __FREELDR_H */

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