Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[sginsberg] 42475: Move variable initialization to top of scope. Welcome to MSVC, eventlog. It is safer here.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Aug 7 21:19:46 2009 New Revision: 42475 URL: http://svn.reactos.org/svn/reactos?rev=42475&view=rev Log: Move variable initialization to top of scope. Welcome to MSVC, eventlog. It is safer here. Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Fri Aug 7 21:19:46 2009 @@ -369,6 +369,7 @@ DWORD dwStringsSize = 0; DWORD dwError = ERROR_SUCCESS; WCHAR *lpStrings; + int pos = 0; lpEventSource = ElfGetEventLogSourceEntryByHandle(LogHandle); if (!lpEventSource) @@ -418,7 +419,6 @@ return STATUS_NO_MEMORY; } - int pos = 0; for (i = 0; i < NumStrings; i++) { wcscpy((WCHAR*)(lpStrings + pos), Strings[i]->Buffer);

15 years, 4 months

[sginsberg] 42474: - Remove HalDisplayString from the DDK as it doesn't belong there and is already in the NDK. - Move KeFlushQueuedDpcs from NDK to DDK as this is where it belongs -- it is a documented routine.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Aug 7 21:16:01 2009 New Revision: 42474 URL: http://svn.reactos.org/svn/reactos?rev=42474&view=rev Log: - Remove HalDisplayString from the DDK as it doesn't belong there and is already in the NDK. - Move KeFlushQueuedDpcs from NDK to DDK as this is where it belongs -- it is a documented routine. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Aug 7 21:16:01 2009 @@ -3956,13 +3956,6 @@ IN OUT POPLOCK Oplock ); -NTHALAPI -VOID -NTAPI -HalDisplayString ( - IN PCHAR String -); - NTKERNELAPI UCHAR NTAPI Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Aug 7 21:16:01 2009 @@ -8304,6 +8304,13 @@ #define ExAcquireSpinLockAtDpcLevel(Lock) KeAcquireSpinLockAtDpcLevel(Lock) #define ExReleaseSpinLockFromDpcLevel(Lock) KeReleaseSpinLockFromDpcLevel(Lock) +NTKERNELAPI +VOID +NTAPI +KeFlushQueuedDpcs( + VOID +); + NTHALAPI VOID NTAPI Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Fri Aug 7 21:16:01 2009 @@ -195,12 +195,6 @@ VOID ); -VOID -NTAPI -KeFlushQueuedDpcs( - VOID -); - BOOLEAN NTAPI KiIpiServiceRoutine(

15 years, 4 months

[mjmartin] 42473: - Calling NtLoadDriver on an already loaded driver should fail with STATUS_IMAGE_ALREADY_LOADED. Fixes one test for kmtest driver tests and a bugcheck when loading the driver a second time.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Aug 7 20:27:31 2009 New Revision: 42473 URL: http://svn.reactos.org/svn/reactos?rev=42473&view=rev Log: - Calling NtLoadDriver on an already loaded driver should fail with STATUS_IMAGE_ALREADY_LOADED. Fixes one test for kmtest driver tests and a bugcheck when loading the driver a second time. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Aug 7 20:27:31 2009 @@ -1776,6 +1776,16 @@ /* Store its DriverSection, so that it could be unloaded */ DriverObject->DriverSection = ModuleObject; } + else + { + DPRINT("DriverObject already exist in ObjectManager\n"); + /* IopGetDriverObject references the DriverObject, so dereference it. */ + ObDereferenceObject(DriverObject); + IopFreeDeviceNode(DeviceNode); + LoadParams->Status = STATUS_IMAGE_ALREADY_LOADED; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } IopInitializeDevice(DeviceNode, DriverObject); LoadParams->Status = IopStartDevice(DeviceNode);

15 years, 4 months

