Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 69261: [NTVDM] - Support loading executables with the old EXE signature ('ZM' instead of 'MZ'). - Fix the EXE loader so that: * we can load programs of >= 1Mb size, by exploiting the fac...
by hbelusca＠svn.reactos.org 17 Sep '15

17 Sep '15

Author: hbelusca Date: Thu Sep 17 23:04:05 2015 New Revision: 69261 URL: http://svn.reactos.org/svn/reactos?rev=69261&view=rev Log: [NTVDM] - Support loading executables with the old EXE signature ('ZM' instead of 'MZ'). - Fix the EXE loader so that: * we can load programs of >= 1Mb size, by exploiting the fact that on real DOS, the computed exe size (which uses the number of 512-byte blocks, stored in the EXE header) is stored in a WORD variable. This has as an effect to truncate the value, and if it is such that the truncated value is less than the size of available memory, the EXE can be loaded (partly, of course). Some apps expect this behaviour, for example, Turbo C++ IDE. * Simplify the memory limits computation, according to http://www.tavi.co.uk/phobos/exeformat.html , which is the correct algorithm used by DOS (and confirmed by FreeDOS also). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Thu Sep 17 23:04:05 2015 @@ -334,6 +334,7 @@ DWORD Result = ERROR_SUCCESS; WORD Segment = 0; WORD EnvBlock = 0; + WORD ExeSignature; WORD LoadSegment; WORD MaxAllocSize; @@ -428,62 +429,84 @@ } } - /* Check if this is an EXE file or a COM file */ - if (ExeBuffer[0] == 'M' && ExeBuffer[1] == 'Z') + /* + * Check if this is an EXE file or a COM file by looking + * at the MZ signature: + * 0x4D5A 'MZ': old signature (stored as 0x5A, 0x4D) + * 0x5A4D 'ZM': new signature (stored as 0x4D, 0x5A) + */ + ExeSignature = *(PWORD)ExeBuffer; + if (ExeSignature == 'MZ' || ExeSignature == 'ZM') { /* EXE file */ PIMAGE_DOS_HEADER Header; - DWORD BaseSize, i; + DWORD BaseSize; PDWORD RelocationTable; PWORD RelocWord; WORD RelocFactor; - BOOLEAN LoadHigh = FALSE; + WORD i; /* Get the MZ header */ Header = (PIMAGE_DOS_HEADER)ExeBuffer; /* Get the base size of the file, in paragraphs (rounded up) */ - BaseSize = ((((Header->e_cp - (Header->e_cblp != 0)) * 512) - + Header->e_cblp + 0x0F) >> 4) - Header->e_cparhdr; +#if 0 // Normally this is not needed to check for the number of bytes in the last pages. + BaseSize = ((((Header->e_cp - (Header->e_cblp != 0)) * 512) + Header->e_cblp) >> 4) + - Header->e_cparhdr; +#else + // e_cp is the number of 512-byte blocks. 512 == (1 << 9) + // so this corresponds to (1 << 5) number of paragraphs. + // + // For DOS compatibility we need to truncate BaseSize to a WORD value. + // This fact is exploited by some EXEs which are bigger than 1 Mb while + // being able to load on DOS, the main EXE code loads the remaining data. + + BaseSize = ((Header->e_cp << 5) - Header->e_cparhdr) & 0xFFFF; +#endif if (LoadType != DOS_LOAD_OVERLAY) { - DWORD TotalSize = BaseSize; - - /* Add the PSP size, in paragraphs */ - TotalSize += sizeof(DOS_PSP) >> 4; - - /* Add the maximum size that should be allocated */ - TotalSize += Header->e_maxalloc; - + BOOLEAN LoadHigh = FALSE; + DWORD TotalSize; + + /* Find the maximum amount of memory that can be allocated */ + DosAllocateMemory(0xFFFF, &MaxAllocSize); + + /* Compute the total needed size, in paragraphs */ + TotalSize = BaseSize + (sizeof(DOS_PSP) >> 4); + + /* We must have the required minimum amount of memory. If not, bail out. */ + if (MaxAllocSize < TotalSize + Header->e_minalloc) + { + Result = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + /* Check if the program should be loaded high */ if (Header->e_minalloc == 0 && Header->e_maxalloc == 0) { - /* This program should be loaded high */ - LoadHigh = TRUE; - TotalSize = 0xFFFF; - } - - /* Make sure it does not pass 0xFFFF */ - if (TotalSize > 0xFFFF) TotalSize = 0xFFFF; + /* Yes it should. Use all the available memory. */ + LoadHigh = TRUE; + TotalSize = MaxAllocSize; + } + else + { + /* Compute the maximum memory size that can be allocated */ + if (Header->e_maxalloc != 0) + TotalSize = min(TotalSize + Header->e_maxalloc, MaxAllocSize); + else + TotalSize = MaxAllocSize; // Use all the available memory + } /* Try to allocate that much memory */ - Segment = DosAllocateMemory((WORD)TotalSize, &MaxAllocSize); + Segment = DosAllocateMemory((WORD)TotalSize, NULL); if (Segment == 0) { - /* Check if there's at least enough memory for the minimum size */ - if (MaxAllocSize < (BaseSize + (sizeof(DOS_PSP) >> 4) + Header->e_minalloc)) - { - Result = Sda->LastErrorCode; - goto Cleanup; - } - - /* Allocate that minimum amount */ - TotalSize = MaxAllocSize; - Segment = DosAllocateMemory((WORD)TotalSize, NULL); - ASSERT(Segment != 0); - } - - /* The process owns its own memory */ + Result = Sda->LastErrorCode; + goto Cleanup; + } + + /* The process owns its memory */ DosChangeMemoryOwner(Segment , Segment); DosChangeMemoryOwner(EnvBlock, Segment); @@ -560,7 +583,7 @@ goto Cleanup; } - /* The process owns its own memory */ + /* The process owns its memory */ DosChangeMemoryOwner(Segment , Segment); DosChangeMemoryOwner(EnvBlock, Segment);

