Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 67331: [USER32_APITEST] - Use correct format specifiers aka fix GCC build
by tfaber＠svn.reactos.org 21 Apr '15

21 Apr '15

Author: tfaber Date: Tue Apr 21 09:25:51 2015 New Revision: 67331 URL: http://svn.reactos.org/svn/reactos?rev=67331&view=rev Log: [USER32_APITEST] - Use correct format specifiers aka fix GCC build Modified: trunk/rostests/apitests/user32/GetWindowPlacement.c Modified: trunk/rostests/apitests/user32/GetWindowPlacement.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetWindow… ============================================================================== --- trunk/rostests/apitests/user32/GetWindowPlacement.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetWindowPlacement.c [iso-8859-1] Tue Apr 21 09:25:51 2015 @@ -104,14 +104,14 @@ ok(wp->length == sizeof(*wp), "wp.length = %u\n", wp->length); ok(wp->flags == 0, "wp.flags = %x\n", wp->flags); ok(wp->showCmd == SW_SHOWNORMAL, "wp.showCmd = %u\n", wp->showCmd); - ok(wp->ptMinPosition.x == (UINT)-1, "wp.ptMinPosition.x = %u\n", wp->ptMinPosition.x); - ok(wp->ptMinPosition.y == (UINT)-1, "wp.ptMinPosition.x = %u\n", wp->ptMinPosition.y); - ok(wp->ptMaxPosition.x == (UINT)-1, "wp.ptMaxPosition.x = %u\n", wp->ptMaxPosition.x); - ok(wp->ptMaxPosition.y == (UINT)-1, "wp.ptMaxPosition.y = %u\n", wp->ptMaxPosition.y); - ok(wp->rcNormalPosition.left == 0, "wp.rcNormalPosition.left = %u\n", wp->rcNormalPosition.left); - ok(wp->rcNormalPosition.top == 0, "wp.rcNormalPosition.top = %u\n", wp->rcNormalPosition.top); + ok(wp->ptMinPosition.x == -1, "wp.ptMinPosition.x = %ld\n", wp->ptMinPosition.x); + ok(wp->ptMinPosition.y == -1, "wp.ptMinPosition.x = %ld\n", wp->ptMinPosition.y); + ok(wp->ptMaxPosition.x == -1, "wp.ptMaxPosition.x = %ld\n", wp->ptMaxPosition.x); + ok(wp->ptMaxPosition.y == -1, "wp.ptMaxPosition.y = %ld\n", wp->ptMaxPosition.y); + ok(wp->rcNormalPosition.left == 0, "wp.rcNormalPosition.left = %ld\n", wp->rcNormalPosition.left); + ok(wp->rcNormalPosition.top == 0, "wp.rcNormalPosition.top = %ld\n", wp->rcNormalPosition.top); ok(wp->rcNormalPosition.right != 0 && - wp->rcNormalPosition.right != 0x55555555, "wp.rcNormalPosition.right = %u\n", wp->rcNormalPosition.right); + wp->rcNormalPosition.right != 0x55555555, "wp.rcNormalPosition.right = %ld\n", wp->rcNormalPosition.right); ok(wp->rcNormalPosition.bottom != 0 && - wp->rcNormalPosition.bottom != 0x55555555, "wp.rcNormalPosition.bottom = %u\n", wp->rcNormalPosition.bottom); + wp->rcNormalPosition.bottom != 0x55555555, "wp.rcNormalPosition.bottom = %ld\n", wp->rcNormalPosition.bottom); }

1 0

[tfaber] 67330: [USER32_APITEST] - Add a test for GetWindowPlacement CORE-9578
by tfaber＠svn.reactos.org 21 Apr '15

21 Apr '15

