Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[tkreuzer] 37844: fix a comment, #undef RtlGetCallersaddress before implementing it

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 4 05:26:30 2008 New Revision: 37844 URL: http://svn.reactos.org/svn/reactos?rev=37844&view=rev Log: fix a comment, #undef RtlGetCallersaddress before implementing it Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Thu Dec 4 05:26:30 2008 @@ -117,9 +117,7 @@ ULONG IndexLo, IndexHi, IndexMid; /* Find the corresponding table */ - FunctionTable = RtlLookupFunctionTable(ControlPc, - ImageBase, - &TableLength); + FunctionTable = RtlLookupFunctionTable(ControlPc, ImageBase, &TableLength); /* Fail, if no table is found */ if (!FunctionTable) @@ -544,8 +542,8 @@ return i; } -// CHEKCME: return PVOID? // http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Debug… +#undef RtlGetCallersAddress VOID NTAPI RtlGetCallersAddress(

16 years

[fireball] 37843: - Fix FsRtlFastCheckLockForRead and Write function prototypes.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Dec 4 05:12:42 2008 New Revision: 37843 URL: http://svn.reactos.org/svn/reactos?rev=37843&view=rev Log: - Fix FsRtlFastCheckLockForRead and Write function prototypes. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Thu Dec 4 05:12:42 2008 @@ -3128,7 +3128,7 @@ IN PLARGE_INTEGER Length, IN ULONG Key, IN PFILE_OBJECT FileObject, - IN PEPROCESS Process + IN PVOID Process ); NTKERNELAPI @@ -3140,7 +3140,7 @@ IN PLARGE_INTEGER Length, IN ULONG Key, IN PFILE_OBJECT FileObject, - IN PEPROCESS Process + IN PVOID Process ); #define FsRtlFastLock(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) ( \ Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Thu Dec 4 05:12:42 2008 @@ -141,7 +141,7 @@ IN PLARGE_INTEGER Length, IN ULONG Key, IN PFILE_OBJECT FileObject, - IN PEPROCESS Process) + IN PVOID Process) { KeBugCheck(FILE_SYSTEM); return FALSE; @@ -157,7 +157,7 @@ IN PLARGE_INTEGER Length, IN ULONG Key, IN PFILE_OBJECT FileObject, - IN PEPROCESS Process) + IN PVOID Process) { KeBugCheck(FILE_SYSTEM); return FALSE;

16 years

