Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 44791: Implement HalpInitPICs
by sserapion＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: sserapion Date: Mon Dec 28 07:38:19 2009 New Revision: 44791 URL: http://svn.reactos.org/svn/reactos?rev=44791&view=rev Log: Implement HalpInitPICs Added: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/pic.c (with props) Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] Mon Dec 28 07:38:19 2009 @@ -12,6 +12,7 @@ <file>mps.S</file> <file>systimer.S</file> <file>usage.c</file> + <file>pic.c</file> <pch>../include/hal.h</pch> </module> </group> Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S [iso-8859-1] Mon Dec 28 07:38:19 2009 @@ -30,12 +30,6 @@ /* FUNCTIONS *****************************************************************/ - -.globl _HalpInitPICs -.func _HalpInitPICs -_HalpInitPICs: - UNIMPLEMENTED "HalpInitPICs" -.endfunc .global _HalEnableInterrupt .func _HalEnableInterrupt Added: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/pic.c (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/pic.c [iso-8859-1] Mon Dec 28 07:38:19 2009 @@ -1,0 +1,111 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: hal/pic.c + * PURPOSE: Hardware Abstraction Layer DLL + * PROGRAMMER: Samuel Serapión + */ +#include <hal.h> + +//#define NDEBUG +#include <debug.h> +#include <asm.h> + +/* + * 8259 interrupt controllers + */ +enum +{ + Int0ctl= 0x20, /* control port (ICW1, OCW2, OCW3) */ + Int0aux= 0x21, /* everything else (ICW2, ICW3, ICW4, OCW1) */ + Int1ctl= 0xA0, /* control port */ + Int1aux= 0xA1, /* everything else (ICW2, ICW3, ICW4, OCW1) */ + + Icw1= 0x10, /* select bit in ctl register */ + Ocw2= 0x00, + Ocw3= 0x08, + + EOI= 0x20, /* non-specific end of interrupt */ + + Elcr1= 0x4D0, /* Edge/Level Triggered Register */ + Elcr2= 0x4D1, +}; + + + +INT i8259mask = 0xFFFF; /* disabled interrupts */ +INT i8259elcr; + + +VOID +NTAPI +HalpInitPICs(VOID) +{ + ULONG OldEflags; + INT x; + + OldEflags = __readeflags(); + _disable(); + /* + * Set up the first 8259 interrupt processor. + * Make 8259 interrupts start at CPU vector VectorPIC. + * Set the 8259 as master with edge triggered + * input with fully nested interrupts. + */ + __outbyte(Int0ctl, 0x20); /* ICW1 - master, edge triggered */ + __outbyte(Int0aux, 0x11); /* Edge, cascade, CAI 8, ICW4 */ + __outbyte(Int0aux, PRIMARY_VECTOR_BASE); /* ICW2 - interrupt vector offset */ + __outbyte(Int0aux, 0x04); /* ICW3 - have slave on level 2 */ + __outbyte(Int0aux, 0x01); /* ICW4 - 8086 mode, not buffered */ + __outbyte(Int0aux, 0xFF); /* Mask Interrupts */ + /* + * Set up the second 8259 interrupt processor. + * Make 8259 interrupts start at CPU vector VectorPIC+8. + * Set the 8259 as slave with edge triggered + * input with fully nested interrupts. + */ + __outbyte(Int1ctl, 0xA0); /* ICW1 - master, edge triggered, */ + __outbyte(Int1aux, 0x11); /* Edge, cascade, CAI 8, ICW4 */ + __outbyte(Int1aux, PRIMARY_VECTOR_BASE+8); /* ICW2 - interrupt vector offset */ + __outbyte(Int1aux, 0x02); /* ICW3 - I am a slave on level 2 */ + __outbyte(Int1aux, 0x01); /* ICW4 - 8086 mode, not buffered */ + __outbyte(Int1aux, 0xFF); /* Mask Interrupts */ + + + /* + * pass #2 8259 interrupts to #1 + */ + i8259mask &= ~0x04; + __outbyte(Int0aux, i8259mask & 0xFF); + + /* + * Set Ocw3 to return the ISR when ctl read. + * After initialisation status read is set to IRR. + * Read IRR first to possibly deassert an outstanding + * interrupt. + */ + __inbyte (Int0ctl); + __outbyte(Int0ctl, Ocw3|0x03); + __inbyte (Int1ctl); + __outbyte(Int1ctl, Ocw3|0x03); + + /* + * Check for Edge/Level register. + * This check may not work for all chipsets. + * First try a non-intrusive test - the bits for + * IRQs 13, 8, 2, 1 and 0 must be edge (0). If + * that's OK try a R/W test. + */ + x = (__inbyte (Elcr2)<<8)|__inbyte(Elcr1); + if(!(x & 0x2107)){ + __outbyte(Elcr1, 0); + if(__inbyte (Elcr1) == 0){ + __outbyte(Elcr1, 0x20); + if(__inbyte (Elcr1) == 0x20) + i8259elcr = x; + __outbyte(Elcr1, x & 0xFF); + DPRINT("ELCR: %4.4uX\n", i8259elcr); + } + } + __writeeflags(OldEflags); + } Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/pic.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sserapion] 44790: Sync to trunk (r44789)
by sserapion＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: sserapion Date: Mon Dec 28 05:55:58 2009 New Revision: 44790 URL: http://svn.reactos.org/svn/reactos?rev=44790&view=rev Log: Sync to trunk (r44789) Added: branches/ros-amd64-bringup/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32k_2k3sp2-x86.db - copied unchanged from r44789, trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32k_2k3sp2-x86.db branches/ros-amd64-bringup/rostests/apitests/w32kdll/w32kdll_2ksp4/w32k_2ksp4-x86.db - copied unchanged from r44789, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32k_2ksp4-x86.db branches/ros-amd64-bringup/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista-x86.db - copied unchanged from r44789, trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista-x86.db branches/ros-amd64-bringup/rostests/apitests/w32kdll/w32kdll_xpsp2/w32k_xpsp2-x86.db - copied unchanged from r44789, trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32k_xpsp2-x86.db branches/ros-amd64-bringup/rostests/tests/mmixer_test/ (props changed) - copied from r44789, trunk/rostests/tests/mmixer_test/ branches/ros-amd64-bringup/rostests/winetests/advapi32/eventlog.c - copied unchanged from r44789, trunk/rostests/winetests/advapi32/eventlog.c branches/ros-amd64-bringup/rostests/winetests/msvcrt/signal.c - copied unchanged from r44789, trunk/rostests/winetests/msvcrt/signal.c branches/ros-amd64-bringup/rostests/winetests/shell32/progman_dde.c - copied unchanged from r44789, trunk/rostests/winetests/shell32/progman_dde.c Modified: branches/ros-amd64-bringup/rostests/ (props changed) branches/ros-amd64-bringup/rostests/tests/directory.rbuild branches/ros-amd64-bringup/rostests/winetests/advapi32/advapi32.rbuild branches/ros-amd64-bringup/rostests/winetests/advapi32/crypt.c branches/ros-amd64-bringup/rostests/winetests/advapi32/registry.c branches/ros-amd64-bringup/rostests/winetests/advapi32/security.c branches/ros-amd64-bringup/rostests/winetests/advapi32/service.c branches/ros-amd64-bringup/rostests/winetests/advapi32/testlist.c branches/ros-amd64-bringup/rostests/winetests/fusion/asmenum.c branches/ros-amd64-bringup/rostests/winetests/fusion/asmname.c branches/ros-amd64-bringup/rostests/winetests/hlink/hlink.c branches/ros-amd64-bringup/rostests/winetests/kernel32/actctx.c branches/ros-amd64-bringup/rostests/winetests/kernel32/environ.c branches/ros-amd64-bringup/rostests/winetests/kernel32/file.c branches/ros-amd64-bringup/rostests/winetests/kernel32/locale.c branches/ros-amd64-bringup/rostests/winetests/kernel32/path.c branches/ros-amd64-bringup/rostests/winetests/kernel32/volume.c branches/ros-amd64-bringup/rostests/winetests/lz32/lzexpand_main.c branches/ros-amd64-bringup/rostests/winetests/msacm32/msacm.c branches/ros-amd64-bringup/rostests/winetests/msi/automation.c branches/ros-amd64-bringup/rostests/winetests/msi/db.c branches/ros-amd64-bringup/rostests/winetests/msi/format.c branches/ros-amd64-bringup/rostests/winetests/msi/install.c branches/ros-amd64-bringup/rostests/winetests/msi/msi.c branches/ros-amd64-bringup/rostests/winetests/msi/package.c branches/ros-amd64-bringup/rostests/winetests/msi/record.c branches/ros-amd64-bringup/rostests/winetests/msi/suminfo.c branches/ros-amd64-bringup/rostests/winetests/mstask/task.c branches/ros-amd64-bringup/rostests/winetests/msvcrt/cpp.c branches/ros-amd64-bringup/rostests/winetests/msvcrt/file.c branches/ros-amd64-bringup/rostests/winetests/msvcrt/msvcrt.rbuild branches/ros-amd64-bringup/rostests/winetests/msvcrt/string.c branches/ros-amd64-bringup/rostests/winetests/msvcrt/testlist.c branches/ros-amd64-bringup/rostests/winetests/msvcrtd/debug.c branches/ros-amd64-bringup/rostests/winetests/msxml3/domdoc.c branches/ros-amd64-bringup/rostests/winetests/netapi32/apibuf.c branches/ros-amd64-bringup/rostests/winetests/ntdll/om.c branches/ros-amd64-bringup/rostests/winetests/ntdll/rtlbitmap.c branches/ros-amd64-bringup/rostests/winetests/ntdll/rtlstr.c branches/ros-amd64-bringup/rostests/winetests/rsaenh/rsaenh.c branches/ros-amd64-bringup/rostests/winetests/setupapi/install.c branches/ros-amd64-bringup/rostests/winetests/setupapi/misc.c branches/ros-amd64-bringup/rostests/winetests/setupapi/parser.c branches/ros-amd64-bringup/rostests/winetests/setupapi/query.c branches/ros-amd64-bringup/rostests/winetests/setupapi/stringtable.c branches/ros-amd64-bringup/rostests/winetests/shell32/shell32.rbuild branches/ros-amd64-bringup/rostests/winetests/shell32/shelllink.c branches/ros-amd64-bringup/rostests/winetests/shell32/shlexec.c branches/ros-amd64-bringup/rostests/winetests/shell32/shlfileop.c branches/ros-amd64-bringup/rostests/winetests/shell32/shlfolder.c branches/ros-amd64-bringup/rostests/winetests/shell32/testlist.c branches/ros-amd64-bringup/rostests/winetests/usp10/usp10.c branches/ros-amd64-bringup/rostests/winetests/winmm/mci.c branches/ros-amd64-bringup/rostests/winetests/wldap32/parse.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/test… Modified: branches/ros-amd64-bringup/rostests/winetests/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/advapi32/crypt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/kernel32/environ.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/lz32/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msi/format.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msi/record.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/mstask/task.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msvcrtd/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/ntdll/rtlbitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/ntdll/rtlstr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine… Modified: branches/ros-amd64-bringup/rostests/winetests/wldap32/parse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/wine…

