Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[cgutman] 54464: [NDIS] - Print debugging information if a mismatch occurs between requested and returned parameter types - Print debugging information if a registry read returns a type that NDIS d...
by cgutman＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: cgutman Date: Sun Nov 20 21:37:16 2011 New Revision: 54464 URL: http://svn.reactos.org/svn/reactos?rev=54464&view=rev Log: [NDIS] - Print debugging information if a mismatch occurs between requested and returned parameter types - Print debugging information if a registry read returns a type that NDIS doesn't handle - Ensure that all digits are less than the base during conversion from string to integer (otherwise it's a string) Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Sun Nov 20 21:37:16 2011 @@ -68,6 +68,8 @@ WCHAR Buff[11]; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + NDIS_DbgPrint(MID_TRACE, ("Parameter type: %d\n", ParameterValue->ParameterType)); /* reset parameter type to standard reg types */ switch(ParameterValue->ParameterType) @@ -373,7 +375,7 @@ * TRUE if it is valid, FALSE if not */ { - ULONG i; + ULONG i, Base; /* I don't think this will ever happen, but we warn it if it does */ if (String->Length == 0) @@ -384,6 +386,7 @@ /* Set the default parameter type */ *ParameterType = NdisParameterInteger; + Base = 10; for (i = 0; i < String->Length / sizeof(WCHAR); i++) { @@ -395,6 +398,7 @@ { NDIS_DbgPrint(MID_TRACE, ("Identified hex string\n")); *ParameterType = NdisParameterHexInteger; + Base = 0x10; continue; } } @@ -403,8 +407,8 @@ if (String->Buffer[i] == UNICODE_NULL) continue; - /* Make sure the character is valid for a numeric string */ - if (UnicodeToHexByte(String->Buffer[i]) == 0xFF) + /* Make sure the character is valid for a numeric string of this base */ + if (UnicodeToHexByte(String->Buffer[i]) >= Base) return FALSE; } @@ -449,6 +453,7 @@ *Status = NDIS_STATUS_FAILURE; NDIS_DbgPrint(MAX_TRACE,("requested read of %wZ\n", Keyword)); + NDIS_DbgPrint(MID_TRACE,("requested parameter type: %d\n", ParameterType)); if (ConfigurationContext == NULL) { @@ -661,7 +666,7 @@ (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; } - else + else if (KeyInformation->Type == REG_SZ) { UNICODE_STRING str; @@ -697,6 +702,22 @@ (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; } + } + else + { + NDIS_DbgPrint(MIN_TRACE, ("Invalid type for NdisReadConfiguration (%d)\n", KeyInformation->Type)); + NDIS_DbgPrint(MIN_TRACE, ("Requested type: %d\n", ParameterType)); + NDIS_DbgPrint(MIN_TRACE, ("Registry entry: %wZ\n", Keyword)); + *Status = NDIS_STATUS_FAILURE; + ExFreePool(KeyInformation); + return; + } + + if ((*ParameterValue)->ParameterType != ParameterType) + { + NDIS_DbgPrint(MIN_TRACE, ("Parameter type mismatch! (Requested: %d | Received: %d)\n", + ParameterType, (*ParameterValue)->ParameterType)); + NDIS_DbgPrint(MIN_TRACE, ("Registry entry: %wZ\n", Keyword)); } MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA;

1 0

[pschweitzer] 54463: [ADVAPI32_APITEST] Add missing test to CD
by pschweitzer＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: pschweitzer Date: Sun Nov 20 20:03:46 2011 New Revision: 54463 URL: http://svn.reactos.org/svn/reactos?rev=54463&view=rev Log: [ADVAPI32_APITEST] Add missing test to CD Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Nov 20 20:03:46 2011 @@ -871,6 +871,7 @@ modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional modules\rostests\winetests\xmllite\xmllite_winetest.exe 7 optional +modules\rostests\apitests\advapi32\advapi32_apitest.exe 7 optional modules\rostests\apitests\dciman32\dciman32_apitest.exe 7 optional modules\rostests\apitests\gdi32\gdi32_apitest.exe 7 optional modules\rostests\apitests\kernel32\kernel32_apitest.exe 7 optional

