Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[cgutman] 45356: - Merge some small changes from aicom-network-branch to fix potential memory corruption and remove unused code in oskittcp - Add a hack to WSHSetSocketInformation so we don't fail with options that aren't implemented yet - Fixes bug #5131

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jan 31 03:07:23 2010 New Revision: 45356 URL: http://svn.reactos.org/svn/reactos?rev=45356&view=rev Log: - Merge some small changes from aicom-network-branch to fix potential memory corruption and remove unused code in oskittcp - Add a hack to WSHSetSocketInformation so we don't fail with options that aren't implemented yet - Fixes bug #5131 Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Sun Jan 31 03:07:23 2010 @@ -623,8 +623,10 @@ /* FIXME: We only handle address file object here */ RealOptionName = GetAddressOption(Level, OptionName); + + /* FIXME: Support all options */ if (!RealOptionName) - return WSAEINVAL; + return 0; /* return WSAEINVAL; */ Info = HeapAlloc(GetProcessHeap(), 0, sizeof(*Info) + OptionLength); if (!Info) Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h [iso-8859-1] Sun Jan 31 03:07:23 2010 @@ -55,13 +55,6 @@ #ifndef M_WAITOK #include <sys/malloc.h> -#endif - -#ifndef OSKIT -#ifdef __REACTOS__ -/* #define OSKIT */ -#define LOCAL_OSKIT_DEFINED -#endif #endif /* @@ -301,21 +294,6 @@ } \ ) -#ifdef __REACTOS__ -#define MCLGET(m, how) { \ - OS_DbgPrint(OSK_MID_TRACE,("(MCLGET) m = %x\n", m)); \ - (m)->m_ext.ext_buf = malloc(MCLBYTES,__FILE__,__LINE__); \ - if ((m)->m_ext.ext_buf != NULL) { \ - (m)->m_data = (m)->m_ext.ext_buf; \ - (m)->m_flags |= M_EXT; \ - (m)->m_ext.ext_size = MCLBYTES; \ - } \ - } - -#define MCLFREE(p) { \ - free( (p), 0 ); \ - } -#else #define MCLGET(m, how) \ { MCLALLOC((m)->m_ext.ext_buf, (how)); \ OS_DbgPrint(OSK_MID_TRACE,("(MCLGET) m = %x\n", m)); \ @@ -335,7 +313,6 @@ mbstat.m_clfree++; \ } \ ) -#endif #else #define MCLGET(m, how) \ { (m)->m_ext.ext_bufio = oskit_bufio_create(MCLBYTES); \ @@ -557,9 +534,4 @@ #endif #endif -#ifdef LOCAL_OSKIT_DEFINED -#undef LOCAL_OSKIT_DEFINED -#undef OSKIT -#endif - #endif /* !_SYS_MBUF_H_ */ Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] Sun Jan 31 03:07:23 2010 @@ -14,7 +14,7 @@ #define printf DbgPrint #define vprintf DbgVPrint -#define ovbcopy(x,y,z) bcopy(x,y,z) +#define ovbcopy(src,dst,n) memmove(dst,src,n) #define bzero(x,y) memset(x,0,y) #define bcopy(src,dst,n) memcpy(dst,src,n) #ifdef _MSC_VER Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] Sun Jan 31 03:07:23 2010 @@ -365,9 +365,7 @@ #ifdef OSKIT oskit_bufio_addref(m->m_ext.ext_bufio); #else -#ifndef __REACTOS__ mclrefcnt[mtocl(m->m_ext.ext_buf)]++; -#endif #endif /* OSKIT */ n->m_ext = m->m_ext; n->m_flags |= M_EXT; @@ -729,11 +727,7 @@ if (copy) copy(cp, mtod(m, caddr_t), (unsigned)len); else -#ifdef __REACTOS__ - memcpy(mtod(m, caddr_t), cp, len); -#else bcopy(cp, mtod(m, caddr_t), (unsigned)len); -#endif cp += len; *mp = m; mp = &m->m_next;

14 years, 7 months

