Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 45103: - Revert back to working comctl32 (Wine-1.1.30 as it looks like from logs). - Apply TOOLTIPS_NotifyFormat fix.
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 16:27:59 2010 New Revision: 45103 URL: http://svn.reactos.org/svn/reactos?rev=45103&view=rev Log: - Revert back to working comctl32 (Wine-1.1.30 as it looks like from logs). - Apply TOOLTIPS_NotifyFormat fix. Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c branches/arwinss/reactos/dll/win32/comctl32/comctl32.h branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild branches/arwinss/reactos/dll/win32/comctl32/comctl_Bg.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Cs.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_De.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_El.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_En.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Eo.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Es.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Fr.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Hu.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_It.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Ja.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Ko.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Lt.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Nl.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_No.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Pl.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Pt.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Ro.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Ru.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Si.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Sk.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Sv.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Th.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Tr.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Uk.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Zh.rc branches/arwinss/reactos/dll/win32/comctl32/commctrl.c branches/arwinss/reactos/dll/win32/comctl32/datetime.c branches/arwinss/reactos/dll/win32/comctl32/draglist.c branches/arwinss/reactos/dll/win32/comctl32/header.c branches/arwinss/reactos/dll/win32/comctl32/imagelist.c branches/arwinss/reactos/dll/win32/comctl32/imagelist.h branches/arwinss/reactos/dll/win32/comctl32/ipaddress.c branches/arwinss/reactos/dll/win32/comctl32/listview.c branches/arwinss/reactos/dll/win32/comctl32/monthcal.c branches/arwinss/reactos/dll/win32/comctl32/propsheet.c branches/arwinss/reactos/dll/win32/comctl32/rebar.c branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc branches/arwinss/reactos/dll/win32/comctl32/status.c branches/arwinss/reactos/dll/win32/comctl32/syslink.c branches/arwinss/reactos/dll/win32/comctl32/tab.c branches/arwinss/reactos/dll/win32/comctl32/theme_combo.c branches/arwinss/reactos/dll/win32/comctl32/toolbar.c branches/arwinss/reactos/dll/win32/comctl32/tooltips.c branches/arwinss/reactos/dll/win32/comctl32/trackbar.c branches/arwinss/reactos/dll/win32/comctl32/treeview.c branches/arwinss/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Sk.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…

1 0

[cgutman] 45102: - Fix a null-pointer dereference crash that happens when we complete a queued NDIS_REQUEST in MiniportWorker
by cgutman＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: cgutman Date: Sat Jan 16 15:59:54 2010 New Revision: 45102 URL: http://svn.reactos.org/svn/reactos?rev=45102&view=rev Log: - Fix a null-pointer dereference crash that happens when we complete a queued NDIS_REQUEST in MiniportWorker Modified: branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Jan 16 15:59:54 2010 @@ -961,13 +961,6 @@ Adapter->NdisMiniportBlock.MiniportAdapterContext, NULL, /* FIXME */ NdisRequest); - } - - if (Status != NDIS_STATUS_PENDING) - { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - Adapter->NdisMiniportBlock.PendingRequest = NULL; - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } return Status;

1 0

[fireball] 45101: - Sync comctl32 to Wine-1.1.36.
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 15:14:02 2010 New Revision: 45101 URL: http://svn.reactos.org/svn/reactos?rev=45101&view=rev Log: - Sync comctl32 to Wine-1.1.36. Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild branches/arwinss/reactos/dll/win32/comctl32/comctl_De.rc branches/arwinss/reactos/dll/win32/comctl32/commctrl.c branches/arwinss/reactos/dll/win32/comctl32/datetime.c branches/arwinss/reactos/dll/win32/comctl32/draglist.c branches/arwinss/reactos/dll/win32/comctl32/header.c branches/arwinss/reactos/dll/win32/comctl32/imagelist.c branches/arwinss/reactos/dll/win32/comctl32/imagelist.h branches/arwinss/reactos/dll/win32/comctl32/listview.c branches/arwinss/reactos/dll/win32/comctl32/propsheet.c branches/arwinss/reactos/dll/win32/comctl32/rebar.c branches/arwinss/reactos/dll/win32/comctl32/status.c branches/arwinss/reactos/dll/win32/comctl32/tab.c branches/arwinss/reactos/dll/win32/comctl32/theme_combo.c branches/arwinss/reactos/dll/win32/comctl32/toolbar.c branches/arwinss/reactos/dll/win32/comctl32/tooltips.c branches/arwinss/reactos/dll/win32/comctl32/trackbar.c branches/arwinss/reactos/dll/win32/comctl32/treeview.c branches/arwinss/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…

1 0