1 0

[sserapion] 44789: ignore some warnings by gcc 4.4.2
by sserapion＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: sserapion Date: Mon Dec 28 05:46:04 2009 New Revision: 44789 URL: http://svn.reactos.org/svn/reactos?rev=44789&view=rev Log: ignore some warnings by gcc 4.4.2 Modified: branches/ros-amd64-bringup/rostests/apitests/w32knapi/w32knapi.c branches/ros-amd64-bringup/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild branches/ros-amd64-bringup/rostests/tests/miditest/miditest.c branches/ros-amd64-bringup/rostests/tests/p_dup_handle/p_dup_handle.c branches/ros-amd64-bringup/rostests/tests/thread/thread.rbuild branches/ros-amd64-bringup/rostests/tests/tmrqueue/tmrqueue.rbuild Modified: branches/ros-amd64-bringup/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/apit… ============================================================================== --- branches/ros-amd64-bringup/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] Mon Dec 28 05:46:04 2009 @@ -10,6 +10,7 @@ { PTEB pTeb = NtCurrentTeb(); PPEB pPeb = pTeb->ProcessEnvironmentBlock; + printf("TEB::PEB=0x%lx PEB::GdiHT=0x%lx, Peb=%p, Teb=%p\n", FIELD_OFFSET(TEB, ProcessEnvironmentBlock), FIELD_OFFSET(PEB, GdiSharedHandleTable), pTeb, pPeb); return pPeb->GdiSharedHandleTable; } Modified: branches/ros-amd64-bringup/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/dxte… ============================================================================== --- branches/ros-amd64-bringup/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] Mon Dec 28 05:46:04 2009 @@ -1,4 +1,4 @@ -<module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe"> +<module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe" allowwarnings="true"> <include base="win32kdxtest">.</include> <library>user32</library> <library>gdi32</library> Modified: branches/ros-amd64-bringup/rostests/tests/miditest/miditest.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/test… ============================================================================== --- branches/ros-amd64-bringup/rostests/tests/miditest/miditest.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/rostests/tests/miditest/miditest.c [iso-8859-1] Mon Dec 28 05:46:04 2009 @@ -36,7 +36,7 @@ printf("Opening MIDI output #0\n"); Result = midiOutOpen(&Handle, 0, 0, 0, CALLBACK_NULL); - printf("Result == %d Handle == %x\n", Result, Handle); + printf("Result == %d Handle == %p\n", Result, Handle); // play something: midiOutShortMsg(Handle, 0x007f3090); Modified: branches/ros-amd64-bringup/rostests/tests/p_dup_handle/p_dup_handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/test… ============================================================================== --- branches/ros-amd64-bringup/rostests/tests/p_dup_handle/p_dup_handle.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/rostests/tests/p_dup_handle/p_dup_handle.c [iso-8859-1] Mon Dec 28 05:46:04 2009 @@ -38,7 +38,7 @@ memset( &si, 0, sizeof( si ) ); memset( &pi, 0, sizeof( pi ) ); - sprintf( cmdline, "%s %x", argv[0], h_process ); + sprintf( cmdline, "%s %p", argv[0], h_process ); if( !CreateProcess(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi ) ) { fprintf( stderr, "%lu: Could not create child process.\n", Modified: branches/ros-amd64-bringup/rostests/tests/thread/thread.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/test… ============================================================================== --- branches/ros-amd64-bringup/rostests/tests/thread/thread.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/rostests/tests/thread/thread.rbuild [iso-8859-1] Mon Dec 28 05:46:04 2009 @@ -1,4 +1,4 @@ -<module name="thread" type="win32gui" installbase="bin" installname="thread.exe"> +<module name="thread" type="win32gui" installbase="bin" installname="thread.exe" allowwarnings="true"> <library>gdi32</library> <file>thread.c</file> </module> Modified: branches/ros-amd64-bringup/rostests/tests/tmrqueue/tmrqueue.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/test… ============================================================================== --- branches/ros-amd64-bringup/rostests/tests/tmrqueue/tmrqueue.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/rostests/tests/tmrqueue/tmrqueue.rbuild [iso-8859-1] Mon Dec 28 05:46:04 2009 @@ -1,4 +1,4 @@ -<module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe"> +<module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe" allowwarnings="true"> <library>gdi32</library> <file>tmrqueue.c</file> </module>