[janderwald] 37842: - Add CLSIDs for Miniport drivers - Add IIDs for IResourceList, IRegistryKey - Add IMiniportWaveCyclicStream, IMiniportWaveCyclic interface

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Dec 4 02:44:17 2008 New Revision: 37842 URL: http://svn.reactos.org/svn/reactos?rev=37842&view=rev Log: - Add CLSIDs for Miniport drivers - Add IIDs for IResourceList, IRegistryKey - Add IMiniportWaveCyclicStream, IMiniportWaveCyclic interface Added: trunk/reactos/include/ddk/dmusicks.h (with props) Modified: trunk/reactos/include/ddk/portcls.h Added: trunk/reactos/include/ddk/dmusicks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmusicks.h?rev… ============================================================================== --- trunk/reactos/include/ddk/dmusicks.h (added) +++ trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] Thu Dec 4 02:44:17 2008 @@ -1,0 +1,10 @@ +#ifndef _DMUSICKS_ +#define _DMUSICKS_ + +DEFINE_GUID(CLSID_MiniportDriverDMusUART, 0xd3f0ce1c, 0xFFFC, 0x11D1, 0x81, 0xB0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1); +DEFINE_GUID(CLSID_MiniportDriverDMusUARTCapture, 0xD3F0CE1D, 0xFFFC, 0x11D1, 0x81, 0xB0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1); + + + + +#endif Propchange: trunk/reactos/include/ddk/dmusicks.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Thu Dec 4 02:44:17 2008 @@ -162,24 +162,9 @@ #define PORT_CLASS_DEVICE_EXTENSION_SIZE ( 64 * sizeof(ULONG_PTR) ) -/* =============================================================== - Class IDs - TODO (put these elsewhere!!!) -*/ -#if 0 -//#define CLSID_PortDMus /* dmusicks.h */ -DEFINE_GUID(CLSID_PortMidi,0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); -#define CLSID_PortTopology -#define CLSID_PortWaveCyclic -#define CLSID_PortWavePci - -/* first 2 are dmusicks.h */ -#define CLSID_MiniportDriverDMusUART -#define CLSID_MiniportDriverDMusUARTCapture -#define CLSID_MiniportDriverFmSynth -#define CLSID_MiniportDriverFmSynthWithVol -DEFINE_GUID(CLSID_MiniportDriverUart,0xb4c90ae1L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); -#endif - + +DEFINE_GUID(CLSID_MiniportDriverFmSynth, 0xb4c90ae0L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); +DEFINE_GUID(CLSID_MiniportDriverFmSynthWithVol, 0xe5a3c139L, 0xf0f2, 0x11d1, 0x81, 0xaf, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); /* =============================================================== Event Item Flags - TODO @@ -400,6 +385,8 @@ #undef INTERFACE #define INTERFACE IResourceList +DEFINE_GUID(IID_IResourceList, 0x22C6AC60L, 0x851B, 0x11D0, 0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE); + DECLARE_INTERFACE_(IResourceList, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() @@ -788,6 +775,8 @@ /* =============================================================== IRegistryKey Interface */ + +DEFINE_GUID(IID_IRegistryKey, 0xE8DA4302l, 0xF304, 0x11D0, 0x95, 0x8B, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); DECLARE_INTERFACE_(IRegistryKey, IUnknown) { @@ -1015,28 +1004,55 @@ STDMETHODIMP_(NTSTATUS) RegisterServiceGroup( \ IN PSERVICEGROUP ServiceGroup); - +#undef INTERFACE /* =============================================================== IPortWaveCyclic Interface */ - -#if 0 -#define STATIC_IPortWaveCyclic \ - 0xb4c90a26L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44 -DEFINE_GUIDSTRUCT("0xB4C90A26-5791-11d0-86f9-00a0c911b544", IID_IPortWaveCyclic); -#define IID_IPortWaveCyclic DEFINE_GUIDNAMED(IID_IPortWaveCyclic) -#endif DEFINE_GUID(IID_IPortWaveCyclic, 0xb4c90a26L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); DEFINE_GUID(CLSID_PortWaveCyclic, 0xb4c90a2aL, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); +#define INTERFACE IPortWaveCyclic + DECLARE_INTERFACE_(IPortWaveCyclic, IPort) { - DEFINE_ABSTRACT_UNKNOWN() - DEFINE_ABSTRACT_PORT() + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + + STDMETHOD_(NTSTATUS,Init)(THIS_ + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PUNKNOWN UnknownMiniport, + IN PUNKNOWN UnknownAdapter OPTIONAL, + IN PRESOURCELIST ResourceList + ) PURE; + STDMETHOD_(NTSTATUS,GetDeviceProperty)(THIS_ + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ResultLength + ) PURE; + STDMETHOD_(NTSTATUS,NewRegistryKey)(THIS_ + OUT PREGISTRYKEY * OutRegistryKey, + IN PUNKNOWN OuterUnknown, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL + ) PURE; + + STDMETHOD_(VOID, Notify)(THIS_ + IN PSERVICEGROUP ServiceGroup) PURE; + STDMETHOD_(NTSTATUS, NewMasterDmaChannel)(THIS_ OUT PDMACHANNEL* DmaChannel, @@ -1057,13 +1073,12 @@ IN BOOL DemandMode, IN DMA_SPEED DmaSpeed) PURE; - STDMETHOD_(VOID, Notify)(THIS_ - IN PSERVICEGROUP ServiceGroup) PURE; -}; - -/* TODO ... */ - - + +}; + +typedef IPortWaveCyclic *PPORTWAVECYCLIC; + +#undef INTERFACE /* =============================================================== IPortWavePci Interface */ @@ -1231,6 +1246,7 @@ #define IMP_IPortTopology IMP_IPort + /* =============================================================== IMiniportTopology Interface */ @@ -1239,9 +1255,73 @@ IMiniportWaveCyclicStream Interface */ +DECLARE_INTERFACE_(IMiniportWaveCyclicStream,IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() // For IUnknown + + STDMETHOD_(NTSTATUS,SetFormat)(THIS_ + IN PKSDATAFORMAT DataFormat)PURE; + + STDMETHOD_(ULONG,SetNotificationFreq)(THIS_ + IN ULONG Interval, + OUT PULONG FrameSize) PURE; + + STDMETHOD_(NTSTATUS,SetState)(THIS_ + IN KSSTATE State) PURE; + + STDMETHOD_(NTSTATUS,GetPosition)( THIS_ + OUT PULONG Position) PURE; + + STDMETHOD_(NTSTATUS,NormalizePhysicalPosition)(THIS_ + IN OUT PLONGLONG PhysicalPosition) PURE; + + STDMETHOD_(void, Silence)( THIS_ + IN PVOID Buffer, + IN ULONG ByteCount) PURE; +}; + +typedef IMiniportWaveCyclicStream *PMINIPORTWAVECYCLICSTREAM; + /* =============================================================== IMiniportWaveCyclic Interface */ +#undef INTERFACE + +DEFINE_GUID(IID_IMiniportWaveCyclic, + 0xb4c90a27L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + +#define INTERFACE IMiniportWaveCyclic + +DECLARE_INTERFACE_(IMiniportWaveCyclic, IMiniport) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + + DEFINE_ABSTRACT_MINIPORT() + + STDMETHOD_(NTSTATUS, Init)(THIS_ + IN PUNKNOWN UnknownAdapter, + IN PRESOURCELIST ResourceList, + IN PPORTWAVECYCLIC Port) PURE; + + STDMETHOD_(NTSTATUS, NewStream)(THIS_ + OUT PMINIPORTWAVECYCLICSTREAM *Stream, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN ULONG Pin, + IN BOOL Capture, + IN PKSDATAFORMAT DataFormat, + OUT PDMACHANNEL *DmaChannel, + OUT PSERVICEGROUP *ServiceGroup) PURE; +}; + +typedef IMiniportWaveCyclic *PMINIPORTWAVECYCLIC; +#undef INTERFACE /* =============================================================== IMiniportWavePciStream Interface