[fireball] 45100: Merge: - 45097: "Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32)". - 45098: "Merge Wine-1.1.36 changes to commctrl.h." - 45099: "Add missing IIDs to UUID."
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 14:55:35 2010 New Revision: 45100 URL: http://svn.reactos.org/svn/reactos?rev=45100&view=rev Log: Merge: - 45097: "Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32)". - 45098: "Merge Wine-1.1.36 changes to commctrl.h." - 45099: "Add missing IIDs to UUID." Added: branches/arwinss/reactos/include/psdk/commoncontrols.idl - copied unchanged from r45097, trunk/reactos/include/psdk/commoncontrols.idl Modified: branches/arwinss/ (props changed) branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed) branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/include/ndk/amd64/ (props changed) branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/arwinss/reactos/include/psdk/ (props changed) branches/arwinss/reactos/include/psdk/commctrl.h (contents, props changed) branches/arwinss/reactos/include/psdk/psdk.rbuild branches/arwinss/reactos/lib/sdk/crt/time/ (props changed) branches/arwinss/reactos/lib/sdk/uuid/uuid.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/tools/rsym/log2lines.c (props changed) branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) branches/arwinss/rosapps/applications/cmdutils/ (props changed) branches/arwinss/rosapps/applications/devutils/ (props changed) branches/arwinss/rosapps/applications/fraginator/ (props changed) branches/arwinss/rosapps/applications/net/ (props changed) branches/arwinss/rosapps/applications/net/roshttpd/ (props changed) branches/arwinss/rosapps/applications/notevil/ (props changed) branches/arwinss/rosapps/applications/sysutils/ (props changed) branches/arwinss/rosapps/applications/sysutils/gettype/ (props changed) branches/arwinss/rosapps/applications/sysutils/logevent/ (props changed) branches/arwinss/rosapps/applications/sysutils/screenshot/ (props changed) branches/arwinss/rosapps/applications/winfile/ (props changed) branches/arwinss/rosapps/lib/win32err/ (props changed) branches/arwinss/rosapps/lib/win32err/win32err.rbuild (props changed) branches/arwinss/rosapps/templates/imagesoft/ (props changed) branches/arwinss/rosapps/templates/imagesoft/lang/no-NO.rc (props changed) branches/arwinss/rosapps/templates/old_wordpad/ (props changed) branches/arwinss/rosapps/templates/old_wordpad/lang/no-NO.rc (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README.odt (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/scripts/ (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/sources/ (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/tools/ (props changed) branches/arwinss/wallpaper/Angelus_02_ROSWP.bmp (props changed) branches/arwinss/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg (props changed) Propchange: branches/arwinss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,1 +1,1 @@ -/trunk:42678-43126 +/trunk:42678-43126,45097-45099 Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos:42000-43670 +/trunk/reactos:42000-43670,45097-45099 Propchange: branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-43670 +/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-43670,45097-45099 Propchange: branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-43670 +/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-43670,45097-45099 Propchange: branches/arwinss/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-43670 +/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-43670,45097-45099 Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/gdi32:42000-43670 +/trunk/reactos/dll/win32/gdi32:42000-43670,45097-45099 /vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044 Propchange: branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-43670,44261 +/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-43670,44261,45097-45099 Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/user32:42000-43670 +/trunk/reactos/dll/win32/user32:42000-43670,45097-45099 /vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044 Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/winex11.drv:42000-43670 +/trunk/reactos/dll/win32/winex11.drv:42000-43670,45097-45099 /vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044 Propchange: branches/arwinss/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64:34925,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35739,35823,35952,35966,36360,37323,37434,37472,37475,37536,37820-37821,37869,37990,38013-38014,43426,43454 -/trunk/reactos/include/ndk/amd64:43125-43670 +/trunk/reactos/include/ndk/amd64:43125-43670,45097-45099 Propchange: branches/arwinss/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:37475,37536,37820-37821,37869,37990,38013-38014,43426,43454 +/trunk/reactos/include/ndk/amd64/asmmacro.S:45097-45099 Propchange: branches/arwinss/reactos/include/psdk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/psdk:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/include/psdk:42000-43670,44153 +/trunk/reactos/include/psdk:42000-43670,44153,45097-45099 Modified: branches/arwinss/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/co… ============================================================================== --- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Jan 16 14:55:35 2010 @@ -2991,6 +2991,7 @@ #define LVSIL_NORMAL 0 #define LVSIL_SMALL 1 #define LVSIL_STATE 2 +#define LVSIL_GROUPHEADER 3 /* following 2 flags only for LVS_OWNERDATA listviews */ /* and only in report or list mode */ @@ -2998,11 +2999,12 @@ #define LVSICF_NOSCROLL 0x0002 -#define LVFI_PARAM 0X0001 -#define LVFI_STRING 0X0002 -#define LVFI_PARTIAL 0X0008 -#define LVFI_WRAP 0X0020 -#define LVFI_NEARESTXY 0X0040 +#define LVFI_PARAM 0x0001 +#define LVFI_STRING 0x0002 +#define LVFI_SUBSTRING 0x0004 +#define LVFI_PARTIAL 0x0008 +#define LVFI_WRAP 0x0020 +#define LVFI_NEARESTXY 0x0040 #define LVIF_TEXT 0x0001 #define LVIF_IMAGE 0x0002 @@ -5133,7 +5135,7 @@ #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) /************************************************************************** - * List box control + * Listbox control */ #define WC_LISTBOXA "ListBox" @@ -5147,7 +5149,7 @@ #define WC_LISTBOX WINELIB_NAME_AW(WC_LISTBOX) /************************************************************************** - * Scroll bar control + * Scrollbar control */ #define WC_SCROLLBARA "ScrollBar" Propchange: branches/arwinss/reactos/include/psdk/commctrl.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015,44019,44153 +/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015,44019,44153,45097-45099 Modified: branches/arwinss/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ps… ============================================================================== --- branches/arwinss/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sat Jan 16 14:55:35 2010 @@ -6,6 +6,7 @@ <file>activscp.idl</file> <file>bits1_5.idl</file> <file>bits.idl</file> + <file>commoncontrols.idl</file> <file>control.idl</file> <file>ctxtcall.idl</file> <file>dimm.idl</file> Propchange: branches/arwinss/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,4 +1,4 @@ /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:38268,41028 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 -/trunk/reactos/lib/sdk/crt/time:42678-43670 +/trunk/reactos/lib/sdk/crt/time:42678-43670,45097-45099 /trunk/reactos/lib/sdk/crt/time_new:39350-42241,42401-42678 Modified: branches/arwinss/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/uuid/uu… ============================================================================== --- branches/arwinss/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sat Jan 16 14:55:35 2010 @@ -77,6 +77,12 @@ #include "isguids.h" #include "objsafe.h" #include "perhist.h" +#include "netcon.h" +#include "netfw.h" +#include "msctf.h" +#include "sensevts.h" +#include "ocmm.h" +#include "commoncontrols.h" /* FIXME: cguids declares GUIDs but does not define their values */ Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-43670,43934-43935 +/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-43670,43934-43935,45097-45099 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/win32k/include:42000-43670 +/trunk/reactos/subsystems/win32/win32k/include:42000-43670,45097-45099 /vendor/wine/server/current:45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-43670 +/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-43670,45097-45099 /vendor/wine/server/current/request.h:43136,43398,43708,45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/user.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126 +/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,45097-45099 /vendor/wine/server/current/user.h:43708,45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/wine:42000-43126 +/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,45097-45099 /vendor/wine/server/current:43708,44715,45044 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:38268,41028 -/trunk/reactos/tools/rsym/log2lines.c:43125-43670 +/trunk/reactos/tools/rsym/log2lines.c:43125-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:38268,41028 -/trunk/reactos/tools/rsym/log2lines.mak:43125-43670 +/trunk/reactos/tools/rsym/log2lines.mak:43125-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.c:42000-43670 +/trunk/reactos/tools/rsym/rsym.c:42000-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.h:42000-43670 +/trunk/reactos/tools/rsym/rsym.h:42000-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.mak:42000-43670 +/trunk/reactos/tools/rsym/rsym.mak:42000-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym_common.c:42000-43670 +/trunk/reactos/tools/rsym/rsym_common.c:42000-43670,45097-45099 Propchange: branches/arwinss/rosapps/applications/cmdutils/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/cmdutils:45097-45099 Propchange: branches/arwinss/rosapps/applications/devutils/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/devutils:45097-45099 Propchange: branches/arwinss/rosapps/applications/fraginator/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/fraginator:45097-45099 Propchange: branches/arwinss/rosapps/applications/net/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/net:45097-45099 Propchange: branches/arwinss/rosapps/applications/net/roshttpd/ ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/applications/notevil/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/notevil:45097-45099 Propchange: branches/arwinss/rosapps/applications/sysutils/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/sysutils:45097-45099 Propchange: branches/arwinss/rosapps/applications/sysutils/gettype/ ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/applications/sysutils/logevent/ ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/applications/sysutils/screenshot/ ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/applications/winfile/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/winfile:45097-45099 Propchange: branches/arwinss/rosapps/lib/win32err/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/lib/win32err:45097-45099 Propchange: branches/arwinss/rosapps/lib/win32err/win32err.rbuild ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/templates/imagesoft/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/templates/imagesoft:45097-45099 Propchange: branches/arwinss/rosapps/templates/imagesoft/lang/no-NO.rc ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/templates/old_wordpad/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/templates/old_wordpad:45097-45099 Propchange: branches/arwinss/rosapps/templates/old_wordpad/lang/no-NO.rc ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/README:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README.odt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/scripts/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/sources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/sources:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/tools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/tools:45097-45099 Propchange: branches/arwinss/wallpaper/Angelus_02_ROSWP.bmp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/wallpaper/Angelus_02_ROSWP.bmp:45097-45099 Propchange: branches/arwinss/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg:45097-45099