1 0

[tkreuzer] 44788: Implement KiGeneralProtectionFault a bit
by tkreuzer＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: tkreuzer Date: Mon Dec 28 05:39:02 2009 New Revision: 44788 URL: http://svn.reactos.org/svn/reactos?rev=44788&view=rev Log: Implement KiGeneralProtectionFault a bit Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Mon Dec 28 05:39:02 2009 @@ -235,14 +235,13 @@ -// rbp = TrapFrame, ecx = ExceptionCode, edx = NumParams, r9,r10,r11 = params +// rbp = TrapFrame, eax = ExceptionCode, edx = NumParams, r9,r10,r11 = params _InternalDispatchException: /* Allocate stack space for EXCEPTION_RECORD and KEXCEPTION_FRAME */ sub rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME /* Set up EXCEPTION_RECORD */ - mov eax, ecx lea rcx, [rsp + SIZE_KEXCEPTION_FRAME] mov [rcx + EXCEPTION_RECORD_ExceptionCode], eax xor rax, rax @@ -313,7 +312,7 @@ KiDebugTrapOrFaultKMode: /* Dispatch the exception */ - mov ecx, STATUS_SINGLE_STEP + mov eax, STATUS_SINGLE_STEP mov edx, 0 mov r9, 0 mov r10, 0 @@ -351,7 +350,7 @@ // call _FrLdrDbgPrint[rip] /* Dispatch the exception */ - mov ecx, STATUS_BREAKPOINT + mov eax, STATUS_BREAKPOINT mov edx, 3 mov r9, 0 mov r10, 0 @@ -491,20 +490,111 @@ .pushframe 1 /* We have an error code */ + cli ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiGeneralProtectionFault - -// DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, 0, 0 mov rdx, [rbp + KTRAP_FRAME_Rip] lea rcx, _MsgGeneralProtFault[rip] call _FrLdrDbgPrint[rip] - jmp $ + + /* Check if this was from user-mode */ + cmp byte ptr [rbp + KTRAP_FRAME_PreviousMode], KernelMode + jnz KiGpfUserMode + + /* Get instruction */ + mov rax, [rbp + KTRAP_FRAME_Rip] + mov rax, [rax] + + /* Check for MSR failure */ + cmp al, 0xF + jz KiGpfMsr + + /* Check for IRET */ + cmp ax, 0xCF48 + je KiGpfIret + + /* Check for pop ds/es/fs/gs */ + xor edx, edx + cmp al, 0x1F + jz KiGpfPopSegDs + cmp al, 0x07 + jz KiGpfPopSegEs + cmp ax, 0xA10F + jz KiGpfPopSegFs + cmp ax, 0xA90F + jz KiGpfPopSegGs + + + mov dx, 0x002B // KGDT64_R3_DATA | RPL_MASK + cmp [rbp + KTRAP_FRAME_SegDs], dx + jne KiGpfPopSegDs + cmp [rbp + KTRAP_FRAME_SegEs], dx + jne KiGpfPopSegEs + cmp [rbp + KTRAP_FRAME_SegFs], dx + jne KiGpfPopSegFs + cmp [rbp + KTRAP_FRAME_SegGs], dx + jne KiGpfPopSegGs + +KiGpfFatal: + + /* Bugcheck */ + mov ecx, UNEXPECTED_KERNEL_MODE_TRAP + mov rdx, 0x0000D // EXCEPTION_GP_FAULT + xor rdx, rdx + xor r8, r8 + xor r9, r9 // Reserved + mov [rbp + KTRAP_FRAME_P5], rbp // trap frame + call _KeBugCheckWithTf + + + +KiGpfPopSegDs: + mov [rbp + KTRAP_FRAME_SegDs], dx + jmp KiGpfPopSeg + +KiGpfPopSegEs: + mov [rbp + KTRAP_FRAME_SegEs], dx + jmp KiGpfPopSeg + +KiGpfPopSegFs: + mov [rbp + KTRAP_FRAME_SegFs], dx + jmp KiGpfPopSeg + +KiGpfPopSegGs: + mov [rbp + KTRAP_FRAME_SegGs], dx + jmp KiGpfPopSeg + +KiGpfPopSeg: + jmp KiGpfExit + +KiGpfIret: + /* Get error code */ + mov ax, [rbp + KTRAP_FRAME_ErrorCode] +// and ax, ~RPL_MASK + +KiGpfMsr: + + jmp KiGpfFatal + + +KiGpfUserMode: + + /* Dispatch the exception */ + mov eax, STATUS_ACCESS_VIOLATION + mov edx, 2 + mov r9, [rbp + KTRAP_FRAME_ErrorCode] + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + +KiGpfExit: /* Return */ LEAVE_TRAP_FRAME iretq + .endproc @@ -556,8 +646,8 @@ InPageException: /* Dispatch in-page exception */ - mov ecx, STATUS_IN_PAGE_ERROR // ExceptionCode mov r11d, eax // Param3 = Status + mov eax, STATUS_IN_PAGE_ERROR // ExceptionCode mov edx, 3 // ParamCount call _InternalDispatchException jmp PageFaultReturn @@ -568,7 +658,6 @@ SpecialCode: /* Setup a normal page fault exception */ - mov ecx, eax // ExceptionCode mov edx, 2 // ParamCount call _InternalDispatchException @@ -650,7 +739,7 @@ inc qword ptr [rbp + KTRAP_FRAME_Rip] /* Dispatch the exception */ - mov ecx, STATUS_BREAKPOINT + mov eax, STATUS_BREAKPOINT mov edx, 3 mov r9, [rbp+KTRAP_FRAME_Rax] // Service mov r10, [rbp+KTRAP_FRAME_Rcx] // Buffer @@ -688,8 +777,18 @@ lea rcx, _MsgUnexpectedInterrupt[rip] call _FrLdrDbgPrint[rip] - jmp $ -.endproc - - - + mov ecx, TRAP_CAUSE_UNKNOWN +// mov rdx, // The unexpected interrupt +// mov rdx, // The unknown floating-point exception +// mov r8, // The enabled and asserted status bits + xor r9, r9 // Reserved + mov [rbp + KTRAP_FRAME_P5], rbp // trap frame + call _KeBugCheckWithTf + +.endproc + + +.proc KiSystemFatalException + +.endproc +