Author: tfaber Date: Tue Apr 21 09:21:22 2015 New Revision: 67330 URL: http://svn.reactos.org/svn/reactos?rev=67330&view=rev Log: [USER32_APITEST] - Add a test for GetWindowPlacement CORE-9578 Added: trunk/rostests/apitests/user32/GetWindowPlacement.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Tue Apr 21 09:21:22 2015 @@ -15,6 +15,7 @@ GetPeekMessage.c GetSystemMetrics.c GetUserObjectInformation.c + GetWindowPlacement.c InitializeLpkHooks.c LoadImage.c LookupIconIdFromDirectoryEx.c Added: trunk/rostests/apitests/user32/GetWindowPlacement.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetWindow… ============================================================================== --- trunk/rostests/apitests/user32/GetWindowPlacement.c (added) +++ trunk/rostests/apitests/user32/GetWindowPlacement.c [iso-8859-1] Tue Apr 21 09:21:22 2015 @@ -0,0 +1,117 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for GetWindowPlacement + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <winuser.h> + +#define ALIGN_DOWN_BY(size, align) \ + ((ULONG_PTR)(size) & ~((ULONG_PTR)(align) - 1)) + +#define ALIGN_UP_BY(size, align) \ + (ALIGN_DOWN_BY(((ULONG_PTR)(size) + align - 1), align)) + +START_TEST(GetWindowPlacement) +{ + BYTE buffer[sizeof(WINDOWPLACEMENT) + 16]; + PWINDOWPLACEMENT wp = (PVOID)buffer; + DWORD error; + BOOL ret; + + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(NULL, NULL); + error = GetLastError(); + ok(ret == FALSE, "ret = %d\n", ret); + ok(error == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", error); + + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(GetDesktopWindow(), NULL); + error = GetLastError(); + ok(ret == FALSE, "ret = %d\n", ret); + ok(error == ERROR_NOACCESS, "error = %lu\n", error); + + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(GetDesktopWindow(), (PVOID)(UINT_PTR)-4); + error = GetLastError(); + ok(ret == FALSE, "ret = %d\n", ret); + ok(error == ERROR_NOACCESS, "error = %lu\n", error); + + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(GetDesktopWindow(), (PVOID)(ALIGN_UP_BY(buffer, 16) + 1)); + error = GetLastError(); + ok(ret == TRUE, "ret = %d\n", ret); + ok(error == 0xfeedfab1, "error = %lu\n", error); + + FillMemory(wp, sizeof(*wp), 0x55); + wp->length = 0; + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(NULL, wp); + error = GetLastError(); + ok(ret == FALSE, "ret = %d\n", ret); + ok(error == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", error); + ok(wp->length == 0, "wp.length = %u\n", wp->length); + + FillMemory(wp, sizeof(*wp), 0x55); + wp->length = 0; + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(GetDesktopWindow(), wp); + error = GetLastError(); + ok(ret == TRUE, "ret = %d\n", ret); + ok(error == 0xfeedfab1, "error = %lu\n", error); + ok(wp->length == sizeof(*wp), "wp.length = %u\n", wp->length); + ok(wp->flags == 0, "wp.flags = %x\n", wp->flags); + + FillMemory(wp, sizeof(*wp), 0x55); + wp->length = 1; + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(GetDesktopWindow(), wp); + error = GetLastError(); + ok(ret == TRUE, "ret = %d\n", ret); + ok(error == 0xfeedfab1, "error = %lu\n", error); + ok(wp->length == sizeof(*wp), "wp.length = %u\n", wp->length); + ok(wp->flags == 0, "wp.flags = %x\n", wp->flags); + + FillMemory(wp, sizeof(*wp), 0x55); + wp->length = sizeof(*wp) - 1; + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(GetDesktopWindow(), wp); + error = GetLastError(); + ok(ret == TRUE, "ret = %d\n", ret); + ok(error == 0xfeedfab1, "error = %lu\n", error); + ok(wp->length == sizeof(*wp), "wp.length = %u\n", wp->length); + ok(wp->flags == 0, "wp.flags = %x\n", wp->flags); + + FillMemory(wp, sizeof(*wp), 0x55); + wp->length = sizeof(*wp) + 1; + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(GetDesktopWindow(), wp); + error = GetLastError(); + ok(ret == TRUE, "ret = %d\n", ret); + ok(error == 0xfeedfab1, "error = %lu\n", error); + ok(wp->length == sizeof(*wp), "wp.length = %u\n", wp->length); + ok(wp->flags == 0, "wp.flags = %x\n", wp->flags); + + FillMemory(wp, sizeof(*wp), 0x55); + wp->length = sizeof(*wp); + SetLastError(0xfeedfab1); + ret = GetWindowPlacement(GetDesktopWindow(), wp); + error = GetLastError(); + ok(ret == TRUE, "ret = %d\n", ret); + ok(error == 0xfeedfab1, "error = %lu\n", error); + ok(wp->length == sizeof(*wp), "wp.length = %u\n", wp->length); + ok(wp->flags == 0, "wp.flags = %x\n", wp->flags); + ok(wp->showCmd == SW_SHOWNORMAL, "wp.showCmd = %u\n", wp->showCmd); + ok(wp->ptMinPosition.x == (UINT)-1, "wp.ptMinPosition.x = %u\n", wp->ptMinPosition.x); + ok(wp->ptMinPosition.y == (UINT)-1, "wp.ptMinPosition.x = %u\n", wp->ptMinPosition.y); + ok(wp->ptMaxPosition.x == (UINT)-1, "wp.ptMaxPosition.x = %u\n", wp->ptMaxPosition.x); + ok(wp->ptMaxPosition.y == (UINT)-1, "wp.ptMaxPosition.y = %u\n", wp->ptMaxPosition.y); + ok(wp->rcNormalPosition.left == 0, "wp.rcNormalPosition.left = %u\n", wp->rcNormalPosition.left); + ok(wp->rcNormalPosition.top == 0, "wp.rcNormalPosition.top = %u\n", wp->rcNormalPosition.top); + ok(wp->rcNormalPosition.right != 0 && + wp->rcNormalPosition.right != 0x55555555, "wp.rcNormalPosition.right = %u\n", wp->rcNormalPosition.right); + ok(wp->rcNormalPosition.bottom != 0 && + wp->rcNormalPosition.bottom != 0x55555555, "wp.rcNormalPosition.bottom = %u\n", wp->rcNormalPosition.bottom); +} Propchange: trunk/rostests/apitests/user32/GetWindowPlacement.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Tue Apr 21 09:21:22 2015 @@ -17,6 +17,7 @@ extern void func_GetPeekMessage(void); extern void func_GetSystemMetrics(void); extern void func_GetUserObjectInformation(void); +extern void func_GetWindowPlacement(void); extern void func_InitializeLpkHooks(void); extern void func_LoadImage(void); extern void func_LookupIconIdFromDirectoryEx(void); @@ -49,6 +50,7 @@ { "GetPeekMessage", func_GetPeekMessage }, { "GetSystemMetrics", func_GetSystemMetrics }, { "GetUserObjectInformation", func_GetUserObjectInformation }, + { "GetWindowPlacement", func_GetWindowPlacement }, { "InitializeLpkHooks", func_InitializeLpkHooks }, { "LoadImage", func_LoadImage }, { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx },

