Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[blight] 13425: Raise exception when MmMapLockedPagesSpecifyCache fails to map into UserMode.

by blight＠svn.reactos.com

Raise exception when MmMapLockedPagesSpecifyCache fails to map into UserMode. Modified: trunk/reactos/ntoskrnl/mm/mdl.c _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-02-05 18:52:38 UTC (rev 13424) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-02-05 18:59:14 UTC (rev 13425) @@ -862,8 +862,9 @@ } if (AccessMode == UserMode) { - /* FIXME: Raise an exception */ - return NULL; + /* Throw exception */ + ExRaiseStatus(STATUS_ACCESS_VIOLATION); + ASSERT(0); } else /* AccessMode == KernelMode */ { @@ -888,6 +889,8 @@ } Mdl->MappedSystemVa = (char*)Base + Mdl->ByteOffset; } + else + DPRINT1("UserMode mapping - returning 0x%x\n", (ULONG)Base + Mdl->ByteOffset); return((char*)Base + Mdl->ByteOffset); }

19 years, 10 months

[chorns] 13424: * Build csrss and win32csr

by chorns＠svn.reactos.com

* Build csrss and win32csr * NativeCUI module type support Deleted: branches/xmlbuildsystem/reactos/subsys/csrss/csrss.def Added: branches/xmlbuildsystem/reactos/subsys/csrss/csrss.xml Added: branches/xmlbuildsystem/reactos/subsys/csrss/win32csr/win32csr.xml Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Deleted: branches/xmlbuildsystem/reactos/subsys/csrss/csrss.def --- branches/xmlbuildsystem/reactos/subsys/csrss/csrss.def 2005-02-05 18:49:43 UTC (rev 13423) +++ branches/xmlbuildsystem/reactos/subsys/csrss/csrss.def 2005-02-05 18:52:38 UTC (rev 13424) @@ -1,8 +0,0 @@ -; $Id$ -; - -LIBRARY csrss.exe - -EXPORTS - -CsrServerInitialization _____ Added: branches/xmlbuildsystem/reactos/subsys/csrss/csrss.xml --- branches/xmlbuildsystem/reactos/subsys/csrss/csrss.xml 2005-02-05 18:49:43 UTC (rev 13423) +++ branches/xmlbuildsystem/reactos/subsys/csrss/csrss.xml 2005-02-05 18:52:38 UTC (rev 13424) @@ -0,0 +1,23 @@ +<module name="csrss" type="nativecui"> + <include base="csrss">.</include> + <include base="csrss">include</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0501</define> + <library>rosrtl</library> + <library>ntdll</library> + <directory name="api"> + <file>handle.c</file> + <file>process.c</file> + <file>user.c</file> + <file>wapi.c</file> + </directory> + <file>csrss.c</file> + <file>init.c</file> + <file>print.c</file> + <file>video.c</file> + <file>csrss.rc</file> +</module> +<directory name="win32csr"> + <xi:include href="win32csr/win32csr.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/subsys/csrss/win32csr/win32csr.xml --- branches/xmlbuildsystem/reactos/subsys/csrss/win32csr/win32csr.xml 2005-02-05 18:49:43 UTC (rev 13423) +++ branches/xmlbuildsystem/reactos/subsys/csrss/win32csr/win32csr.xml 2005-02-05 18:52:38 UTC (rev 13424) @@ -0,0 +1,18 @@ +<module name="win32csr" type="win32dll"> + <importlibrary definition="win32csr.def" /> + <include base="win32csr">.</include> + <include base="csrss">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>conio.c</file> + <file>desktopbg.c</file> + <file>dllmain.c</file> + <file>exitros.c</file> + <file>guiconsole.c</file> + <file>tuiconsole.c</file> + <file>win32csr.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml --- branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-02-05 18:49:43 UTC (rev 13423) +++ branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-02-05 18:52:38 UTC (rev 13424) @@ -1,3 +1,6 @@ +<directory name="csrss"> + <xi:include href="csrss/csrss.xml" /> +</directory> <directory name="system"> <xi:include href="system/directory.xml" /> </directory> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-05 18:49:43 UTC (rev 13423) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-05 18:52:38 UTC (rev 13424) @@ -1560,25 +1560,71 @@ if ( module.files.size () > 0 ) { - string killAt = module.mangledSymbols ? "" : "--kill-at"; - fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-lib %s %s\n\n", - module.GetTargetName ().c_str (), - (module.GetBasePath () + SSEP + module.importLibrary->definition).c_str (), - FixupTargetFilename ( module.GetDependencyPath () ).c_str (), - killAt.c_str () ); + GenerateMacrosAndTargetsTarget ( module ); + + fprintf ( fMakefile, "%s: %s %s\n", + target.c_str (), + archiveFilename.c_str (), + importLibraryDependencies.c_str () ); + + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", + module.entrypoint.c_str () ); + GenerateLinkerCommand ( module, + "${gcc}", + linkerParameters, + objectFilenames ); } + else + { + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); + fprintf ( fMakefile, "%s:\n\n", + target.c_str ()); + } +} - if (module.files.size () > 0) + +static MingwNativeCUIModuleHandler nativecui_handler; + +MingwNativeCUIModuleHandler::MingwNativeCUIModuleHandler () + : MingwModuleHandler ( NativeCUI ) +{ +} + +void +MingwNativeCUIModuleHandler::Process ( const Module& module ) +{ + GeneratePreconditionDependencies ( module ); + GenerateNativeCUIModuleTarget ( module ); + GenerateInvocations ( module ); +} + +void +MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& module ) +{ + static string ros_junk ( "$(ROS_TEMPORARY)" ); + string target ( FixupTargetFilename ( module.GetPath () ) ); + string workingDirectory = GetWorkingDirectory ( ); + string objectFilenames = GetObjectFilenames ( module ); + string archiveFilename = GetModuleArchiveFilename ( module ); + string importLibraryDependencies = GetImportLibraryDependencies ( module ); + + GenerateImportLibraryTargetIfNeeded ( module ); + + if ( module.files.size () > 0 ) { - GenerateMacrosAndTargetsTarget ( module ); + string* cflags = new string ( "-D__NTAPP__" ); + GenerateMacrosAndTargetsTarget ( module, + cflags, + NULL ); + delete cflags; fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), archiveFilename.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", module.entrypoint.c_str () ); GenerateLinkerCommand ( module, "${gcc}", _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-02-05 18:49:43 UTC (rev 13423) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-02-05 18:52:38 UTC (rev 13424) @@ -222,6 +222,16 @@ }; +class MingwNativeCUIModuleHandler : public MingwModuleHandler +{ +public: + MingwNativeCUIModuleHandler (); + virtual void Process ( const Module& module ); +private: + void GenerateNativeCUIModuleTarget ( const Module& module ); +}; + + class MingwWin32DLLModuleHandler : public MingwModuleHandler { public: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-02-05 18:49:43 UTC (rev 13423) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-02-05 18:52:38 UTC (rev 13424) @@ -271,6 +271,8 @@ return KernelModeDriver; if ( attribute.value == "nativedll" ) return NativeDLL; + if ( attribute.value == "nativecui" ) + return NativeCUI; if ( attribute.value == "win32dll" ) return Win32DLL; if ( attribute.value == "win32gui" ) @@ -298,6 +300,7 @@ case ObjectLibrary: return ".o"; case Kernel: + case NativeCUI: case Win32GUI: return ".exe"; case KernelModeDLL: @@ -329,6 +332,8 @@ return "_DriverEntry@8"; case NativeDLL: return "_DllMainCRTStartup@12"; + case NativeCUI: + return "_NtProcessStartup@4"; case Win32DLL: return "_DllMain@12"; case KernelModeDriver: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-05 18:49:43 UTC (rev 13423) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-05 18:52:38 UTC (rev 13424) @@ -91,6 +91,7 @@ KernelModeDLL, KernelModeDriver, NativeDLL, + NativeCUI, Win32DLL, Win32GUI, BootLoader,

19 years, 10 months

[gvg] 13423: Re-use (better) stack backtrace function

by gvg＠svn.reactos.com

Re-use (better) stack backtrace function Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-02-05 10:54:00 UTC (rev 13422) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-02-05 18:49:43 UTC (rev 13423) @@ -1,5 +1,4 @@ -/* $Id:$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/exp.c @@ -393,9 +392,7 @@ KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG Parameter1, ULONG Parameter2) { ULONG cr3_; - ULONG i; ULONG StackLimit; - PULONG Frame; ULONG Esp0; ULONG ExceptionNr = (ULONG)Tf->DebugArgMark; ULONG cr2 = (ULONG)Tf->DebugPointer; @@ -462,46 +459,7 @@ /* * Dump the stack frames */ - DbgPrint("Frames: "); - /* Change to an #if 0 if no frames are printed because of fpo. */ -#if 1 - i = 1; - Frame = (PULONG)Tf->Ebp; - while (Frame != NULL) - { - NTSTATUS Status; - PVOID Eip; - Status = MmSafeCopyFromUser(&Eip, Frame + 1, sizeof(Eip)); - if (!NT_SUCCESS(Status)) - { - DbgPrint("<INVALID>"); - break; - } - if (!KeRosPrintAddress(Eip)) - { - DbgPrint("<%X>", Eip); - } - Status = MmSafeCopyFromUser(&Frame, Frame, sizeof(Frame)); - if (!NT_SUCCESS(Status)) - { - break; - } - i++; - DbgPrint(" "); - } -#else - i = 1; - Frame = (PULONG)((ULONG_PTR)Esp0 + KTRAP_FRAME_EFLAGS); - while (Frame < (PULONG)PsGetCurrentThread()->Tcb.StackBase && i < 50) - { - ULONG Address = *Frame; - if (KeRosPrintAddress((PVOID)Address)) - { - i++; - } - Frame++; - } -#endif + KeDumpStackFrames((PULONG)Tf->Ebp); } ULONG @@ -616,7 +574,7 @@ ULONG ResultLength = sizeof(mbi); NTSTATUS Status; - DbgPrint("Frames: "); + DbgPrint("Frames:\n"); _SEH_TRY { Status = MiQueryVirtualMemory (

19 years, 10 months

[ekohl] 13422: Use the allocated buffer size in the call to NtGetPlugPlayEvent.

by ekohl＠svn.reactos.com

Use the allocated buffer size in the call to NtGetPlugPlayEvent. Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-02-05 10:31:37 UTC (rev 13421) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-02-05 10:54:00 UTC (rev 13422) @@ -79,7 +79,7 @@ DPRINT("Calling NtGetPlugPlayEvent()\n"); /* Wait for the next pnp event */ - Status = NtGetPlugPlayEvent(0, 0, PnpEvent, 1024); + Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize); /* Resize the buffer for the PnP event if it's too small. */ if (Status == STATUS_BUFFER_TOO_SMALL) {

19 years, 10 months

[weiden] 13421: only attach to the process to be queried when necessary

by weiden＠svn.reactos.com

only attach to the process to be queried when necessary Modified: trunk/reactos/ntoskrnl/ke/spinlock.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ke/spinlock.c --- trunk/reactos/ntoskrnl/ke/spinlock.c 2005-02-05 10:19:49 UTC (rev 13420) +++ trunk/reactos/ntoskrnl/ke/spinlock.c 2005-02-05 10:31:37 UTC (rev 13421) @@ -195,9 +195,7 @@ : : "r" (SpinLock)); #else - while (0 != *(volatile PKSPIN_LOCK)SpinLock) - { - } + while (0 != *(volatile KSPIN_LOCK*)SpinLock); #endif #else DbgPrint("Spinning on spinlock %x current value %x\n", SpinLock, i); _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-02-05 10:19:49 UTC (rev 13420) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-02-05 10:31:37 UTC (rev 13421) @@ -1613,11 +1613,15 @@ { PRTL_USER_PROCESS_PARAMETERS ProcParams = NULL; UNICODE_STRING LocalDest; + BOOLEAN Attached; ULONG ImagePathLen = 0; PUNICODE_STRING DstPath = (PUNICODE_STRING)ProcessInformation; /* we need to attach to the process to make sure we're in the right context! */ - KeAttachProcess(&Process->Pcb); + Attached = Process != PsGetCurrentProcess(); + + if(Attached) + KeAttachProcess(&Process->Pcb); _SEH_TRY { @@ -1677,7 +1681,8 @@ _SEH_END; /* detach from the process */ - KeDetachProcess(); + if(Attached) + KeDetachProcess(); /* only copy the string back to the caller if we were able to copy it into the temporary buffer! */ @@ -1715,7 +1720,8 @@ } /* don't forget to detach from the process!!! */ - KeDetachProcess(); + if(Attached) + KeDetachProcess(); } else {