1 0

[fireball] 45099: [SDK] - Add missing IIDs to UUID.
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 14:52:51 2010 New Revision: 45099 URL: http://svn.reactos.org/svn/reactos?rev=45099&view=rev Log: [SDK] - Add missing IIDs to UUID. Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=45… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sat Jan 16 14:52:51 2010 @@ -78,6 +78,12 @@ #include "isguids.h" #include "objsafe.h" #include "perhist.h" +#include "netcon.h" +#include "netfw.h" +#include "msctf.h" +#include "sensevts.h" +#include "ocmm.h" +#include "commoncontrols.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

[fireball] 45098: [PSDK] - Merge Wine-1.1.36 changes to commctrl.h.
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 14:40:30 2010 New Revision: 45098 URL: http://svn.reactos.org/svn/reactos?rev=45098&view=rev Log: [PSDK] - Merge Wine-1.1.36 changes to commctrl.h. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Jan 16 14:40:30 2010 @@ -2809,7 +2809,7 @@ (LPARAM)(HTREEITEM)(hitem)) #define TreeView_EnsureVisible(hwnd, hitem) \ - (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(hitem)) + (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem)) #define TreeView_SortChildrenCB(hwnd, psort, recurse) \ (BOOL)SNDMSG((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \ @@ -2993,6 +2993,7 @@ #define LVSIL_NORMAL 0 #define LVSIL_SMALL 1 #define LVSIL_STATE 2 +#define LVSIL_GROUPHEADER 3 /* following 2 flags only for LVS_OWNERDATA listviews */ /* and only in report or list mode */ @@ -3000,11 +3001,12 @@ #define LVSICF_NOSCROLL 0x0002 -#define LVFI_PARAM 0X0001 -#define LVFI_STRING 0X0002 -#define LVFI_PARTIAL 0X0008 -#define LVFI_WRAP 0X0020 -#define LVFI_NEARESTXY 0X0040 +#define LVFI_PARAM 0x0001 +#define LVFI_STRING 0x0002 +#define LVFI_SUBSTRING 0x0004 +#define LVFI_PARTIAL 0x0008 +#define LVFI_WRAP 0x0020 +#define LVFI_NEARESTXY 0x0040 #define LVIF_TEXT 0x0001 #define LVIF_IMAGE 0x0002 @@ -5135,7 +5137,7 @@ #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) /************************************************************************** - * List box control + * Listbox control */ #define WC_LISTBOXA "ListBox" @@ -5149,7 +5151,7 @@ #define WC_LISTBOX WINELIB_NAME_AW(WC_LISTBOX) /************************************************************************** - * Scroll bar control + * Scrollbar control */ #define WC_SCROLLBARA "ScrollBar"

1 0