1 0

[jimtabor] 67329: [Win32k] - Passing GetDesktopWindow() to GetWindowPlacement() causes NULL pointer dereference, Bug found by Nathan Osman, Fix CORE-9578.
by jimtabor＠svn.reactos.org 21 Apr '15

21 Apr '15

Author: jimtabor Date: Tue Apr 21 04:45:09 2015 New Revision: 67329 URL: http://svn.reactos.org/svn/reactos?rev=67329&view=rev Log: [Win32k] - Passing GetDesktopWindow() to GetWindowPlacement() causes NULL pointer dereference, Bug found by Nathan Osman, Fix CORE-9578. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Tue Apr 21 04:45:09 2015 @@ -397,7 +397,7 @@ POINT Size; RECTL Rect = *RestoreRect; - if (Wnd->spwndParent != UserGetDesktopWindow()) + if (Wnd->spwndParent && Wnd->spwndParent != UserGetDesktopWindow()) { RECTL_vOffsetRect(&Rect, -Wnd->spwndParent->rcClient.left,

1 0

[tfaber] 67328: [COMCTL32] - Fix use after free in DPA_Merge
by tfaber＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: tfaber Date: Mon Apr 20 20:01:48 2015 New Revision: 67328 URL: http://svn.reactos.org/svn/reactos?rev=67328&view=rev Log: [COMCTL32] - Fix use after free in DPA_Merge Modified: trunk/reactos/dll/win32/comctl32/dpa.c Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] Mon Apr 20 20:01:48 2015 @@ -291,16 +291,14 @@ hdpa1->nItemCount, hdpa2->nItemCount); - /* working but untrusted implementation */ - - pWork1 = &(hdpa1->ptrs[hdpa1->nItemCount - 1]); - pWork2 = &(hdpa2->ptrs[hdpa2->nItemCount - 1]); - nIndex = hdpa1->nItemCount - 1; nCount = hdpa2->nItemCount - 1; do { + pWork1 = &hdpa1->ptrs[nIndex]; + pWork2 = &hdpa2->ptrs[nCount]; + if (nIndex < 0) { if ((nCount >= 0) && (dwFlags & DPAM_UNION)) { /* Now insert the remaining new items into DPA 1 */ @@ -331,10 +329,8 @@ return FALSE; nCount--; - pWork2--; *pWork1 = ptr; nIndex--; - pWork1--; } else if (nResult > 0) { @@ -349,7 +345,6 @@ (pfnMerge)(DPAMM_DELETE, ptr, NULL, lParam); } nIndex--; - pWork1--; } else { @@ -365,7 +360,6 @@ DPA_InsertPtr (hdpa1, nIndex+1, ptr); } nCount--; - pWork2--; } }