1 0

[jgardou] 54462: [RTL] - explicitly truncate some values, so it doesn't count as an error for compiler/MSVC runtime checker
by jgardou＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: jgardou Date: Sun Nov 20 19:45:06 2011 New Revision: 54462 URL: http://svn.reactos.org/svn/reactos?rev=54462&view=rev Log: [RTL] - explicitly truncate some values, so it doesn't count as an error for compiler/MSVC runtime checker Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=54462&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Sun Nov 20 19:45:06 2011 @@ -369,7 +369,7 @@ { SHORT Offset; USHORT Type; - USHORT i; + ULONG i; PUSHORT ShortPtr; PULONG LongPtr; PULONGLONG LongLongPtr; @@ -379,7 +379,6 @@ Offset = SWAPW(*TypeOffset) & 0xFFF; Type = SWAPW(*TypeOffset) >> 12; ShortPtr = (PUSHORT)(RVA(Address, Offset)); - /* * Don't relocate within the relocation section itself. * GCC/LD generates sometimes relocation records for the relocation section. @@ -398,16 +397,16 @@ break; case IMAGE_REL_BASED_HIGH: - *ShortPtr = HIWORD(MAKELONG(0, *ShortPtr) + (LONG)Delta); + *ShortPtr = HIWORD(MAKELONG(0, *ShortPtr) + (Delta & 0xFFFFFFFF)); break; case IMAGE_REL_BASED_LOW: - *ShortPtr = SWAPW(*ShortPtr) + LOWORD(Delta); + *ShortPtr = SWAPW(*ShortPtr) + LOWORD(Delta & 0xFFFF); break; case IMAGE_REL_BASED_HIGHLOW: LongPtr = (PULONG)RVA(Address, Offset); - *LongPtr = SWAPD(*LongPtr) + (ULONG)Delta; + *LongPtr = SWAPD(*LongPtr) + (Delta & 0xFFFFFFFF); break; case IMAGE_REL_BASED_DIR64:

1 0

[jgardou] 54461: [HAL] - truncate PCI vendor id instead of casting it. MSVC chokes on it with /RTCc
by jgardou＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: jgardou Date: Sun Nov 20 17:54:52 2011 New Revision: 54461 URL: http://svn.reactos.org/svn/reactos?rev=54461&view=rev Log: [HAL] - truncate PCI vendor id instead of casting it. MSVC chokes on it with /RTCc Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcib… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] Sun Nov 20 17:54:52 2011 @@ -1188,7 +1188,7 @@ sizeof(ULONG))) { /* Validate the vendor ID */ - if ((USHORT)VendorId != PCI_INVALID_VENDORID) + if ((VendorId & 0xFFFF) != PCI_INVALID_VENDORID) { /* Set this as the maximum ID */ MaxPciBusNumber = i;

1 0

[jgardou] 54460: [FREELDR] - fix potential integer overflow : casting ULONGLONG to ULONG_PTR is not a good idea.
by jgardou＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: jgardou Date: Sun Nov 20 17:37:20 2011 New Revision: 54460 URL: http://svn.reactos.org/svn/reactos?rev=54460&view=rev Log: [FREELDR] - fix potential integer overflow : casting ULONGLONG to ULONG_PTR is not a good idea. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Sun Nov 20 17:37:20 2011 @@ -248,10 +248,10 @@ /* Copy data to global buffer */ RtlCopyMemory(&PcBiosMemoryMap[PcBiosMapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx); - TRACE("BaseAddress: 0x%p\n", (PVOID)(ULONG_PTR)PcBiosMemoryMap[PcBiosMapCount].BaseAddress); - TRACE("Length: 0x%p\n", (PVOID)(ULONG_PTR)PcBiosMemoryMap[PcBiosMapCount].Length); - TRACE("Type: 0x%x\n", PcBiosMemoryMap[PcBiosMapCount].Type); - TRACE("Reserved: 0x%x\n", PcBiosMemoryMap[PcBiosMapCount].Reserved); + TRACE("BaseAddress: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].BaseAddress); + TRACE("Length: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].Length); + TRACE("Type: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Type); + TRACE("Reserved: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Reserved); TRACE("\n"); /* Check if this is free memory */ @@ -260,13 +260,12 @@ MemoryType = LoaderFree; /* Align up base of memory area */ - RealBaseAddress = ALIGN_UP_BY(PcBiosMemoryMap[PcBiosMapCount].BaseAddress, - MM_PAGE_SIZE); + RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL); /* Calculate the length after aligning the base */ RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress + PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress; - RealSize = ALIGN_DOWN_BY(RealSize, MM_PAGE_SIZE); + RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL); } else { @@ -276,13 +275,11 @@ MemoryType = LoaderSpecialMemory; /* Align down base of memory area */ - RealBaseAddress = ALIGN_DOWN_BY(PcBiosMemoryMap[PcBiosMapCount].BaseAddress, - MM_PAGE_SIZE); - + RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL); /* Calculate the length after aligning the base */ RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress + PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress; - RealSize = ALIGN_UP_BY(RealSize, MM_PAGE_SIZE); + RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL); } /* Check if we can add this descriptor */