1 0

[sserapion] 44787: Fix Build.
by sserapion＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: sserapion Date: Mon Dec 28 04:09:37 2009 New Revision: 44787 URL: http://svn.reactos.org/svn/reactos?rev=44787&view=rev Log: Fix Build. Modified: branches/ros-amd64-bringup/reactos/config-arm.template.rbuild branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild branches/ros-amd64-bringup/reactos/config.template.rbuild branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak Modified: branches/ros-amd64-bringup/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… ============================================================================== --- branches/ros-amd64-bringup/reactos/config-arm.template.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/config-arm.template.rbuild [iso-8859-1] Mon Dec 28 04:09:37 2009 @@ -90,4 +90,10 @@ --> <property name="_ELF_" value="0" /> + +<property name="USERMODE" value="1" /> + </group> Modified: branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… ============================================================================== --- branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild [iso-8859-1] Mon Dec 28 04:09:37 2009 @@ -70,4 +70,10 @@ --> <property name="_ELF_" value="0" /> + +<property name="USERMODE" value="1" /> + </group> Modified: branches/ros-amd64-bringup/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… ============================================================================== --- branches/ros-amd64-bringup/reactos/config.template.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/config.template.rbuild [iso-8859-1] Mon Dec 28 04:09:37 2009 @@ -97,6 +97,12 @@  -<property name="BUILD_MP" value="1" /> +<property name="BUILD_MP" value="0" /> + + +<property name="USERMODE" value="1" /> </group> Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Mon Dec 28 04:09:37 2009 @@ -263,7 +263,9 @@ $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) $${checkpoint} $$@>$(NUL) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_c.o}endef +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call RBUILD_intermediate_path_noext,$(2)}_c.o} + +endef #(module, source, dependencies, cflags) define RBUILD_WIDL_SERVER_RULE @@ -277,7 +279,9 @@ $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) $${checkpoint} $$@>$(NUL) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_s.o}endef +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,,${call RBUILD_intermediate_path_noext,$(2)}_s.o} + +endef #(module, source, dependencies, cflags) define RBUILD_WIDL_PROXY_RULE @@ -291,7 +295,9 @@ $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2) $${checkpoint} $$@>$(NUL) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_p.o}endef +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,,${call RBUILD_intermediate_path_noext,$(2)}_p.o} + +endef #(module, source, dependencies, cflags) define RBUILD_WIDL_INTERFACE_RULE