1 0

[dreimer] 69260: [TRANSLATION] Romanian resources maintenance by Ștefan Fulea CORE-10042 #resolve #comment Committed, thx ^^
by dreimer＠svn.reactos.org 17 Sep '15

17 Sep '15

Author: dreimer Date: Thu Sep 17 17:26:52 2015 New Revision: 69260 URL: http://svn.reactos.org/svn/reactos?rev=69260&view=rev Log: [TRANSLATION] Romanian resources maintenance by Ștefan Fulea CORE-10042 #resolve #comment Committed, thx ^^ Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/winlogon/lang/ro-RO.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/main/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/wined3dcfg/lang/ro-RO.rc trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/devmgr_new/lang/ro-RO.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc trunk/reactos/dll/win32/ieframe/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msports/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/media/inf/hdaudbus.inf trunk/reactos/media/rapps/ac97forvirtualbox.txt trunk/reactos/media/rapps/agatemulator.txt trunk/reactos/media/rapps/audacity.txt trunk/reactos/media/rapps/bittorrent.txt trunk/reactos/media/rapps/burnawarefree.txt trunk/reactos/media/rapps/chromium.txt trunk/reactos/media/rapps/cnt.txt trunk/reactos/media/rapps/codeblocks.txt trunk/reactos/media/rapps/codeblocks_gcc.txt trunk/reactos/media/rapps/codeblocks_gcc_2.txt trunk/reactos/media/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/media/rapps/dosbox.txt trunk/reactos/media/rapps/efserch.txt trunk/reactos/media/rapps/foxit.txt trunk/reactos/media/rapps/gensemulator.txt trunk/reactos/media/rapps/ghostview.txt trunk/reactos/media/rapps/gimp.txt trunk/reactos/media/rapps/hexedit.txt trunk/reactos/media/rapps/hxd.txt trunk/reactos/media/rapps/inkscape.txt trunk/reactos/media/rapps/jre.txt trunk/reactos/media/rapps/kindlepc.txt trunk/reactos/media/rapps/kompozer.txt trunk/reactos/media/rapps/lazaruside.txt trunk/reactos/media/rapps/librecad.txt trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/mkvtoolnix.txt trunk/reactos/media/rapps/mono2.txt trunk/reactos/media/rapps/mpxplay.txt trunk/reactos/media/rapps/net11.txt trunk/reactos/media/rapps/nginx.txt trunk/reactos/media/rapps/openarena.txt trunk/reactos/media/rapps/pdfsam.txt trunk/reactos/media/rapps/pidgin.txt trunk/reactos/media/rapps/pingus.txt trunk/reactos/media/rapps/ptanks.txt trunk/reactos/media/rapps/qb64sdl.txt trunk/reactos/media/rapps/revo.txt trunk/reactos/media/rapps/rfstools.txt trunk/reactos/media/rapps/scribus.txt trunk/reactos/media/rapps/seamonkey.txt trunk/reactos/media/rapps/shed.txt trunk/reactos/media/rapps/stamina.txt trunk/reactos/media/rapps/summerbound.txt trunk/reactos/media/rapps/superdxb.txt trunk/reactos/media/rapps/supertux.txt trunk/reactos/media/rapps/tightvnc.txt trunk/reactos/media/rapps/ultraiso.txt trunk/reactos/media/rapps/vbasdl.txt trunk/reactos/media/rapps/watercolor.txt trunk/reactos/media/rapps/winamp.txt trunk/reactos/media/rapps/winmerge.txt trunk/reactos/media/rapps/winspypp.txt trunk/reactos/media/rapps/zaz.txt trunk/reactos/media/themes/lautus.msstyles/lang/ro-RO.rc trunk/reactos/win32ss/user/user32/lang/ro-RO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/winlogon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/ro… Modified: trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… Modified: trunk/reactos/dll/win32/devmgr_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/lang/… Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… Modified: trunk/reactos/dll/win32/ieframe/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/ro-… Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… Modified: trunk/reactos/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ro-… Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… Modified: trunk/reactos/media/inf/hdaudbus.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdaudbus.inf?rev… Modified: trunk/reactos/media/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ac97forvirtual… Modified: trunk/reactos/media/rapps/agatemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/agatemulator.t… Modified: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?r… Modified: trunk/reactos/media/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bittorrent.txt… Modified: trunk/reactos/media/rapps/burnawarefree.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/burnawarefree.… Modified: trunk/reactos/media/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/chromium.txt?r… Modified: trunk/reactos/media/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cnt.txt?rev=69… Modified: trunk/reactos/media/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks.txt… Modified: trunk/reactos/media/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/devcpp_tdm_gcc… Modified: trunk/reactos/media/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dosbox.txt?rev… Modified: trunk/reactos/media/rapps/efserch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/efserch.txt?re… Modified: trunk/reactos/media/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/foxit.txt?rev=… Modified: trunk/reactos/media/rapps/gensemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gensemulator.t… Modified: trunk/reactos/media/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostview.txt?… Modified: trunk/reactos/media/rapps/gimp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gimp.txt?rev=6… Modified: trunk/reactos/media/rapps/hexedit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hexedit.txt?re… Modified: trunk/reactos/media/rapps/hxd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hxd.txt?rev=69… Modified: trunk/reactos/media/rapps/inkscape.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/inkscape.txt?r… Modified: trunk/reactos/media/rapps/jre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/jre.txt?rev=69… Modified: trunk/reactos/media/rapps/kindlepc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kindlepc.txt?r… Modified: trunk/reactos/media/rapps/kompozer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kompozer.txt?r… Modified: trunk/reactos/media/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lazaruside.txt… Modified: trunk/reactos/media/rapps/librecad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/librecad.txt?r… Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… Modified: trunk/reactos/media/rapps/mkvtoolnix.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mkvtoolnix.txt… Modified: trunk/reactos/media/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mono2.txt?rev=… Modified: trunk/reactos/media/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpxplay.txt?re… Modified: trunk/reactos/media/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net11.txt?rev=… Modified: trunk/reactos/media/rapps/nginx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nginx.txt?rev=… Modified: trunk/reactos/media/rapps/openarena.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openarena.txt?… Modified: trunk/reactos/media/rapps/pdfsam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pdfsam.txt?rev… Modified: trunk/reactos/media/rapps/pidgin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pidgin.txt?rev… Modified: trunk/reactos/media/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pingus.txt?rev… Modified: trunk/reactos/media/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ptanks.txt?rev… Modified: trunk/reactos/media/rapps/qb64sdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qb64sdl.txt?re… Modified: trunk/reactos/media/rapps/revo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/revo.txt?rev=6… Modified: trunk/reactos/media/rapps/rfstools.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rfstools.txt?r… Modified: trunk/reactos/media/rapps/scribus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scribus.txt?re… Modified: trunk/reactos/media/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/seamonkey.txt?… Modified: trunk/reactos/media/rapps/shed.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/shed.txt?rev=6… Modified: trunk/reactos/media/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/stamina.txt?re… Modified: trunk/reactos/media/rapps/summerbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/summerbound.tx… Modified: trunk/reactos/media/rapps/superdxb.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/superdxb.txt?r… Modified: trunk/reactos/media/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/supertux.txt?r… Modified: trunk/reactos/media/rapps/tightvnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tightvnc.txt?r… Modified: trunk/reactos/media/rapps/ultraiso.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultraiso.txt?r… Modified: trunk/reactos/media/rapps/vbasdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vbasdl.txt?rev… Modified: trunk/reactos/media/rapps/watercolor.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/watercolor.txt… Modified: trunk/reactos/media/rapps/winamp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winamp.txt?rev… Modified: trunk/reactos/media/rapps/winmerge.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winmerge.txt?r… Modified: trunk/reactos/media/rapps/winspypp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winspypp.txt?r… Modified: trunk/reactos/media/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/zaz.txt?rev=69… Modified: trunk/reactos/media/themes/lautus.msstyles/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… Modified: trunk/reactos/win32ss/user/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r…