[tkreuzer] 45355: Commit the stuff. Lots of changes. I'll write a proper list of changes when it's done.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 30 22:12:42 2010 New Revision: 45355 URL: http://svn.reactos.org/svn/reactos?rev=45355&view=rev Log: Commit the stuff. Lots of changes. I'll write a proper list of changes when it's done. Added: branches/reactos-yarotows/subsystems/win32/win32k/eng/ldevobj.c (with props) branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c (with props) branches/reactos-yarotows/subsystems/win32/win32k/include/device.h (with props) branches/reactos-yarotows/subsystems/win32/win32k/include/ldevobj.h (with props) Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/win32csr.rbuild branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c branches/reactos-yarotows/subsystems/win32/win32k/eng/semaphor.c branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h branches/reactos-yarotows/subsystems/win32/win32k/include/intgdi.h branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h branches/reactos-yarotows/subsystems/win32/win32k/include/win32k.h branches/reactos-yarotows/subsystems/win32/win32k/ldr/loader.c branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c branches/reactos-yarotows/subsystems/win32/win32k/misc/driver.c branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c branches/reactos-yarotows/subsystems/win32/win32k/misc/registry.c branches/reactos-yarotows/subsystems/win32/win32k/ntddraw/dxeng.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/kbdlayout.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/ntstubs.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/ntuser.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/windc.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dcattr.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c branches/reactos-yarotows/subsystems/win32/win32k/objects/device.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c branches/reactos-yarotows/subsystems/win32/win32k/objects/gdibatch.c branches/reactos-yarotows/subsystems/win32/win32k/objects/gdidbg.c branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c branches/reactos-yarotows/subsystems/win32/win32k/stubs/stubs.c branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Added: branches/reactos-yarotows/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Added: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Added: branches/reactos-yarotows/subsystems/win32/win32k/include/device.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Added: branches/reactos-yarotows/subsystems/win32/win32k/include/ldevobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/misc/registry.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcattr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…

14 years, 7 months

[sir_richard] 45354: [NTOS]: Simplify KiTrapStub and write registers in order. [PERF]: Change instructions used to save registers on the trap frame to fix some WaW and RaW hazards.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jan 30 20:10:22 2010 New Revision: 45354 URL: http://svn.reactos.org/svn/reactos?rev=45354&view=rev Log: [NTOS]: Simplify KiTrapStub and write registers in order. [PERF]: Change instructions used to save registers on the trap frame to fix some WaW and RaW hazards. Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sat Jan 30 20:10:22 2010 @@ -798,47 +798,42 @@ /* Software traps need to get their EIP from the caller's frame */ if (Flags & KI_SOFTWARE_TRAP) __asm__ __volatile__ ("popl %%eax\n":::"%esp"); - /* Now go ahead and make space for this frame */ - __asm__ __volatile__ ("subl $%c[e],%%esp\n":: [e] "i"(FrameSize) : "%esp"); - - /* Does the caller want volatiles only? */ - if (Flags & KI_NONVOLATILES_ONLY) __asm__ __volatile__ - ( - /* Then only EBX, ESI, EDI and EBP are saved */ + /* Save nonvolatile registers */ + __asm__ __volatile__ + ( + /* EBX, ESI, EDI and EBP are saved */ + "movl %%ebp, %c[p](%%esp)\n" "movl %%ebx, %c[b](%%esp)\n" "movl %%esi, %c[s](%%esp)\n" "movl %%edi, %c[i](%%esp)\n" - "movl %%ebp, %c[p](%%esp)\n" - : - : [b] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebx)), - [s] "i"(FIELD_OFFSET(KTRAP_FRAME, Esi)), - [i] "i"(FIELD_OFFSET(KTRAP_FRAME, Edi)), - [p] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebp)) - : "%esp" - ); - else __asm__ __volatile__ - ( - /* Otherwise, we save all the registers (except ESP) */ + : + : [b] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Ebx)), + [s] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Esi)), + [i] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Edi)), + [p] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Ebp)) + : "%esp" + ); + + /* Does the caller want nonvolatiles only? */ + if (!(Flags & KI_NONVOLATILES_ONLY)) __asm__ __volatile__ + ( + /* Otherwise, save the volatiles as well */ "movl %%eax, %c[a](%%esp)\n" - "movl %%ebx, %c[b](%%esp)\n" "movl %%ecx, %c[c](%%esp)\n" "movl %%edx, %c[d](%%esp)\n" - "movl %%esi, %c[s](%%esp)\n" - "movl %%edi, %c[i](%%esp)\n" - "movl %%ebp, %c[p](%%esp)\n" - : - : [a] "i"(FIELD_OFFSET(KTRAP_FRAME, Eax)), - [b] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebx)), - [c] "i"(FIELD_OFFSET(KTRAP_FRAME, Ecx)), - [d] "i"(FIELD_OFFSET(KTRAP_FRAME, Edx)), - [s] "i"(FIELD_OFFSET(KTRAP_FRAME, Esi)), - [i] "i"(FIELD_OFFSET(KTRAP_FRAME, Edi)), - [p] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebp)) + : + : [a] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Eax)), + [c] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Ecx)), + [d] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Edx)) : "%esp" ); /* Now set parameter 1 (ECX) to point to the frame */ __asm__ __volatile__ ("movl %%esp, %%ecx\n":::"%esp"); + + /* Now go ahead and make space for this frame */ + __asm__ __volatile__ ("subl $%c[e],%%esp\n":: [e] "i"(FrameSize) : "%esp"); + __asm__ __volatile__ ("subl $%c[e],%%ecx\n":: [e] "i"(FrameSize) : "%ecx"); /* For Fast-V86 traps, set parameter 2 (EDX) to hold EFlags */ if (Flags & KI_FAST_V86_TRAP) __asm__ __volatile__