1 0

[dreimer] 67327: [INF] Add FontSubstitutes for Times and Tms Rmn which are not there in ROS, but in Windows
by dreimer＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: dreimer Date: Mon Apr 20 17:25:24 2015 New Revision: 67327 URL: http://svn.reactos.org/svn/reactos?rev=67327&view=rev Log: [INF] Add FontSubstitutes for Times and Tms Rmn which are not there in ROS, but in Windows Modified: trunk/reactos/media/inf/font.inf Modified: trunk/reactos/media/inf/font.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=673… ============================================================================== Binary files - no diff available.

1 0

[aandrejevic] 67326: [NTVDM] We must set the retry flag when repeating a call to GetNextVDMCommand.
by aandrejevic＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: aandrejevic Date: Mon Apr 20 17:10:28 2015 New Revision: 67326 URL: http://svn.reactos.org/svn/reactos?rev=67326&view=rev Log: [NTVDM] We must set the retry flag when repeating a call to GetNextVDMCommand. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Mon Apr 20 17:10:28 2015 @@ -237,6 +237,7 @@ CommandInfo.Env = Env = RtlReAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); /* Repeat the request */ + CommandInfo.VDMState |= VDM_FLAG_RETRY; goto Command; }

1 0

[aandrejevic] 67325: [NTVDM] Make the total amount of EMS pages configurable. Allocate memory for EMS instead of sharing a part of the guest memory.
by aandrejevic＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: aandrejevic Date: Mon Apr 20 14:02:18 2015 New Revision: 67325 URL: http://svn.reactos.org/svn/reactos?rev=67325&view=rev Log: [NTVDM] Make the total amount of EMS pages configurable. Allocate memory for EMS instead of sharing a part of the guest memory. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Mon Apr 20 14:02:18 2015 @@ -666,7 +666,11 @@ SearchAndInitRoms(&BiosContext); /* Initialize EMS */ - EmsInitialize(); + if (!EmsInitialize(EMS_TOTAL_PAGES)) + { + DPRINT1("Could not initialize EMS. EMS will not be available.\n" + "Try reducing the number of EMS pages.\n"); + } /* * End of the 32-bit POST portion. We then fall back into 16-bit where Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] Mon Apr 20 14:02:18 2015 @@ -21,6 +21,9 @@ // #define BIOS_TIME_INTERRUPT 0x1A // #define BIOS_SYS_TIMER_INTERRUPT 0x1C +/* 16 MB of EMS memory */ +#define EMS_TOTAL_PAGES 1024 + /* FUNCTIONS ******************************************************************/ BOOLEAN Bios32Initialize(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c [iso-8859-1] Mon Apr 20 14:02:18 2015 @@ -19,10 +19,12 @@ /* PRIVATE VARIABLES **********************************************************/ static RTL_BITMAP AllocBitmap; -static ULONG BitmapBuffer[(EMS_TOTAL_PAGES + sizeof(ULONG) - 1) / sizeof(ULONG)]; -static EMS_PAGE PageTable[EMS_TOTAL_PAGES]; +static PULONG BitmapBuffer = NULL; +static PEMS_PAGE PageTable = NULL; static EMS_HANDLE HandleTable[EMS_MAX_HANDLES]; static PVOID Mapping[EMS_PHYSICAL_PAGES] = { NULL }; +static ULONG EmsTotalPages = 0; +static PVOID EmsMemory = NULL; /* PRIVATE FUNCTIONS **********************************************************/ @@ -137,7 +139,8 @@ PageEntry = GetLogicalPage(HandleEntry, LogicalPage); if (!PageEntry) return EMS_STATUS_INV_LOGICAL_PAGE; - Mapping[PhysicalPage] = (PVOID)(EMS_ADDRESS + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE); + Mapping[PhysicalPage] = (PVOID)((ULONG_PTR)EmsMemory + + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE); return EMS_STATUS_OK; } @@ -165,7 +168,7 @@ { setAH(EMS_STATUS_OK); setBX(RtlNumberOfClearBits(&AllocBitmap)); - setDX(EMS_TOTAL_PAGES); + setDX(EmsTotalPages); break; } @@ -230,10 +233,9 @@ break; } - SourcePtr = (PUCHAR)REAL_TO_PHYS(EMS_ADDRESS - + ARRAY_INDEX(PageEntry, PageTable) - * EMS_PAGE_SIZE - + Data->SourceOffset); + SourcePtr = (PUCHAR)((ULONG_PTR)EmsMemory + + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE + + Data->SourceOffset); } else { @@ -260,10 +262,9 @@ break; } - DestPtr = (PUCHAR)REAL_TO_PHYS(EMS_ADDRESS - + ARRAY_INDEX(PageEntry, PageTable) - * EMS_PAGE_SIZE - + Data->DestOffset); + DestPtr = (PUCHAR)((ULONG_PTR)EmsMemory + + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE + + Data->DestOffset); } else { @@ -346,18 +347,45 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID EmsInitialize(VOID) +BOOLEAN EmsInitialize(ULONG TotalPages) { ULONG i; - - RtlZeroMemory(BitmapBuffer, sizeof(BitmapBuffer)); - RtlInitializeBitMap(&AllocBitmap, BitmapBuffer, EMS_TOTAL_PAGES); for (i = 0; i < EMS_MAX_HANDLES; i++) { HandleTable[i].Allocated = FALSE; HandleTable[i].PageCount = 0; InitializeListHead(&HandleTable[i].PageList); + } + + EmsTotalPages = TotalPages; + BitmapBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + ((TotalPages + 31) / 32) * sizeof(ULONG)); + if (BitmapBuffer == NULL) return FALSE; + + RtlInitializeBitMap(&AllocBitmap, BitmapBuffer, TotalPages); + + PageTable = (PEMS_PAGE)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + TotalPages * sizeof(EMS_PAGE)); + if (PageTable == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, BitmapBuffer); + BitmapBuffer = NULL; + + return FALSE; + } + + EmsMemory = (PVOID)RtlAllocateHeap(RtlGetProcessHeap(), 0, TotalPages * EMS_PAGE_SIZE); + if (EmsMemory == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, PageTable); + PageTable = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, BitmapBuffer); + BitmapBuffer = NULL; + + return FALSE; } MemInstallFastMemoryHook((PVOID)TO_LINEAR(EMS_SEGMENT, 0), @@ -366,10 +394,29 @@ EmsWriteMemory); RegisterBiosInt32(EMS_INTERRUPT_NUM, EmsIntHandler); + return TRUE; } VOID EmsCleanup(VOID) { MemRemoveFastMemoryHook((PVOID)TO_LINEAR(EMS_SEGMENT, 0), EMS_PHYSICAL_PAGES * EMS_PAGE_SIZE); -} + + if (EmsMemory) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsMemory); + EmsMemory = NULL; + } + + if (PageTable) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, PageTable); + PageTable = NULL; + } + + if (BitmapBuffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, BitmapBuffer); + BitmapBuffer = NULL; + } +} Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h [iso-8859-1] Mon Apr 20 14:02:18 2015 @@ -15,10 +15,8 @@ #define EMS_INTERRUPT_NUM 0x67 #define EMS_SEGMENT 0xD000 #define EMS_MAX_HANDLES 16 -#define EMS_TOTAL_PAGES 256 #define EMS_PAGE_BITS 14 #define EMS_PAGE_SIZE (1 << EMS_PAGE_BITS) -#define EMS_ADDRESS 0xA00000 #define EMS_PHYSICAL_PAGES 4 #define EMS_STATUS_OK 0x00 @@ -63,7 +61,7 @@ /* FUNCTIONS ******************************************************************/ -VOID EmsInitialize(VOID); +BOOLEAN EmsInitialize(ULONG TotalPages); VOID EmsCleanup(VOID); #endif // _EMS_H_

