Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[akhaldi] 67354: [URLMON_WINETEST] Skip test_ftp_protocol() because of timeouts. ROSTESTS-165

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 22 20:48:13 2015 New Revision: 67354 URL: http://svn.reactos.org/svn/reactos?rev=67354&view=rev Log: [URLMON_WINETEST] Skip test_ftp_protocol() because of timeouts. ROSTESTS-165 Modified: trunk/rostests/winetests/urlmon/protocol.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Wed Apr 22 20:48:13 2015 @@ -3788,7 +3788,11 @@ else win_skip("Skipping https tests on too old platform\n"); - test_ftp_protocol(); + if (!winetest_interactive) + skip("ROSTESTS-165: Skipping test_ftp_protocol() because of timeouts.\n"); + else + test_ftp_protocol(); + test_gopher_protocol(); test_mk_protocol(); test_CreateBinding();

9 years, 8 months

[tfaber] 67353: [GDI32][WIN32K:NTGDI] - Correctly handle relative paths passed to AddFontResource*. - Fix the user->kernel interface between GdiAddFontResourceW and NtGdiAddFontResourceW Patch by V...

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Apr 22 20:24:29 2015 New Revision: 67353 URL: http://svn.reactos.org/svn/reactos?rev=67353&view=rev Log: [GDI32][WIN32K:NTGDI] - Correctly handle relative paths passed to AddFontResource*. - Fix the user->kernel interface between GdiAddFontResourceW and NtGdiAddFontResourceW Patch by Víctor Martínez Calvo. CORE-9079 Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c trunk/reactos/win32ss/gdi/ntgdi/font.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Wed Apr 22 20:24:29 2015 @@ -10,6 +10,7 @@ #include <precomp.h> #include <math.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -2181,7 +2182,7 @@ } /* - * @unimplemented + * @implemented */ int WINAPI @@ -2190,7 +2191,45 @@ FLONG fl, DESIGNVECTOR *pdv) { - return NtGdiAddFontResourceW((PWSTR)lpszFilename, 0, 0, fl, 0, pdv); + INT Ret; + WCHAR lpszBuffer[MAX_PATH]; + WCHAR lpszAbsPath[MAX_PATH]; + UNICODE_STRING NtAbsPath; + + /* FIXME: We don't support multiple files passed in lpszFilename + * as L"abcxxxxx.pfm|abcxxxxx.pfb" + */ + + /* Does the file exist in CurrentDirectory or in the Absolute Path passed? */ + GetCurrentDirectoryW(MAX_PATH, lpszBuffer); + + if (!SearchPathW(lpszBuffer, lpszFilename, NULL, MAX_PATH, lpszAbsPath, NULL)) + { + /* Nope. Then let's check Fonts folder */ + GetWindowsDirectoryW(lpszBuffer, MAX_PATH); + StringCbCatW(lpszBuffer, sizeof(lpszBuffer), L"\\Fonts"); + + if (!SearchPathW(lpszBuffer, lpszFilename, NULL, MAX_PATH, lpszAbsPath, NULL)) + { + DPRINT1("Font not found. The Buffer is: %ls, the FileName is: %S", lpszBuffer, lpszFilename); + return 0; + } + } + + /* We found the font file so: */ + if (!RtlDosPathNameToNtPathName_U(lpszAbsPath, &NtAbsPath, NULL, NULL)) + { + DPRINT1("Can't convert Path! Path: %ls\n", lpszAbsPath); + return 0; + } + + /* The Nt call expects a null-terminator included in cwc param. */ + ASSERT(NtAbsPath.Buffer[NtAbsPath.Length / sizeof(WCHAR)] == UNICODE_NULL); + Ret = NtGdiAddFontResourceW(NtAbsPath.Buffer, NtAbsPath.Length / sizeof(WCHAR) + 1, 1, fl, 0, pdv); + + RtlFreeUnicodeString(&NtAbsPath); + + return Ret; } /* Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Wed Apr 22 20:24:29 2015 @@ -427,48 +427,51 @@ INT APIENTRY NtGdiAddFontResourceW( - IN WCHAR *pwszFiles, + IN WCHAR *pwcFiles, IN ULONG cwc, IN ULONG cFiles, IN FLONG fl, IN DWORD dwPidTid, IN OPTIONAL DESIGNVECTOR *pdv) { - UNICODE_STRING SafeFileName; - PWSTR src; - NTSTATUS Status; - int Ret; - - /* FIXME: Protect with SEH? */ - RtlInitUnicodeString(&SafeFileName, pwszFiles); - - /* Reserve for prepending '\??\' */ - SafeFileName.Length += 4 * sizeof(WCHAR); - SafeFileName.MaximumLength += 4 * sizeof(WCHAR); - - src = SafeFileName.Buffer; - SafeFileName.Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, SafeFileName.MaximumLength, TAG_STRING); - if(!SafeFileName.Buffer) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - /* Prepend '\??\' */ - RtlCopyMemory(SafeFileName.Buffer, L"\\??\\", 4 * sizeof(WCHAR)); - - Status = MmCopyFromCaller(SafeFileName.Buffer + 4, src, SafeFileName.MaximumLength - (4 * sizeof(WCHAR))); - if(!NT_SUCCESS(Status)) - { + UNICODE_STRING SafeFileName; + INT Ret; + + DBG_UNREFERENCED_PARAMETER(cFiles); + DBG_UNREFERENCED_PARAMETER(dwPidTid); + DBG_UNREFERENCED_PARAMETER(pdv); + + /* cwc = Length + trailing zero. */ + if (cwc <= 1 || cwc > UNICODE_STRING_MAX_CHARS) + return 0; + + SafeFileName.MaximumLength = cwc * sizeof(WCHAR); + SafeFileName.Length = SafeFileName.MaximumLength - sizeof(UNICODE_NULL); + SafeFileName.Buffer = ExAllocatePoolWithTag(PagedPool, + SafeFileName.MaximumLength, + TAG_STRING); + if (!SafeFileName.Buffer) + { + return 0; + } + + _SEH2_TRY + { + ProbeForRead(pwcFiles, cwc * sizeof(WCHAR), sizeof(WCHAR)); + RtlCopyMemory(SafeFileName.Buffer, pwcFiles, SafeFileName.Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); + _SEH2_YIELD(return 0); + } + _SEH2_END; + + SafeFileName.Buffer[SafeFileName.Length / sizeof(WCHAR)] = UNICODE_NULL; + Ret = IntGdiAddFontResource(&SafeFileName, fl); + ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); - SetLastNtError(Status); - return 0; - } - - Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); - - ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); - return Ret; + return Ret; } /*