16 years

[dgorbachev] 37841: Fix them second time.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Dec 3 18:55:15 2008 New Revision: 37841 URL: http://svn.reactos.org/svn/reactos?rev=37841&view=rev Log: Fix them second time. Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Dec 3 18:55:15 2008 @@ -16,7 +16,9 @@ #define Ke386GetInterruptDescriptorTable(X) \ __asm__("sidt %0\n\t" \ - : "=m" (X)); + : "=m" (X) \ + : /* no input */ \ + : "memory"); #define Ke386SetGlobalDescriptorTable(X) \ __asm__("lgdt %0\n\t" \ @@ -25,11 +27,15 @@ #define Ke386GetGlobalDescriptorTable(X) \ __asm__("sgdt %0\n\t" \ - : "=m" (X)); + : "=m" (X) \ + : /* no input */ \ + : "memory"); #define Ke386GetLocalDescriptorTable(X) \ __asm__("sldt %0\n\t" \ - : "=m" (X)); + : "=m" (X) \ + : /* no input */ \ + : "memory"); #define Ke386SetLocalDescriptorTable(X) \ __asm__("lldt %w0\n\t" \

16 years

[dgorbachev] 37840: Fix Ke386Get(Global|Local|Interrupt)DescriptorTable, Ke386GetTr.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Dec 3 16:24:29 2008 New Revision: 37840 URL: http://svn.reactos.org/svn/reactos?rev=37840&view=rev Log: Fix Ke386Get(Global|Local|Interrupt)DescriptorTable, Ke386GetTr. Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Dec 3 16:24:29 2008 @@ -16,8 +16,7 @@ #define Ke386GetInterruptDescriptorTable(X) \ __asm__("sidt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); + : "=m" (X)); #define Ke386SetGlobalDescriptorTable(X) \ __asm__("lgdt %0\n\t" \ @@ -26,13 +25,11 @@ #define Ke386GetGlobalDescriptorTable(X) \ __asm__("sgdt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); + : "=m" (X)); #define Ke386GetLocalDescriptorTable(X) \ __asm__("sldt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); + : "=m" (X)); #define Ke386SetLocalDescriptorTable(X) \ __asm__("lldt %w0\n\t" \ @@ -43,8 +40,7 @@ #define Ke386GetTr(X) \ __asm__("str %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); + : "=m" (X)); #define Ke386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) #define Ke386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory")