[fireball] 45097: [PSDK] - Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32).
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 13:39:44 2010 New Revision: 45097 URL: http://svn.reactos.org/svn/reactos?rev=45097&view=rev Log: [PSDK] - Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32). Added: trunk/reactos/include/psdk/commoncontrols.idl (with props) Modified: trunk/reactos/include/psdk/psdk.rbuild Added: trunk/reactos/include/psdk/commoncontrols.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commoncontrol… ============================================================================== --- trunk/reactos/include/psdk/commoncontrols.idl (added) +++ trunk/reactos/include/psdk/commoncontrols.idl [iso-8859-1] Sat Jan 16 13:39:44 2010 @@ -1,0 +1,214 @@ +/* + * Common controls v6 interface definitions + * + * Copyright 2009 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +/* Definitions required for widl, but already defined in commctrl.h for C */ +cpp_quote("#if 0") +typedef DWORD RGBQUAD; +typedef IUnknown* HIMAGELIST; + +typedef struct +{ + HBITMAP hbmImage; + HBITMAP hbmMask; + int Unused1; + int Unused2; + RECT rcImage; +} IMAGEINFO; + +typedef IMAGEINFO* LPIMAGEINFO; + +typedef struct +{ + DWORD cbSize; + HIMAGELIST himl; + int i; + HDC hdcDst; + int x; + int y; + int cx; + int cy; + int xBitmap; + int yBitmap; + COLORREF rgbBk; + COLORREF rgbFg; + UINT fStyle; + DWORD dwRop; + DWORD fState; + DWORD Frame; + COLORREF crEffect; +} IMAGELISTDRAWPARAMS; + +typedef IMAGELISTDRAWPARAMS* LPIMAGELISTDRAWPARAMS; +cpp_quote("#endif") + +cpp_quote("HRESULT WINAPI ImageList_CoCreateInstance(REFCLSID,const IUnknown *, REFIID,void **);") + +const UINT ILIF_ALPHA = 1; + +[ + object, + uuid(46EB5926-582E-4017-9FDF-E8998DAA0950), + helpstring("Image List"), + local +] +interface IImageList : IUnknown +{ + HRESULT Add( + [in] HBITMAP hbmImage, + [in] HBITMAP hbmMask, + [out] int* pi); + + HRESULT ReplaceIcon( + [in] int i, + [in] HICON hicon, + [out] int* pi); + + HRESULT SetOverlayImage( + [in] int iImage, + [in] int iOverlay); + + HRESULT Replace( + [in] int i, + [in] HBITMAP hbmImage, + [in] HBITMAP hbmMask); + + HRESULT AddMasked( + [in] HBITMAP hbmImage, + [in] COLORREF crMask, + [out] int* pi); + + HRESULT Draw( + [in] IMAGELISTDRAWPARAMS* pimldp); + + HRESULT Remove( + [in] int i); + + HRESULT GetIcon( + [in] int i, + [in] UINT flags, + [out] HICON* picon); + + HRESULT GetImageInfo( + [in] int i, + [out] IMAGEINFO* pImageInfo); + + HRESULT Copy( + [in] int iDst, + [in] IUnknown* punkSrc, + [in] int iSrc, + [in] UINT uFlags); + + HRESULT Merge( + [in] int i1, + [in] IUnknown* punk2, + [in] int i2, + [in] int dx, + [in] int dy, + [out] REFIID riid, + [out] PVOID* ppv); + + HRESULT Clone( + [in] REFIID riid, + [out] PVOID* ppv); + + HRESULT GetImageRect( + [in] int i, + [out] RECT* prc); + + HRESULT GetIconSize( + [out] int* cx, + [out] int* cy); + + HRESULT SetIconSize( + [in] int cx, + [in] int cy); + + HRESULT GetImageCount( + [out] int* pi); + + HRESULT SetImageCount( + [in] UINT uNewCount); + + HRESULT SetBkColor( + [in] COLORREF clrBk, + [out] COLORREF* pclr); + + HRESULT GetBkColor( + [out] COLORREF* pclr); + + HRESULT BeginDrag( + [in] int iTrack, + [in] int dxHotspot, + [in] int dyHotspot); + + HRESULT EndDrag(); + + HRESULT DragEnter( + [in] HWND hwndLock, + [in] int x, + [in] int y); + + HRESULT DragLeave( + [in] HWND hwndLock); + + HRESULT DragMove( + [in] int x, + [in] int y); + + HRESULT SetDragCursorImage( + [in] IUnknown* punk, + [in] int iDrag, + [in] int dxHotspot, + [in] int dyHotspot); + + HRESULT DragShowNolock( + [in] BOOL fShow); + + HRESULT GetDragImage( + [out] POINT * ppt, + [out] POINT * pptHotspot, + [out] REFIID riid, + [out] PVOID* ppv); + + HRESULT GetItemFlags( + [in] int i, + [out] DWORD *dwFlags); + + HRESULT GetOverlayImage( + [in] int iOverlay, + [out] int* piIndex); +} + +[ + uuid(BCADA15B-B428-420c-8D28-023590924C9F) +] +library CommonControlObjects +{ + [ + uuid(7C476BA2-02B1-48f4-8048-B24619DDC058) + ] + coclass ImageList + { + interface IImageList; + } +} Propchange: trunk/reactos/include/psdk/commoncontrols.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sat Jan 16 13:39:44 2010 @@ -6,6 +6,7 @@ <file>activscp.idl</file> <file>bits1_5.idl</file> <file>bits.idl</file> + <file>commoncontrols.idl</file> <file>control.idl</file> <file>ctxtcall.idl</file> <file>dimm.idl</file>

1 0

[jimtabor] 45096: [Win32k] - Fix the window handle De/Reference throttler issue. Used mIrc.
by jimtabor＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: jimtabor Date: Sat Jan 16 06:56:22 2010 New Revision: 45096 URL: http://svn.reactos.org/svn/reactos?rev=45096&view=rev Log: [Win32k] - Fix the window handle De/Reference throttler issue. Used mIrc. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Sat Jan 16 06:56:22 2010 @@ -396,37 +396,26 @@ BOOL FASTCALL -UserDereferenceObject(PVOID obj) -{ - ASSERT(((PHEAD)obj)->cLockObj >= 1); - - if (--((PHEAD)obj)->cLockObj <= 0) +UserDereferenceObject(PVOID object) +{ + PUSER_HANDLE_ENTRY entry; + USER_OBJECT_TYPE type; + + ASSERT(((PHEAD)object)->cLockObj >= 1); + + if ((INT)--((PHEAD)object)->cLockObj <= 0) { - return TRUE; - } - return FALSE; -} - -BOOL -FASTCALL -UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ) -{ - PUSER_HANDLE_ENTRY entry; - PVOID object; - USER_OBJECT_TYPE type; - - if (!(entry = handle_to_entry( ht, handle ))) - { - SetLastNtError( STATUS_INVALID_HANDLE ); - return FALSE; - } - - entry->flags = HANDLEENTRY_INDESTROY; - - if (UserDereferenceObject(entry->ptr)) - { + entry = handle_to_entry(gHandleTable, ((PHEAD)object)->h ); + + DPRINT("warning! Dereference to zero! Obj -> 0x%x\n", object); + + ((PHEAD)object)->cLockObj = 0; + + if (!(entry->flags & HANDLEENTRY_INDESTROY)) + return TRUE; + type = entry->type; - object = free_user_entry(ht, entry ); + free_user_entry(gHandleTable, entry ); switch (type) { @@ -446,6 +435,23 @@ BOOL FASTCALL +UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ) +{ + PUSER_HANDLE_ENTRY entry; + + if (!(entry = handle_to_entry( ht, handle ))) + { + SetLastNtError( STATUS_INVALID_HANDLE ); + return FALSE; + } + + entry->flags = HANDLEENTRY_INDESTROY; + + return UserDereferenceObject(entry->ptr); +} + +BOOL +FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ) { PVOID body = UserGetObject(gHandleTable, h, type);

1 0