9 years, 8 months

[aandrejevic] 67352: [NTVDM] Implement the XMS functions AH = 03h and AH = 04h (global enable/disable A20). Make the GetHandleRecord function in the EMS driver inline. CORE-8277 #comment Please ret...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Apr 22 19:56:50 2015 New Revision: 67352 URL: http://svn.reactos.org/svn/reactos?rev=67352&view=rev Log: [NTVDM] Implement the XMS functions AH = 03h and AH = 04h (global enable/disable A20). Make the GetHandleRecord function in the EMS driver inline. CORE-8277 #comment Please retest. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed Apr 22 19:56:50 2015 @@ -35,7 +35,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static PEMS_HANDLE GetHandleRecord(USHORT Handle) +static inline PEMS_HANDLE GetHandleRecord(USHORT Handle) { if (Handle >= EMS_MAX_HANDLES) return NULL; return &HandleTable[Handle]; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Wed Apr 22 19:56:50 2015 @@ -164,6 +164,20 @@ break; } + /* Global Enable A20 */ + case 0x03: + { + EmulatorSetA20(TRUE); + break; + } + + /* Global Disable A20 */ + case 0x04: + { + EmulatorSetA20(FALSE); + break; + } + /* Query Free Extended Memory */ case 0x08: {

9 years, 8 months