16 years

[dgorbachev] 37839: Trying to fix...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Dec 3 12:04:26 2008 New Revision: 37839 URL: http://svn.reactos.org/svn/reactos?rev=37839&view=rev Log: Trying to fix... Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Dec 3 12:04:26 2008 @@ -166,10 +166,10 @@ #define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ - (ULONG)InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) + InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) #define InterlockedExchangePte(PointerPte, Value) \ - (ULONG)InterlockedExchange((PLONG)(PointerPte), Value) + InterlockedExchange((PLONG)(PointerPte), Value) typedef struct {

16 years

[dgorbachev] 37838: Slovak patch by Mario Kacmar aka Kario (bug #3934).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Dec 3 11:52:24 2008 New Revision: 37838 URL: http://svn.reactos.org/svn/reactos?rev=37838&view=rev Log: Slovak patch by Mario Kacmar aka Kario (bug #3934). Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/sk-SK.h Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Wed Dec 3 11:52:24 2008 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: xx-xx-2007 - * LAST UPDATE: 13-11-2008 + * LAST UPDATE: 03-12-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -11,9 +11,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Víta Vás sprievodca intaláciou systému ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Systém ReactOS sa z tohto CD nedá naintalova ihneï! "\ - "Retartujte, prosím, poèítaè a intalaèné CD nechajte "\ - "vloené, aby sa mohol systém ReactOS naintalova.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Systém ReactOS sa z tohto CD nedá naintalova ihneï! Retartujte, prosím, poèítaè a intalaèné CD nechajte vloené, aby sa mohol systém ReactOS naintalova.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Intaláciu ukonèíte kliknutím na tlaèidlo Dokonèi.", IDC_STATIC, 115, 169, 195, 17 END @@ -23,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "Jazyk intalácie:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 @@ -35,9 +33,9 @@ CAPTION "Intalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 - CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + CONTROL "Typ intalácie", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Naintalova systém ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Opravi alebo aktualizova naintalovaný systém ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 END @@ -48,11 +46,11 @@ BEGIN CONTROL "Nastavenia zariadení", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Poèítaè:", IDC_STATIC, 20,15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 180, 80 LTEXT "Obrazovka:", IDC_STATIC, 20,35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 LTEXT "Klávesnica:", IDC_STATIC, 20,55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 END @@ -63,10 +61,11 @@ BEGIN CONTROL "Partícia na naintalovanie systému ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + PUSHBUTTON "&Vytvori", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "O&dstráni", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "Rozírené &monosti...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 @@ -86,8 +85,8 @@ END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 -STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME -CAPTION "Advanced Partition Settings" +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Rozírené nastavenia partície" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Intalaèný prieèinok", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 @@ -95,10 +94,19 @@ CONTROL "Intalácia zavádzaèa systému", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 - CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + CONTROL "Naintalova zavádzaè systému na pevný disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Nenaintalova zavádzaè systému", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Zrui", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Intalácia systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Zhrnutie intalácie", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Kliknutím na tlaèidlo Ïalej spustíte intalaèný proces.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -122,7 +130,7 @@ CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Kliknutím na tlaèidlo Dokonèi retartujete poèítaè.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 END @@ -131,8 +139,8 @@ STRINGTABLE BEGIN IDS_LANGTITLE "Výber jazyka" //Vo¾ba jazyka - IDS_LANGSUBTITLE "Choose language for setup and final system." - IDS_TYPETITLE "Welcome to ReactOS Setup" + IDS_LANGSUBTITLE "Vo¾ba jazyka pre intalátor a výsledný systém." //Choose lang., Vyberte, Zvo¾te + IDS_TYPETITLE "Víta Vás intalátor systému ReactOS" //Welcome to ReactOS Setup IDS_TYPESUBTITLE "Choose setup type." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." @@ -142,7 +150,9 @@ IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" IDS_RESTARTTITLE "First stage of setup finished" IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_SUMMARYTITLE "Zhrnutie intalácie" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Naozaj skonèi?" IDS_ABORTSETUP2 "Prerui intaláciu?" END /* EOF */ Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Wed Dec 3 11:52:24 2008 @@ -1,7 +1,7 @@ /* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 * Encoding : Latin II (852) - * LastChange: 19-11-2008 + * LastChange: 01-12-2008 */ #ifndef LANG_SK_SK_H__ @@ -370,31 +370,31 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, "Po¡ta:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 12, "Monitor:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 13, "Kl vesnica:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 14, "Rozlo§enie kl.:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 16, "Akceptova:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT

16 years

[tkreuzer] 37837: Some assembly code to save restore registers on traps

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 3 11:45:50 2008 New Revision: 37837 URL: http://svn.reactos.org/svn/reactos?rev=37837&view=rev Log: Some assembly code to save restore registers on traps Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Wed Dec 3 11:45:50 2008 @@ -3,12 +3,11 @@ * COPYRIGHT: See COPYING in the top level directory * PURPOSE: System Traps, Entrypoints and Exitpoints * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * NOTE: See asmmacro.S for the shared entry/exit code. */ /* INCLUDES ******************************************************************/ -//#include <asm.h> +#include <ndk/amd64/asm.h> #include <ndk/amd64/asmmacro.S> /* GLOBALS *******************************************************************/ @@ -31,6 +30,180 @@ _MsgUnexpectedInterrupt: .ascii "UnexpectedInterrupt\n\0" +/* Helper Macros *************************************************************/ + +#define TRAPFLAG_SYSTEMSERVICE 1 + +.macro ENTER_TRAP_FRAME AllocSize Flags +.set SIZE_INITIAL_FRAME, 7 * 8 +//.set SIZE_LOCAL_DATA, SIZE_EXCEPTION_RECORD + 0x28 +.set SIZE_TRAP_FRAME_ALLOC, SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME + \AllocSize +.set TRAPFLAGS, \Flags + + /* Save rbp */ + push rbp + .pushreg rbp + + /* Make room for a KTRAP_FRAME and function parameters */ + sub rsp, SIZE_TRAP_FRAME_ALLOC + .allocstack SIZE_TRAP_FRAME_ALLOC + + /* Point rbp to the KTRAP_FRAME */ + lea rbp, [rsp + \AllocSize] + +// KTRAP_FRAME_P1Home +// KTRAP_FRAME_P2Home +// KTRAP_FRAME_P3Home +// KTRAP_FRAME_P4Home +// KTRAP_FRAME_P5 + +.if (TRAPFLAGS & TRAPFLAG_SYSTEMSERVICE) + /* Save non-volatile registers */ + mov [rbp + KTRAP_FRAME_Rbx], rbx + mov [rbp + KTRAP_FRAME_Rdi], rdi + mov [rbp + KTRAP_FRAME_Rsi], rsi +.else + /* Save volatile registers */ + mov [rbp + KTRAP_FRAME_Rax], rax + mov [rbp + KTRAP_FRAME_Rcx], rcx + mov [rbp + KTRAP_FRAME_Rdx], rdx + mov [rbp + KTRAP_FRAME_R8], r8 + mov [rbp + KTRAP_FRAME_R9], r9 + mov [rbp + KTRAP_FRAME_R10], r10 + mov [rbp + KTRAP_FRAME_R11], r11 + + /* Save xmm registers */ + movdqa [rbp + KTRAP_FRAME_Xmm0], xmm0 + movdqa [rbp + KTRAP_FRAME_Xmm1], xmm1 + movdqa [rbp + KTRAP_FRAME_Xmm2], xmm2 + movdqa [rbp + KTRAP_FRAME_Xmm3], xmm3 + movdqa [rbp + KTRAP_FRAME_Xmm4], xmm4 + movdqa [rbp + KTRAP_FRAME_Xmm5], xmm5 +.endif + + /* Save segment selectors */ + mov ax, ds + mov [rbp + KTRAP_FRAME_SegDs], ax + mov ax, es + mov [rbp + KTRAP_FRAME_SegEs], ax + mov ax, fs + mov [rbp + KTRAP_FRAME_SegFs], ax + mov ax, gs + mov [rbp + KTRAP_FRAME_SegGs], ax + + /* Save previous mode and swap gs when it was UserMode */ + mov ax, [rbp + KTRAP_FRAME_SegCs] + and ax, 1 + mov [rbp + KTRAP_FRAME_PreviousMode], al + jz 1f + swapgs +1: + + /* Save previous irql */ + mov rax, cr8 + mov [rbp + KTRAP_FRAME_PreviousIrql], al + +// KTRAP_FRAME_FaultIndicator +// KTRAP_FRAME_ExceptionActive +// KTRAP_FRAME_MxCsr + + + /* Save debug registers */ + mov rax, dr0 + mov [rbp + KTRAP_FRAME_Dr0], rax + mov rax, dr1 + mov [rbp + KTRAP_FRAME_Dr1], rax + mov rax, dr2 + mov [rbp + KTRAP_FRAME_Dr2], rax + mov rax, dr3 + mov [rbp + KTRAP_FRAME_Dr3], rax + mov rax, dr6 + mov [rbp + KTRAP_FRAME_Dr6], rax + mov rax, dr7 + mov [rbp + KTRAP_FRAME_Dr7], rax + +// KTRAP_FRAME_DebugControl +// KTRAP_FRAME_LastBranchToRip +// KTRAP_FRAME_LastBranchFromRip +// KTRAP_FRAME_LastExceptionToRip +// KTRAP_FRAME_LastExceptionFromRip +// KTRAP_FRAME_TrapFrame + +.endm + +.macro LEAVE_TRAP_FRAME + + /* Restore segment selectors */ + mov ax, [rbp + KTRAP_FRAME_SegDs] + mov ds, ax + mov ax, [rbp + KTRAP_FRAME_SegEs] + mov es, ax + mov ax, [rbp + KTRAP_FRAME_SegFs] + mov fs, ax + test byte ptr [rbp + KTRAP_FRAME_PreviousMode], 1 + jz 1f + swapgs +1: + +.if (TRAPFLAGS & TRAPFLAG_SYSTEMSERVICE) + /* Restore non-volatile registers */ + mov rbx, [rbp + KTRAP_FRAME_Rbx] + mov rdi, [rbp + KTRAP_FRAME_Rdi] + mov rsi, [rbp + KTRAP_FRAME_Rsi] +.else + /* Restore volatile registers */ + mov rax, [rbp + KTRAP_FRAME_Rax] + mov rcx, [rbp + KTRAP_FRAME_Rcx] + mov rdx, [rbp + KTRAP_FRAME_Rdx] + mov r8, [rbp + KTRAP_FRAME_R8] + mov r9, [rbp + KTRAP_FRAME_R9] + mov r10, [rbp + KTRAP_FRAME_R10] + mov r11, [rbp + KTRAP_FRAME_R11] + + /* Restore xmm registers */ + movdqa xmm0, [rbp + KTRAP_FRAME_Xmm0] + movdqa xmm1, [rbp + KTRAP_FRAME_Xmm1] + movdqa xmm2, [rbp + KTRAP_FRAME_Xmm2] + movdqa xmm3, [rbp + KTRAP_FRAME_Xmm3] + movdqa xmm4, [rbp + KTRAP_FRAME_Xmm4] + movdqa xmm5, [rbp + KTRAP_FRAME_Xmm5] +.endif + + /* Restore rbp */ + mov rbp, [rbp + KTRAP_FRAME_Rbp] + + /* Adjust stack pointer (plus one qword for rbp, one for error code) */ + add rsp, SIZE_TRAP_FRAME_ALLOC + 0x10 +.endm + +.macro DISPATCH_EXCEPTION Code, NumParams, p1, p2, p3 + + /* rsp+0x28 points to EXCEPTION_RECORD, set it up */ + mov dword ptr [rsp + 0x28 + EXCEPTION_RECORD_ExceptionCode], \Code + mov dword ptr [rsp + 0x28 + EXCEPTION_RECORD_ExceptionFlags], 0 + mov qword ptr [rsp + 0x28 + EXCEPTION_RECORD_ExceptionRecord], 0 + mov rax, [rbp + KTRAP_FRAME_Rip] + mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionAddress], rax + mov dword ptr [rsp + 0x28 + EXCEPTION_RECORD_NumberParameters], \NumParams + +.if \NumParams >= 1 + mov qword ptr [rsp + 0x28 + EXCEPTION_RECORD_ExceptionInformation + 0x00], \p1 +.endif +.if \NumParams >= 2 + mov qword ptr [rsp + 0x28 + EXCEPTION_RECORD_ExceptionInformation + 0x08], \p2 +.endif +.if \NumParams >= 3 + mov qword ptr [rsp + 0x28 + EXCEPTION_RECORD_ExceptionInformation + 0x10], \p3 +.endif + + mov byte ptr [rsp + 0x20], 1 // FirstChance + mov r9b, [rbp + KTRAP_FRAME_PreviousMode] // PreviousMode + mov r8, rbp // TrapFrame + xor rdx, rdx // ExceptionFrame + lea rcx, [rsp + 0x28] // ExceptionRecord + call _KiDispatchException +.endm + /* SOFTWARE INTERRUPT SERVICES ***********************************************/ .text @@ -75,26 +248,18 @@ push 0 .allocstack 0x8 - push rax - .pushreg rax - push rcx - .pushreg rcx - push rdx - sub rsp, 0x10 - .allocstack 0x10 - .endprolog + ENTER_TRAP_FRAME (SIZE_EXCEPTION_RECORD + 0x28), 0 lea rcx, _MsgBreakpointTrap[rip] - mov rdx, [rsp + 0x10 + 24 + 8] + mov rdx, [rbp + KTRAP_FRAME_Rip] lea rax, _FrLdrDbgPrint[rip] call [rax] + mov rcx, gs:[KPCR_PRCB + KPRCB_CurrentThread] + DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, rcx, 0 + /* Return */ - add rsp, 0x10 - pop rdx - pop rcx - pop rax - add rsp, 8 + LEAVE_TRAP_FRAME iretq .endproc @@ -224,6 +389,17 @@ call [rax] jmp $ + + ENTER_TRAP_FRAME (SIZE_EXCEPTION_RECORD + 0x28), 0 + + /* Save page fault address */ + mov rax, cr2 + mov [rbp + KTRAP_FRAME_FaultAddress], rax + + DISPATCH_EXCEPTION STATUS_BREAKPOINT, 0, 0, 0, 0 + + LEAVE_TRAP_FRAME; + iretq .endproc

16 years

[dgorbachev] 37836: Fix Unicode -> Multibyte conversion (bug #3903).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Dec 3 11:40:49 2008 New Revision: 37836 URL: http://svn.reactos.org/svn/reactos?rev=37836&view=rev Log: Fix Unicode -> Multibyte conversion (bug #3903). Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Wed Dec 3 11:40:49 2008 @@ -433,7 +433,7 @@ UCHAR Char; USHORT DBCSOffset; LPCSTR MbsEnd = MultiByteString + MultiByteCount; - ULONG Count; + INT Count; /* Does caller query for output buffer size? */ if (WideCharCount == 0) @@ -770,8 +770,9 @@ { if(ch & 0xff00) { - UCHAR uOffset = CodePageTable->DBCSOffsets[ch >> 8]; - return (CodePageTable->MultiByteTable[(uOffset << 8) + (ch & 0xff)] == wch); + USHORT uOffset = CodePageTable->DBCSOffsets[ch >> 8]; + /* if (!uOffset) return (CodePageTable->MultiByteTable[ch] == wch); */ + return (CodePageTable->DBCSOffsets[uOffset + (ch & 0xff)] == wch); } return (CodePageTable->MultiByteTable[ch] == wch);

16 years

[dgorbachev] 37835: Remove stray semicolons, GCC gratias.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Dec 3 11:39:55 2008 New Revision: 37835 URL: http://svn.reactos.org/svn/reactos?rev=37835&view=rev Log: Remove stray semicolons, GCC gratias. Modified: trunk/reactos/dll/directx/ddraw/startup.c trunk/reactos/dll/win32/setupapi/driver.c trunk/reactos/lib/rtl/message.c trunk/reactos/ntoskrnl/io/iomgr/controller.c trunk/reactos/ntoskrnl/io/iomgr/remlock.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Wed Dec 3 11:39:55 2008 @@ -136,7 +136,7 @@ { DX_STUB_str("Got iface\n"); - if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK); + if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK) { /* RtlZeroMemory(&wnd_class, sizeof(wnd_class)); Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/driver.c [iso-8859-1] Wed Dec 3 11:39:55 2008 @@ -1537,7 +1537,7 @@ if (DriverInfoData != NULL) { if (DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V2_A) && - DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V1_A)); + DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V1_A)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; Modified: trunk/reactos/lib/rtl/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/message.c?rev=3783… ============================================================================== --- trunk/reactos/lib/rtl/message.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/message.c [iso-8859-1] Wed Dec 3 11:39:55 2008 @@ -110,7 +110,7 @@ DPRINT("UnicodeText: %S\n", (PWSTR)MessageEntry->Text); } - if (MessageResourceEntry != NULL); + if (MessageResourceEntry != NULL) { *MessageResourceEntry = MessageEntry; } Modified: trunk/reactos/ntoskrnl/io/iomgr/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/controll… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/controller.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/controller.c [iso-8859-1] Wed Dec 3 11:39:55 2008 @@ -36,7 +36,7 @@ /* Insert the Device Queue */ if (!KeInsertDeviceQueue(&ControllerObject->DeviceWaitQueue, - &DeviceObject->Queue.Wcb.WaitQueueEntry)); + &DeviceObject->Queue.Wcb.WaitQueueEntry)) { /* Call the execution routine */ Result = ExecutionRoutine(DeviceObject, Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Wed Dec 3 11:39:55 2008 @@ -114,7 +114,7 @@ } /* Decrement the lock count */ - if (!InterlockedDecrement(&Lock->Common.IoCount)); + if (!InterlockedDecrement(&Lock->Common.IoCount)) { /* Signal the event */ KeSetEvent(&Lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE);

16 years

← Newer
1
...
63
64
65
66
67
68
69
70
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008