[tkreuzer] 45095: [NTOS] - Implement KiInitializeCpuFeatures amd call it early in the boot process - fix KeProcessorArchitecture - sumplify KiGetCpuVendor - fix and enable __lldt - remove some legacy code
by tkreuzer＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: tkreuzer Date: Sat Jan 16 05:36:56 2010 New Revision: 45095 URL: http://svn.reactos.org/svn/reactos?rev=45095&view=rev Log: [NTOS] - Implement KiInitializeCpuFeatures amd call it early in the boot process - fix KeProcessorArchitecture - sumplify KiGetCpuVendor - fix and enable __lldt - remove some legacy code Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Sat Jan 16 05:36:56 2010 @@ -72,9 +72,9 @@ __asm__ __volatile__("sgdt %0" : : "m"(*(short*)Destination) : "memory"); } -static __inline__ __attribute__((always_inline)) void __lldt(void *Source) -{ - __asm__ __volatile__("lldt %0" : : "m"(*(short*)Source)); +static __inline__ __attribute__((always_inline)) void __lldt(unsigned short Value) +{ + __asm__ __volatile__("lldt %0" : : "rm"(Value)); } static __inline__ __attribute__((always_inline)) void __sldt(void *Destination) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Sat Jan 16 05:36:56 2010 @@ -33,8 +33,6 @@ ULONG KeFeatureBits; ULONG KeI386MachineType; ULONG KeI386NpxPresent = 1; -ULONG KeI386XMMIPresent = 0; -ULONG KeI386FxsrPresent = 0; ULONG KeLargestCacheLine = 0x40; ULONG KiDmaIoCoherency = 0; CHAR KeNumberProcessors = 0; @@ -127,26 +125,15 @@ { PKPRCB Prcb = KeGetCurrentPrcb(); INT Vendor[5]; - ULONG Temp; - - /* Assume no Vendor ID and fail if no CPUID Support. */ - Prcb->VendorString[0] = 0; - if (!Prcb->CpuID) return 0; /* Get the Vendor ID and null-terminate it */ __cpuid(Vendor, 0); - Vendor[4] = 0; - - /* Re-arrange vendor string */ - Temp = Vendor[2]; - Vendor[2] = Vendor[3]; - Vendor[3] = Temp; - - /* Copy it to the PRCB and null-terminate it again */ - RtlCopyMemory(Prcb->VendorString, - &Vendor[1], - sizeof(Prcb->VendorString) - sizeof(CHAR)); - Prcb->VendorString[sizeof(Prcb->VendorString) - sizeof(CHAR)] = ANSI_NULL; + + /* Copy it to the PRCB and null-terminate it */ + *(ULONG*)&Prcb->VendorString[0] = Vendor[1]; // ebx + *(ULONG*)&Prcb->VendorString[4] = Vendor[3]; // edx + *(ULONG*)&Prcb->VendorString[8] = Vendor[2]; // ecx + *(ULONG*)&Prcb->VendorString[12] = 0; /* Now check the CPU Type */ if (!strcmp((PCHAR)Prcb->VendorString, CmpIntelID)) @@ -223,6 +210,15 @@ if (CpuFeatures & 0x02000000) FeatureBits |= KF_XMMI; if (CpuFeatures & 0x04000000) FeatureBits |= KF_XMMI64; +#if 0 + if (Reg[2] & 0x00000001) FeatureBits |= KF_SSE3NEW; + if (Reg[2] & 0x00000008) FeatureBits |= KF_MONITOR; + if (Reg[2] & 0x00000200) FeatureBits |= KF_SSE3SUP; + if (Reg[2] & 0x00002000) FeatureBits |= KF_CMPXCHG16B; + if (Reg[2] & 0x00080000) FeatureBits |= KF_SSE41; + if (Reg[2] & 0x00800000) FeatureBits |= KF_POPCNT; +#endif + /* Check if the CPU has hyper-threading */ if (CpuFeatures & 0x10000000) { @@ -265,18 +261,6 @@ /* Return the Feature Bits */ return FeatureBits; -} - -VOID -NTAPI -KiInitializeCpuFeatures() -{ - /* Enable Write-Protection */ - __writecr0(__readcr0() | CR0_WP); - - /* Disable fpu monitoring */ - __writecr0(__readcr0() & ~CR0_MP); - } VOID Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Sat Jan 16 05:36:56 2010 @@ -36,19 +36,6 @@ NTAPI KiInitMachineDependent(VOID) { -#if 0 - ULONG Protect; - ULONG CpuCount; - BOOLEAN FbCaching = FALSE; - NTSTATUS Status; - ULONG ReturnLength; - ULONG i, Affinity, Sample = 0; - PFX_SAVE_AREA FxSaveArea; - ULONG MXCsrMask = 0xFFBF; - ULONG Dummy[4]; - KI_SAMPLE_MAP Samples[4]; - PKI_SAMPLE_MAP CurrentSample = Samples; - /* Check for large page support */ if (KeFeatureBits & KF_LARGE_PAGE) { @@ -59,274 +46,25 @@ /* Check for global page support */ if (KeFeatureBits & KF_GLOBAL_PAGE) { - /* Do an IPI to enable it on all CPUs */ - CpuCount = KeNumberProcessors; - KeIpiGenericCall(Ki386EnableGlobalPage, (ULONG_PTR)&CpuCount); + /* FIXME: Support this */ + DPRINT1("Global Page support detected but not yet taken advantage of!\n"); + } + + /* Check if we have MTRR */ + if (KeFeatureBits & KF_MTRR) + { + /* FIXME: Support this */ + DPRINT1("MTRR support detected but not yet taken advantage of!\n"); } /* Check for PAT and/or MTRR support */ - if (KeFeatureBits & (KF_PAT | KF_MTRR)) - { - /* Query the HAL to make sure we can use it */ - Status = HalQuerySystemInformation(HalFrameBufferCachingInformation, - sizeof(BOOLEAN), - &FbCaching, - &ReturnLength); - if ((NT_SUCCESS(Status)) && (FbCaching)) - { - /* We can't, disable it */ - KeFeatureBits &= ~(KF_PAT | KF_MTRR); - } - } - - /* Check for PAT support and enable it */ - if (KeFeatureBits & KF_PAT) KiInitializePAT(); - - /* Assume no errata for now */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = 0; - - /* Check if we have an NPX */ - if (KeI386NpxPresent) - { - /* Loop every CPU */ - i = KeActiveProcessors; - for (Affinity = 1; i; Affinity <<= 1) - { - /* Check if this is part of the set */ - if (i & Affinity) - { - /* Run on this CPU */ - i &= ~Affinity; - KeSetSystemAffinityThread(Affinity); - - /* Detect FPU errata */ - if (KiIsNpxErrataPresent()) - { - /* Disable NPX support */ - KeI386NpxPresent = FALSE; - SharedUserData-> - ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = - TRUE; - break; - } - } - } - } - - /* If there's no NPX, then we're emulating the FPU */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = - !KeI386NpxPresent; - - /* Check if there's no NPX, so that we can disable associated features */ - if (!KeI386NpxPresent) - { - /* Remove NPX-related bits */ - KeFeatureBits &= ~(KF_XMMI64 | KF_XMMI | KF_FXSR | KF_MMX); - - /* Disable kernel flags */ - KeI386FxsrPresent = KeI386XMMIPresent = FALSE; - - /* Disable processor features that might've been set until now */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = - SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = 0; - } - - /* Check for CR4 support */ - if (KeFeatureBits & KF_CR4) - { - /* Do an IPI call to enable the Debug Exceptions */ - CpuCount = KeNumberProcessors; - KeIpiGenericCall(Ki386EnableDE, (ULONG_PTR)&CpuCount); - } - - /* Check if FXSR was found */ - if (KeFeatureBits & KF_FXSR) - { - /* Do an IPI call to enable the FXSR */ - CpuCount = KeNumberProcessors; - KeIpiGenericCall(Ki386EnableFxsr, (ULONG_PTR)&CpuCount); - - /* Check if XMM was found too */ - if (KeFeatureBits & KF_XMMI) - { - /* Do an IPI call to enable XMMI exceptions */ - CpuCount = KeNumberProcessors; - KeIpiGenericCall(Ki386EnableXMMIExceptions, (ULONG_PTR)&CpuCount); - - /* FIXME: Implement and enable XMM Page Zeroing for Mm */ - - /* Patch the RtlPrefetchMemoryNonTemporal routine to enable it */ - Protect = MmGetPageProtect(NULL, RtlPrefetchMemoryNonTemporal); - MmSetPageProtect(NULL, - RtlPrefetchMemoryNonTemporal, - Protect | PAGE_IS_WRITABLE); - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; - MmSetPageProtect(NULL, RtlPrefetchMemoryNonTemporal, Protect); - } - } - - /* Check for, and enable SYSENTER support */ - KiRestoreFastSyscallReturnState(); - - /* Loop every CPU */ - i = KeActiveProcessors; - for (Affinity = 1; i; Affinity <<= 1) - { - /* Check if this is part of the set */ - if (i & Affinity) - { - /* Run on this CPU */ - i &= ~Affinity; - KeSetSystemAffinityThread(Affinity); - - /* Reset MHz to 0 for this CPU */ - KeGetCurrentPrcb()->MHz = 0; - - /* Check if we can use RDTSC */ - if (KeFeatureBits & KF_RDTSC) - { - /* Start sampling loop */ - for (;;) - { - /* Do a dummy CPUID to start the sample */ - CPUID(Dummy, 0); - - /* Fill out the starting data */ - CurrentSample->PerfStart = KeQueryPerformanceCounter(NULL); - CurrentSample->TSCStart = __rdtsc(); - CurrentSample->PerfFreq.QuadPart = -50000; - - /* Sleep for this sample */ - KeDelayExecutionThread(KernelMode, - FALSE, - &CurrentSample->PerfFreq); - - /* Do another dummy CPUID */ - CPUID(Dummy, 0); - - /* Fill out the ending data */ - CurrentSample->PerfEnd = - KeQueryPerformanceCounter(&CurrentSample->PerfFreq); - CurrentSample->TSCEnd = __rdtsc(); - - /* Calculate the differences */ - CurrentSample->PerfDelta = CurrentSample->PerfEnd.QuadPart - - CurrentSample->PerfStart.QuadPart; - CurrentSample->TSCDelta = CurrentSample->TSCEnd - - CurrentSample->TSCStart; - - /* Compute CPU Speed */ - CurrentSample->MHz = (ULONG)((CurrentSample->TSCDelta * - CurrentSample-> - PerfFreq.QuadPart + 500000) / - (CurrentSample->PerfDelta * - 1000000)); - - /* Check if this isn't the first sample */ - if (Sample) - { - /* Check if we got a good precision within 1MHz */ - if ((CurrentSample->MHz == CurrentSample[-1].MHz) || - (CurrentSample->MHz == CurrentSample[-1].MHz + 1) || - (CurrentSample->MHz == CurrentSample[-1].MHz - 1)) - { - /* We did, stop sampling */ - break; - } - } - - /* Move on */ - CurrentSample++; - Sample++; - - if (Sample == sizeof(Samples) / sizeof(Samples[0])) - { - /* Restart */ - CurrentSample = Samples; - Sample = 0; - } - } - - /* Save the CPU Speed */ - KeGetCurrentPrcb()->MHz = CurrentSample[-1].MHz; - } - - /* Check if we have MTRR */ - if (KeFeatureBits & KF_MTRR) - { - /* Then manually initialize MTRR for the CPU */ - KiInitializeMTRR(i ? FALSE : TRUE); - } - - /* Check if we have AMD MTRR and initialize it for the CPU */ - if (KeFeatureBits & KF_AMDK6MTRR) KiAmdK6InitializeMTRR(); - - /* Check if this is a buggy Pentium and apply the fixup if so */ - if (KiI386PentiumLockErrataPresent) KiI386PentiumLockErrataFixup(); - - /* Check if the CPU supports FXSR */ - if (KeFeatureBits & KF_FXSR) - { - /* Get the current thread NPX state */ - FxSaveArea = (PVOID) - ((ULONG_PTR)KeGetCurrentThread()->InitialStack - - NPX_FRAME_LENGTH); - - /* Clear initial MXCsr mask */ - FxSaveArea->U.FxArea.MXCsrMask = 0; - - /* Save the current NPX State */ -#ifdef __GNUC__ - asm volatile("fxsave %0\n\t" : "=m" (*FxSaveArea)); -#else - __asm fxsave [FxSaveArea] -#endif - /* Check if the current mask doesn't match the reserved bits */ - if (FxSaveArea->U.FxArea.MXCsrMask != 0) - { - /* Then use whatever it's holding */ - MXCsrMask = FxSaveArea->U.FxArea.MXCsrMask; - } - - /* Check if nobody set the kernel-wide mask */ - if (!KiMXCsrMask) - { - /* Then use the one we calculated above */ - KiMXCsrMask = MXCsrMask; - } - else - { - /* Was it set to the same value we found now? */ - if (KiMXCsrMask != MXCsrMask) - { - /* No, something is definitely wrong */ - KEBUGCHECKEX(MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED, - KF_FXSR, - KiMXCsrMask, - MXCsrMask, - 0); - } - } - - /* Now set the kernel mask */ - KiMXCsrMask &= MXCsrMask; - } - } - } - - /* Return affinity back to where it was */ - KeRevertToUserAffinityThread(); - - /* NT allows limiting the duration of an ISR with a registry key */ - if (KiTimeLimitIsrMicroseconds) - { - /* FIXME: TODO */ - DPRINT1("ISR Time Limit not yet supported\n"); - } -#endif + if (KeFeatureBits & KF_PAT) + { + /* FIXME: Support this */ + DPRINT1("PAT support detected but not yet taken advantage of!\n"); + } + + } VOID @@ -407,6 +145,44 @@ VOID NTAPI +KiInitializeCpuFeatures(ULONG Cpu) +{ + ULONG FeatureBits; + + /* Get the processor features for this CPU */ + FeatureBits = KiGetFeatureBits(); + + /* Check if we support all needed features */ + if ((FeatureBits & REQUIRED_FEATURE_BITS) != REQUIRED_FEATURE_BITS) + { + /* If not, bugcheck system */ + FrLdrDbgPrint("CPU doesn't have needed features! Has: 0x%x, required: 0x%x\n", + FeatureBits, REQUIRED_FEATURE_BITS); + KeBugCheck(0); + } + + /* Set DEP to always on */ + SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; + FeatureBits |= KF_NX_ENABLED; + + /* Save feature bits */ + KeGetCurrentPrcb()->FeatureBits = FeatureBits; + + /* Enable fx save restore support */ + __writecr4(__readcr4() | CR4_FXSR); + + /* Enable XMMI exceptions */ + __writecr4(__readcr4() | CR4_XMMEXCPT); + + /* Enable Write-Protection */ + __writecr0(__readcr0() | CR0_WP); + + /* Disable fpu monitoring */ + __writecr0(__readcr0() & ~CR0_MP); +} + +VOID +NTAPI KiInitializeKernel(IN PKPROCESS InitProcess, IN PKTHREAD InitThread, IN PVOID IdleStack, @@ -414,7 +190,6 @@ IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG FeatureBits; ULONG PageDirectory[2]; PVOID DpcStack; @@ -423,54 +198,6 @@ /* Initialize the Power Management Support for this PRCB */ // PoInitializePrcb(Prcb); - - /* Get the processor features for the CPU */ - FeatureBits = KiGetFeatureBits(); - - /* Check if we support all needed features */ - if ((FeatureBits & REQUIRED_FEATURE_BITS) != REQUIRED_FEATURE_BITS) - { - /* If not, bugcheck system */ - DPRINT1("CPU doesn't have needed features! Has: 0x%x, required: 0x%x\n", - FeatureBits, REQUIRED_FEATURE_BITS); - KeBugCheck(0); - } - - /* Set the default NX policy (opt-in) */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; - - /* Check if NPX is always on */ - if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=ALWAYSON")) - { - /* Set it always on */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; - FeatureBits |= KF_NX_ENABLED; - } - else if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTOUT")) - { - /* Set it in opt-out mode */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTOUT; - FeatureBits |= KF_NX_ENABLED; - } - else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTIN")) || - (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE"))) - { - /* Set the feature bits */ - FeatureBits |= KF_NX_ENABLED; - } - else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=ALWAYSOFF")) || - (strstr(KeLoaderBlock->LoadOptions, "EXECUTE"))) - { - /* Set disabled mode */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSOFF; - FeatureBits |= KF_NX_DISABLED; - } - - /* Save feature bits */ - Prcb->FeatureBits = FeatureBits; - - /* Initialize the CPU features */ - KiInitializeCpuFeatures(); /* Save CPU state */ KiSaveProcessorControlState(&Prcb->ProcessorState); @@ -490,15 +217,9 @@ KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; /* Set boot-level flags */ - KeI386NpxPresent = TRUE; - KeI386CpuType = Prcb->CpuType; - KeI386CpuStep = Prcb->CpuStep; - KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; + KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; KeProcessorLevel = (USHORT)Prcb->CpuType; if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; - KeFeatureBits = FeatureBits; - KeI386FxsrPresent = (KeFeatureBits & KF_FXSR) ? TRUE : FALSE; - KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb; @@ -646,10 +367,7 @@ KeLoaderBlock = LoaderBlock; /* Get the current CPU number */ - Cpu = KeNumberProcessors++; - - /* Set active processors */ - KeActiveProcessors |= 1 << Cpu; + Cpu = KeNumberProcessors++; // FIXME /* LoaderBlock initialization for Cpu 0 */ if (Cpu == 0) @@ -677,10 +395,7 @@ Ke386SetFs(KGDT_32_R3_TEB | RPL_MASK); /* LDT is unused */ -// __lldt(0); - - /* Enable fx save restore support */ - __writecr4(__readcr4() | CR4_FXSR); + __lldt(0); /* Align stack to 16 bytes */ LoaderBlock->KernelStack &= ~(16 - 1); @@ -697,6 +412,9 @@ /* Initialize the PCR */ KiInitializePcr(Pcr, Cpu, InitialThread, KiDoubleFaultStack); + + /* Initialize the CPU features */ + KiInitializeCpuFeatures(Cpu); /* Initial setup for the boot CPU */ if (Cpu == 0) @@ -721,21 +439,26 @@ while (!KdPollBreakIn()); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); #endif - } DPRINT("Pcr = %p, Gdt = %p, Idt = %p, Tss = %p\n", Pcr, Pcr->GdtBase, Pcr->IdtBase, Pcr->TssBase); + /* Acquire lock */ + while (InterlockedBitTestAndSet64((PLONG64)&KiFreezeExecutionLock, 0)) + { + /* Loop until lock is free */ + while ((*(volatile KSPIN_LOCK*)&KiFreezeExecutionLock) & 1); + } + /* Initialize the Processor with HAL */ HalInitializeProcessor(Cpu, KeLoaderBlock); - /* Loop until we can release the freeze lock */ - do - { - /* Loop until execution can continue */ - while (*(volatile PKSPIN_LOCK*)&KiFreezeExecutionLock == (PVOID)1); - } while(InterlockedBitTestAndSet64((PLONG64)&KiFreezeExecutionLock, 0)); + /* Set processor as active */ + KeActiveProcessors |= 1 << Cpu; + + /* Release lock */ + InterlockedAnd64((PLONG64)&KiFreezeExecutionLock, 0); /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] Sat Jan 16 05:36:56 2010 @@ -81,9 +81,6 @@ /* Setup the Fx Area */ //FxSaveArea = &InitFrame->FxSaveArea; - /* Check if we support FXsr */ -// if (KeI386FxsrPresent) -// { // /* Get the FX Save Format Area */ // FxSaveFormat = (PFXSAVE_FORMAT)Context->ExtendedRegisters; // @@ -96,41 +93,19 @@ // FxSaveFormat->DataOffset = 0; // FxSaveFormat->DataSelector = 0; // FxSaveFormat->MXCsr = 0x1F80; -// } -// else -// { -// /* Setup the regular save area */ -// Context->FloatSave.ControlWord = 0x27F; -// Context->FloatSave.StatusWord = 0; -// Context->FloatSave.TagWord = -1; -// Context->FloatSave.ErrorOffset = 0; -// Context->FloatSave.ErrorSelector = 0; -// Context->FloatSave.DataOffset =0; -// Context->FloatSave.DataSelector = 0; -// } - /* Check if the CPU has NPX */ - if (KeI386NpxPresent) - { - /* Set an intial NPX State */ - //Context->FloatSave.Cr0NpxState = 0; - //FxSaveArea->Cr0NpxState = 0; - //FxSaveArea->NpxSavedCpu = 0; + /* Set an intial NPX State */ + //Context->FloatSave.Cr0NpxState = 0; + //FxSaveArea->Cr0NpxState = 0; + //FxSaveArea->NpxSavedCpu = 0; - /* Now set the context flags depending on XMM support */ - //ContextFlags |= (KeI386FxsrPresent) ? CONTEXT_EXTENDED_REGISTERS : - // CONTEXT_FLOATING_POINT; + /* Now set the context flags depending on XMM support */ + //ContextFlags |= (KeI386FxsrPresent) ? CONTEXT_EXTENDED_REGISTERS : + // CONTEXT_FLOATING_POINT; - /* Set the Thread's NPX State */ - Thread->NpxState = 0xA; - Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; - } - else - { - /* We'll use emulation */ - //FxSaveArea->Cr0NpxState = CR0_EM; - Thread->NpxState = 0xA &~ CR0_MP; - } + /* Set the Thread's NPX State */ + Thread->NpxState = 0xA; + Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; /* Disable any debug regiseters */ Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS; @@ -179,19 +154,10 @@ //RtlZeroMemory(FxSaveArea, sizeof(FX_SAVE_AREA)); /* Check if we have Fxsr support */ - if (KeI386FxsrPresent) - { - DPRINT1("FxsrPresent but did nothing\n"); -// /* Set the stub FX area */ -// FxSaveArea->U.FxArea.ControlWord = 0x27F; -// FxSaveArea->U.FxArea.MXCsr = 0x1F80; -// } -// else -// { -// /* Set the stub FN area */ -// FxSaveArea->U.FnArea.ControlWord = 0x27F; -// FxSaveArea->U.FnArea.TagWord = -1; - } + DPRINT1("FxsrPresent but did nothing\n"); +// /* Set the stub FX area */ +// FxSaveArea->U.FxArea.ControlWord = 0x27F; +// FxSaveArea->U.FxArea.MXCsr = 0x1F80; /* No NPX State */ Thread->NpxState = 0xA;