1 0

[sginsberg] 69259: [RTL] Add support for vectored continue handlers, complementing the vectored exception handler support we already have, by doing some massive shared code usage: just use two diff...
by sginsberg＠svn.reactos.org 17 Sep '15

17 Sep '15

Author: sginsberg Date: Thu Sep 17 13:36:55 2015 New Revision: 69259 URL: http://svn.reactos.org/svn/reactos?rev=69259&view=rev Log: [RTL] Add support for vectored continue handlers, complementing the vectored exception handler support we already have, by doing some massive shared code usage: just use two different lists for the different handler types and all the code is basically the same. Call the "new" functionality from RtlDispatchException and stub it out for kernel mode. Clean up the existing code and simplify it. Passes the Winetests fine, not that they test this a a lot. #CORE-10202 Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/lib/rtl/i386/except.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/vectoreh.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Thu Sep 17 13:36:55 2015 @@ -77,7 +77,7 @@ //extern LIST_ENTRY RtlCriticalSectionList; -VOID RtlpInitializeVectoredExceptionHandling(VOID); +VOID NTAPI RtlpInitializeVectoredExceptionHandling(VOID); VOID NTAPI RtlpInitDeferedCriticalSection(VOID); VOID NTAPI RtlInitializeHeapManager(VOID); extern BOOLEAN RtlpPageHeapEnabled; Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] Thu Sep 17 13:36:55 2015 @@ -74,10 +74,13 @@ ULONG_PTR StackLow, StackHigh; ULONG_PTR RegistrationFrameEnd; - /* Perform vectored exception handling (a dummy in kernel mode) */ + /* Perform vectored exception handling for user mode */ if (RtlCallVectoredExceptionHandlers(ExceptionRecord, Context)) { - /* Exception handled, continue execution */ + /* Exception handled, now call vectored continue handlers */ + RtlCallVectoredContinueHandlers(ExceptionRecord, Context); + + /* Continue execution */ return TRUE; } @@ -139,7 +142,7 @@ /* Handle the dispositions */ switch (Disposition) { - /* Continue searching */ + /* Continue execution */ case ExceptionContinueExecution: /* Check if it was non-continuable */ @@ -157,7 +160,11 @@ } else { - /* Return to caller */ + /* In user mode, call any registered vectored continue handlers */ + RtlCallVectoredContinueHandlers(ExceptionRecord, + Context); + + /* Execution continues */ return TRUE; } Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=69259&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Thu Sep 17 13:36:55 2015 @@ -67,6 +67,13 @@ IN PCONTEXT Context ); +VOID +NTAPI +RtlCallVectoredContinueHandlers( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context +); + typedef struct _DISPATCHER_CONTEXT { PEXCEPTION_REGISTRATION_RECORD RegistrationPointer; Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=692… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Thu Sep 17 13:36:55 2015 @@ -13,201 +13,328 @@ #define NDEBUG #include <debug.h> -static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock; -static LIST_ENTRY RtlpVectoredExceptionHead; -static volatile LONG RtlpVectoredExceptionsInstalled; - -typedef struct _RTL_VECTORED_EXCEPTION_HANDLER -{ - LIST_ENTRY ListEntry; - PVECTORED_EXCEPTION_HANDLER VectoredHandler; - ULONG Refs; - BOOLEAN Deleted; -} RTL_VECTORED_EXCEPTION_HANDLER, *PRTL_VECTORED_EXCEPTION_HANDLER; +RTL_CRITICAL_SECTION RtlpVectoredHandlerLock; +LIST_ENTRY RtlpVectoredExceptionList, RtlpVectoredContinueList; + +typedef struct _RTL_VECTORED_HANDLER_ENTRY +{ + LIST_ENTRY ListEntry; + PVECTORED_EXCEPTION_HANDLER VectoredHandler; + ULONG Refs; +} RTL_VECTORED_HANDLER_ENTRY, *PRTL_VECTORED_HANDLER_ENTRY; /* FUNCTIONS ***************************************************************/ +VOID +NTAPI +RtlpInitializeVectoredExceptionHandling(VOID) +{ + /* Initialize our two lists and the common lock */ + RtlInitializeCriticalSection(&RtlpVectoredHandlerLock); + InitializeListHead(&RtlpVectoredExceptionList); + InitializeListHead(&RtlpVectoredContinueList); +} + BOOLEAN NTAPI -RtlCallVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) -{ - PLIST_ENTRY CurrentEntry; - PRTL_VECTORED_EXCEPTION_HANDLER veh = NULL; - PVECTORED_EXCEPTION_HANDLER VectoredHandler; - EXCEPTION_POINTERS ExceptionInfo; - BOOLEAN Remove = FALSE; - BOOLEAN Ret = FALSE; - - ExceptionInfo.ExceptionRecord = ExceptionRecord; - ExceptionInfo.ContextRecord = Context; - - if(RtlpVectoredExceptionsInstalled) - { - RtlEnterCriticalSection(&RtlpVectoredExceptionLock); - CurrentEntry = RtlpVectoredExceptionHead.Flink; - while (CurrentEntry != &RtlpVectoredExceptionHead) - { - veh = CONTAINING_RECORD(CurrentEntry, - RTL_VECTORED_EXCEPTION_HANDLER, - ListEntry); - veh->Refs++; - RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); - - VectoredHandler = RtlDecodePointer(veh->VectoredHandler); - if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) - { - RtlEnterCriticalSection(&RtlpVectoredExceptionLock); - if (--veh->Refs == 0) +RtlpCallVectoredHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN PLIST_ENTRY VectoredHandlerList) +{ + PLIST_ENTRY CurrentEntry; + PRTL_VECTORED_HANDLER_ENTRY VectoredExceptionHandler; + PVECTORED_EXCEPTION_HANDLER VectoredHandler; + EXCEPTION_POINTERS ExceptionInfo; + BOOLEAN HandlerRemoved; + LONG HandlerReturn; + + /* + * Initialize these in case there are no entries, + * or if no one handled the exception + */ + HandlerRemoved = FALSE; + HandlerReturn = EXCEPTION_CONTINUE_SEARCH; + + /* Set up the data to pass to the handler */ + ExceptionInfo.ExceptionRecord = ExceptionRecord; + ExceptionInfo.ContextRecord = Context; + + /* Grab the lock */ + RtlEnterCriticalSection(&RtlpVectoredHandlerLock); + + /* Loop entries */ + CurrentEntry = VectoredHandlerList->Flink; + while (CurrentEntry != VectoredHandlerList) + { + /* Get the struct */ + VectoredExceptionHandler = CONTAINING_RECORD(CurrentEntry, + RTL_VECTORED_HANDLER_ENTRY, + ListEntry); + + /* Reference it so it doesn't go away while we are using it */ + VectoredExceptionHandler->Refs++; + + /* Drop the lock before calling the handler */ + RtlLeaveCriticalSection(&RtlpVectoredHandlerLock); + + /* + * Get the function pointer, decoding it so we will crash + * if malicious code has altered it. That is, if something has + * set VectoredHandler to a non-encoded pointer + */ + VectoredHandler = RtlDecodePointer(VectoredExceptionHandler->VectoredHandler); + + /* Call the handler */ + HandlerReturn = VectoredHandler(&ExceptionInfo); + + /* Handler called -- grab the lock to dereference */ + RtlEnterCriticalSection(&RtlpVectoredHandlerLock); + + /* Dereference and see if it got deleted */ + VectoredExceptionHandler->Refs--; + if (VectoredExceptionHandler->Refs == 0) { - RemoveEntryList (&veh->ListEntry); - InterlockedDecrement (&RtlpVectoredExceptionsInstalled); - Remove = TRUE; + /* It did -- do we have to free it now? */ + if (HandlerReturn == EXCEPTION_CONTINUE_EXECUTION) + { + /* We don't, just remove it from the list and break out */ + RemoveEntryList(&VectoredExceptionHandler->ListEntry); + HandlerRemoved = TRUE; + break; + } + + /* + * Get the next entry before freeing, + * and remove the current one from the list + */ + CurrentEntry = VectoredExceptionHandler->ListEntry.Flink; + RemoveEntryList(&VectoredExceptionHandler->ListEntry); + + /* Free the entry outside of the lock, then reacquire it */ + RtlLeaveCriticalSection(&RtlpVectoredHandlerLock); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + VectoredExceptionHandler); + RtlEnterCriticalSection(&RtlpVectoredHandlerLock); } - Ret = TRUE; - break; - } - - RtlEnterCriticalSection(&RtlpVectoredExceptionLock); - - if (--veh->Refs == 0) - { - CurrentEntry = veh->ListEntry.Flink; - RemoveEntryList (&veh->ListEntry); - InterlockedDecrement (&RtlpVectoredExceptionsInstalled); - RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); - + else + { + /* No delete -- should we continue execution? */ + if (HandlerReturn == EXCEPTION_CONTINUE_EXECUTION) + { + /* Break out */ + break; + } + else + { + /* Continue searching the list */ + CurrentEntry = CurrentEntry->Flink; + } + } + } + + /* Let go of the lock now */ + RtlLeaveCriticalSection(&RtlpVectoredHandlerLock); + + /* Anything to free? */ + if (HandlerRemoved) + { + /* Get rid of it */ RtlFreeHeap(RtlGetProcessHeap(), 0, - veh); - RtlEnterCriticalSection(&RtlpVectoredExceptionLock); - } - else - CurrentEntry = CurrentEntry->Flink; - } - - RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); - } - - if (Remove) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - veh); - } - - return Ret; + VectoredExceptionHandler); + } + + /* Return whether to continue execution (ignored for continue handlers) */ + return (HandlerReturn == EXCEPTION_CONTINUE_EXECUTION) ? TRUE : FALSE; +} + +PVOID +NTAPI +RtlpAddVectoredHandler(IN ULONG FirstHandler, + IN PVECTORED_EXCEPTION_HANDLER VectoredHandler, + IN PLIST_ENTRY VectoredHandlerList) +{ + PRTL_VECTORED_HANDLER_ENTRY VectoredHandlerEntry; + + /* Allocate our structure */ + VectoredHandlerEntry = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(RTL_VECTORED_HANDLER_ENTRY)); + if (!VectoredHandlerEntry) return NULL; + + /* Set it up, encoding the pointer for security */ + VectoredHandlerEntry->VectoredHandler = RtlEncodePointer(VectoredHandler); + VectoredHandlerEntry->Refs = 1; + + /* Lock the list before modifying it */ + RtlEnterCriticalSection(&RtlpVectoredHandlerLock); + + /* + * While holding the list lock, insert the handler + * at beginning or end of list according to caller. + */ + if (FirstHandler) + { + InsertHeadList(VectoredHandlerList, + &VectoredHandlerEntry->ListEntry); + } + else + { + InsertTailList(VectoredHandlerList, + &VectoredHandlerEntry->ListEntry); + } + + /* Done with the list, unlock it */ + RtlLeaveCriticalSection(&RtlpVectoredHandlerLock); + + /* Return pointer to the structure as the handle */ + return VectoredHandlerEntry; +} + +ULONG +NTAPI +RtlpRemoveVectoredHandler(IN PVOID VectoredHandlerHandle, + IN PLIST_ENTRY VectoredHandlerList) +{ + PLIST_ENTRY CurrentEntry; + PRTL_VECTORED_HANDLER_ENTRY VectoredExceptionHandler; + BOOLEAN HandlerRemoved; + BOOLEAN HandlerFound; + + /* Initialize these in case we don't find anything */ + HandlerRemoved = FALSE; + HandlerFound = FALSE; + + /* Acquire list lock */ + RtlEnterCriticalSection(&RtlpVectoredHandlerLock); + + /* Loop the list */ + CurrentEntry = VectoredHandlerList->Flink; + while (CurrentEntry != VectoredHandlerList) + { + /* Get the struct */ + VectoredExceptionHandler = CONTAINING_RECORD(CurrentEntry, + RTL_VECTORED_HANDLER_ENTRY, + ListEntry); + + /* Does it match? */ + if (VectoredExceptionHandler == VectoredHandlerHandle) + { + /* + * Great, this means it is a valid entry. + * However, it may be in use by the exception + * dispatcher, so we have a ref count to respect. + * If we can't remove it now then it will be done + * right after it is not in use anymore. + * + * Caller is supposed to keep track of if it has deleted the + * entry and should not call us twice for the same entry. + * We could maybe throw in some kind of ASSERT to detect this + * if this was to become a problem. + */ + VectoredExceptionHandler->Refs--; + if (VectoredExceptionHandler->Refs == 0) + { + /* Not in use, ok to remove and free */ + RemoveEntryList(&VectoredExceptionHandler->ListEntry); + HandlerRemoved = TRUE; + } + + /* Found what we are looking for, stop searching */ + HandlerFound = TRUE; + break; + } + else + { + /* Get the next entry */ + CurrentEntry = CurrentEntry->Flink; + } + } + + /* Done with the list, let go of the lock */ + RtlLeaveCriticalSection(&RtlpVectoredHandlerLock); + + /* Can we free what we found? */ + if (HandlerRemoved) + { + /* Do it */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + VectoredExceptionHandler); + } + + /* Return whether we found it */ + return (ULONG)HandlerFound; +} + +BOOLEAN +NTAPI +RtlCallVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) +{ + /* Call the shared routine */ + return RtlpCallVectoredHandlers(ExceptionRecord, + Context, + &RtlpVectoredExceptionList); } VOID -RtlpInitializeVectoredExceptionHandling(VOID) -{ - InitializeListHead(&RtlpVectoredExceptionHead); - RtlInitializeCriticalSection(&RtlpVectoredExceptionLock); - RtlpVectoredExceptionsInstalled = 0; -} - - -/* - * @implemented - */ -PVOID NTAPI DECLSPEC_HOTPATCH +NTAPI +RtlCallVectoredContinueHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) +{ + /* + * Call the shared routine (ignoring result, + * execution always continues at this point) + */ + (VOID)RtlpCallVectoredHandlers(ExceptionRecord, + Context, + &RtlpVectoredContinueList); +} + +DECLSPEC_HOTPATCH +PVOID +NTAPI RtlAddVectoredExceptionHandler(IN ULONG FirstHandler, IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) { - PRTL_VECTORED_EXCEPTION_HANDLER veh; - - veh = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(RTL_VECTORED_EXCEPTION_HANDLER)); - if(veh != NULL) - { - veh->VectoredHandler = RtlEncodePointer(VectoredHandler); - veh->Refs = 1; - veh->Deleted = FALSE; - RtlEnterCriticalSection(&RtlpVectoredExceptionLock); - if(FirstHandler != 0) - { - InsertHeadList(&RtlpVectoredExceptionHead, - &veh->ListEntry); - } - else - { - InsertTailList(&RtlpVectoredExceptionHead, - &veh->ListEntry); - } - InterlockedIncrement (&RtlpVectoredExceptionsInstalled); - RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); - } - - return veh; -} - - -/* - * @implemented - */ -ULONG NTAPI + /* Call the shared routine */ + return RtlpAddVectoredHandler(FirstHandler, + VectoredHandler, + &RtlpVectoredExceptionList); +} + +DECLSPEC_HOTPATCH +PVOID +NTAPI +RtlAddVectoredContinueHandler(IN ULONG FirstHandler, + IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) +{ + /* Call the shared routine */ + return RtlpAddVectoredHandler(FirstHandler, + VectoredHandler, + &RtlpVectoredContinueList); +} + +//DECLSPEC_HOTPATCH +ULONG +NTAPI RtlRemoveVectoredExceptionHandler(IN PVOID VectoredHandlerHandle) { - PLIST_ENTRY CurrentEntry; - PRTL_VECTORED_EXCEPTION_HANDLER veh = NULL; - BOOLEAN Remove = FALSE; - ULONG Ret = FALSE; - - RtlEnterCriticalSection(&RtlpVectoredExceptionLock); - for(CurrentEntry = RtlpVectoredExceptionHead.Flink; - CurrentEntry != &RtlpVectoredExceptionHead; - CurrentEntry = CurrentEntry->Flink) - { - veh = CONTAINING_RECORD(CurrentEntry, - RTL_VECTORED_EXCEPTION_HANDLER, - ListEntry); - if(veh == VectoredHandlerHandle) - { - if (!veh->Deleted) - { - if (--veh->Refs == 0) - { - RemoveEntryList (&veh->ListEntry); - Remove = TRUE; - } - veh->Deleted = TRUE; - Ret = TRUE; - break; - } - } - } - RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); - - if(Remove) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - veh); - } - - return Ret; -} - -PVOID -NTAPI -DECLSPEC_HOTPATCH -RtlAddVectoredContinueHandler( - IN ULONG FirstHandler, - IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) -{ - UNIMPLEMENTED; - return NULL; -} - + /* Call the shared routine */ + return RtlpRemoveVectoredHandler(VectoredHandlerHandle, + &RtlpVectoredExceptionList); +} + +//DECLSPEC_HOTPATCH ULONG NTAPI -RtlRemoveVectoredContinueHandler( - IN PVOID VectoredHandlerHandle) -{ - UNIMPLEMENTED; - return FALSE; +RtlRemoveVectoredContinueHandler(IN PVOID VectoredHandlerHandle) +{ + /* Call the shared routine */ + return RtlpRemoveVectoredHandler(VectoredHandlerHandle, + &RtlpVectoredContinueList); } /* EOF */ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Thu Sep 17 13:36:55 2015 @@ -764,12 +764,20 @@ BOOLEAN NTAPI -RtlCallVectoredExceptionHandlers( - _In_ PEXCEPTION_RECORD ExceptionRecord, - _In_ PCONTEXT Context) +RtlCallVectoredExceptionHandlers(_In_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PCONTEXT Context) { /* In the kernel we don't have vectored exception handlers */ return FALSE; } +VOID +NTAPI +RtlCallVectoredContinueHandlers(_In_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PCONTEXT Context) +{ + /* No vectored continue handlers either in kernel mode */ + return; +} + /* EOF */