1 0

[tfaber] 67324: [SYSSETUP] - Addendum to r66069: also install tcpip on the livecd CORE-9564 CORE-9113
by tfaber＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: tfaber Date: Mon Apr 20 09:35:39 2015 New Revision: 67324 URL: http://svn.reactos.org/svn/reactos?rev=67324&view=rev Log: [SYSSETUP] - Addendum to r66069: also install tcpip on the livecd CORE-9564 CORE-9113 Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Mon Apr 20 09:35:39 2015 @@ -754,12 +754,92 @@ return FALSE; } +/* Install a section of a .inf file + * Returns TRUE if success, FALSE if failure. Error code can + * be retrieved with GetLastError() + */ +static +BOOL +InstallInfSection( + IN HWND hWnd, + IN LPCWSTR InfFile, + IN LPCWSTR InfSection OPTIONAL, + IN LPCWSTR InfService OPTIONAL) +{ + WCHAR Buffer[MAX_PATH]; + HINF hInf = INVALID_HANDLE_VALUE; + UINT BufferSize; + PVOID Context = NULL; + BOOL ret = FALSE; + + /* Get Windows directory */ + BufferSize = MAX_PATH - 5 - wcslen(InfFile); + if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize) + { + /* Function failed */ + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + /* We have enough space to add some information in the buffer */ + if (Buffer[wcslen(Buffer) - 1] != '\\') + wcscat(Buffer, L"\\"); + wcscat(Buffer, L"Inf\\"); + wcscat(Buffer, InfFile); + + /* Install specified section */ + hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + goto cleanup; + + Context = SetupInitDefaultQueueCallback(hWnd); + if (Context == NULL) + goto cleanup; + + ret = TRUE; + if (ret && InfSection) + { + ret = SetupInstallFromInfSectionW( + hWnd, hInf, + InfSection, SPINST_ALL, + NULL, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, Context, + NULL, NULL); + } + if (ret && InfService) + { + ret = SetupInstallServicesFromInfSectionW( + hInf, InfService, 0); + } + +cleanup: + if (Context) + SetupTermDefaultQueueCallback(Context); + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + return ret; +} + DWORD WINAPI InstallLiveCD(IN HINSTANCE hInstance) { STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; BOOL bRes; + + /* Hack: Install TCP/IP protocol driver */ + bRes = InstallInfSection(NULL, + L"nettcpip.inf", + L"MS_TCPIP.PrimaryInstall", + L"MS_TCPIP.PrimaryInstall.Services"); + if (!bRes && GetLastError() != ERROR_FILE_NOT_FOUND) + { + DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError()); + } + else + { + /* Start the TCP/IP protocol driver */ + SetupStartService(L"Tcpip", FALSE); + } if (!CommonInstall()) goto error; @@ -844,71 +924,6 @@ return FALSE; return TRUE; -} - -/* Install a section of a .inf file - * Returns TRUE if success, FALSE if failure. Error code can - * be retrieved with GetLastError() - */ -static -BOOL -InstallInfSection( - IN HWND hWnd, - IN LPCWSTR InfFile, - IN LPCWSTR InfSection OPTIONAL, - IN LPCWSTR InfService OPTIONAL) -{ - WCHAR Buffer[MAX_PATH]; - HINF hInf = INVALID_HANDLE_VALUE; - UINT BufferSize; - PVOID Context = NULL; - BOOL ret = FALSE; - - /* Get Windows directory */ - BufferSize = MAX_PATH - 5 - wcslen(InfFile); - if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize) - { - /* Function failed */ - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - /* We have enough space to add some information in the buffer */ - if (Buffer[wcslen(Buffer) - 1] != '\\') - wcscat(Buffer, L"\\"); - wcscat(Buffer, L"Inf\\"); - wcscat(Buffer, InfFile); - - /* Install specified section */ - hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL); - if (hInf == INVALID_HANDLE_VALUE) - goto cleanup; - - Context = SetupInitDefaultQueueCallback(hWnd); - if (Context == NULL) - goto cleanup; - - ret = TRUE; - if (ret && InfSection) - { - ret = SetupInstallFromInfSectionW( - hWnd, hInf, - InfSection, SPINST_ALL, - NULL, NULL, SP_COPY_NEWER, - SetupDefaultQueueCallbackW, Context, - NULL, NULL); - } - if (ret && InfService) - { - ret = SetupInstallServicesFromInfSectionW( - hInf, InfService, 0); - } - -cleanup: - if (Context) - SetupTermDefaultQueueCallback(Context); - if (hInf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(hInf); - return ret; } static DWORD CALLBACK Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Mon Apr 20 09:35:39 2015 @@ -1807,7 +1807,7 @@ RegistrationData->hwndDlg = hwndDlg; RegistrationData->DllCount = DllCount; RegistrationThread = CreateThread(NULL, 0, RegistrationProc, - (LPVOID) RegistrationData, 0, NULL); + RegistrationData, 0, NULL); if (RegistrationThread != NULL) { CloseHandle(RegistrationThread);