[hyperion] 42472: modified include/psdk/windows.h modified include/psdk/winnt.h Visual C++ needs love, too. Extend conditional w32api code for Watcom C to Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 19:07:10 2009 New Revision: 42472 URL: http://svn.reactos.org/svn/reactos?rev=42472&view=rev Log: modified include/psdk/windows.h modified include/psdk/winnt.h Visual C++ needs love, too. Extend conditional w32api code for Watcom C to Visual C++ Modified: trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Fri Aug 7 19:07:10 2009 @@ -101,7 +101,7 @@ #endif #ifndef NOGDI #if !defined (__OBJC__) -#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) +#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) || defined(_MSC_VER) #include <ole2.h> #endif #endif /* __OBJC__ */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Aug 7 19:07:10 2009 @@ -197,7 +197,7 @@ #endif #undef __int64 #define __int64 long long -#elif defined(__WATCOMC__) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 ) +#elif (defined(__WATCOMC__) || defined(_MSC_VER)) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 ) #define _HAVE_INT64 #endif /* __GNUC__/__WATCOMC */ #if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64) @@ -2841,7 +2841,7 @@ #ifndef PAGE_SIZE #define PAGE_SIZE 0x1000 // FIXME: This should probably go elsewhere #endif - + /* The following flags control the contents of the CONTEXT structure. */ #define CONTEXT_ARM 0x0000040

15 years, 4 months

[sginsberg] 42471: - Properly stub atan2/exp/fmod/ldexp for MSVC -- #error out on them instead of calling nonexisting functions to fail at link time (wtf?).

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Aug 7 18:40:11 2009 New Revision: 42471 URL: http://svn.reactos.org/svn/reactos?rev=42471&view=rev Log: - Properly stub atan2/exp/fmod/ldexp for MSVC -- #error out on them instead of calling nonexisting functions to fail at link time (wtf?). Modified: trunk/reactos/lib/sdk/crt/math/i386/atan2.c trunk/reactos/lib/sdk/crt/math/i386/exp.c trunk/reactos/lib/sdk/crt/math/i386/fmod.c trunk/reactos/lib/sdk/crt/math/i386/ldexp.c Modified: trunk/reactos/lib/sdk/crt/math/i386/atan2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/atan2.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/atan2.c [iso-8859-1] Fri Aug 7 18:40:11 2009 @@ -15,7 +15,7 @@ "fld %%st(0)" : "=t" (__val) : "0" (__x), "u" (__y)); #else - __val = linkme_atan2(__x, __y); +#error IMPLEMENT ME #endif /*__GNUC__*/ return __val; } Modified: trunk/reactos/lib/sdk/crt/math/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/exp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/exp.c [iso-8859-1] Fri Aug 7 18:40:11 2009 @@ -42,6 +42,6 @@ return __value; #else - return linkme_exp(__x); +#error IMPLEMENT ME #endif /*__GNUC__*/ } Modified: trunk/reactos/lib/sdk/crt/math/i386/fmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/fmod… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/fmod.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/fmod.c [iso-8859-1] Fri Aug 7 18:40:11 2009 @@ -33,7 +33,7 @@ "jp 1b" : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); #else - __val = linkme_fmod(__x, __y); +#error IMPLEMENT ME #endif /*__GNUC__*/ return __val; } Modified: trunk/reactos/lib/sdk/crt/math/i386/ldexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ldex… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] Fri Aug 7 18:40:11 2009 @@ -30,7 +30,7 @@ ("fscale" : "=t" (__val) : "0" (__x), "u" ((double) __y)); #else - __val = linkme_ldexp(__x, __y); +#error IMPLEMENT ME #endif /*__GNUC__*/ return __val; }

15 years, 4 months

[hyperion] 42470: Use include path for typeof.h that only depends on global include paths (typeof.h -> wine/typeof.h)

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 17:35:41 2009 New Revision: 42470 URL: http://svn.reactos.org/svn/reactos?rev=42470&view=rev Log: Use include path for typeof.h that only depends on global include paths (typeof.h -> wine/typeof.h) Modified: trunk/reactos/ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Fri Aug 7 17:35:41 2009 @@ -99,7 +99,7 @@ <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> - <compilerflag>/FItypeof.h</compilerflag> + <compilerflag>/FIwine/typeof.h</compilerflag> </group> <group compilerset="gcc">

15 years, 4 months