1 0

[rnaumann] 69258: [MSXML3] When renaming an icon identifier in the header, do it in the resource file too CORE-10200
by rnaumann＠svn.reactos.org 17 Sep '15

17 Sep '15

Author: rnaumann Date: Thu Sep 17 05:23:29 2015 New Revision: 69258 URL: http://svn.reactos.org/svn/reactos?rev=69258&view=rev Log: [MSXML3] When renaming an icon identifier in the header, do it in the resource file too CORE-10200 Modified: trunk/reactos/dll/win32/msxml3/resources.rc Modified: trunk/reactos/dll/win32/msxml3/resources.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/resources… ============================================================================== --- trunk/reactos/dll/win32/msxml3/resources.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/resources.rc [iso-8859-1] Thu Sep 17 05:23:29 2015 @@ -1,4 +1,4 @@ #include "resource.h" IDI_XML_FILE ICON "res/128.ico" -IDI_XML_SYSTEM ICON "res/129.ico" +IDI_XSL_FILE ICON "res/129.ico"

1 0

[rnaumann] 69257: [MSXML3][BOOTDATA] Add icons for XML and XSL files and use them. Patch by Jared Smudde with some modifications by me. CORE-10133
by rnaumann＠svn.reactos.org 16 Sep '15

16 Sep '15

