Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[navaraf] 19642: Fix splitting of cells (noticed by Hartmut).
by navaraf＠svn.reactos.com 26 Nov '05

26 Nov '05

Fix splitting of cells (noticed by Hartmut). Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/tools/mkhive/binhive.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-26 16:35:23 UTC (rev 19641) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-26 16:36:18 UTC (rev 19642) @@ -809,6 +809,7 @@ { NewBlock = (PCELL_HEADER) ((ULONG)NewBlock + CellSize); NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize; + ((PCELL_HEADER) (*Block))->CellSize = CellSize; CmiAddFree (RegistryHive, NewBlock, *pBlockOffset + CellSize, _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-26 16:35:23 UTC (rev 19641) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-26 16:36:18 UTC (rev 19642) @@ -3417,6 +3417,7 @@ { NewCell = (PCELL_HEADER) ((ULONG_PTR) NewCell + CellSize); NewCell->CellSize = ((PCELL_HEADER) (*Cell))->CellSize - CellSize; + ((PCELL_HEADER) (*Cell))->CellSize = CellSize; CmiAddFree(RegistryHive, NewCell, *CellOffset + CellSize, _____ Modified: trunk/reactos/tools/mkhive/binhive.c --- trunk/reactos/tools/mkhive/binhive.c 2005-11-26 16:35:23 UTC (rev 19641) +++ trunk/reactos/tools/mkhive/binhive.c 2005-11-26 16:36:18 UTC (rev 19642) @@ -829,6 +829,7 @@ { NewBlock = (PCELL_HEADER) ((ULONG_PTR) NewBlock + CellSize); NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize; + ((PCELL_HEADER) (*Block))->CellSize = CellSize; CmiAddFree (RegistryHive, NewBlock, *pBlockOffset + CellSize,

1 0

[hbirr] 19641: Don't use the OldIrql value from fmutex after releasing it.
by hbirr＠svn.reactos.com 26 Nov '05

26 Nov '05

Don't use the OldIrql value from fmutex after releasing it. Modified: trunk/reactos/hal/halx86/generic/fmutex.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c _____ Modified: trunk/reactos/hal/halx86/generic/fmutex.c --- trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-26 16:08:27 UTC (rev 19640) +++ trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-26 16:35:23 UTC (rev 19641) @@ -56,8 +56,11 @@ FASTCALL ExReleaseFastMutex(PFAST_MUTEX FastMutex) { + KIRQL OldIrql; + /* Erase the owner */ FastMutex->Owner = (PVOID)1; + OldIrql = FastMutex->OldIrql; /* Increase the count */ if (InterlockedIncrement(&FastMutex->Count) <= 0) @@ -67,7 +70,7 @@ } /* Lower IRQL back */ - KfLowerIrql(FastMutex->OldIrql); + KfLowerIrql(OldIrql); } BOOLEAN _____ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c --- trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-26 16:08:27 UTC (rev 19640) +++ trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-26 16:35:23 UTC (rev 19641) @@ -106,10 +106,12 @@ FASTCALL ExReleaseFastMutex (PFAST_MUTEX FastMutex) { + KIRQL oldIrql; ASSERT_IRQL(APC_LEVEL); /* Erase the owner */ FastMutex->Owner = NULL; + OldIrql = FastMutex->OldIrql; /* Increase the count */ if (InterlockedIncrement(&FastMutex->Count) <= 0) @@ -119,7 +121,7 @@ } /* Lower IRQL back */ - KfLowerIrql(FastMutex->OldIrql); + KfLowerIrql(OldIrql); } /*

1 0

[hbirr] 19640: Save the old irql in ExTryToAcquireFastMutex.
by hbirr＠svn.reactos.com 26 Nov '05

26 Nov '05

Save the old irql in ExTryToAcquireFastMutex. Modified: trunk/reactos/hal/halx86/generic/fmutex.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c _____ Modified: trunk/reactos/hal/halx86/generic/fmutex.c --- trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-26 16:04:33 UTC (rev 19639) +++ trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-26 16:08:27 UTC (rev 19640) @@ -84,6 +84,7 @@ { /* We have, set us as owners */ FastMutex->Owner = KeGetCurrentThread(); + FastMutex->OldIrql = OldIrql; return TRUE; } else _____ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c --- trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-26 16:04:33 UTC (rev 19639) +++ trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-26 16:08:27 UTC (rev 19640) @@ -191,6 +191,7 @@ { /* We have, set us as owners */ FastMutex->Owner = KeGetCurrentThread(); + FastMutex->OldIrql = OldIrql; return TRUE; } else

1 0

[hbirr] 19639: Fixed CcTryToAcquireBrokenMutex.
by hbirr＠svn.reactos.com 26 Nov '05

26 Nov '05

Fixed CcTryToAcquireBrokenMutex. Modified: trunk/reactos/ntoskrnl/cc/view.c _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-11-26 15:23:25 UTC (rev 19638) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-11-26 16:04:33 UTC (rev 19639) @@ -115,7 +115,7 @@ CcTryToAcquireBrokenMutex(PFAST_MUTEX FastMutex) { KeEnterCriticalRegion(); - if (InterlockedExchange(&FastMutex->Count, 0) == 1) + if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) { FastMutex->Owner = KeGetCurrentThread(); return(TRUE);

1 0

[navaraf] 19638: Don't make cells smaller than they are.
by navaraf＠svn.reactos.com 26 Nov '05

26 Nov '05

Don't make cells smaller than they are. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-26 15:22:33 UTC (rev 19637) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-26 15:23:25 UTC (rev 19638) @@ -820,7 +820,7 @@ } memset(*Block, 0, CellSize); - ((PCELL_HEADER)(*Block))->CellSize = -CellSize; + ((PCELL_HEADER)(*Block))->CellSize *= -1; return TRUE; }

1 0

[navaraf] 19637: Don't make cells smaller than they are.
by navaraf＠svn.reactos.com 26 Nov '05

26 Nov '05

Don't make cells smaller than they are. Modified: trunk/reactos/tools/mkhive/binhive.c _____ Modified: trunk/reactos/tools/mkhive/binhive.c --- trunk/reactos/tools/mkhive/binhive.c 2005-11-26 15:21:44 UTC (rev 19636) +++ trunk/reactos/tools/mkhive/binhive.c 2005-11-26 15:22:33 UTC (rev 19637) @@ -840,7 +840,7 @@ } memset(*Block, 0, CellSize); - ((PCELL_HEADER)(*Block))->CellSize = -CellSize; + ((PCELL_HEADER)(*Block))->CellSize *= -1; return TRUE; }

1 0

[navaraf] 19636: Don't make cells smaller than they are.
by navaraf＠svn.reactos.com 26 Nov '05

26 Nov '05

Don't make cells smaller than they are. Modified: trunk/reactos/ntoskrnl/cm/regfile.c _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-26 13:26:48 UTC (rev 19635) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-26 15:21:44 UTC (rev 19636) @@ -3431,7 +3431,7 @@ RtlZeroMemory(*Cell, CellSize); - ((PCELL_HEADER) (*Cell))->CellSize = -CellSize; + ((PCELL_HEADER) (*Cell))->CellSize *= -1; } return STATUS_SUCCESS;

1 0

[hbirr] 19635: Define the DPRINT and CHECKPOINT macro depend from NDEBUG for each include of debug.h.
by hbirr＠svn.reactos.com 26 Nov '05

26 Nov '05

Define the DPRINT and CHECKPOINT macro depend from NDEBUG for each include of debug.h. Modified: trunk/reactos/ntoskrnl/include/internal/debug.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-11-26 12:37:49 UTC (rev 19634) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-11-26 13:26:48 UTC (rev 19635) @@ -15,6 +15,30 @@ * Define NASSERT before including this header to disable assertions */ +#ifdef CHECKPOINT +#undef CHECKPOINT +#endif + +#ifdef DPRINT +#undef DPRINT +#endif + +#ifndef NDEBUG +#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ +#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) +#else +#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint +#endif +#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) +#else /* NDEBUG */ +#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ +#define DPRINT(args...) +#else +#define DPRINT +#endif +#define CHECKPOINT +#endif /* NDEBUG */ + #ifndef __INTERNAL_DEBUG #define __INTERNAL_DEBUG @@ -94,23 +118,6 @@ #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) -#ifndef NDEBUG -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif -#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) -#else /* NDEBUG */ -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT(args...) -#else -#define DPRINT -#endif -#define CHECKPOINT -#endif /* NDEBUG */ - - /* * FUNCTION: Assert a maximum value for the current irql * ARGUMENTS:

1 0

[hpoussin] 19634: Remove useless property pages
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Remove useless property pages Modified: trunk/reactos/lib/cpl/main/De.rc Modified: trunk/reactos/lib/cpl/main/En.rc Modified: trunk/reactos/lib/cpl/main/Ja.rc Modified: trunk/reactos/lib/cpl/main/Nl.rc Modified: trunk/reactos/lib/cpl/main/mouse.c Modified: trunk/reactos/lib/cpl/main/resource.h _____ Modified: trunk/reactos/lib/cpl/main/De.rc --- trunk/reactos/lib/cpl/main/De.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/De.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "Maus" _____ Modified: trunk/reactos/lib/cpl/main/En.rc --- trunk/reactos/lib/cpl/main/En.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/En.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Speed" _____ Modified: trunk/reactos/lib/cpl/main/Ja.rc --- trunk/reactos/lib/cpl/main/Ja.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/Ja.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "â}âEâX" _____ Modified: trunk/reactos/lib/cpl/main/Nl.rc --- trunk/reactos/lib/cpl/main/Nl.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/Nl.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "Muis" _____ Modified: trunk/reactos/lib/cpl/main/mouse.c --- trunk/reactos/lib/cpl/main/mouse.c 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/mouse.c 2005-11-26 12:37:49 UTC (rev 19634) @@ -33,61 +33,8 @@ #include "resource.h" - /* Property page dialog callback */ static INT_PTR CALLBACK -Page1Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* Property page dialog callback */ -static INT_PTR CALLBACK -Page2Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* Property page dialog callback */ -static INT_PTR CALLBACK -Page3Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - - -/* Property page dialog callback */ -static INT_PTR CALLBACK MouseHardwareProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -117,7 +64,7 @@ LONG APIENTRY MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2) { - PROPSHEETPAGE psp[4]; + PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; TCHAR Caption[256]; @@ -134,10 +81,7 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_PROPPAGE1, Page1Proc); - InitPropSheetPage(&psp[1], IDD_PROPPAGE2, Page2Proc); - InitPropSheetPage(&psp[2], IDD_PROPPAGE3, Page3Proc); - InitPropSheetPage(&psp[3], IDD_HARDWARE, MouseHardwareProc); + InitPropSheetPage(&psp[0], IDD_HARDWARE, MouseHardwareProc); return (LONG)(PropertySheet(&psh) != -1); } _____ Modified: trunk/reactos/lib/cpl/main/resource.h --- trunk/reactos/lib/cpl/main/resource.h 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/resource.h 2005-11-26 12:37:49 UTC (rev 19634) @@ -5,9 +5,6 @@ #define IDC_CPLICON_1 1 #define IDC_CPLICON_2 2 -#define IDD_PROPPAGE1 100 -#define IDD_PROPPAGE2 101 -#define IDD_PROPPAGE3 102 #define IDD_KEYBSPEED 103 #define IDD_HARDWARE 104

1 0

[gedmurphy] 19633: silence debug messages
by gedmurphy＠svn.reactos.com 26 Nov '05

26 Nov '05

silence debug messages Modified: trunk/reactos/apps/utils/net/ping/ping.c _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-11-26 11:44:06 UTC (rev 19632) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-11-26 12:14:28 UTC (rev 19633) @@ -16,7 +16,9 @@ #include <stdio.h> #ifndef _MSC_VER -//#define DBG +#ifdef DBG +#undef DBG +#endif /* FIXME: Where should this be? */ #ifdef CopyMemory

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005