1 0

[pschweitzer] 54459: [KERNEL32] Properly fix GetEnvironmentVariableW and set error in case of RtlInitUnicodeStringEx failure
by pschweitzer＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: pschweitzer Date: Sun Nov 20 17:00:39 2011 New Revision: 54459 URL: http://svn.reactos.org/svn/reactos?rev=54459&view=rev Log: [KERNEL32] Properly fix GetEnvironmentVariableW and set error in case of RtlInitUnicodeStringEx failure Modified: trunk/reactos/dll/win32/kernel32/client/environ.c Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Sun Nov 20 17:00:39 2011 @@ -181,24 +181,28 @@ { UniSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); } + + Status = RtlInitUnicodeStringEx(&VarName, lpName); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } RtlInitEmptyUnicodeString(&VarValue, lpBuffer, UniSize); - Status = RtlInitUnicodeStringEx(&VarName, lpName); - if (NT_SUCCESS(Status)) - { - Status = RtlQueryEnvironmentVariable_U(NULL, &VarName, &VarValue); - if (!NT_SUCCESS(Status)) - { - if (Status == STATUS_BUFFER_TOO_SMALL) - { - return (VarValue.Length / sizeof(WCHAR)) + sizeof(ANSI_NULL); - } - BaseSetLastNTError (Status); - return 0; - } - - lpBuffer[VarValue.Length / sizeof(WCHAR)] = UNICODE_NULL; - } + + Status = RtlQueryEnvironmentVariable_U(NULL, &VarName, &VarValue); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_BUFFER_TOO_SMALL) + { + return (VarValue.Length / sizeof(WCHAR)) + sizeof(ANSI_NULL); + } + BaseSetLastNTError (Status); + return 0; + } + + lpBuffer[VarValue.Length / sizeof(WCHAR)] = UNICODE_NULL; return (VarValue.Length / sizeof(WCHAR)); }

1 0

[pschweitzer] 54458: [NTOSKNRL] Properly check for string
by pschweitzer＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: pschweitzer Date: Sun Nov 20 16:39:31 2011 New Revision: 54458 URL: http://svn.reactos.org/svn/reactos?rev=54458&view=rev Log: [NTOSKNRL] Properly check for string Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Sun Nov 20 16:39:31 2011 @@ -478,7 +478,7 @@ } /* Check if we had a Vendor ID */ - if (Prcb->VendorString) + if (Prcb->VendorString[0]) { /* Convert it to Unicode */ RtlInitAnsiString(&TempString, Prcb->VendorString);

1 0