1 0

[sserapion] 44786: Fix broken merge
by sserapion＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: sserapion Date: Mon Dec 28 04:02:12 2009 New Revision: 44786 URL: http://svn.reactos.org/svn/reactos?rev=44786&view=rev Log: Fix broken merge Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Mon Dec 28 04:02:12 2009 @@ -263,7 +263,7 @@ $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) $${checkpoint} $$@>$(NUL) -endef +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_c.o}endef #(module, source, dependencies, cflags) define RBUILD_WIDL_SERVER_RULE @@ -277,7 +277,7 @@ $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) $${checkpoint} $$@>$(NUL) -endef +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_s.o}endef #(module, source, dependencies, cflags) define RBUILD_WIDL_PROXY_RULE @@ -291,7 +291,7 @@ $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2) $${checkpoint} $$@>$(NUL) -endef +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_p.o}endef #(module, source, dependencies, cflags) define RBUILD_WIDL_INTERFACE_RULE

1 0

[sserapion] 44785: Unhack ntoskrnl, fixes many x86 regressions.
by sserapion＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: sserapion Date: Mon Dec 28 02:37:31 2009 New Revision: 44785 URL: http://svn.reactos.org/svn/reactos?rev=44785&view=rev Log: Unhack ntoskrnl, fixes many x86 regressions. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Dec 28 02:37:31 2009 @@ -956,8 +956,7 @@ } /* Make sure interrupts are active now */ -// FIXME HAX!!! - //_enable(); + _enable(); /* Clear the crypto exponent */ SharedUserData->CryptoExponent = 0;