[hyperion] 42469: added include/reactos/wine/typeof.h Simulate typeof operator for the Wine code that requires it modified ReactOS-generic.rbuild Force-include typeof.h when compiling with Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 17:25:03 2009 New Revision: 42469 URL: http://svn.reactos.org/svn/reactos?rev=42469&view=rev Log: added include/reactos/wine/typeof.h Simulate typeof operator for the Wine code that requires it modified ReactOS-generic.rbuild Force-include typeof.h when compiling with Visual C++ Added: trunk/reactos/include/reactos/wine/typeof.h (with props) Modified: trunk/reactos/ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Fri Aug 7 17:25:03 2009 @@ -99,6 +99,7 @@ <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> + <compilerflag>/FItypeof.h</compilerflag> </group> <group compilerset="gcc"> Added: trunk/reactos/include/reactos/wine/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/typeo… ============================================================================== --- trunk/reactos/include/reactos/wine/typeof.h (added) +++ trunk/reactos/include/reactos/wine/typeof.h [iso-8859-1] Fri Aug 7 17:25:03 2009 @@ -1,0 +1,56 @@ +#define typeof(X_) __typeof_ ## X_ + +#ifdef _WIN64 +#define __typeof_intptr long long +#define __typeof_longptr long long +#else +#define __typeof_intptr int +#define __typeof_longptr long +#endif + +#ifdef __cplusplus +#define __typeof_size size_t +#define __typeof_wchar wchar_t +#else +#define __typeof_size __typeof_intptr +#define __typeof_wchar unsigned short +#endif + +typedef struct IWineD3D * (__stdcall typeof(WineDirect3DCreate))(unsigned int, struct IUnknown *); +typedef struct IWineD3DClipper * (__stdcall typeof(WineDirect3DCreateClipper))(struct IUnknown *); +typedef int (__stdcall typeof(ImeInquire))(struct _tagIMEINFO *, __typeof_wchar *, const __typeof_wchar *); +typedef int (__stdcall typeof(ImeConfigure))(void *, void *, unsigned int, void *); +typedef int (__stdcall typeof(ImeDestroy))(unsigned int); +typedef __typeof_longptr (__stdcall typeof(ImeEscape))(void *, unsigned int, void *); +typedef int (__stdcall typeof(ImeSelect))(void *, int); +typedef int (__stdcall typeof(ImeSetActiveContext))(void *, int); +typedef unsigned int (__stdcall typeof(ImeToAsciiEx))(unsigned int, unsigned int, unsigned char *, unsigned int *, unsigned int, void *); +typedef int (__stdcall typeof(NotifyIME))(void *, unsigned int, unsigned int, unsigned int); +typedef int (__stdcall typeof(ImeRegisterWord))(const __typeof_wchar *, unsigned int, const __typeof_wchar *); +typedef int (__stdcall typeof(ImeUnregisterWord))(const __typeof_wchar *, unsigned int, const __typeof_wchar *); +typedef unsigned int (__stdcall typeof(ImeGetRegisterWordStyle))(unsigned int, struct tagSTYLEBUFW *); +typedef unsigned int (__stdcall typeof(ImeEnumRegisterWord))(int (__stdcall *)(const __typeof_wchar *, unsigned int, const __typeof_wchar *, void *), const __typeof_wchar *, unsigned int, const __typeof_wchar *, void *); +typedef int (__stdcall typeof(ImeSetCompositionString))(void *, unsigned int, const void *, unsigned int, const void *, unsigned int); +typedef unsigned int (__stdcall typeof(ImeConversionList))(void *, const __typeof_wchar *, struct tagCANDIDATELIST *, unsigned int, unsigned int); +typedef int (__stdcall typeof(ImeProcessKey))(void *, unsigned int, __typeof_longptr, unsigned char *); +typedef unsigned int (__stdcall typeof(ImeGetRegisterWordStyle))(unsigned int, struct tagSTYLEBUFW *); +typedef unsigned int (__stdcall typeof(ImeGetImeMenuItems))(void *, unsigned int, unsigned int, struct tagIMEMENUITEMINFOW *, struct tagIMEMENUITEMINFOW *, unsigned int); +typedef struct _xmlDoc * (__cdecl typeof(xsltApplyStylesheet))(struct _xsltStylesheet *, struct _xmlDoc *, const char **); +typedef void (__cdecl typeof(xsltCleanupGlobals))(void); +typedef void (__cdecl typeof(xsltFreeStylesheet))(struct _xsltStylesheet *); +typedef struct _xsltStylesheet * (__cdecl typeof(xsltParseStylesheetDoc))(struct _xmlDoc *); +typedef struct jpeg_error_mgr * (__cdecl typeof(jpeg_std_error))(struct jpeg_error_mgr *); +typedef void (__cdecl typeof(jpeg_CreateDecompress))(struct jpeg_decompress_struct *, int, __typeof_size); +typedef int (__cdecl typeof(jpeg_read_header))(struct jpeg_decompress_struct *, int); +typedef int (__cdecl typeof(jpeg_start_decompress))(struct jpeg_decompress_struct *); +typedef unsigned int (__cdecl typeof(jpeg_read_scanlines))(struct jpeg_decompress_struct *, unsigned char **, unsigned int); +typedef int (__cdecl typeof(jpeg_finish_decompress))(struct jpeg_decompress_struct *); +typedef void (__cdecl typeof(jpeg_destroy_decompress))(struct jpeg_decompress_struct *); + +#undef __typeof_intptr +#undef __typeof_longptr +#undef __typeof_wchar +#undef __typeof_size + +/* EOF */ + Propchange: trunk/reactos/include/reactos/wine/typeof.h ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 4 months