[hbelusca] 67351: [NTVDM] - Fix copy-paste error in the initialization of DriverHeader. - Use BOP_... syntax for BOP #define names (to comply with the rest of the code).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Apr 22 17:27:35 2015 New Revision: 67351 URL: http://svn.reactos.org/svn/reactos?rev=67351&view=rev Log: [NTVDM] - Fix copy-paste error in the initialization of DriverHeader. - Use BOP_... syntax for BOP #define names (to comply with the rest of the code). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Wed Apr 22 17:27:35 2015 @@ -375,7 +375,7 @@ RtlMoveMemory(SEG_OFF_TO_PTR(Segment, DriverHeader->StrategyRoutine), StrategyRoutine, sizeof(StrategyRoutine)); - RtlMoveMemory(SEG_OFF_TO_PTR(Segment, DriverHeader->StrategyRoutine), + RtlMoveMemory(SEG_OFF_TO_PTR(Segment, DriverHeader->InterruptRoutine), InterruptRoutine, sizeof(InterruptRoutine)); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Wed Apr 22 17:27:35 2015 @@ -20,7 +20,9 @@ #include "himem.h" #define XMS_DEVICE_NAME "XMSXXXX0" -#define XMS_BOP 0x52 + +/* BOP Identifiers */ +#define BOP_XMS 0x52 /* PRIVATE VARIABLES **********************************************************/ @@ -32,7 +34,7 @@ 0x90, // nop LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), - XMS_BOP, + BOP_XMS, 0xCB // retf }; @@ -264,7 +266,7 @@ XMS_DEVICE_NAME, sizeof(EntryProcedure)); - RegisterBop(XMS_BOP, XmsBopProcedure); + RegisterBop(BOP_XMS, XmsBopProcedure); /* Copy the entry routine to the device private area */ RtlMoveMemory(FAR_POINTER(DEVICE_PRIVATE_AREA(Node->Driver)), @@ -274,6 +276,6 @@ VOID XmsCleanup(VOID) { - RegisterBop(XMS_BOP, NULL); + RegisterBop(BOP_XMS, NULL); DosDeleteDevice(Node); }

9 years, 8 months

[akhaldi] 67350: [RAPPS_NEW] Use rapps as base for implementing the new Applications Manager for ReactOS CE. CORE-9593

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 22 16:53:55 2015 New Revision: 67350 URL: http://svn.reactos.org/svn/reactos?rev=67350&view=rev Log: [RAPPS_NEW] Use rapps as base for implementing the new Applications Manager for ReactOS CE. CORE-9593 Added: trunk/reactos/base/applications/rapps_new/ - copied from r67342, trunk/reactos/base/applications/rapps/ trunk/reactos/base/applications/rapps_new/rappsmsg_new.mc - copied unchanged from r67342, trunk/reactos/base/applications/rapps/rappsmsg.mc Removed: trunk/reactos/base/applications/rapps_new/rappsmsg.mc Modified: trunk/reactos/base/applications/CMakeLists.txt trunk/reactos/base/applications/rapps_new/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Wed Apr 22 16:53:55 2015 @@ -25,6 +25,7 @@ add_subdirectory(notepad) add_subdirectory(osk) add_subdirectory(rapps) +add_subdirectory(rapps_new) add_subdirectory(regedit) add_subdirectory(regedt32) add_subdirectory(sc) Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] Wed Apr 22 16:53:55 2015 @@ -16,11 +16,11 @@ winmain.c rapps.h) -add_executable(rapps ${SOURCE} rapps.rc) -set_module_type(rapps win32gui UNICODE) -target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) -add_pch(rapps rapps.h SOURCE) -add_dependencies(rapps rappsmsg) -add_message_headers(ANSI rappsmsg.mc) -add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all) +add_executable(rapps_new ${SOURCE} rapps.rc) +set_module_type(rapps_new win32gui UNICODE) +target_link_libraries(rapps_new uuid) +add_importlibs(rapps_new advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) +add_pch(rapps_new rapps.h SOURCE) +add_dependencies(rapps_new rappsmsg_new) +add_message_headers(ANSI rappsmsg_new.mc) +add_cd_file(TARGET rapps_new DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/base/applications/rapps_new/rappsmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rappsmsg.mc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rappsmsg.mc (removed) @@ -1,27 +0,0 @@ -MessageIdTypedef=ULONG - -SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS -Informational=0x1:STATUS_SEVERITY_INFORMATIONAL -Warning=0x2:STATUS_SEVERITY_WARNING -Error=0x3:STATUS_SEVERITY_ERROR) - -FacilityNames=(System=0x0:FACILITY_SYSTEM Application=0xFFF) - -LanguageNames=(English=0x409:MSG00409) - -MessageId=1 -Severity=Success -Facility=Application -SymbolicName=MSG_SUCCESS_INSTALL -Language=English -Installation of the program "%1" is called. -. - -MessageId=2 -Severity=Success -Facility=Application -SymbolicName=MSG_SUCCESS_REMOVE -Language=English -Removal of the program "%1" is called. -. -

