Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[tfaber] 67334: [NTDLL_APITEST] - Add some more tests for RtlDoesFileExists_*, in particular passing NT paths CORE-9523
by tfaber＠svn.reactos.org 21 Apr '15

21 Apr '15

Author: tfaber Date: Tue Apr 21 10:50:12 2015 New Revision: 67334 URL: http://svn.reactos.org/svn/reactos?rev=67334&view=rev Log: [NTDLL_APITEST] - Add some more tests for RtlDoesFileExists_*, in particular passing NT paths CORE-9523 Modified: trunk/rostests/apitests/ntdll/RtlDoesFileExists.c Modified: trunk/rostests/apitests/ntdll/RtlDoesFileExists.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDoesFil… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDoesFileExists.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDoesFileExists.c [iso-8859-1] Tue Apr 21 10:50:12 2015 @@ -139,6 +139,7 @@ { L"C:\\/\\%ls", TRUE }, { L"C:\\%ls\\", TRUE }, { L"C:\\%ls\\ThisFolderExists", TRUE }, + { L"C:\\%ls\\ThisFolderExists\\", TRUE }, { L"C:\\%ls\\ThisFolderExists ", TRUE }, { L"C:\\%ls\\ThisFolderExists ", TRUE }, { L"C:\\%ls\\ThisFolderExists ", TRUE }, @@ -170,6 +171,13 @@ { L"NUL", FALSE }, { L"CON", FALSE }, { L"COM1", FALSE }, + { L"\\?", FALSE }, + { L"\\??", FALSE }, + { L"\\??\\", FALSE }, + { L"\\??\\C", FALSE }, + { L"\\??\\C:", FALSE }, + { L"\\??\\C:\\", FALSE }, // TRUE on Win7 + { L"\\??\\C:\\%ls\\ThisFolderExists", FALSE }, // TRUE on Win7 }; ULONG i; WCHAR FileName[MAX_PATH];

1 0

[tfaber] 67333: [WIN32K:NTUSER] - Fix some GetWindowPlacement tests CORE-9578
by tfaber＠svn.reactos.org 21 Apr '15

21 Apr '15

Author: tfaber Date: Tue Apr 21 10:14:12 2015 New Revision: 67333 URL: http://svn.reactos.org/svn/reactos?rev=67333&view=rev Log: [WIN32K:NTUSER] - Fix some GetWindowPlacement tests CORE-9578 Modified: trunk/reactos/win32ss/user/ntuser/winpos.c trunk/rostests/apitests/user32/GetWindowPlacement.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 10:14:12 2015 @@ -3038,20 +3038,18 @@ } Status = MmCopyFromCaller(&Safepl, lpwndpl, sizeof(WINDOWPLACEMENT)); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); RETURN( FALSE); } - if(Safepl.length != sizeof(WINDOWPLACEMENT)) - { - RETURN( FALSE); - } + + Safepl.length = sizeof(WINDOWPLACEMENT); IntGetWindowPlacement(Wnd, &Safepl); Status = MmCopyToCaller(lpwndpl, &Safepl, sizeof(WINDOWPLACEMENT)); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); RETURN( FALSE); 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 10:14:12 2015 @@ -39,6 +39,7 @@ ok(ret == FALSE, "ret = %d\n", ret); ok(error == ERROR_NOACCESS, "error = %lu\n", error); + FillMemory(buffer, sizeof(buffer), 0x55); SetLastError(0xfeedfab1); ret = GetWindowPlacement(GetDesktopWindow(), (PVOID)(ALIGN_UP_BY(buffer, 16) + 1)); error = GetLastError();

1 0

[pschweitzer] 67332: [KERNEL32_APITEST] Force hexa output
by pschweitzer＠svn.reactos.org 21 Apr '15

21 Apr '15

Author: pschweitzer Date: Tue Apr 21 09:30:05 2015 New Revision: 67332 URL: http://svn.reactos.org/svn/reactos?rev=67332&view=rev Log: [KERNEL32_APITEST] Force hexa output Modified: trunk/rostests/apitests/kernel32/PrivMoveFileIdentityW.c Modified: trunk/rostests/apitests/kernel32/PrivMoveFileIdentityW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/PrivMov… ============================================================================== --- trunk/rostests/apitests/kernel32/PrivMoveFileIdentityW.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/PrivMoveFileIdentityW.c [iso-8859-1] Tue Apr 21 09:30:05 2015 @@ -8,7 +8,6 @@ #include <apitest.h> #define WIN32_NO_STATUS -#include <stdio.h> #include <ndk/iofuncs.h> #include <ndk/rtltypes.h> @@ -101,12 +100,12 @@ ok(FileStandardInfo.EndOfFile.QuadPart == 0LL, "File wasn't created empty: %I64d\n", FileStandardInfo.EndOfFile.QuadPart); SetLastError(0xdeadbeef); ok(pPrivMoveFileIdentityW(Self, FileName, 0) == FALSE, "PrivMoveFileIdentityW succeed\n"); - ok(GetLastError() == ERROR_SHARING_VIOLATION, "Last error: %lx\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "Last error: %#lx\n", GetLastError()); ok(QueryFileInfo(FileName, &FileBasicInfo, &FileStandardInfo) == TRUE, "QueryFileInfo returned FALSE\n"); ok(FileBasicInfo.CreationTime.QuadPart != CreationTime.QuadPart, "Equal creation times\n"); ok(FileStandardInfo.EndOfFile.QuadPart == 0LL, "File wasn't created empty: %I64d\n", FileStandardInfo.EndOfFile.QuadPart); SetLastError(0xdeadbeef); - ok(pPrivMoveFileIdentityW(Self, FileName, 2) == TRUE, "PrivMoveFileIdentityW failed with %lx\n", GetLastError()); + ok(pPrivMoveFileIdentityW(Self, FileName, 2) == TRUE, "PrivMoveFileIdentityW failed with %#lx\n", GetLastError()); ok(QueryFileInfo(FileName, &FileBasicInfo, &FileStandardInfo) == TRUE, "QueryFileInfo returned FALSE\n"); ok(FileBasicInfo.CreationTime.QuadPart == CreationTime.QuadPart, "Creation time didn't change\n"); ok(FileStandardInfo.EndOfFile.QuadPart == 0LL, "File not empty anymore: %I64d\n", FileStandardInfo.EndOfFile.QuadPart); @@ -129,7 +128,7 @@ ok(QueryFileInfo(FileName2, &FileBasicInfo, &FileStandardInfo) == TRUE, "QueryFileInfo returned FALSE\n"); ok(FileBasicInfo.CreationTime.QuadPart != CreationTime.QuadPart, "Equal creation times\n"); SetLastError(0xdeadbeef); - ok(pPrivMoveFileIdentityW(FileName, FileName2, 3) == TRUE, "PrivMoveFileIdentityW failed with %lx\n", GetLastError()); + ok(pPrivMoveFileIdentityW(FileName, FileName2, 3) == TRUE, "PrivMoveFileIdentityW failed with %#lx\n", GetLastError()); ok(QueryFileInfo(FileName2, &FileBasicInfo, &FileStandardInfo) == TRUE, "QueryFileInfo returned FALSE\n"); ok(FileBasicInfo.CreationTime.QuadPart == CreationTime.QuadPart, "Creation time didn't change\n"); ok(OpenFile(FileNameA, &ReOpen, OF_EXIST) == HFILE_ERROR, "Source file still exists\n");

1 0

[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

← Newer
1
...
13
14
15
16
17
18
19
...
49
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 April 2015