19 years, 10 months

[gvg] 13420: Convert ROP2 to MIX when calling driver

by gvg＠svn.reactos.com

Convert ROP2 to MIX when calling driver Modified: trunk/reactos/subsys/win32k/eng/lineto.c Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/line.c _____ Modified: trunk/reactos/subsys/win32k/eng/lineto.c --- trunk/reactos/subsys/win32k/eng/lineto.c 2005-02-05 10:17:33 UTC (rev 13419) +++ trunk/reactos/subsys/win32k/eng/lineto.c 2005-02-05 10:19:49 UTC (rev 13420) @@ -488,7 +488,7 @@ LONG x2, LONG y2, RECTL *RectBounds, - MIX mix) + MIX Mix) { BOOLEAN ret; SURFOBJ *DestSurf; @@ -524,7 +524,7 @@ { /* Call the driver's DrvLineTo */ ret = GDIDEVFUNCS(DestSurf).LineTo( - DestSurf, Clip, Brush, x1, y1, x2, y2, /*RectBounds*/&b, mix); + DestSurf, Clip, Brush, x1, y1, x2, y2, /*RectBounds*/&b, Mix); } #if 0 @@ -536,7 +536,7 @@ if (! ret) { - ret = EngLineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, RectBounds, mix); + ret = EngLineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, RectBounds, Mix); } MouseSafetyOnDrawEnd(DestSurf); @@ -550,7 +550,7 @@ BRUSHOBJ *Brush, CONST LPPOINT pt, LONG dCount, - MIX mix) + MIX Mix) { LONG i; RECTL rect; @@ -571,7 +571,7 @@ pt[i].x, pt[i].y, &rect, - mix); + Mix); if (!ret) { break; _____ Modified: trunk/reactos/subsys/win32k/include/inteng.h --- trunk/reactos/subsys/win32k/include/inteng.h 2005-02-05 10:17:33 UTC (rev 13419) +++ trunk/reactos/subsys/win32k/include/inteng.h 2005-02-05 10:19:49 UTC (rev 13420) @@ -32,7 +32,7 @@ IntEngCleanupDriverObjs(struct _EPROCESS *Process, PW32PROCESS Win32Process); - +#define ROP2_TO_MIX(Rop2) (((Rop2) << 8) | (Rop2)) BOOL STDCALL IntEngLineTo(BITMAPOBJ *Surface, CLIPOBJ *Clip, _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-02-05 10:17:33 UTC (rev 13419) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-02-05 10:19:49 UTC (rev 13420) @@ -212,6 +212,7 @@ NewDC->w.textAlign = OrigDC->w.textAlign; NewDC->w.backgroundColor = OrigDC->w.backgroundColor; NewDC->w.backgroundMode = OrigDC->w.backgroundMode; + NewDC->w.ROPmode = OrigDC->w.ROPmode; DC_UnlockDc( hDC ); if (NULL != DisplayDC) { @@ -774,8 +775,8 @@ NewDC->DMW.dmDisplayFrequency = 0; NewDC->w.bitsPerPixel = NewDC->DMW.dmBitsPerPel; // FIXME: set this here?? - NewDC->w.hPalette = NewDC->DevInfo->hpalDefault; + NewDC->w.ROPmode = R2_COPYPEN; DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); _____ Modified: trunk/reactos/subsys/win32k/objects/fillshap.c --- trunk/reactos/subsys/win32k/objects/fillshap.c 2005-02-05 10:17:33 UTC (rev 13419) +++ trunk/reactos/subsys/win32k/objects/fillshap.c 2005-02-05 10:19:49 UTC (rev 13420) @@ -28,7 +28,7 @@ &BrushInst.BrushObject, \ x, y, (x)+1, y, \ &RectBounds, \ - dc->w.ROPmode); + ROP2_TO_MIX(dc->w.ROPmode)); #define PUTLINE(x1,y1,x2,y2,BrushInst) \ ret = ret && IntEngLineTo(BitmapObj, \ @@ -36,7 +36,7 @@ &BrushInst.BrushObject, \ x1, y1, x2, y2, \ &RectBounds, \ - dc->w.ROPmode); + ROP2_TO_MIX(dc->w.ROPmode)); BOOL FASTCALL IntGdiPolygon(PDC dc, @@ -93,7 +93,7 @@ if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, dc->w.ROPmode, UnsafePoints, Count, DestRect ); + ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->w.ROPmode), UnsafePoints, Count, DestRect ); } BRUSHOBJ_UnlockBrush(dc->w.hBrush); @@ -128,7 +128,7 @@ To.x, To.y, &DestRect, - dc->w.ROPmode); /* MIX */ + ROP2_TO_MIX(dc->w.ROPmode)); /* MIX */ } } PENOBJ_UnlockPen( dc->w.hPen ); @@ -939,6 +939,7 @@ GDIBRUSHINST PenBrushInst, FillBrushInst; BOOL ret = FALSE; // default to failure RECTL DestRect; + MIX Mix; ASSERT ( dc ); // caller's responsibility to set this up /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ @@ -1001,33 +1002,34 @@ if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { + Mix = ROP2_TO_MIX(dc->w.ROPmode); ret = ret && IntEngLineTo(BitmapObj, dc->CombinedClip, &PenBrushInst.BrushObject, LeftRect, TopRect, RightRect, TopRect, &DestRect, // Bounding rectangle - dc->w.ROPmode); // MIX + Mix); ret = ret && IntEngLineTo(BitmapObj, dc->CombinedClip, &PenBrushInst.BrushObject, RightRect, TopRect, RightRect, BottomRect, &DestRect, // Bounding rectangle - dc->w.ROPmode); // MIX + Mix); ret = ret && IntEngLineTo(BitmapObj, dc->CombinedClip, &PenBrushInst.BrushObject, RightRect, BottomRect, LeftRect, BottomRect, &DestRect, // Bounding rectangle - dc->w.ROPmode); // MIX + Mix); ret = ret && IntEngLineTo(BitmapObj, dc->CombinedClip, &PenBrushInst.BrushObject, LeftRect, BottomRect, LeftRect, TopRect, &DestRect, // Bounding rectangle - dc->w.ROPmode); // MIX */ + Mix); } PENOBJ_UnlockPen(dc->w.hPen); _____ Modified: trunk/reactos/subsys/win32k/objects/line.c --- trunk/reactos/subsys/win32k/objects/line.c 2005-02-05 10:17:33 UTC (rev 13419) +++ trunk/reactos/subsys/win32k/objects/line.c 2005-02-05 10:19:49 UTC (rev 13420) @@ -110,7 +110,7 @@ Points[0].x, Points[0].y, Points[1].x, Points[1].y, &Bounds, - dc->w.ROPmode); + ROP2_TO_MIX(dc->w.ROPmode)); } BITMAPOBJ_UnlockBitmap ( dc->w.hBitmap ); @@ -228,7 +228,7 @@ IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); Ret = IntEngPolyline(BitmapObj, dc->CombinedClip, &PenBrushInst.BrushObject, Points, Count, - dc->w.ROPmode); + ROP2_TO_MIX(dc->w.ROPmode)); BITMAPOBJ_UnlockBitmap(dc->w.hBitmap); EngFreeMem(Points);