9 years, 8 months

[tfaber] 67349: [NTDLL_APITEST] - Ensure 4-byte alignment for ATOM_BASIC_INFORMATION CORE-6994 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Apr 22 15:50:00 2015 New Revision: 67349 URL: http://svn.reactos.org/svn/reactos?rev=67349&view=rev Log: [NTDLL_APITEST] - Ensure 4-byte alignment for ATOM_BASIC_INFORMATION CORE-6994 #resolve Modified: trunk/rostests/winetests/ntdll/atom.c Modified: trunk/rostests/winetests/ntdll/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/atom.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/atom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/atom.c [iso-8859-1] Wed Apr 22 15:50:00 2015 @@ -432,9 +432,9 @@ { NTSTATUS res; RTL_ATOM atom; - char ptr[sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)]; + ULONG ptr[(sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)) / sizeof(ULONG)]; ATOM_BASIC_INFORMATION* abi = (ATOM_BASIC_INFORMATION*)ptr; - ULONG ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR); + ULONG ptr_size = sizeof(ptr); if (pNtAddAtomNT4) res = pNtAddAtomNT4(testAtom1, &atom);

9 years, 8 months

[akhaldi] 67348: [URLMON_WINETEST] Skip test_http_protocol() and test_https_protocol() because of timeouts. ROSTESTS-165

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 22 12:44:36 2015 New Revision: 67348 URL: http://svn.reactos.org/svn/reactos?rev=67348&view=rev Log: [URLMON_WINETEST] Skip test_http_protocol() and test_https_protocol() because of timeouts. ROSTESTS-165 Modified: trunk/rostests/winetests/urlmon/protocol.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Wed Apr 22 12:44:36 2015 @@ -3772,11 +3772,22 @@ thread_id = GetCurrentThreadId(); test_file_protocol(); - test_http_protocol(); + + if (!winetest_interactive) + skip("ROSTESTS-165: Skipping test_http_protocol() because of timeouts.\n"); + else + test_http_protocol(); + if(pCreateUri) - test_https_protocol(); + { + if (!winetest_interactive) + skip("ROSTESTS-165: Skipping test_https_protocol() because of timeouts.\n"); + else + test_https_protocol(); + } else win_skip("Skipping https tests on too old platform\n"); + test_ftp_protocol(); test_gopher_protocol(); test_mk_protocol();

9 years, 8 months