1 0

[cgutman] 45094: - Fix ECHO_REPLY_HEADER which was corrupting incoming packets (fixes displaying reply time) - Fix a bug in the packet waiting code - Display the IP address if getnameinfo fails - tracert is actually useful now
by cgutman＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: cgutman Date: Sat Jan 16 04:30:10 2010 New Revision: 45094 URL: http://svn.reactos.org/svn/reactos?rev=45094&view=rev Log: - Fix ECHO_REPLY_HEADER which was corrupting incoming packets (fixes displaying reply time) - Fix a bug in the packet waiting code - Display the IP address if getnameinfo fails - tracert is actually useful now Modified: branches/aicom-network-branch/base/applications/network/tracert/tracert.c branches/aicom-network-branch/base/applications/network/tracert/tracert.h Modified: branches/aicom-network-branch/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/base/appli… ============================================================================== --- branches/aicom-network-branch/base/applications/network/tracert/tracert.c [iso-8859-1] (original) +++ branches/aicom-network-branch/base/applications/network/tracert/tracert.c [iso-8859-1] Sat Jan 16 04:30:10 2010 @@ -377,7 +377,6 @@ /* cast the recieved packet into an ECHO reply and a TTL Exceed and check the ID*/ ECHO_REPLY_HEADER *IcmpHdr = (ECHO_REPLY_HEADER *)((char*)pInfo->RecvPacket + header_len); - TTL_EXCEED_HEADER *TTLExceedHdr = (TTL_EXCEED_HEADER *)((char *)pInfo->RecvPacket + header_len); /* Make sure the reply is ok */ if (PACKET_SIZE < header_len + ICMP_MIN_SIZE) @@ -389,13 +388,6 @@ switch (IcmpHdr->icmpheader.type) { case TTL_EXCEEDED : - if (TTLExceedHdr->OrigIcmpHeader.id != (USHORT)GetCurrentProcessId()) - { - /* FIXME: our network stack shouldn't allow this... */ - /* we've picked up a packet not related to this process probably from another local program. We ignore it */ - DebugPrint(_T("Rouge packet: header id, process id %d"), TTLExceedHdr->OrigIcmpHeader.id, GetCurrentProcessId()); - return -1; - } _tprintf(_T("%3ld ms"), (ULONG)((pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart)); return 0; @@ -415,7 +407,7 @@ return 2; } - return 0; + return -3; } @@ -513,11 +505,9 @@ if (iRecieveReturn) { - DecodeResponse(pInfo); + if (DecodeResponse(pInfo) < 0) + bAwaitPacket = TRUE; } - else - /* packet timed out. Don't wait for it again */ - bAwaitPacket = FALSE; } while (bAwaitPacket); } @@ -559,6 +549,7 @@ { DebugPrint(_T("error: %d"), WSAGetLastError()); DebugPrint(_T(" getnameinfo failed: %d"), iNameInfoRet); + _tprintf(_T("%s"), inet_ntoa(pInfo->source.sin_addr)); } } Modified: branches/aicom-network-branch/base/applications/network/tracert/tracert.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/base/appli… ============================================================================== --- branches/aicom-network-branch/base/applications/network/tracert/tracert.h [iso-8859-1] (original) +++ branches/aicom-network-branch/base/applications/network/tracert/tracert.h [iso-8859-1] Sat Jan 16 04:30:10 2010 @@ -50,20 +50,11 @@ USHORT seq; // not used in time exceeded } ICMP_HEADER, *PICMP_HEADER; -/* ICMP Echo Reply Header, 12 bytes */ +/* ICMP Echo Reply Header */ typedef struct EchoReplyHeader { - struct timeval timestamp; struct ICMPHeader icmpheader; } ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER; - -/* ICMP Echo Reply Header, 12 bytes */ -typedef struct TTLExceedHeader -{ - struct ICMPHeader icmpheader; - struct IPv4Header ipheader; - struct ICMPHeader OrigIcmpHeader; -} TTL_EXCEED_HEADER, *PTTL_EXCEED_HEADER; #include <poppack.h>

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