14 years, 7 months

[sir_richard] 45353: [PERF]: Omit setting certain useless trap frame fields. [NTOS]: Fix KiEnterInterruptFrame. In the case of a V86 trap, the segments were overriden because this wasn't a kernel trap (missing if/elseif).

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jan 30 19:25:30 2010 New Revision: 45353 URL: http://svn.reactos.org/svn/reactos?rev=45353&view=rev Log: [PERF]: Omit setting certain useless trap frame fields. [NTOS]: Fix KiEnterInterruptFrame. In the case of a V86 trap, the segments were overriden because this wasn't a kernel trap (missing if/elseif). Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sat Jan 30 19:25:30 2010 @@ -616,8 +616,7 @@ Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - /* Save exception list and bogus previous mode */ - TrapFrame->PreviousPreviousMode = -1; + /* Save exception list */ TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; /* Clear direction flag */ @@ -639,10 +638,7 @@ FORCEINLINE KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) { - /* Set bogus previous mode */ - TrapFrame->PreviousPreviousMode = -1; - - /* Check for V86 mode */ + /* Check for V86 mode, otherwise check for ring 3 code */ if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) { /* Restore V8086 segments into Protected Mode segments */ @@ -651,9 +647,7 @@ TrapFrame->SegDs = TrapFrame->V86Ds; TrapFrame->SegEs = TrapFrame->V86Es; } - - /* Check if this wasn't kernel code */ - if (__builtin_expect(TrapFrame->SegCs != KGDT_R0_CODE, 1)) /* Ring 3 is more common */ + else if (__builtin_expect(TrapFrame->SegCs != KGDT_R0_CODE, 1)) /* Ring 3 is more common */ { /* Save segments and then switch to correct ones */ TrapFrame->SegFs = Ke386GetFs(); @@ -668,10 +662,7 @@ /* Save exception list and terminate it */ TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; KeGetPcr()->Tib.ExceptionList = EXCEPTION_CHAIN_END; - - /* No error code */ - TrapFrame->ErrCode = 0; - + /* Clear direction flag */ Ke386ClearDirectionFlag(); @@ -718,8 +709,7 @@ TrapFrame->SegGs = Ke386GetGs(); Ke386SetFs(KGDT_R0_PCR); - /* Save exception list and bogus previous mode */ - TrapFrame->PreviousPreviousMode = -1; + /* Save exception list */ TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; /* Check for V86 mode */

14 years, 7 months

[tkreuzer] 45352: Autostart blue.sys, also needed for console mode

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 30 18:47:58 2010 New Revision: 45352 URL: http://svn.reactos.org/svn/reactos?rev=45352&view=rev Log: Autostart blue.sys, also needed for console mode Modified: branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf Modified: branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… ============================================================================== --- branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Jan 30 18:47:58 2010 @@ -995,7 +995,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Group",0x00000000,"Video Init" HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ImagePath",0x00020000,"system32\drivers\blue.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001 ; Cdfs (ISO96660) filesystem driver

14 years, 7 months

[tkreuzer] 45351: Add vgafonts to bootcd, needed for console mode

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 30 18:47:01 2010 New Revision: 45351 URL: http://svn.reactos.org/svn/reactos?rev=45351&view=rev Log: Add vgafonts to bootcd, needed for console mode Modified: branches/reactos-yarotows/boot/bootdata/packages/reactos.dff Modified: branches/reactos-yarotows/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… ============================================================================== --- branches/reactos-yarotows/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/reactos-yarotows/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 30 18:47:01 2010 @@ -568,6 +568,8 @@ media\fonts\tahoma.ttf 3 media\fonts\tahomabd.ttf 3 +media\vgafonts\vgafonts.cab 4 + media\nls\c_037.nls 1 media\nls\c_424.nls 1 media\nls\c_500.nls 1

14 years, 7 months

[spetreolle] 45350: Move Reactos logon sound to WindowsLogon sound scheme. Fixes bug 5002.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Jan 30 18:07:33 2010 New Revision: 45350 URL: http://svn.reactos.org/svn/reactos?rev=45350&view=rev Log: Move Reactos logon sound to WindowsLogon sound scheme. Fixes bug 5002. Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sat Jan 30 18:07:33 2010 @@ -1790,14 +1790,14 @@ HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Current","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart",,0x00000012 -HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Current","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" -HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Default","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff",,0x00000012 HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Current","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon",,0x00000012 -HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Current","",0x00020000,"" -HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Current","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Default","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" HKCU,"AppEvents\Schemes\Apps\Explorer","",0x00000002,"ReactOS Explorer" HKCU,"AppEvents\Schemes\Apps\Explorer","DispFileName",0x00000000,"@mmsys.cpl,-5854" HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin",,0x00000012