Author: rnaumann Date: Wed Sep 16 21:45:48 2015 New Revision: 69257 URL: http://svn.reactos.org/svn/reactos?rev=69257&view=rev Log: [MSXML3][BOOTDATA] Add icons for XML and XSL files and use them. Patch by Jared Smudde with some modifications by me. CORE-10133 Added: trunk/reactos/dll/win32/msxml3/res/ trunk/reactos/dll/win32/msxml3/res/128.ico (with props) trunk/reactos/dll/win32/msxml3/res/129.ico (with props) trunk/reactos/dll/win32/msxml3/resource.h (with props) trunk/reactos/dll/win32/msxml3/resources.rc (with props) Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/win32/msxml3/version.rc Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Wed Sep 16 21:45:48 2015 @@ -237,8 +237,15 @@ HKCR,".xml","",0x00000000,"xmlfile" HKCR,"xmlfile","",0x00000000,"XML Document" HKCR,".xml","Content Type",0x00000000,"text/xml" -HKCR,"xmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" +HKCR,"xmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\msxml3.dll,0" HKCR,"xmlfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" + +; XSL Stylesheets +HKCR,".xsl","",0x00000000,"xslfile" +HKCR,"xslfile","",0x00000000,"XSL Stylesheet" +HKCR,".xsl","Content Type",0x00000000,"text/xml" +HKCR,"xslfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\msxml3.dll,1" +HKCR,"xslfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" ; MSI files HKCR,".msi","",0x00000000,"MSI.Package" Added: trunk/reactos/dll/win32/msxml3/res/128.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/res/128.i… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msxml3/res/128.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/msxml3/res/129.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/res/129.i… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msxml3/res/129.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/msxml3/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/resource.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/resource.h (added) +++ trunk/reactos/dll/win32/msxml3/resource.h [iso-8859-1] Wed Sep 16 21:45:48 2015 @@ -0,0 +1,4 @@ +#pragma once + +#define IDI_XML_FILE 128 +#define IDI_XSL_FILE 129 Propchange: trunk/reactos/dll/win32/msxml3/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msxml3/resources.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/resources… ============================================================================== --- trunk/reactos/dll/win32/msxml3/resources.rc (added) +++ trunk/reactos/dll/win32/msxml3/resources.rc [iso-8859-1] Wed Sep 16 21:45:48 2015 @@ -0,0 +1,4 @@ +#include "resource.h" + +IDI_XML_FILE ICON "res/128.ico" +IDI_XML_SYSTEM ICON "res/129.ico" Propchange: trunk/reactos/dll/win32/msxml3/resources.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msxml3/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/version.r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/version.rc [iso-8859-1] Wed Sep 16 21:45:48 2015 @@ -32,3 +32,6 @@ 2 WINE_REGISTRY "xmlparser.rgs" #include "schemas.rc" +#ifdef __REACTOS__ + #include "resources.rc" +#endif