1 0

[tfaber] 67323: [NETSHELL] - Fix spelling in README. Patch by Jared Smudde. CORE-9568 #resolve
by tfaber＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: tfaber Date: Mon Apr 20 07:32:03 2015 New Revision: 67323 URL: http://svn.reactos.org/svn/reactos?rev=67323&view=rev Log: [NETSHELL] - Fix spelling in README. Patch by Jared Smudde. CORE-9568 #resolve Modified: trunk/reactos/dll/shellext/netshell/README Modified: trunk/reactos/dll/shellext/netshell/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/READ… ============================================================================== --- trunk/reactos/dll/shellext/netshell/README [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/README [iso-8859-1] Mon Apr 20 07:32:03 2015 @@ -23,8 +23,8 @@ === Status Dialog & Notification Area === The status dialog is implemented by IOleCommandTarget interface(CLSID_ConnectionTray). This interface manages all status dialogs -for all available dialogs. The interface is implemented as a singleton to advoid multiple notification icons -appear in the Notification area of the explorer. Everytime the IShellFolder object is created (ISF_NetConnect_Constructor), +for all available dialogs. The interface is implemented as a singleton to avoid multiple notification icons +appearing in the Notification area of the explorer. Every time the IShellFolder object is created (ISF_NetConnect_Constructor), it creates a reference to IOleCommandTarget interface and calls its IOleCommandTarget::Exec function with CGID_ShellServiceObject. This causes IOleCommandTarget interface to enumerate all available network connections, check if they should be shown (NCCF_SHOW_ICON flag set in the NETCON_PROPERTIES dwCharacter), and add them to notification area with Shell_NotifyIcon. For that purpose a hidden window is created (dialog @@ -39,9 +39,9 @@ The network connections property dialog is implemented by the INetConnectionPropertyUi2 interface. The class id is obtained by calling INetConnection::GetUiObjectClassId of the current selected network connection. After obtaining the interface by calling CoCreateInstance, the selected network connection is stored as reference by calling INetConnectionPropertyUi::SetConnection. The next step is to call -INetConnectionPropertyUi::AddPages to add custom property pages to the property sheet set. If the function suceeds, the caller can then invoke +INetConnectionPropertyUi::AddPages to add custom property pages to the property sheet set. If the function succeeds, the caller can then invoke PropertySheetW function to display the properties. - Note: If the context doesnt match, i.e. the INetConnectionPropertyUi2 cannot work together + Note: If the context doesn't match, i.e. the INetConnectionPropertyUi2 cannot work together with current INetConnection, then it should fail INetConnectionPropertyUi::AddPages Note: The function ShowNetConnectionProperties in shlfdr_netconnect.c shows how to invoke the Network Connections Property Dialog @@ -52,7 +52,3 @@ * The notification icons are only added once IShellFolder of netshell is created for the first time * Status changes of an adapter are not automatically updated because the information is cached * There seems to be an icon problem which makes icon blink in the status dialog - -Last Update 31/10/2008 - -