14 years, 7 months

[cgutman] 45349: - Remove some unused junk code

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 30 17:45:22 2010 New Revision: 45349 URL: http://svn.reactos.org/svn/reactos?rev=45349&view=rev Log: - Remove some unused junk code Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h [iso-8859-1] Sat Jan 30 17:45:22 2010 @@ -55,13 +55,6 @@ #ifndef M_WAITOK #include <sys/malloc.h> -#endif - -#ifndef OSKIT -#ifdef __REACTOS__ -/* #define OSKIT */ -#define LOCAL_OSKIT_DEFINED -#endif #endif /* @@ -301,21 +294,6 @@ } \ ) -#ifdef __REACTOS__ -#define MCLGET(m, how) { \ - OS_DbgPrint(OSK_MID_TRACE,("(MCLGET) m = %x\n", m)); \ - (m)->m_ext.ext_buf = malloc(MCLBYTES,__FILE__,__LINE__); \ - if ((m)->m_ext.ext_buf != NULL) { \ - (m)->m_data = (m)->m_ext.ext_buf; \ - (m)->m_flags |= M_EXT; \ - (m)->m_ext.ext_size = MCLBYTES; \ - } \ - } - -#define MCLFREE(p) { \ - free( (p), 0 ); \ - } -#else #define MCLGET(m, how) \ { MCLALLOC((m)->m_ext.ext_buf, (how)); \ OS_DbgPrint(OSK_MID_TRACE,("(MCLGET) m = %x\n", m)); \ @@ -335,7 +313,6 @@ mbstat.m_clfree++; \ } \ ) -#endif #else #define MCLGET(m, how) \ { (m)->m_ext.ext_bufio = oskit_bufio_create(MCLBYTES); \ @@ -557,9 +534,4 @@ #endif #endif -#ifdef LOCAL_OSKIT_DEFINED -#undef LOCAL_OSKIT_DEFINED -#undef OSKIT -#endif - #endif /* !_SYS_MBUF_H_ */ Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] Sat Jan 30 17:45:22 2010 @@ -365,9 +365,7 @@ #ifdef OSKIT oskit_bufio_addref(m->m_ext.ext_bufio); #else -#ifndef __REACTOS__ mclrefcnt[mtocl(m->m_ext.ext_buf)]++; -#endif #endif /* OSKIT */ n->m_ext = m->m_ext; n->m_flags |= M_EXT; @@ -729,11 +727,7 @@ if (copy) copy(cp, mtod(m, caddr_t), (unsigned)len); else -#ifdef __REACTOS__ - memcpy(mtod(m, caddr_t), cp, len); -#else bcopy(cp, mtod(m, caddr_t), (unsigned)len); -#endif cp += len; *mp = m; mp = &m->m_next;

14 years, 7 months

[sir_richard] 45348: [HAL]: Add debugging feature to HalpTrap06 error that sometimes happen. Please post/email/IM your trap frame should you see this error.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jan 30 17:40:57 2010 New Revision: 45348 URL: http://svn.reactos.org/svn/reactos?rev=45348&view=rev Log: [HAL]: Add debugging feature to HalpTrap06 error that sometimes happen. Please post/email/IM your trap frame should you see this error. Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Sat Jan 30 17:40:57 2010 @@ -226,6 +226,7 @@ /* Strange, it isn't! This can happen during NMI */ DPRINT1("HAL: Trap0D while not in V86 mode\n"); + KiDumpTrapFrame(TrapFrame); while (TRUE); }

14 years, 7 months

[cgutman] 45347: - ovbcopy is used when the source address and destination address overlap so defining it to memcpy was a horrible idea

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 30 16:18:21 2010 New Revision: 45347 URL: http://svn.reactos.org/svn/reactos?rev=45347&view=rev Log: - ovbcopy is used when the source address and destination address overlap so defining it to memcpy was a horrible idea Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/oskitfreebsd.h Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/oskitfreebsd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] Sat Jan 30 16:18:21 2010 @@ -14,7 +14,7 @@ #define printf DbgPrint #define vprintf DbgVPrint -#define ovbcopy(x,y,z) bcopy(x,y,z) +#define ovbcopy(src,dst,n) memmove(dst,src,n) #define bzero(x,y) memset(x,0,y) #define bcopy(src,dst,n) memcpy(dst,src,n) #ifdef _MSC_VER

14 years, 7 months

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 January 2010