[fireball] 54457: [RBUILD] - Convert SPACEs to TABs in .rbuild.
by fireball＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: fireball Date: Sun Nov 20 16:34:16 2011 New Revision: 54457 URL: http://svn.reactos.org/svn/reactos?rev=54457&view=rev Log: [RBUILD] - Convert SPACEs to TABs in .rbuild. Modified: trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sun Nov 20 16:34:16 2011 @@ -5,7 +5,7 @@ <directory name="except"> <if property="ARCH" value="i386"> <directory name="i386"> - <file>chkesp.s</file> + <file>chkesp.s</file> <file>chkstk_asm.s</file> <file>chkstk_ms.s</file> </directory> @@ -160,11 +160,11 @@ <file>tanh.c</file> <file>powl.c</file> - <directory name="ieee754"> - <file>j0_y0.c</file> - <file>j1_y1.c</file> - <file>jn_yn.c</file> - </directory> + <directory name="ieee754"> + <file>j0_y0.c</file> + <file>j1_y1.c</file> + <file>jn_yn.c</file> + </directory> <if property="ARCH" value="i386"> <directory name="i386"> @@ -225,10 +225,6 @@ <file>sqrtf.S</file> <file>tan.S</file> </directory> -  -  </if> <ifnot property="ARCH" value="i386"> <file>stubs.c</file>

1 0

[rharabien] 54456: [KERNEL32/WIN32CSR] - Use ShowCmd from STARTUPINFO when creating console window
by rharabien＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: rharabien Date: Sun Nov 20 14:35:41 2011 New Revision: 54456 URL: http://svn.reactos.org/svn/reactos?rev=54456&view=rev Log: [KERNEL32/WIN32CSR] - Use ShowCmd from STARTUPINFO when creating console window Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/file/console.c trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Sun Nov 20 14:35:41 2011 @@ -67,6 +67,7 @@ BOOLEAN NotConsole = FALSE; PRTL_USER_PROCESS_PARAMETERS Parameters = NtCurrentPeb()->ProcessParameters; LPCWSTR ExeName; + STARTUPINFO si; WCHAR lpTest[MAX_PATH]; GetModuleFileNameW(NULL, lpTest, MAX_PATH); @@ -86,8 +87,9 @@ else { /* Assume one is needed */ + GetStartupInfo(&si); Request.Data.AllocConsoleRequest.ConsoleNeeded = TRUE; - Request.Data.AllocConsoleRequest.Visible = TRUE; + Request.Data.AllocConsoleRequest.ShowCmd = si.wShowWindow; /* Handle the special flags given to us by BasepInitializeEnvironment */ if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS) @@ -108,7 +110,7 @@ /* We'll get the real one soon */ DPRINT("Creating new invisible console\n"); Parameters->ConsoleHandle = NULL; - Request.Data.AllocConsoleRequest.Visible = FALSE; + Request.Data.AllocConsoleRequest.ShowCmd = SW_HIDE; } else { Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] Sun Nov 20 14:35:41 2011 @@ -1823,6 +1823,7 @@ ULONG CsrRequest; NTSTATUS Status; HANDLE hStdError; + STARTUPINFO si; if (NtCurrentPeb()->ProcessParameters->ConsoleHandle) { @@ -1831,9 +1832,11 @@ return FALSE; } + GetStartupInfo(&si); + Request.Data.AllocConsoleRequest.CtrlDispatcher = ConsoleControlDispatcher; Request.Data.AllocConsoleRequest.ConsoleNeeded = TRUE; - Request.Data.AllocConsoleRequest.Visible = TRUE; + Request.Data.AllocConsoleRequest.ShowCmd = si.wShowWindow; CsrRequest = MAKE_CSR_API(ALLOC_CONSOLE, CSR_CONSOLE); Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Sun Nov 20 14:35:41 2011 @@ -83,7 +83,7 @@ { PCONTROLDISPATCHER CtrlDispatcher; BOOLEAN ConsoleNeeded; - BOOLEAN Visible; + INT ShowCmd; HANDLE Console; HANDLE InputHandle; HANDLE OutputHandle; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Sun Nov 20 14:35:41 2011 @@ -67,7 +67,7 @@ } static NTSTATUS WINAPI -CsrInitConsole(PCSRSS_CONSOLE Console, BOOL Visible) +CsrInitConsole(PCSRSS_CONSOLE Console, int ShowCmd) { NTSTATUS Status; SECURITY_ATTRIBUTES SecurityAttributes; @@ -142,7 +142,7 @@ } if (GuiMode) { - Status = GuiInitConsole(Console, Visible); + Status = GuiInitConsole(Console, ShowCmd); if (! NT_SUCCESS(Status)) { HeapFree(Win32CsrApiHeap,0, NewBuffer); @@ -217,7 +217,7 @@ /* insert process data required for GUI initialization */ InsertHeadList(&Console->ProcessList, &ProcessData->ProcessEntry); /* Initialize the Console */ - Status = CsrInitConsole(Console, Request->Data.AllocConsoleRequest.Visible); + Status = CsrInitConsole(Console, Request->Data.AllocConsoleRequest.ShowCmd); if (!NT_SUCCESS(Status)) { DPRINT1("Console init failed\n"); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Sun Nov 20 14:35:41 2011 @@ -2097,10 +2097,7 @@ if (NULL != NewWindow) { SetWindowLongW(hWnd, GWL_USERDATA, GetWindowLongW(hWnd, GWL_USERDATA) + 1); - if (wParam) - { - ShowWindow(NewWindow, SW_SHOW); - } + ShowWindow(NewWindow, (int)wParam); } return (LRESULT) NewWindow; case PM_DESTROY_CONSOLE: @@ -2280,7 +2277,7 @@ }; NTSTATUS FASTCALL -GuiInitConsole(PCSRSS_CONSOLE Console, BOOL Visible) +GuiInitConsole(PCSRSS_CONSOLE Console, int ShowCmd) { HANDLE GraphicsStartupEvent; HANDLE ThreadHandle; @@ -2347,7 +2344,7 @@ */ GuiData->hGuiInitEvent = CreateEventW(NULL, FALSE, FALSE, NULL); /* create console */ - PostMessageW(NotifyWnd, PM_CREATE_CONSOLE, Visible, (LPARAM) Console); + PostMessageW(NotifyWnd, PM_CREATE_CONSOLE, ShowCmd, (LPARAM) Console); /* wait untill initialization has finished */ WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE);