1 0

[ekohl] 69256: [SYSDM] Set the proper title for the hardware profile properties dialog. CORE-10197 #resolve #comment Looks much better now!
by ekohl＠svn.reactos.org 16 Sep '15

16 Sep '15

Author: ekohl Date: Wed Sep 16 20:56:14 2015 New Revision: 69256 URL: http://svn.reactos.org/svn/reactos?rev=69256&view=rev Log: [SYSDM] Set the proper title for the hardware profile properties dialog. CORE-10197 #resolve #comment Looks much better now! Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Wed Sep 16 20:56:14 2015 @@ -433,11 +433,11 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE; psh.hwndParent = hwndDlg; psh.hInstance = hApplet; psh.hIcon = NULL; - psh.pszCaption = NULL; + psh.pszCaption = pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex].szFriendlyName; psh.nPages = 1; psh.nStartPage = 0; psh.phpage = &hpsp;

1 0

[rnaumann] 69255: [NETSHELL] Change the icons to make network activity more visible. Icons by reactosfanboy. CORE-10031
by rnaumann＠svn.reactos.org 16 Sep '15

16 Sep '15

Author: rnaumann Date: Wed Sep 16 18:20:40 2015 New Revision: 69255 URL: http://svn.reactos.org/svn/reactos?rev=69255&view=rev Log: [NETSHELL] Change the icons to make network activity more visible. Icons by reactosfanboy. CORE-10031 Modified: trunk/reactos/dll/shellext/netshell/res/netrec.ico trunk/reactos/dll/shellext/netshell/res/nettrans.ico trunk/reactos/dll/shellext/netshell/res/nettrrec.ico Modified: trunk/reactos/dll/shellext/netshell/res/netrec.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/res/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/netshell/res/nettrans.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/res/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/netshell/res/nettrrec.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/res/… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 69254: [UxTheme] - Fix uninitialized local variable context, MSVC Build. See CORE-9225.
by jimtabor＠svn.reactos.org 16 Sep '15