1 0

[aandrejevic] 67322: [FAST486] Fix ENTER and LEAVE in the same way I fixed PUSH and POP in the previous 2 commits.
by aandrejevic＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: aandrejevic Date: Mon Apr 20 02:22:56 2015 New Revision: 67322 URL: http://svn.reactos.org/svn/reactos?rev=67322&view=rev Log: [FAST486] Fix ENTER and LEAVE in the same way I fixed PUSH and POP in the previous 2 commits. Modified: trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Mon Apr 20 02:22:56 2015 @@ -4405,16 +4405,24 @@ if (NestingLevel > 0) Fast486StackPush(State, FramePointer.Long); /* Set EBP to the frame pointer */ - State->GeneralRegs[FAST486_REG_EBP] = FramePointer; + if (Size) State->GeneralRegs[FAST486_REG_EBP].Long = FramePointer.Long; + else State->GeneralRegs[FAST486_REG_EBP].LowWord = FramePointer.LowWord; /* Reserve space for the frame */ - if (Size) State->GeneralRegs[FAST486_REG_ESP].Long -= (ULONG)FrameSize; - else State->GeneralRegs[FAST486_REG_ESP].LowWord -= FrameSize; + if (State->SegmentRegs[FAST486_REG_SS].Size) + { + State->GeneralRegs[FAST486_REG_ESP].Long -= (ULONG)FrameSize; + } + else + { + State->GeneralRegs[FAST486_REG_ESP].LowWord -= FrameSize; + } } FAST486_OPCODE_HANDLER(Fast486OpcodeLeave) { BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; + ULONG Value; /* Make sure this is the right instruction */ ASSERT(Opcode == 0xC9); @@ -4422,26 +4430,22 @@ NO_LOCK_PREFIX(); TOGGLE_OPSIZE(Size); - if (Size) + if (State->SegmentRegs[FAST486_REG_SS].Size) { /* Set the stack pointer (ESP) to the base pointer (EBP) */ State->GeneralRegs[FAST486_REG_ESP].Long = State->GeneralRegs[FAST486_REG_EBP].Long; - - /* Pop the saved base pointer from the stack */ - Fast486StackPop(State, &State->GeneralRegs[FAST486_REG_EBP].Long); - } - else - { - ULONG Value; - + } + else + { /* Set the stack pointer (SP) to the base pointer (BP) */ State->GeneralRegs[FAST486_REG_ESP].LowWord = State->GeneralRegs[FAST486_REG_EBP].LowWord; - - /* Pop the saved base pointer from the stack */ - if (Fast486StackPop(State, &Value)) - { - State->GeneralRegs[FAST486_REG_EBP].LowWord = LOWORD(Value); - } + } + + /* Pop the saved base pointer from the stack */ + if (Fast486StackPop(State, &Value)) + { + if (Size) State->GeneralRegs[FAST486_REG_EBP].Long = Value; + else State->GeneralRegs[FAST486_REG_EBP].LowWord = LOWORD(Value); } }

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