1 0

[jgardou] 54455: [CRT] - implement _chkesp
by jgardou＠svn.reactos.org 20 Nov '11

20 Nov '11

Author: jgardou Date: Sun Nov 20 14:04:40 2011 New Revision: 54455 URL: http://svn.reactos.org/svn/reactos?rev=54455&view=rev Log: [CRT] - implement _chkesp Added: trunk/reactos/lib/sdk/crt/except/i386/chkesp.s (with props) Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/except/stack.c Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun Nov 20 14:04:40 2011 @@ -306,6 +306,7 @@ if(ARCH MATCHES i386) list(APPEND CRT_SOURCE + except/i386/chkesp.s except/i386/prolog.s except/i386/seh.s except/i386/seh_prolog.s Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sun Nov 20 14:04:40 2011 @@ -5,6 +5,7 @@ <directory name="except"> <if property="ARCH" value="i386"> <directory name="i386"> + <file>chkesp.s</file> <file>chkstk_asm.s</file> <file>chkstk_ms.s</file> </directory> Added: trunk/reactos/lib/sdk/crt/except/i386/chkesp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/ch… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/i386/chkesp.s (added) +++ trunk/reactos/lib/sdk/crt/except/i386/chkesp.s [iso-8859-1] Sun Nov 20 14:04:40 2011 @@ -1,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS C run time library + * PURPOSE: Stack checker + * PROGRAMMERS: Jérôme Gardou + */ + +#include <asm.inc> +#include <ks386.inc> + +/* Code is taken from wine 1.3.33, + * Copyright Jon Griffiths and Alexandre Julliard + */ +EXTERN __chkesp_failed:PROC + +PUBLIC __chkesp +.code +__chkesp: + jnz .test_failed + ret + +.test_failed: + push ebp + mov ebp, esp + sub esp, 12 + push eax + push ecx + push edx + call __chkesp_failed + pop edx + pop ecx + pop eax + leave + ret + +END Propchange: trunk/reactos/lib/sdk/crt/except/i386/chkesp.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/except/stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/stack.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/stack.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/stack.c [iso-8859-1] Sun Nov 20 14:04:40 2011 @@ -24,14 +24,10 @@ #ifdef __i386__ -void _chkesp(void) +void _chkesp_failed(void) { -} - -#else - -void _chkesp(void) -{ + ERR("stack got corrupted!\n"); + __debugbreak(); } #endif /* __i386__ */

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011