19 years, 10 months

[gvg] 13419: Silence debug messages

by gvg＠svn.reactos.com

Silence debug messages Modified: trunk/reactos/lib/mmdrv/Makefile Modified: trunk/reactos/lib/mmdrv/auxil.c Modified: trunk/reactos/lib/mmdrv/entry.c Modified: trunk/reactos/lib/mmdrv/midi.c Modified: trunk/reactos/lib/mmdrv/mmdrv.h Modified: trunk/reactos/lib/mmdrv/utils.c Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/Makefile --- trunk/reactos/lib/mmdrv/Makefile 2005-02-05 08:44:49 UTC (rev 13418) +++ trunk/reactos/lib/mmdrv/Makefile 2005-02-05 10:17:33 UTC (rev 13419) @@ -14,7 +14,7 @@ TARGET_LFLAGS = -TARGET_SDKLIBS = winmm.a +TARGET_SDKLIBS = winmm.a ntdll.a TARGET_BASE = $(TARGET_BASE_LIB_MMDRV) _____ Modified: trunk/reactos/lib/mmdrv/auxil.c --- trunk/reactos/lib/mmdrv/auxil.c 2005-02-05 08:44:49 UTC (rev 13418) +++ trunk/reactos/lib/mmdrv/auxil.c 2005-02-05 10:17:33 UTC (rev 13419) @@ -12,6 +12,8 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> APIENTRY DWORD auxMessage(UINT uDevice, UINT uMessage, @@ -20,7 +22,7 @@ DWORD dwParam2) { - printf("auxMessage\n"); + DPRINT("auxMessage\n"); // the following cases are documented by DDK switch (uMessage) _____ Modified: trunk/reactos/lib/mmdrv/entry.c --- trunk/reactos/lib/mmdrv/entry.c 2005-02-05 08:44:49 UTC (rev 13418) +++ trunk/reactos/lib/mmdrv/entry.c 2005-02-05 10:17:33 UTC (rev 13419) @@ -14,6 +14,8 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> #define EXPORT __declspec(dllexport) @@ -22,14 +24,14 @@ APIENTRY LONG DriverProc(DWORD DriverID, HANDLE DriverHandle, UINT Message, LONG Param1, LONG Param2) { - printf("DriverProc\n"); + DPRINT("DriverProc\n"); // HINSTANCE Module; switch(Message) { case DRV_LOAD : - printf("DRV_LOAD\n"); + DPRINT("DRV_LOAD\n"); return TRUE; // dont need to do any more /* Module = GetDriverModuleHandle(DriverHandle); @@ -56,7 +58,7 @@ // return 1L; case DRV_FREE : - printf("DRV_FREE\n"); + DPRINT("DRV_FREE\n"); // TerminateMidi(); // TerminateWave(); @@ -65,35 +67,35 @@ return 1L; case DRV_OPEN : - printf("DRV_OPEN\n"); + DPRINT("DRV_OPEN\n"); return 1L; case DRV_CLOSE : - printf("DRV_CLOSE\n"); + DPRINT("DRV_CLOSE\n"); return 1L; case DRV_ENABLE : - printf("DRV_ENABLE\n"); + DPRINT("DRV_ENABLE\n"); return 1L; case DRV_DISABLE : - printf("DRV_DISABLE\n"); + DPRINT("DRV_DISABLE\n"); return 1L; case DRV_QUERYCONFIGURE : - printf("DRV_QUERYCONFIGURE\n"); + DPRINT("DRV_QUERYCONFIGURE\n"); return 0L; case DRV_CONFIGURE : - printf("DRV_CONFIGURE\n"); + DPRINT("DRV_CONFIGURE\n"); return 0L; case DRV_INSTALL : - printf("DRV_INSTALL\n"); + DPRINT("DRV_INSTALL\n"); return DRVCNF_RESTART; default : - printf("?\n"); + DPRINT("?\n"); return DefDriverProc(DriverID, DriverHandle, Message, Param1, Param2); }; } @@ -101,7 +103,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) { - printf("DllMain called!\n"); + DPRINT("DllMain called!\n"); if (Reason == DLL_PROCESS_ATTACH) { _____ Modified: trunk/reactos/lib/mmdrv/midi.c --- trunk/reactos/lib/mmdrv/midi.c 2005-02-05 08:44:49 UTC (rev 13418) +++ trunk/reactos/lib/mmdrv/midi.c 2005-02-05 10:17:33 UTC (rev 13419) @@ -11,6 +11,8 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> // MIDI device instance information // @@ -66,7 +68,7 @@ MMRESULT Result = MMSYSERR_NOERROR; // Check ID? - printf("OpenMidiDevice()\n"); + DPRINT("OpenMidiDevice()\n"); switch(DeviceType) { @@ -119,7 +121,7 @@ { DWORD BytesReturned; - printf("IOCTL_MIDI_PLAY == %d [%x]\n", IOCTL_MIDI_PLAY, IOCTL_MIDI_PLAY); + DPRINT("IOCTL_MIDI_PLAY == %d [%x]\n", IOCTL_MIDI_PLAY, IOCTL_MIDI_PLAY); if ( !DeviceIoControl(pClient->DeviceHandle, IOCTL_MIDI_PLAY, (PVOID)pData, Length, NULL, 0, &BytesReturned, NULL)) @@ -174,40 +176,40 @@ APIENTRY DWORD midMessage(DWORD dwId, DWORD dwMessage, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) { - printf("midMessage\n"); + DPRINT("midMessage\n"); return MMSYSERR_NOERROR; switch (dwMessage) { case MIDM_GETNUMDEVS: - printf("MIDM_GETNUMDEVS"); + DPRINT("MIDM_GETNUMDEVS"); return 0; case MIDM_GETDEVCAPS: - printf("MIDM_GETDEVCAPS"); + DPRINT("MIDM_GETDEVCAPS"); return MMSYSERR_NOERROR; case MIDM_OPEN: - printf("MIDM_OPEN"); + DPRINT("MIDM_OPEN"); return MMSYSERR_NOERROR; case MIDM_CLOSE: - printf("MIDM_CLOSE"); + DPRINT("MIDM_CLOSE"); return MMSYSERR_NOERROR; case MIDM_ADDBUFFER: - printf("MIDM_ADDBUFFER"); + DPRINT("MIDM_ADDBUFFER"); return MMSYSERR_NOERROR; case MIDM_STOP: - printf("MIDM_PAUSE"); + DPRINT("MIDM_PAUSE"); return MMSYSERR_NOERROR; case MIDM_START: - printf("MIDM_RESTART"); + DPRINT("MIDM_RESTART"); return MMSYSERR_NOERROR; case MIDM_RESET: - printf("MIDM_RESET"); + DPRINT("MIDM_RESET"); return MMSYSERR_NOERROR; default: @@ -221,27 +223,27 @@ APIENTRY DWORD modMessage(DWORD ID, DWORD Message, DWORD User, DWORD Param1, DWORD Param2) { - printf("modMessage\n"); + DPRINT("modMessage\n"); switch(Message) { case MODM_GETNUMDEVS: - printf("MODM_GETNUMDEVS == %d\n", (int)GetDeviceCount(MidiOutDevice)); + DPRINT("MODM_GETNUMDEVS == %d\n", (int)GetDeviceCount(MidiOutDevice)); return GetDeviceCount(MidiOutDevice); case MODM_GETDEVCAPS: - printf("MODM_GETDEVCAPS"); + DPRINT("MODM_GETDEVCAPS"); return MMSYSERR_NOTSUPPORTED; case MODM_OPEN : return OpenMidiDevice(MidiOutDevice, ID, User, Param1, Param2); case MODM_CLOSE: - printf("MODM_CLOSE"); + DPRINT("MODM_CLOSE"); return MMSYSERR_NOTSUPPORTED; case MODM_DATA: - printf("MODM_DATA"); + DPRINT("MODM_DATA"); int i; BYTE b[4]; @@ -253,27 +255,27 @@ (PMIDIALLOC)User); case MODM_LONGDATA: - printf("MODM_LONGDATA"); + DPRINT("MODM_LONGDATA"); return MMSYSERR_NOTSUPPORTED; case MODM_RESET: - printf("MODM_RESET"); + DPRINT("MODM_RESET"); return MMSYSERR_NOTSUPPORTED; case MODM_SETVOLUME: - printf("MODM_SETVOLUME"); + DPRINT("MODM_SETVOLUME"); return MMSYSERR_NOTSUPPORTED; case MODM_GETVOLUME: - printf("MODM_GETVOLUME"); + DPRINT("MODM_GETVOLUME"); return MMSYSERR_NOTSUPPORTED; case MODM_CACHEPATCHES: - printf("MODM_CACHEPATCHES"); + DPRINT("MODM_CACHEPATCHES"); return MMSYSERR_NOTSUPPORTED; case MODM_CACHEDRUMPATCHES: - printf("MODM_CACHEDRUMPATCHES"); + DPRINT("MODM_CACHEDRUMPATCHES"); return MMSYSERR_NOTSUPPORTED; }; _____ Modified: trunk/reactos/lib/mmdrv/mmdrv.h --- trunk/reactos/lib/mmdrv/mmdrv.h 2005-02-05 08:44:49 UTC (rev 13418) +++ trunk/reactos/lib/mmdrv/mmdrv.h 2005-02-05 10:17:33 UTC (rev 13419) @@ -31,6 +31,8 @@ #include "mmdef.h" +ULONG DbgPrint(PCH Format, ...); + /* #define SOUND_MAX_DEVICE_NAME 1024 // GUESSWORK #define SOUND_MAX_DEVICES 256 // GUESSWORK _____ Modified: trunk/reactos/lib/mmdrv/utils.c --- trunk/reactos/lib/mmdrv/utils.c 2005-02-05 08:44:49 UTC (rev 13418) +++ trunk/reactos/lib/mmdrv/utils.c 2005-02-05 10:17:33 UTC (rev 13419) @@ -11,6 +11,8 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> typedef struct _DEVICE_LIST { @@ -59,7 +61,7 @@ MMRESULT OpenDevice(UINT DeviceType, DWORD ID, PHANDLE pDeviceHandle, DWORD Access) { - printf("OpenDevice()\n"); + DPRINT("OpenDevice()\n"); WCHAR DeviceName[SOUND_MAX_DEVICE_NAME]; *pDeviceHandle = INVALID_HANDLE_VALUE; @@ -84,13 +86,13 @@ wsprintf(DeviceName, L"\\\\.%ls%d", AUX_DEVICE_NAME_U + strlen("\\Device"), ID); }; - printf("Attempting to open %S\n", DeviceName); + DPRINT("Attempting to open %S\n", DeviceName); *pDeviceHandle = CreateFile(DeviceName, Access, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, Access != GENERIC_READ ? FILE_FLAG_OVERLAPPED : 0, NULL); - printf("DeviceHandle == 0x%x\n", (int)*pDeviceHandle); + DPRINT("DeviceHandle == 0x%x\n", (int)*pDeviceHandle); if (pDeviceHandle == INVALID_HANDLE_VALUE) return TranslateStatus(); @@ -107,7 +109,7 @@ { PDEVICE_LIST pNewDevice; - printf("AddDeviceToList()\n"); + DPRINT("AddDeviceToList()\n"); pNewDevice = (PDEVICE_LIST) HeapAlloc(Heap, 0, sizeof(DEVICE_LIST) + lstrlen(Name) * sizeof(WCHAR)); @@ -125,7 +127,7 @@ pNewDevice->Next = *pList; *pList = pNewDevice; - printf("Success!\n"); + DPRINT("Success!\n"); return TRUE; } @@ -135,7 +137,7 @@ { PDEVICE_LIST pDevice; - printf("FreeDeviceList()\n"); + DPRINT("FreeDeviceList()\n"); while (DeviceList) { @@ -155,7 +157,7 @@ // DWORD Index; // HKEY DriverKey; - printf("Finding devices\n"); + DPRINT("Finding devices\n"); // DriverKey = OpenParametersKey(); // see drvutil.c of MS DDK for how this SHOULD be done... _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-02-05 08:44:49 UTC (rev 13418) +++ trunk/reactos/lib/mmdrv/wave.c 2005-02-05 10:17:33 UTC (rev 13419) @@ -14,6 +14,9 @@ #include "mmdrv.h" #include "wave.h" +#define NDEBUG +#include <debug.h> + /* ============================ * INTERNAL * functions start here @@ -144,23 +147,23 @@ { switch (dwMessage) { case WODM_GETNUMDEVS: - printf("WODM_GETNUMDEVS"); + DPRINT("WODM_GETNUMDEVS"); return GetDeviceCount(WaveOutDevice); case WODM_GETDEVCAPS: - printf("WODM_GETDEVCAPS"); + DPRINT("WODM_GETDEVCAPS"); return GetDeviceCapabilities(dwId, WaveOutDevice, (LPBYTE)dwParam1, (DWORD)dwParam2); case WODM_OPEN: - printf("WODM_OPEN"); + DPRINT("WODM_OPEN"); return OpenWaveDevice(WaveOutDevice, dwId, dwUser, dwParam1, dwParam2); case WODM_CLOSE: { MMRESULT Result; PWAVEALLOC pTask = (PWAVEALLOC)dwUser; - printf("WODM_CLOSE"); + DPRINT("WODM_CLOSE"); // 1. Check if the task is ready to complete Result = ThreadCallWaveDevice(WaveThreadClose, pTask); @@ -186,7 +189,7 @@ { LPWAVEHDR pWaveHdr = (LPWAVEHDR)dwParam1; - printf("WODM_WRITE"); + DPRINT("WODM_WRITE"); if (dwParam1 != 0) return MMSYSERR_INVALPARAM; @@ -215,37 +218,37 @@ case WODM_PAUSE: - printf("WODM_PAUSE"); + DPRINT("WODM_PAUSE"); ((PWAVEALLOC)dwUser)->AuxParam.State = WAVE_DD_STOP; return ThreadCallWaveDevice(WaveThreadSetState, (PWAVEALLOC)dwUser); case WODM_RESTART: - printf("WODM_RESTART"); + DPRINT("WODM_RESTART"); ((PWAVEALLOC)dwUser)->AuxParam.State = WAVE_DD_PLAY; return ThreadCallWaveDevice(WaveThreadSetState, (PWAVEALLOC)dwUser); case WODM_RESET: - printf("WODM_RESET"); + DPRINT("WODM_RESET"); ((PWAVEALLOC)dwUser)->AuxParam.State = WAVE_DD_RESET; return ThreadCallWaveDevice(WaveThreadSetState, (PWAVEALLOC)dwUser); case WODM_BREAKLOOP: - printf("WODM_BREAKLOOP"); + DPRINT("WODM_BREAKLOOP"); return ThreadCallWaveDevice(WaveThreadBreakLoop, (PWAVEALLOC)dwUser); case WODM_GETPOS: - printf("WODM_GETPOS"); + DPRINT("WODM_GETPOS"); return GetPositionWaveDevice(((PWAVEALLOC)dwUser), (LPMMTIME)dwParam1, dwParam2); case WODM_SETPITCH: - printf("WODM_SETPITCH"); + DPRINT("WODM_SETPITCH"); ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.pData = (PBYTE)&dwParam1; ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.DataLen = sizeof(DWORD); ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.Function = IOCTL_WAVE_SET_PITCH; return ThreadCallWaveDevice(WaveThreadSetData, ((PWAVEALLOC)dwUser)); case WODM_SETVOLUME: - printf("WODM_SETVOLUME"); + DPRINT("WODM_SETVOLUME"); { WAVE_DD_VOLUME Vol; Vol.Left = LOWORD(dwParam1) << 16; @@ -256,21 +259,21 @@ } case WODM_SETPLAYBACKRATE: - printf("WODM_SETPLAYBACKRATE"); + DPRINT("WODM_SETPLAYBACKRATE"); ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.pData = (PBYTE)&dwParam1; ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.DataLen = sizeof(DWORD); ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.Function = IOCTL_WAVE_SET_PLAYBACK_RATE; return ThreadCallWaveDevice(WaveThreadSetData, (PWAVEALLOC)dwUser); case WODM_GETPITCH: - printf("WODM_GETPITCH"); + DPRINT("WODM_GETPITCH"); ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.pData = (PBYTE)dwParam1; ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.DataLen = sizeof(DWORD); ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.Function = IOCTL_WAVE_GET_PITCH; return ThreadCallWaveDevice(WaveThreadGetData, (PWAVEALLOC)dwUser); case WODM_GETVOLUME: - printf("WODM_GETVOLUME"); + DPRINT("WODM_GETVOLUME"); { WAVE_DD_VOLUME Vol; DWORD res; @@ -285,7 +288,7 @@ } case WODM_GETPLAYBACKRATE: - printf("WODM_GETPLAYBACKRATE"); + DPRINT("WODM_GETPLAYBACKRATE"); ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.pData = (PBYTE)dwParam1; ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.DataLen = sizeof(DWORD); ((PWAVEALLOC)dwUser)->AuxParam.GetSetData.Function = IOCTL_WAVE_GET_PLAYBACK_RATE; @@ -305,7 +308,7 @@ */ APIENTRY DWORD widMessage(DWORD dwId, DWORD dwMessage, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) { - printf("widMessage\n"); + DPRINT("widMessage\n"); switch (dwMessage) { case WIDM_GETNUMDEVS:

19 years, 10 months

[navaraf] 13418: Dynamically reallocate the buffer for PnP event if it's too small.

by navaraf＠svn.reactos.com

Dynamically reallocate the buffer for PnP event if it's too small. Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-02-05 08:43:52 UTC (rev 13417) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-02-05 08:44:49 UTC (rev 13418) @@ -65,10 +65,12 @@ PnpEventThread(LPVOID lpParameter) { PPLUGPLAY_EVENT_BLOCK PnpEvent; + ULONG PnpEventSize; NTSTATUS Status; RPC_STATUS RpcStatus; - PnpEvent = HeapAlloc(GetProcessHeap(), 0, 1024); + PnpEventSize = 0x1000; + PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); if (PnpEvent == NULL) return ERROR_OUTOFMEMORY; @@ -76,10 +78,17 @@ { DPRINT("Calling NtGetPlugPlayEvent()\n"); - ZeroMemory(PnpEvent, 1024); - /* Wait for the next pnp event */ Status = NtGetPlugPlayEvent(0, 0, PnpEvent, 1024); + /* Resize the buffer for the PnP event if it's too small. */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + PnpEventSize += 0x400; + PnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize); + if (PnpEvent == NULL) + return ERROR_OUTOFMEMORY; + continue; + } if (!NT_SUCCESS(Status)) { DPRINT("NtPlugPlayEvent() failed (Status %lx)\n", Status); @@ -87,7 +96,7 @@ } DPRINT("Received PnP Event\n"); - if (UuidEqual((UUID*)&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) + if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); } @@ -98,7 +107,6 @@ /* FIXME: Process the pnp event */ - /* Dequeue the current pnp event and signal the next one */ NtPlugPlayControl(PLUGPLAY_USER_RESPONSE, NULL, 0); }