16 Sep '15

Author: jimtabor Date: Wed Sep 16 08:53:35 2015 New Revision: 69254 URL: http://svn.reactos.org/svn/reactos?rev=69254&view=rev Log: [UxTheme] - Fix uninitialized local variable context, MSVC Build. See CORE-9225. Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Wed Sep 16 08:53:35 2015 @@ -399,13 +399,13 @@ return; } - /* The scrollbar rect is in screen coordinates */ - OffsetRect(&sbi.rcScrollBar, -context.wi.rcWindow.left, -context.wi.rcWindow.top); - if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) return; ThemeInitDrawContext(&context, hwnd, 0); + + /* The scrollbar rect is in screen coordinates */ + OffsetRect(&sbi.rcScrollBar, -context.wi.rcWindow.left, -context.wi.rcWindow.top); hwndOwner = (nBar == SB_CTL) ? GetParent(hwnd) : hwnd; hwndCtl = (nBar == SB_CTL) ? hwnd : 0;

1 0

[jimtabor] 69253: [UxTheme] - Fix user side GetScrollBarInfo. See CORE-9225.
by jimtabor＠svn.reactos.org 16 Sep '15

16 Sep '15

Author: jimtabor Date: Wed Sep 16 08:12:52 2015 New Revision: 69253 URL: http://svn.reactos.org/svn/reactos?rev=69253&view=rev Log: [UxTheme] - Fix user side GetScrollBarInfo. See CORE-9225. Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Wed Sep 16 08:12:52 2015 @@ -288,10 +288,8 @@ sbi.xyThumbTop = 0; } -#ifndef ROS_SUCKS /* The scrollbar rect is in screen coordinates */ -// OffsetRect(&sbi.rcScrollBar, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); -#endif + OffsetRect(&sbi.rcScrollBar, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); if(pt) { @@ -401,10 +399,8 @@ return; } -#ifndef ROS_SUCKS /* The scrollbar rect is in screen coordinates */ -// OffsetRect(&sbi.rcScrollBar, -context.wi.rcWindow.left, -context.wi.rcWindow.top); -#endif + OffsetRect(&sbi.rcScrollBar, -context.wi.rcWindow.left, -context.wi.rcWindow.top); if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) return;

1 0

[jimtabor] 69252: - Real fix MSVC build?
by jimtabor＠svn.reactos.org 16 Sep '15

16 Sep '15

Author: jimtabor Date: Wed Sep 16 08:06:26 2015 New Revision: 69252 URL: http://svn.reactos.org/svn/reactos?rev=69252&view=rev Log: - Real fix MSVC build? Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] Wed Sep 16 08:06:26 2015 @@ -10,11 +10,13 @@ BOOL FASTCALL TestState(PWND, UINT); +#if 0 EXTINLINE BOOL WINAPI GetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) { return NtUserGetScrollBarInfo(hWnd, idObject, psbi); } +#endif EXTINLINE BOOL WINAPI ShowScrollBar(HWND hWnd, INT wBar, BOOL bShow)

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