[aandrejevic] 67347: [NTVDM] Avoid array indexing with invalid indexes, always.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Apr 22 12:13:14 2015 New Revision: 67347 URL: http://svn.reactos.org/svn/reactos?rev=67347&view=rev Log: [NTVDM] Avoid array indexing with invalid indexes, always. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed Apr 22 12:13:14 2015 @@ -35,12 +35,18 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static PEMS_HANDLE GetHandleRecord(USHORT Handle) +{ + if (Handle >= EMS_MAX_HANDLES) return NULL; + return &HandleTable[Handle]; +} + static USHORT EmsFree(USHORT Handle) { PLIST_ENTRY Entry; - PEMS_HANDLE HandleEntry = &HandleTable[Handle]; - - if (Handle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) + PEMS_HANDLE HandleEntry = GetHandleRecord(Handle); + + if (HandleEntry == NULL || !HandleEntry->Allocated) { return EMS_STATUS_INVALID_HANDLE; } @@ -131,7 +137,7 @@ static USHORT EmsMap(USHORT Handle, UCHAR PhysicalPage, USHORT LogicalPage) { PEMS_PAGE PageEntry; - PEMS_HANDLE HandleEntry = &HandleTable[Handle]; + PEMS_HANDLE HandleEntry = GetHandleRecord(Handle); if (PhysicalPage >= EMS_PHYSICAL_PAGES) return EMS_STATUS_INV_PHYSICAL_PAGE; if (LogicalPage == 0xFFFF) @@ -141,7 +147,10 @@ return EMS_STATUS_OK; } - if (Handle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) return EMS_STATUS_INVALID_HANDLE; + if (HandleEntry == NULL || !HandleEntry->Allocated) + { + return EMS_STATUS_INVALID_HANDLE; + } PageEntry = GetLogicalPage(HandleEntry, LogicalPage); if (!PageEntry) return EMS_STATUS_INV_LOGICAL_PAGE; @@ -224,9 +233,9 @@ if (Data->SourceType) { /* Expanded memory */ - HandleEntry = &HandleTable[Data->SourceHandle]; - - if (Data->SourceHandle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) + HandleEntry = GetHandleRecord(Data->SourceHandle); + + if (HandleEntry == NULL || !HandleEntry->Allocated) { setAL(EMS_STATUS_INVALID_HANDLE); break; @@ -253,9 +262,9 @@ if (Data->DestType) { /* Expanded memory */ - HandleEntry = &HandleTable[Data->DestHandle]; - - if (Data->SourceHandle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) + HandleEntry = GetHandleRecord(Data->DestHandle); + + if (HandleEntry == NULL || !HandleEntry->Allocated) { setAL(EMS_STATUS_INVALID_HANDLE); break; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Wed Apr 22 12:13:14 2015 @@ -46,9 +46,10 @@ static inline PXMS_HANDLE GetHandleRecord(WORD Handle) { - PXMS_HANDLE Entry = &HandleTable[Handle - 1]; + PXMS_HANDLE Entry; if (Handle == 0 || Handle >= XMS_MAX_HANDLES) return NULL; + Entry = &HandleTable[Handle - 1]; return Entry->Size ? Entry : NULL; }

9 years, 8 months

[akhaldi] 67346: [XDK] Partially revert r67338. We already have this in ntifs.h

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 22 08:49:35 2015 New Revision: 67346 URL: http://svn.reactos.org/svn/reactos?rev=67346&view=rev Log: [XDK] Partially revert r67338. We already have this in ntifs.h Modified: trunk/reactos/include/xdk/iotypes.h Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Wed Apr 22 08:49:35 2015 @@ -4972,12 +4972,6 @@ ULONG ReparseTag; } FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION; -typedef struct _FILE_TRACKING_INFORMATION { - HANDLE DestinationFile; - ULONG ObjectInformationLength; - CHAR ObjectInformation[1]; -} FILE_TRACKING_INFORMATION, *PFILE_TRACKING_INFORMATION; - typedef struct _FILE_DISPOSITION_INFORMATION { BOOLEAN DeleteFile; } FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION;

9 years, 8 months

[akhaldi] 67345: [PSDK] Add missing KF_FLAG_DEFAULT_PATH definition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 22 08:44:41 2015 New Revision: 67345 URL: http://svn.reactos.org/svn/reactos?rev=67345&view=rev Log: [PSDK] Add missing KF_FLAG_DEFAULT_PATH definition. Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Wed Apr 22 08:44:41 2015 @@ -248,6 +248,8 @@ int WINAPI RestartDialog(_In_opt_ HWND, _In_opt_ LPCWSTR, DWORD); int WINAPI RestartDialogEx(_In_opt_ HWND, _In_opt_ LPCWSTR, DWORD, DWORD); BOOL WINAPI IsUserAnAdmin(void); + +#define KF_FLAG_DEFAULT_PATH 0x00000400 #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */

9 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
49
Older →

Jump to page:

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