19 years, 10 months

[navaraf] 13417: Use CONTAINING_RECORD macro instead of type cast, fix the copyright header.

by navaraf＠svn.reactos.com

Use CONTAINING_RECORD macro instead of type cast, fix the copyright header. Modified: trunk/reactos/ntoskrnl/io/plugplay.c _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-02-05 05:40:35 UTC (rev 13416) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-02-05 08:43:52 UTC (rev 13417) @@ -5,7 +5,7 @@ * FILE: ntoskrnl/io/plugplay.c * PURPOSE: Plug-and-play interface routines * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Eric Kohl <eric.kohl(a)t-online.de> */ /* INCLUDES *****************************************************************/ @@ -146,7 +146,9 @@ } /* Get entry from the tail of the queue */ - Entry = (PPNP_EVENT_ENTRY)IopPnpEventQueueHead.Blink; + Entry = CONTAINING_RECORD(IopPnpEventQueueHead.Blink, + PNP_EVENT_ENTRY, + ListEntry); /* Check the buffer size */ if (BufferLength < Entry->Event.TotalSize)

19 years, 10 months

[arty] 13416: Read: Change AFD_EVENT_CLOSE to AFD_EVENT_DISCONNECT when the other end

by arty＠svn.reactos.com

Read: Change AFD_EVENT_CLOSE to AFD_EVENT_DISCONNECT when the other end hangs up. The socket isn't closed yet. Listen: Turn off fired flag for AFD_EVENT_ACCEPT. Modified: trunk/reactos/drivers/net/afd/afd/listen.c Modified: trunk/reactos/drivers/net/afd/afd/read.c _____ Modified: trunk/reactos/drivers/net/afd/afd/listen.c --- trunk/reactos/drivers/net/afd/afd/listen.c 2005-02-05 04:56:04 UTC (rev 13415) +++ trunk/reactos/drivers/net/afd/afd/listen.c 2005-02-05 05:40:35 UTC (rev 13416) @@ -242,6 +242,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + FCB->EventsFired &= ~AFD_EVENT_ACCEPT; + if( FCB->NeedsNewListen ) { AFD_DbgPrint(MID_TRACE,("ADDRESSFILE: %x\n", FCB->AddressFile.Handle)); _____ Modified: trunk/reactos/drivers/net/afd/afd/read.c --- trunk/reactos/drivers/net/afd/afd/read.c 2005-02-05 04:56:04 UTC (rev 13415) +++ trunk/reactos/drivers/net/afd/afd/read.c 2005-02-05 05:40:35 UTC (rev 13416) @@ -131,7 +131,7 @@ } /* Handle closing signal */ - FCB->PollState |= AFD_EVENT_CLOSE; + FCB->PollState |= AFD_EVENT_DISCONNECT; PollReeval( FCB->DeviceExt, FCB->FileObject ); }

19 years, 10 months

← Newer
1
...
34
35
36
37
38
39
40
41
42
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 February 2005