[cgutman] 42468: - We associate the MDL with the IRP later (in TdiBuildSend, TdiBuildReceive, etc)

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 7 17:22:24 2009 New Revision: 42468 URL: http://svn.reactos.org/svn/reactos?rev=42468&view=rev Log: - We associate the MDL with the IRP later (in TdiBuildSend, TdiBuildReceive, etc) Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 7 17:22:24 2009 @@ -830,7 +830,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Use IRP */ + NULL); /* Don't use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoCompleteRequest(*Irp, IO_NO_INCREMENT); @@ -911,7 +911,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Use IRP */ + NULL); /* Don't use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoCompleteRequest(*Irp, IO_NO_INCREMENT); @@ -1011,7 +1011,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Use IRP */ + NULL); /* Don't use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoCompleteRequest(*Irp, IO_NO_INCREMENT); @@ -1109,7 +1109,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Use IRP */ + NULL); /* Don't use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));

15 years, 4 months

[cgutman] 42467: - Call IoCompleteRequest to free IRPs created by IoBuildDeviceIoControlRequest - Fixes bug 4770

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 7 17:00:42 2009 New Revision: 42467 URL: http://svn.reactos.org/svn/reactos?rev=42467&view=rev Log: - Call IoCompleteRequest to free IRPs created by IoBuildDeviceIoControlRequest - Fixes bug 4770 Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 7 17:00:42 2009 @@ -833,7 +833,7 @@ *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -843,7 +843,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; @@ -914,7 +914,7 @@ *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -926,7 +926,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; @@ -1014,7 +1014,7 @@ *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -1024,7 +1024,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; @@ -1113,7 +1113,7 @@ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -1123,7 +1123,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END;

15 years, 4 months

[cwittich] 42466: include windef.h to get the definitions for BYTE and DWORD req. by bdatypes.h

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Aug 7 16:09:36 2009 New Revision: 42466 URL: http://svn.reactos.org/svn/reactos?rev=42466&view=rev Log: include windef.h to get the definitions for BYTE and DWORD req. by bdatypes.h Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Fri Aug 7 16:09:36 2009 @@ -1,11 +1,7 @@ #include <ntddk.h> +#include <windef.h> #include <ks.h> - -/* FIXME */ -typedef unsigned long DWORD; -typedef UCHAR BYTE; - #include <bdatypes.h> #include <bdamedia.h> #include <bdasup.h>

15 years, 4 months

← Newer
1
...
48
49
50
51
52
53
54
...
66
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 August 2009