1 0

[tkreuzer] 44784: remove unneded parameter
by tkreuzer＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: tkreuzer Date: Mon Dec 28 02:28:29 2009 New Revision: 44784 URL: http://svn.reactos.org/svn/reactos?rev=44784&view=rev Log: remove unneded parameter Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Mon Dec 28 02:28:29 2009 @@ -77,7 +77,7 @@ /* * ENTER_TRAP_FRAME - Allocate SIZE_KTRAP_FRAME and save registers to it */ -.macro ENTER_TRAP_FRAME AllocSize Flags +.macro ENTER_TRAP_FRAME Flags .set SIZE_INITIAL_FRAME, 7 * 8 //.set SIZE_LOCAL_DATA, SIZE_EXCEPTION_RECORD + 0x28 .set SIZE_TRAP_FRAME_ALLOC, SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME @@ -299,7 +299,7 @@ push 0 .allocstack 0x8 - ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL + ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiDebugTrapOrFault @@ -342,7 +342,7 @@ push 0 .allocstack 0x8 - ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL + ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiBreakpointTrap @@ -396,7 +396,7 @@ push 0 .allocstack 0x8 - ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL + ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiInvalidOpcodeFault @@ -491,7 +491,7 @@ .pushframe 1 /* We have an error code */ - ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL + ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiGeneralProtectionFault @@ -512,7 +512,7 @@ .pushframe 1 /* We have an error code */ - ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL + ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiPageFault @@ -642,7 +642,7 @@ push 0 .allocstack 0x08 - ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL + ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiDebugServiceTrap

1 0

[sserapion] 44783: - Fix LPBLOCKINGCALLBACK - Don't use size_t for string sizes. - Fixes warnings.
by sserapion＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: sserapion Date: Mon Dec 28 02:07:10 2009 New Revision: 44783 URL: http://svn.reactos.org/svn/reactos?rev=44783&view=rev Log: - Fix LPBLOCKINGCALLBACK - Don't use size_t for string sizes. - Fixes warnings. Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/qshelpr.c branches/ros-amd64-bringup/reactos/include/psdk/ws2spi.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h [iso-8859-1] Mon Dec 28 02:07:10 2009 @@ -299,13 +299,13 @@ INT WSAAPI MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet, - IN OUT PSIZE_T SetSize, + IN OUT PDWORD SetSize, OUT LPWSAQUERYSETW UnicodeSet); INT WSAAPI MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet, - IN OUT PSIZE_T SetSize, + IN OUT PDWORD SetSize, IN LPWSAQUERYSETA AnsiSet); INT Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/qshelpr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] Mon Dec 28 02:07:10 2009 @@ -807,11 +807,11 @@ INT WSAAPI MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet, - IN OUT PSIZE_T SetSize, + IN OUT PDWORD SetSize, OUT LPWSAQUERYSETW UnicodeSet) { INT ErrorCode = ERROR_SUCCESS; - SIZE_T AnsiSize, UnicodeSize; + DWORD AnsiSize, UnicodeSize; LPWSAQUERYSETA AnsiCopy = NULL; LPWSAQUERYSETW UnicodeCopy; LPWSTR ServiceCopy = NULL, CommentCopy = NULL; @@ -928,11 +928,11 @@ INT WSAAPI MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet, - IN OUT PSIZE_T SetSize, + IN OUT PDWORD SetSize, IN LPWSAQUERYSETA AnsiSet) { INT ErrorCode = ERROR_SUCCESS; - SIZE_T UnicodeSize, AnsiSize; + DWORD UnicodeSize, AnsiSize; LPWSAQUERYSETW UnicodeCopy = NULL; LPWSAQUERYSETA AnsiCopy; LPSTR ServiceCopy = NULL, CommentCopy = NULL; Modified: branches/ros-amd64-bringup/reactos/include/psdk/ws2spi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/ws2spi.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/ws2spi.h [iso-8859-1] Mon Dec 28 02:07:10 2009 @@ -39,7 +39,7 @@ DWORD Reserved; } WSATHREADID, FAR *LPWSATHREADID; -typedef BOOL (CALLBACK FAR *LPBLOCKINGCALLBACK)(DWORD); +typedef BOOL (CALLBACK FAR *LPBLOCKINGCALLBACK)(DWORD_PTR); typedef VOID (CALLBACK FAR *LPWSAUSERAPC)(DWORD); /* Prototypes for service provider procedure table */

1 0

[tkreuzer] 44782: reduce diff to trunk
by tkreuzer＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: tkreuzer Date: Mon Dec 28 01:51:53 2009 New Revision: 44782 URL: http://svn.reactos.org/svn/reactos?rev=44782&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/dll/cpl/console/console.spec Modified: branches/ros-amd64-bringup/reactos/dll/cpl/console/console.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/console/console.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/console/console.spec [iso-8859-1] Mon Dec 28 01:51:53 2009 @@ -1,1 +1,1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall CPlApplet(ptr long ptr ptr)

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