Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[tkreuzer] 56471: [CMD] - Add a newline to the output of the echo command - Remove debug stuff

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 1 21:00:16 2012 New Revision: 56471 URL: http://svn.reactos.org/svn/reactos?rev=56471&view=rev Log: [CMD] - Add a newline to the output of the echo command - Remove debug stuff Modified: trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/echo.c trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Tue May 1 21:00:16 2012 @@ -582,7 +582,6 @@ /* If no destination was entered then just use the current directory as the destination */ GetCurrentDirectory(MAX_PATH, szDestPath); - printf("szDestPath = %S\n", szDestPath); } else { @@ -647,7 +646,6 @@ { /* Something's seriously wrong! */ UseThisName = szDestPath; - printf("\n##########\n\n"); } do @@ -677,7 +675,6 @@ _tcsncat(szSrcPath, appendPointer, 1); appendPointer++; } -printf("szSrcPath = %S\n\n", szSrcPath); if (_tcschr(arg[nSrc], _T(',')) != NULL) { Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] Tue May 1 21:00:16 2012 @@ -83,6 +83,7 @@ { /* skip the first character */ ConOutPuts(param + 1); + ConOutPuts("\n"); } return 0; } Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Tue May 1 21:00:16 2012 @@ -128,7 +128,7 @@ } } - ConOutPrintf(_T("\n")); + ConOutPuts(_T("\n")); CloseHandle(hFile); }

12 years, 7 months

[tfaber] 56470: [WINE] - Import isinf and isnan implementations from libwine_port and adjust port.h and config.h to support them - Remove isinf/isnan hacks from jscript and wined3d build files - Ad...

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 1 17:20:47 2012 New Revision: 56470 URL: http://svn.reactos.org/svn/reactos?rev=56470&view=rev Log: [WINE] - Import isinf and isnan implementations from libwine_port and adjust port.h and config.h to support them - Remove isinf/isnan hacks from jscript and wined3d build files - Add missing port.h include to jscript/array.c (sent and applied upstream) See issue #7027 for more details. Added: trunk/reactos/lib/3rdparty/libwine/isinf.c (with props) trunk/reactos/lib/3rdparty/libwine/isnan.c (with props) Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/win32/jscript/CMakeLists.txt trunk/reactos/dll/win32/jscript/array.c trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/port.h trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Tue May 1 17:20:47 2012 @@ -5,11 +5,6 @@ -DUSE_WIN32_OPENGL) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - -if(MSVC) - add_definitions(-Disnan=_isnan) - add_definitions(-Disinf=!_finite) -endif() spec2def(wined3d.dll wined3d.spec ADD_IMPORTLIB) Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Tue May 1 17:20:47 2012 @@ -6,9 +6,7 @@ add_definitions( -D__WINESRC__ - -D_USE_MATH_DEFINES - -Disinf=!_finite - -Disnan=_isnan) + -D_USE_MATH_DEFINES) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -18,29 +16,28 @@ list(APPEND SOURCE activex.c + array.c + bool.c date.c dispex.c engine.c error.c + function.c + global.c jscript.c jscript_main.c jsutils.c lex.c - parser.tab.c math.c number.c object.c + parser.tab.c regexp.c string.c - array.c - bool.c - function.c - global.c + rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/jscript.def) -add_library(jscript SHARED - ${SOURCE} - rsrc.rc) +add_library(jscript SHARED ${SOURCE}) set_module_type(jscript win32dll) @@ -63,10 +60,4 @@ add_dependencies(jscript stdole2) add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(jscript) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb) Modified: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?… ============================================================================== --- trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] Tue May 1 17:20:47 2012 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/config.h" +#include "wine/port.h" + #include <math.h> #include "jscript.h" Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Tue May 1 17:20:47 2012 @@ -299,10 +299,10 @@ #define HAVE_IO_H 1 /* Define to 1 if you have the `isinf' function. */ -#define HAVE_ISINF 1 +/* #undef HAVE_ISINF */ /* Define to 1 if you have the `isnan' function. */ -#define HAVE_ISNAN 1 +/* #undef HAVE_ISNAN */ /* Define to 1 if you have the <jack/jack.h> header file. */ /* #undef HAVE_JACK_JACK_H */ @@ -1139,6 +1139,12 @@ /* Define to 1 if you have the <zlib.h> header file. */ /* #define HAVE_ZLIB_H 1 */ + +/* Define to 1 if you have the `_finite' function. */ +#define HAVE__FINITE 1 + +/* Define to 1 if you have the `_isnan' function. */ +#define HAVE__ISNAN 1 /* Define to 1 if you have the `_pclose' function. */ #define HAVE__PCLOSE 1 Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/port.h [iso-8859-1] Tue May 1 17:20:47 2012 @@ -226,6 +226,14 @@ size_t getpagesize(void); #endif /* HAVE_GETPAGESIZE */ +#if !defined(HAVE_ISINF) && !defined(_ISINF) && !defined(isinf) +int isinf(double x); +#endif + +#if !defined(HAVE_ISNAN) && !defined(_ISNAN) && !defined(isnan) +int isnan(double x); +#endif + #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ Modified: trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] Tue May 1 17:20:47 2012 @@ -5,6 +5,8 @@ list(APPEND SOURCE config.c debug_ros.c + isinf.c + isnan.c loader.c wctype.c register.c Added: trunk/reactos/lib/3rdparty/libwine/isinf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/isinf… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/isinf.c (added) +++ trunk/reactos/lib/3rdparty/libwine/isinf.c [iso-8859-1] Tue May 1 17:20:47 2012 @@ -1,0 +1,46 @@ +/* + * isinf function + * + * Copyright 2008 Petr Sumbera + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#if !defined(HAVE_ISINF) && !defined(_ISINF) && !defined(isinf) + +#ifdef HAVE_IEEEFP_H +#include <ieeefp.h> + +int isinf(double x) +{ + return (!(finite(x) || isnand(x))); +} + +#elif defined(HAVE_FLOAT_H) && defined(HAVE__ISNAN) && defined(HAVE__FINITE) +#include <float.h> + +int isinf(double x) +{ + return (!(_finite(x) || _isnan(x))); +} + +#else +#error No isinf() implementation available. +#endif + +#endif /* !defined(HAVE_ISINF) && !defined(_ISINF) && !defined(isinf) */ Propchange: trunk/reactos/lib/3rdparty/libwine/isinf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/3rdparty/libwine/isnan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/isnan… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/isnan.c (added) +++ trunk/reactos/lib/3rdparty/libwine/isnan.c [iso-8859-1] Tue May 1 17:20:47 2012 @@ -1,0 +1,46 @@ +/* + * isnan function + * + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#if !defined(HAVE_ISNAN) && !defined(_ISNAN) && !defined(isnan) + +#ifdef HAVE_IEEEFP_H +#include <ieeefp.h> + +int isnan(double x) +{ + return isnand(x); +} + +#elif defined(HAVE_FLOAT_H) && defined(HAVE__ISNAN) +#include <float.h> + +int isnan(double x) +{ + return _isnan(x); +} + +#else +#error No isnan() implementation available. +#endif + +#endif /* !defined(HAVE_ISNAN) && !defined(_ISNAN) && !defined(isnan) */ Propchange: trunk/reactos/lib/3rdparty/libwine/isnan.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 7 months

[tfaber] 56469: [FBTUSB] - Shut up warnings - Fix whitespace issues

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 1 16:53:02 2012 New Revision: 56469 URL: http://svn.reactos.org/svn/reactos?rev=56469&view=rev Log: [FBTUSB] - Shut up warnings - Fix whitespace issues Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.c Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c [iso-8859-1] Tue May 1 16:53:02 2012 @@ -22,13 +22,13 @@ // Dispatch routine for CreateHandle NTSTATUS FreeBT_DispatchCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - ULONG i; + //ULONG i; NTSTATUS ntStatus; PFILE_OBJECT fileObject; PDEVICE_EXTENSION deviceExtension; PIO_STACK_LOCATION irpStack; - PFREEBT_PIPE_CONTEXT pipeContext; - PUSBD_INTERFACE_INFORMATION interface; + //PFREEBT_PIPE_CONTEXT pipeContext; + PUSBD_INTERFACE_INFORMATION interface; PAGED_CODE(); @@ -71,12 +71,12 @@ } - if (deviceExtension->OpenHandleCount>0) - { - ntStatus = STATUS_ACCESS_VIOLATION; - goto FreeBT_DispatchCreate_Exit; - - } + if (deviceExtension->OpenHandleCount>0) + { + ntStatus = STATUS_ACCESS_VIOLATION; + goto FreeBT_DispatchCreate_Exit; + + } // opening a device as opposed to pipe. ntStatus = STATUS_SUCCESS; @@ -105,15 +105,15 @@ PFILE_OBJECT fileObject; PDEVICE_EXTENSION deviceExtension; PIO_STACK_LOCATION irpStack; - PFREEBT_PIPE_CONTEXT pipeContext; - PUSBD_PIPE_INFORMATION pipeInformation; + //PFREEBT_PIPE_CONTEXT pipeContext; + //PUSBD_PIPE_INFORMATION pipeInformation; PAGED_CODE(); irpStack = IoGetCurrentIrpStackLocation(Irp); fileObject = irpStack->FileObject; - pipeContext = NULL; - pipeInformation = NULL; + //pipeContext = NULL; + //pipeInformation = NULL; deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; FreeBT_DbgPrint(3, ("FreeBT_DispatchClose: Entered\n")); @@ -134,16 +134,16 @@ // Called when a HCI Send on the control pipe completes NTSTATUS FreeBT_HCISendCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { - ULONG stageLength; + //ULONG stageLength; NTSTATUS ntStatus; FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_HCISendCompletion, status=0x%08X\n", Irp->IoStatus.Status)); - if (Irp->PendingReturned) - IoMarkIrpPending(Irp); + if (Irp->PendingReturned) + IoMarkIrpPending(Irp); ExFreePool(Context); - FreeBT_IoDecrement(DeviceObject->DeviceExtension); + FreeBT_IoDecrement(DeviceObject->DeviceExtension); ntStatus = Irp->IoStatus.Status; Irp->IoStatus.Information = 0; @@ -155,79 +155,79 @@ // HCI Commands are sent on the (default) control pipe NTSTATUS FreeBT_SendHCICommand(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID IoBuffer, IN ULONG InputBufferLength) { - PDEVICE_EXTENSION deviceExtension; - ULONG urbFlags; - ULONG stageLength; - PVOID pBuffer; - PURB urb; - NTSTATUS ntStatus; - PIO_STACK_LOCATION nextStack; - //PFBT_HCI_CMD_HEADER pHCICommand; - //LARGE_INTEGER delay; - - deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; - if (!deviceExtension) - { - ntStatus=STATUS_INVALID_PARAMETER; - FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_SendHCICommand: Failed to get DeviceExtension\n")); - Irp->IoStatus.Status = ntStatus; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return ntStatus; - - } - - // The user is doing a reset, reset all the pipes as well, so that any - // old events or data are removed - /*pHCICommand=(PFBT_HCI_CMD_HEADER)IoBuffer; - if (pHCICommand->OpCode==FBT_HCI_CMD_RESET) - { - FreeBT_ResetPipe(DeviceObject, deviceExtension->EventPipe.PipeHandle); - FreeBT_ResetPipe(DeviceObject, deviceExtension->DataInPipe.PipeHandle); - FreeBT_ResetPipe(DeviceObject, deviceExtension->DataOutPipe.PipeHandle); - FreeBT_ResetPipe(DeviceObject, deviceExtension->AudioInPipe.PipeHandle); - FreeBT_ResetPipe(DeviceObject, deviceExtension->AudioOutPipe.PipeHandle); - - // Wait a second for the device to recover - FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_SendHCICommand: Sleeping\n")); - delay.QuadPart = -10000 * 5000; // 5s + PDEVICE_EXTENSION deviceExtension; + //ULONG urbFlags; + //ULONG stageLength; + //PVOID pBuffer; + PURB urb; + NTSTATUS ntStatus; + PIO_STACK_LOCATION nextStack; + //PFBT_HCI_CMD_HEADER pHCICommand; + //LARGE_INTEGER delay; + + deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; + if (!deviceExtension) + { + ntStatus=STATUS_INVALID_PARAMETER; + FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_SendHCICommand: Failed to get DeviceExtension\n")); + Irp->IoStatus.Status = ntStatus; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return ntStatus; + + } + + // The user is doing a reset, reset all the pipes as well, so that any + // old events or data are removed + /*pHCICommand=(PFBT_HCI_CMD_HEADER)IoBuffer; + if (pHCICommand->OpCode==FBT_HCI_CMD_RESET) + { + FreeBT_ResetPipe(DeviceObject, deviceExtension->EventPipe.PipeHandle); + FreeBT_ResetPipe(DeviceObject, deviceExtension->DataInPipe.PipeHandle); + FreeBT_ResetPipe(DeviceObject, deviceExtension->DataOutPipe.PipeHandle); + FreeBT_ResetPipe(DeviceObject, deviceExtension->AudioInPipe.PipeHandle); + FreeBT_ResetPipe(DeviceObject, deviceExtension->AudioOutPipe.PipeHandle); + + // Wait a second for the device to recover + FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_SendHCICommand: Sleeping\n")); + delay.QuadPart = -10000 * 5000; // 5s KeWaitForSingleObject(&deviceExtension->DelayEvent, Executive, UserMode, FALSE, &delay); - FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_SendHCICommand: Finished sleeping\n")); - - - }*/ - - // Create the URB + FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_SendHCICommand: Finished sleeping\n")); + + + }*/ + + // Create the URB urb = (PURB)ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); if(urb == NULL) { FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_SendHCICommand: Failed to alloc mem for urb\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; - Irp->IoStatus.Status = ntStatus; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return ntStatus; - - } - - UsbBuildVendorRequest( - urb, - URB_FUNCTION_CLASS_DEVICE, // This works, for CSR and Silicon Wave - sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), - 0, - 0, - 0, - 0, - 0, - IoBuffer, - NULL, - InputBufferLength, - NULL); + Irp->IoStatus.Status = ntStatus; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return ntStatus; + + } + + UsbBuildVendorRequest( + urb, + URB_FUNCTION_CLASS_DEVICE, // This works, for CSR and Silicon Wave + sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), + 0, + 0, + 0, + 0, + 0, + IoBuffer, + NULL, + InputBufferLength, + NULL); // use the original irp as an internal device control irp nextStack = IoGetNextIrpStackLocation(Irp); @@ -236,41 +236,41 @@ nextStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; IoSetCompletionRoutine( - Irp, - (PIO_COMPLETION_ROUTINE)FreeBT_HCISendCompletion, - urb, - TRUE, - TRUE, - TRUE); + Irp, + (PIO_COMPLETION_ROUTINE)FreeBT_HCISendCompletion, + urb, + TRUE, + TRUE, + TRUE); // We return STATUS_PENDING; call IoMarkIrpPending. IoMarkIrpPending(Irp); - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_SendHCICommand::")); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_SendHCICommand::")); FreeBT_IoIncrement(deviceExtension); - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_SendHCICommand: Sending IRP %X to underlying driver\n", Irp)); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_SendHCICommand: Sending IRP %X to underlying driver\n", Irp)); ntStatus=IoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); if(!NT_SUCCESS(ntStatus)) { FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_SendHCICommand: IoCallDriver fails with status %X\n", ntStatus)); - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_SendHCICommand::")); - FreeBT_IoDecrement(deviceExtension); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_SendHCICommand::")); + FreeBT_IoDecrement(deviceExtension); // If the device was surprise removed out, the pipeInformation field is invalid. // similarly if the request was cancelled, then we need not reset the device. if((ntStatus != STATUS_CANCELLED) && (ntStatus != STATUS_DEVICE_NOT_CONNECTED)) - ntStatus = FreeBT_ResetDevice(DeviceObject); + ntStatus = FreeBT_ResetDevice(DeviceObject); else FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_SendHCICommand: ntStatus is STATUS_CANCELLED or STATUS_DEVICE_NOT_CONNECTED\n")); - Irp->IoStatus.Status = ntStatus; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return ntStatus; + Irp->IoStatus.Status = ntStatus; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return ntStatus; } @@ -283,24 +283,24 @@ // Called when a HCI Get on the event pipe completes NTSTATUS FreeBT_HCIEventCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { - ULONG stageLength; + //ULONG stageLength; NTSTATUS ntStatus; PIO_STACK_LOCATION nextStack; - PURB urb; + PURB urb; FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_HCIEventCompletion, status=0x%08X\n", Irp->IoStatus.Status)); - if (Irp->PendingReturned) - IoMarkIrpPending(Irp); + if (Irp->PendingReturned) + IoMarkIrpPending(Irp); // initialize variables - urb=(PURB)Context; + urb=(PURB)Context; ntStatus = Irp->IoStatus.Status; Irp->IoStatus.Information = urb->UrbBulkOrInterruptTransfer.TransferBufferLength; nextStack = IoGetNextIrpStackLocation(Irp); ExFreePool(Context); - FreeBT_IoDecrement(DeviceObject->DeviceExtension); + FreeBT_IoDecrement(DeviceObject->DeviceExtension); return ntStatus; @@ -309,10 +309,10 @@ // Called from the DeviceIOControl handler to wait for an event on the interrupt pipe NTSTATUS FreeBT_GetHCIEvent(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID IoBuffer, IN ULONG InputBufferLength) { - PDEVICE_EXTENSION deviceExtension; - PURB urb; - NTSTATUS ntStatus; - PIO_STACK_LOCATION nextStack; + PDEVICE_EXTENSION deviceExtension; + PURB urb; + NTSTATUS ntStatus; + PIO_STACK_LOCATION nextStack; FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetHCIEvent: Entered\n")); @@ -346,17 +346,17 @@ nextStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; IoSetCompletionRoutine( - Irp, - (PIO_COMPLETION_ROUTINE)FreeBT_HCIEventCompletion, - urb, - TRUE, - TRUE, - TRUE); + Irp, + (PIO_COMPLETION_ROUTINE)FreeBT_HCIEventCompletion, + urb, + TRUE, + TRUE, + TRUE); // We return STATUS_PENDING; call IoMarkIrpPending. IoMarkIrpPending(Irp); - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetHCIEvent::")); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetHCIEvent::")); FreeBT_IoIncrement(deviceExtension); ntStatus = IoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); @@ -364,8 +364,8 @@ { FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetHCIEvent: IoCallDriver fails with status %X\n", ntStatus)); - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetHCIEvent::")); - FreeBT_IoDecrement(deviceExtension); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetHCIEvent::")); + FreeBT_IoDecrement(deviceExtension); // If the device was surprise removed out, the pipeInformation field is invalid. // similarly if the request was cancelled, then we need not reset the pipe. @@ -432,17 +432,17 @@ if (deviceExtension->DeviceState != Working) { FreeBT_DbgPrint(1, ("FBTUSB: Invalid device state\n")); - ntStatus = STATUS_INVALID_DEVICE_STATE; - goto FreeBT_DispatchDevCtrlExit; - - } + ntStatus = STATUS_INVALID_DEVICE_STATE; + goto FreeBT_DispatchDevCtrlExit; + + } FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchDevCtrl::")); // Make sure that any selective suspend request has been completed. if (deviceExtension->SSEnable) { - FreeBT_DbgPrint(3, ("Waiting on the IdleReqPendEvent\n")); + FreeBT_DbgPrint(3, ("Waiting on the IdleReqPendEvent\n")); KeWaitForSingleObject(&deviceExtension->NoIdleReqPendEvent, Executive, KernelMode, @@ -453,49 +453,49 @@ switch(code) { - case IOCTL_FREEBT_HCI_SEND_CMD: - FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_SEND_CMD received\n")); - if (inputBufferLength<FBT_HCI_CMD_MIN_SIZE) - { - ntStatus = STATUS_BUFFER_TOO_SMALL; - FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_SEND_CMD: Buffer too small\n")); - goto FreeBT_DispatchDevCtrlExit; - - } - - if (inputBufferLength>FBT_HCI_CMD_MAX_SIZE) - { - ntStatus = STATUS_INVALID_BUFFER_SIZE; - FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_SEND_CMD: Buffer too long\n")); - goto FreeBT_DispatchDevCtrlExit; - - } - - return FreeBT_SendHCICommand(DeviceObject, Irp, ioBuffer, inputBufferLength); - break; - - case IOCTL_FREEBT_HCI_GET_EVENT: - FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_GET_EVENT received\n")); - if (outputBufferLength<FBT_HCI_EVENT_MAX_SIZE) - { - ntStatus = STATUS_BUFFER_TOO_SMALL; - FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_GET_EVENT: Buffer too small\n")); - goto FreeBT_DispatchDevCtrlExit; - - } - - return FreeBT_GetHCIEvent(DeviceObject, Irp, ioBuffer, outputBufferLength); - break; + case IOCTL_FREEBT_HCI_SEND_CMD: + FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_SEND_CMD received\n")); + if (inputBufferLength<FBT_HCI_CMD_MIN_SIZE) + { + ntStatus = STATUS_BUFFER_TOO_SMALL; + FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_SEND_CMD: Buffer too small\n")); + goto FreeBT_DispatchDevCtrlExit; + + } + + if (inputBufferLength>FBT_HCI_CMD_MAX_SIZE) + { + ntStatus = STATUS_INVALID_BUFFER_SIZE; + FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_SEND_CMD: Buffer too long\n")); + goto FreeBT_DispatchDevCtrlExit; + + } + + return FreeBT_SendHCICommand(DeviceObject, Irp, ioBuffer, inputBufferLength); + break; + + case IOCTL_FREEBT_HCI_GET_EVENT: + FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_GET_EVENT received\n")); + if (outputBufferLength<FBT_HCI_EVENT_MAX_SIZE) + { + ntStatus = STATUS_BUFFER_TOO_SMALL; + FreeBT_DbgPrint(3, ("FBTUSB: IOCTL_FREEBT_HCI_GET_EVENT: Buffer too small\n")); + goto FreeBT_DispatchDevCtrlExit; + + } + + return FreeBT_GetHCIEvent(DeviceObject, Irp, ioBuffer, outputBufferLength); + break; default: - FreeBT_DbgPrint(3, ("FBTUSB: Invalid IOCTL 0x%08x received\n", code)); + FreeBT_DbgPrint(3, ("FBTUSB: Invalid IOCTL 0x%08x received\n", code)); ntStatus = STATUS_INVALID_DEVICE_REQUEST; break; } FreeBT_DispatchDevCtrlExit: - Irp->IoStatus.Information = 0; + Irp->IoStatus.Information = 0; Irp->IoStatus.Status = ntStatus; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -1125,13 +1125,13 @@ { FreeBT_DbgPrint(3, ("IoCancelIrp returns TRUE\n")); - } + } else { FreeBT_DbgPrint(3, ("IoCancelIrp returns FALSE\n")); - } + } // ....we decrement the FreeIdleIrpCount from 2 to 1. // if completion routine runs ahead of us, then this routine @@ -1167,7 +1167,7 @@ if(irpContext) { KeSetEvent(irpContext->Event, 0, FALSE); - FreeBT_IoDecrement(irpContext->DeviceExtension); + FreeBT_IoDecrement(irpContext->DeviceExtension); ExFreePool(irpContext); } Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c [iso-8859-1] Tue May 1 16:53:02 2012 @@ -25,7 +25,7 @@ { PIO_STACK_LOCATION irpStack; PDEVICE_EXTENSION deviceExtension; - KEVENT startDeviceEvent; + //KEVENT startDeviceEvent; NTSTATUS ntStatus; irpStack = IoGetCurrentIrpStackLocation(Irp); @@ -33,7 +33,7 @@ // since the device is removed, fail the Irp. if (Removed == deviceExtension->DeviceState) - { + { ntStatus = STATUS_DELETE_PENDING; Irp->IoStatus.Status = ntStatus; Irp->IoStatus.Information = 0; @@ -45,15 +45,15 @@ FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchPnP::")); FreeBT_IoIncrement(deviceExtension); if (irpStack->MinorFunction == IRP_MN_START_DEVICE) - { + { ASSERT(deviceExtension->IdleReqPend == 0); } else - { + { if (deviceExtension->SSEnable) - { + { CancelSelectSuspend(deviceExtension); } @@ -64,7 +64,7 @@ FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchPnP::")); FreeBT_DbgPrint(2, (PnPMinorFunctionString(irpStack->MinorFunction))); switch (irpStack->MinorFunction) - { + { case IRP_MN_START_DEVICE: ntStatus = HandleStartDevice(DeviceObject, Irp); break; @@ -73,7 +73,7 @@ // if we cannot stop the device, we fail the query stop irp ntStatus = CanStopDevice(DeviceObject, Irp); if(NT_SUCCESS(ntStatus)) - { + { ntStatus = HandleQueryStopDevice(DeviceObject, Irp); return ntStatus; @@ -168,14 +168,14 @@ ntStatus = IoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); if (ntStatus == STATUS_PENDING) - { + { KeWaitForSingleObject(&startDeviceEvent, Executive, KernelMode, FALSE, NULL); ntStatus = Irp->IoStatus.Status; } if (!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HandleStartDevice: Lower drivers failed this Irp (0x%08x)\n", ntStatus)); return ntStatus; @@ -185,7 +185,7 @@ // and select the interface descriptors ntStatus = ReadandSelectDescriptors(DeviceObject); if (!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HandleStartDevice: ReadandSelectDescriptors failed (0x%08x)\n", ntStatus)); return ntStatus; @@ -195,7 +195,7 @@ // handles to the device ntStatus = IoSetDeviceInterfaceState(&deviceExtension->InterfaceName, TRUE); if (!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HandleStartDevice: IoSetDeviceInterfaceState failed (0x%08x)\n", ntStatus)); return ntStatus; @@ -213,19 +213,19 @@ deviceExtension->WaitWakeIrp = NULL; if (deviceExtension->WaitWakeEnable) - { + { IssueWaitWake(deviceExtension); } ProcessQueuedRequests(deviceExtension); if (WinXpOrBetter == deviceExtension->WdmVersion) - { + { deviceExtension->SSEnable = deviceExtension->SSRegistryEnable; // set timer.for selective suspend requests if (deviceExtension->SSEnable) - { + { dueTime.QuadPart = -10000 * IDLE_INTERVAL; // 5000 ms KeSetTimerEx(&deviceExtension->Timer, dueTime, IDLE_INTERVAL, &deviceExtension->DeferredProcCall); deviceExtension->FreeIdleIrpCount = 0; @@ -254,11 +254,11 @@ // 1. Read the device descriptor urb = (PURB) ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST)); if(urb) - { + { siz = sizeof(USB_DEVICE_DESCRIPTOR); deviceDescriptor = (PUSB_DEVICE_DESCRIPTOR) ExAllocatePool(NonPagedPool, siz); if (deviceDescriptor) - { + { UsbBuildGetDescriptorRequest( urb, (USHORT) sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), @@ -272,7 +272,7 @@ ntStatus = CallUSBD(DeviceObject, urb); if (NT_SUCCESS(ntStatus)) - { + { ASSERT(deviceDescriptor->bNumConfigurations); ntStatus = ConfigureDevice(DeviceObject); @@ -284,7 +284,7 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: ReadandSelectDescriptors: Failed to allocate memory for deviceDescriptor")); ExFreePool(urb); ntStatus = STATUS_INSUFFICIENT_RESOURCES; @@ -294,7 +294,7 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: ReadandSelectDescriptors: Failed to allocate memory for urb")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; @@ -323,12 +323,12 @@ // 2. Read the CD with all embedded interface and endpoint descriptors urb = (PURB) ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST)); if (urb) - { + { siz = sizeof(USB_CONFIGURATION_DESCRIPTOR); configurationDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR) ExAllocatePool(NonPagedPool, siz); if(configurationDescriptor) - { + { UsbBuildGetDescriptorRequest( urb, (USHORT) sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), @@ -342,7 +342,7 @@ ntStatus = CallUSBD(DeviceObject, urb); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: ConfigureDevice: UsbBuildGetDescriptorRequest failed\n")); goto ConfigureDevice_Exit; @@ -351,7 +351,7 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: ConfigureDevice: Failed to allocate mem for config Descriptor\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; goto ConfigureDevice_Exit; @@ -363,7 +363,7 @@ configurationDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR) ExAllocatePool(NonPagedPool, siz); if (configurationDescriptor) - { + { UsbBuildGetDescriptorRequest( urb, (USHORT)sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), @@ -377,7 +377,7 @@ ntStatus = CallUSBD(DeviceObject, urb); if (!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1,("FBTUSB: ConfigureDevice: Failed to read configuration descriptor")); goto ConfigureDevice_Exit; @@ -386,7 +386,7 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: ConfigureDevice: Failed to alloc mem for config Descriptor\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; goto ConfigureDevice_Exit; @@ -396,7 +396,7 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: ConfigureDevice: Failed to allocate memory for urb\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; goto ConfigureDevice_Exit; @@ -404,7 +404,7 @@ } if (configurationDescriptor) - { + { // save a copy of configurationDescriptor in deviceExtension // remember to free it later. deviceExtension->UsbConfigurationDescriptor = configurationDescriptor; @@ -427,14 +427,14 @@ } else - { + { deviceExtension->UsbConfigurationDescriptor = NULL; } ConfigureDevice_Exit: if (urb) - { + { ExFreePool(urb); } @@ -448,7 +448,7 @@ LONG numberOfInterfaces, interfaceNumber, interfaceindex; ULONG i; PURB urb; - PUCHAR pInf; + //PUCHAR pInf; NTSTATUS ntStatus; PDEVICE_EXTENSION deviceExtension; PUSB_INTERFACE_DESCRIPTOR interfaceDescriptor; @@ -465,10 +465,10 @@ // Parse the configuration descriptor for the interface; tmp = interfaceList = (PUSBD_INTERFACE_LIST_ENTRY) - ExAllocatePool(NonPagedPool, sizeof(USBD_INTERFACE_LIST_ENTRY) * (numberOfInterfaces + 1)); + ExAllocatePool(NonPagedPool, sizeof(USBD_INTERFACE_LIST_ENTRY) * (numberOfInterfaces + 1)); if (!tmp) - { + { FreeBT_DbgPrint(1, ("FBTUSB: SelectInterfaces: Failed to allocate mem for interfaceList\n")); return STATUS_INSUFFICIENT_RESOURCES; @@ -476,11 +476,11 @@ } - FreeBT_DbgPrint(3, ("FBTUSB: -------------\n")); - FreeBT_DbgPrint(3, ("FBTUSB: Number of interfaces %d\n", numberOfInterfaces)); + FreeBT_DbgPrint(3, ("FBTUSB: -------------\n")); + FreeBT_DbgPrint(3, ("FBTUSB: Number of interfaces %d\n", numberOfInterfaces)); while (interfaceNumber < numberOfInterfaces) - { + { interfaceDescriptor = USBD_ParseConfigurationDescriptorEx( ConfigurationDescriptor, ConfigurationDescriptor, @@ -488,7 +488,7 @@ 0, -1, -1, -1); if (interfaceDescriptor) - { + { interfaceList->InterfaceDescriptor = interfaceDescriptor; interfaceList->Interface = NULL; interfaceList++; @@ -505,10 +505,10 @@ urb = USBD_CreateConfigurationRequestEx(ConfigurationDescriptor, tmp); if (urb) - { + { Interface = &urb->UrbSelectConfiguration.Interface; for (i=0; i<Interface->NumberOfPipes; i++) - { + { // perform pipe initialization here // set the transfer size and any pipe flags we use // USBD sets the rest of the Interface struct members @@ -518,17 +518,17 @@ ntStatus = CallUSBD(DeviceObject, urb); if (NT_SUCCESS(ntStatus)) - { + { // save a copy of interface information in the device extension. deviceExtension->UsbInterface = (PUSBD_INTERFACE_INFORMATION) ExAllocatePool(NonPagedPool, Interface->Length); if (deviceExtension->UsbInterface) - { + { RtlCopyMemory(deviceExtension->UsbInterface, Interface, Interface->Length); } else - { + { ntStatus = STATUS_INSUFFICIENT_RESOURCES; FreeBT_DbgPrint(1, ("FBTUSB: SelectInterfaces: Memory alloc for UsbInterface failed\n")); @@ -547,18 +547,18 @@ Interface->SubClass, Interface->Protocol)); - if (Interface->Class==FREEBT_USB_STDCLASS && Interface->SubClass==FREEBT_USB_STDSUBCLASS && - Interface->Protocol==FREEBT_USB_STDPROTOCOL) - { - FreeBT_DbgPrint(3, ("FBTUSB: This is a standard USB Bluetooth device\n")); - - } - - else - { - FreeBT_DbgPrint(3, ("FBTUSB: WARNING: This device does not report itself as a standard USB Bluetooth device\n")); - - } + if (Interface->Class==FREEBT_USB_STDCLASS && Interface->SubClass==FREEBT_USB_STDSUBCLASS && + Interface->Protocol==FREEBT_USB_STDPROTOCOL) + { + FreeBT_DbgPrint(3, ("FBTUSB: This is a standard USB Bluetooth device\n")); + + } + + else + { + FreeBT_DbgPrint(3, ("FBTUSB: WARNING: This device does not report itself as a standard USB Bluetooth device\n")); + + } // Initialize the PipeContext // Dump the pipe info @@ -568,74 +568,74 @@ sizeof(FREEBT_PIPE_CONTEXT)); if (!deviceExtension->PipeContext) - { + { ntStatus = STATUS_INSUFFICIENT_RESOURCES; FreeBT_DbgPrint(1, ("FBTUSB: Memory alloc for UsbInterface failed\n")); } else - { - FreeBT_DbgPrint(3, ("FBTUSB: SelectInterfaces: Allocated PipeContext %p\n", deviceExtension->PipeContext)); - for (i=0; i<Interface->NumberOfPipes; i++) - { - deviceExtension->PipeContext[i].PipeOpen = FALSE; - - FreeBT_DbgPrint(3, ("FBTUSB: ---------\n")); - FreeBT_DbgPrint(3, ("FBTUSB: PipeType 0x%x\n", Interface->Pipes[i].PipeType)); - FreeBT_DbgPrint(3, ("FBTUSB: EndpointAddress 0x%x\n", Interface->Pipes[i].EndpointAddress)); - FreeBT_DbgPrint(3, ("FBTUSB: MaxPacketSize 0x%x\n", Interface->Pipes[i].MaximumPacketSize)); - FreeBT_DbgPrint(3, ("FBTUSB: Interval 0x%x\n", Interface->Pipes[i].Interval)); - FreeBT_DbgPrint(3, ("FBTUSB: Handle 0x%x\n", Interface->Pipes[i].PipeHandle)); - FreeBT_DbgPrint(3, ("FBTUSB: MaximumTransferSize 0x%x\n", Interface->Pipes[i].MaximumTransferSize)); - - // Log the pipes - // Note the HCI Command endpoint won't appear here, because the Default Control Pipe - // is used for this. The Default Control Pipe is always present at EndPointAddress 0x0 - switch (Interface->Pipes[i].EndpointAddress) - { - case FREEBT_STDENDPOINT_HCIEVENT: - deviceExtension->PipeContext[i].PipeType=HciEventPipe; - deviceExtension->EventPipe=Interface->Pipes[i]; - FreeBT_DbgPrint(3, ("FBTUSB: HCI Event Endpoint\n")); - break; - - case FREEBT_STDENDPOINT_ACLIN: - deviceExtension->PipeContext[i].PipeType=AclDataIn; - deviceExtension->DataInPipe=Interface->Pipes[i]; - FreeBT_DbgPrint(3, ("FBTUSB: ACL Data In Endpoint\n")); - break; - - case FREEBT_STDENDPOINT_ACLOUT: - deviceExtension->PipeContext[i].PipeType=AclDataOut; - deviceExtension->DataOutPipe=Interface->Pipes[i]; - FreeBT_DbgPrint(3, ("FBTUSB: ACL Data Out Endpoint\n")); - break; - - case FREEBT_STDENDPOINT_AUDIOIN: - deviceExtension->PipeContext[i].PipeType=SCODataIn; - deviceExtension->AudioInPipe=Interface->Pipes[i]; - FreeBT_DbgPrint(3, ("FBTUSB: ACL Data Out Endpoint\n")); - break; - - case FREEBT_STDENDPOINT_AUDIOOUT: - deviceExtension->PipeContext[i].PipeType=SCODataOut; - deviceExtension->AudioOutPipe=Interface->Pipes[i]; - FreeBT_DbgPrint(3, ("FBTUSB: ACL Data Out Endpoint\n")); - break; - - } - - } - - } + { + FreeBT_DbgPrint(3, ("FBTUSB: SelectInterfaces: Allocated PipeContext %p\n", deviceExtension->PipeContext)); + for (i=0; i<Interface->NumberOfPipes; i++) + { + deviceExtension->PipeContext[i].PipeOpen = FALSE; + + FreeBT_DbgPrint(3, ("FBTUSB: ---------\n")); + FreeBT_DbgPrint(3, ("FBTUSB: PipeType 0x%x\n", Interface->Pipes[i].PipeType)); + FreeBT_DbgPrint(3, ("FBTUSB: EndpointAddress 0x%x\n", Interface->Pipes[i].EndpointAddress)); + FreeBT_DbgPrint(3, ("FBTUSB: MaxPacketSize 0x%x\n", Interface->Pipes[i].MaximumPacketSize)); + FreeBT_DbgPrint(3, ("FBTUSB: Interval 0x%x\n", Interface->Pipes[i].Interval)); + FreeBT_DbgPrint(3, ("FBTUSB: Handle 0x%x\n", Interface->Pipes[i].PipeHandle)); + FreeBT_DbgPrint(3, ("FBTUSB: MaximumTransferSize 0x%x\n", Interface->Pipes[i].MaximumTransferSize)); + + // Log the pipes + // Note the HCI Command endpoint won't appear here, because the Default Control Pipe + // is used for this. The Default Control Pipe is always present at EndPointAddress 0x0 + switch (Interface->Pipes[i].EndpointAddress) + { + case FREEBT_STDENDPOINT_HCIEVENT: + deviceExtension->PipeContext[i].PipeType=HciEventPipe; + deviceExtension->EventPipe=Interface->Pipes[i]; + FreeBT_DbgPrint(3, ("FBTUSB: HCI Event Endpoint\n")); + break; + + case FREEBT_STDENDPOINT_ACLIN: + deviceExtension->PipeContext[i].PipeType=AclDataIn; + deviceExtension->DataInPipe=Interface->Pipes[i]; + FreeBT_DbgPrint(3, ("FBTUSB: ACL Data In Endpoint\n")); + break; + + case FREEBT_STDENDPOINT_ACLOUT: + deviceExtension->PipeContext[i].PipeType=AclDataOut; + deviceExtension->DataOutPipe=Interface->Pipes[i]; + FreeBT_DbgPrint(3, ("FBTUSB: ACL Data Out Endpoint\n")); + break; + + case FREEBT_STDENDPOINT_AUDIOIN: + deviceExtension->PipeContext[i].PipeType=SCODataIn; + deviceExtension->AudioInPipe=Interface->Pipes[i]; + FreeBT_DbgPrint(3, ("FBTUSB: ACL Data Out Endpoint\n")); + break; + + case FREEBT_STDENDPOINT_AUDIOOUT: + deviceExtension->PipeContext[i].PipeType=SCODataOut; + deviceExtension->AudioOutPipe=Interface->Pipes[i]; + FreeBT_DbgPrint(3, ("FBTUSB: ACL Data Out Endpoint\n")); + break; + + } + + } + + } FreeBT_DbgPrint(3, ("FBTUSB: ---------\n")); } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: SelectInterfaces: Failed to select an interface\n")); } @@ -643,20 +643,20 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: SelectInterfaces: USBD_CreateConfigurationRequestEx failed\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; } if (tmp) - { + { ExFreePool(tmp); } if (urb) - { + { ExFreePool(urb); } @@ -674,11 +674,11 @@ siz = sizeof(struct _URB_SELECT_CONFIGURATION); urb = (PURB) ExAllocatePool(NonPagedPool, siz); if (urb) - { + { UsbBuildSelectConfigurationRequest(urb, (USHORT)siz, NULL); ntStatus = CallUSBD(DeviceObject, urb); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(3, ("FBTUSB: DeconfigureDevice: Failed to deconfigure device\n")); } @@ -688,7 +688,7 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: DeconfigureDevice: Failed to allocate urb\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; @@ -722,7 +722,7 @@ &ioStatus); if (!irp) - { + { FreeBT_DbgPrint(1, ("FBTUSB: CallUSBD: IoBuildDeviceIoControlRequest failed\n")); return STATUS_INSUFFICIENT_RESOURCES; @@ -737,7 +737,7 @@ ntStatus = IoCallDriver(deviceExtension->TopOfStackDeviceObject, irp); if (ntStatus == STATUS_PENDING) - { + { KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); ntStatus = ioStatus.Status; @@ -808,7 +808,7 @@ // above us fails a query-stop and passes down the subsequent // cancel-stop. if(PendingStop == deviceExtension->DeviceState) - { + { KeInitializeEvent(&event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); @@ -821,14 +821,14 @@ ntStatus = IoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); if(ntStatus == STATUS_PENDING) - { + { KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); ntStatus = Irp->IoStatus.Status; } if(NT_SUCCESS(ntStatus)) - { + { KeAcquireSpinLock(&deviceExtension->DevStateLock, &oldIrql); RESTORE_PREVIOUS_PNP_STATE(deviceExtension); @@ -844,7 +844,7 @@ } else - { + { // spurious Irp ntStatus = STATUS_SUCCESS; @@ -866,9 +866,9 @@ deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; if(WinXpOrBetter == deviceExtension->WdmVersion) - { + { if(deviceExtension->SSEnable) - { + { // Cancel the timer so that the DPCs are no longer fired. // Thus, we are making judicious usage of our resources. // we do not need DPCs because the device is stopping. @@ -898,7 +898,7 @@ // the driver must not send any more Irps down that touch // the device until another Start has occurred. if (deviceExtension->WaitWakeEnable) - { + { CancelWaitWake(deviceExtension); } @@ -988,7 +988,7 @@ // someone above us fails a query-remove and passes down the // subsequent cancel-remove. if(PendingRemove == deviceExtension->DeviceState) - { + { KeInitializeEvent(&event, NotificationEvent, FALSE); @@ -1002,14 +1002,14 @@ ntStatus = IoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); if(ntStatus == STATUS_PENDING) - { + { KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); ntStatus = Irp->IoStatus.Status; } if (NT_SUCCESS(ntStatus)) - { + { KeAcquireSpinLock(&deviceExtension->DevStateLock, &oldIrql); deviceExtension->QueueState = AllowRequests; @@ -1026,8 +1026,8 @@ } else - { - // spurious cancel-remove + { + // spurious cancel-remove ntStatus = STATUS_SUCCESS; } @@ -1053,16 +1053,16 @@ // 2. return device and memory resources // 3. disable interfaces if(deviceExtension->WaitWakeEnable) - { + { CancelWaitWake(deviceExtension); } if (WinXpOrBetter == deviceExtension->WdmVersion) - { + { if (deviceExtension->SSEnable) - { + { // Cancel the timer so that the DPCs are no longer fired. // we do not need DPCs because the device has been surprise // removed @@ -1090,7 +1090,7 @@ ntStatus = IoSetDeviceInterfaceState(&deviceExtension->InterfaceName, FALSE); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HandleSurpriseRemoval: IoSetDeviceInterfaceState::disable:failed\n")); } @@ -1112,7 +1112,7 @@ NTSTATUS HandleRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; - KEVENT event; + //KEVENT event; ULONG requestCount; NTSTATUS ntStatus; PDEVICE_EXTENSION deviceExtension; @@ -1126,7 +1126,7 @@ // (If we wanted to express an interest in preventing this removal, // we should have failed the query remove IRP). if(SurpriseRemoved != deviceExtension->DeviceState) - { + { // we are here after QUERY_REMOVE KeAcquireSpinLock(&deviceExtension->DevStateLock, &oldIrql); @@ -1134,15 +1134,15 @@ KeReleaseSpinLock(&deviceExtension->DevStateLock, oldIrql); if(deviceExtension->WaitWakeEnable) - { + { CancelWaitWake(deviceExtension); } if(WinXpOrBetter == deviceExtension->WdmVersion) - { + { if (deviceExtension->SSEnable) - { + { // Cancel the timer so that the DPCs are no longer fired. // we do not need DPCs because the device has been removed KeCancelTimer(&deviceExtension->Timer); @@ -1164,7 +1164,7 @@ ntStatus = IoSetDeviceInterfaceState(&deviceExtension->InterfaceName, FALSE); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HandleRemoveDevice: IoSetDeviceInterfaceState::disable:failed\n")); } @@ -1231,7 +1231,7 @@ pdc = irpStack->Parameters.DeviceCapabilities.Capabilities; if(pdc->Version < 1 || pdc->Size < sizeof(DEVICE_CAPABILITIES)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HandleQueryCapabilities::request failed\n")); ntStatus = STATUS_UNSUCCESSFUL; @@ -1254,7 +1254,7 @@ TRUE); ntStatus = IoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); if(ntStatus == STATUS_PENDING) - { + { KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); ntStatus = Irp->IoStatus.Status; @@ -1263,12 +1263,12 @@ // initialize PowerDownLevel to disabled deviceExtension->PowerDownLevel = PowerDeviceUnspecified; if(NT_SUCCESS(ntStatus)) - { + { deviceExtension->DeviceCapabilities = *pdc; for(i = PowerSystemSleeping1; i <= PowerSystemSleeping3; i++) - { + { if(deviceExtension->DeviceCapabilities.DeviceState[i] < PowerDeviceD3) - { + { deviceExtension->PowerDownLevel = deviceExtension->DeviceCapabilities.DeviceState[i]; } @@ -1283,8 +1283,8 @@ } if(deviceExtension->PowerDownLevel == PowerDeviceUnspecified || - deviceExtension->PowerDownLevel <= PowerDeviceD0) - { + deviceExtension->PowerDownLevel <= PowerDeviceD0) + { deviceExtension->PowerDownLevel = PowerDeviceD2; } @@ -1317,19 +1317,19 @@ KeClearEvent(&deviceExtension->NoDpcWorkItemPendingEvent); if(CanDeviceSuspend(deviceExtension)) - { + { FreeBT_DbgPrint(3, ("FBTUSB: DpcRoutine: Device is Idle\n")); item = IoAllocateWorkItem(deviceObject); if (item) - { + { IoQueueWorkItem(item, IdleRequestWorkerRoutine, DelayedWorkQueue, item); ntStatus = STATUS_PENDING; } else - { + { FreeBT_DbgPrint(3, ("FBTUSB: DpcRoutine: Cannot alloc memory for work item\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; KeSetEvent(&deviceExtension->NoDpcWorkItemPendingEvent, IO_NO_INCREMENT, FALSE); @@ -1339,7 +1339,7 @@ } else - { + { FreeBT_DbgPrint(3, ("FBTUSB: DpcRoutine: Idle event not signaled\n")); KeSetEvent(&deviceExtension->NoDpcWorkItemPendingEvent, IO_NO_INCREMENT, FALSE); @@ -1351,7 +1351,7 @@ VOID IdleRequestWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { - PIRP irp; + //PIRP irp; NTSTATUS ntStatus; PDEVICE_EXTENSION deviceExtension; PIO_WORKITEM workItem; @@ -1362,11 +1362,11 @@ workItem = (PIO_WORKITEM) Context; if(CanDeviceSuspend(deviceExtension)) - { + { FreeBT_DbgPrint(3, ("FBTUSB: IdleRequestWorkerRoutine: Device is idle\n")); ntStatus = SubmitIdleRequestIrp(deviceExtension); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: IdleRequestWorkerRoutine: SubmitIdleRequestIrp failed\n")); } @@ -1374,7 +1374,7 @@ } else - { + { FreeBT_DbgPrint(3, ("FBTUSB: IdleRequestWorkerRoutine: Device is not idle\n")); } @@ -1427,10 +1427,10 @@ // 3a. if the device is active, send them down // 3b. else complete with STATUS_DELETE_PENDING while(1) - { + { KeAcquireSpinLock(&DeviceExtension->QueueLock, &oldIrql); if(IsListEmpty(&DeviceExtension->NewRequestsQueue)) - { + { KeReleaseSpinLock(&DeviceExtension->QueueLock, oldIrql); break; @@ -1443,9 +1443,9 @@ // check if its already cancelled if (nextIrp->Cancel) - { + { if(cancelRoutine) - { + { // the cancel routine for this IRP hasnt been called yet // so queue the IRP in the cancelledIrp list and complete // after releasing the lock @@ -1454,8 +1454,8 @@ } else - { - // the cancel routine has run + { + // the cancel routine has run // it must be waiting to hold the queue lock // so initialize the IRPs listEntry InitializeListHead(listEntry); @@ -1467,10 +1467,10 @@ } else - { + { KeReleaseSpinLock(&DeviceExtension->QueueLock, oldIrql); if(FailRequests == DeviceExtension->QueueState) - { + { nextIrp->IoStatus.Information = 0; nextIrp->IoStatus.Status = STATUS_DELETE_PENDING; IoCompleteRequest(nextIrp, IO_NO_INCREMENT); @@ -1478,8 +1478,8 @@ } else - { - PIO_STACK_LOCATION irpStack; + { + //PIO_STACK_LOCATION irpStack; FreeBT_DbgPrint(3, ("FBTUSB: ProcessQueuedRequests::")); FreeBT_IoIncrement(DeviceExtension); @@ -1497,7 +1497,7 @@ } while(!IsListEmpty(&cancelledIrpList)) - { + { PLIST_ENTRY cancelEntry = RemoveHeadList(&cancelledIrpList); cancelledIrp = CONTAINING_RECORD(cancelEntry, IRP, Tail.Overlay.ListEntry); @@ -1547,14 +1547,14 @@ NULL); if (NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetRegistryDword: Success, Value = %X\n", *Value)); return STATUS_SUCCESS; } else - { - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetRegistryDword: Failed\n")); + { + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_GetRegistryDword: Failed\n")); *Value = 0; return STATUS_UNSUCCESSFUL; @@ -1573,7 +1573,7 @@ PIRP pendingIrp; PIO_STACK_LOCATION pendingIrpStack, irpStack; - NTSTATUS ntStatus; + //NTSTATUS ntStatus; deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; irpStack = IoGetCurrentIrpStackLocation(Irp); @@ -1588,21 +1588,21 @@ for(thisEntry = listHead->Flink, nextEntry = thisEntry->Flink; thisEntry != listHead; thisEntry = nextEntry, nextEntry = thisEntry->Flink) - { + { pendingIrp = CONTAINING_RECORD(thisEntry, IRP, Tail.Overlay.ListEntry); pendingIrpStack = IoGetCurrentIrpStackLocation(pendingIrp); if (irpStack->FileObject == pendingIrpStack->FileObject) - { + { RemoveEntryList(thisEntry); if (NULL == IoSetCancelRoutine(pendingIrp, NULL)) - { + { InitializeListHead(thisEntry); } else - { + { InsertTailList(&cleanupList, thisEntry); } @@ -1614,7 +1614,7 @@ KeReleaseSpinLock(&deviceExtension->QueueLock, oldIrql); while(!IsListEmpty(&cleanupList)) - { + { thisEntry = RemoveHeadList(&cleanupList); pendingIrp = CONTAINING_RECORD(thisEntry, IRP, Tail.Overlay.ListEntry); @@ -1644,7 +1644,7 @@ if ((DeviceExtension->OpenHandleCount == 0) && (DeviceExtension->OutStandingIO == 1)) return TRUE; - return FALSE; + return FALSE; } @@ -1654,8 +1654,8 @@ ULONG i; NTSTATUS ntStatus; PDEVICE_EXTENSION deviceExtension; - PFREEBT_PIPE_CONTEXT pipeContext; - PUSBD_PIPE_INFORMATION pipeInformation; + PFREEBT_PIPE_CONTEXT pipeContext; + //PUSBD_PIPE_INFORMATION pipeInformation; PUSBD_INTERFACE_INFORMATION interfaceInfo; deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; @@ -1668,14 +1668,14 @@ return STATUS_SUCCESS; for(i=0; i<interfaceInfo->NumberOfPipes; i++) - { + { if(pipeContext[i].PipeOpen) - { + { FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_AbortPipes: Aborting open pipe %d\n", i)); urb = (PURB) ExAllocatePool(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); if (urb) - { + { urb->UrbHeader.Length = sizeof(struct _URB_PIPE_REQUEST); urb->UrbHeader.Function = URB_FUNCTION_ABORT_PIPE; urb->UrbPipeRequest.PipeHandle = interfaceInfo->Pipes[i].PipeHandle; @@ -1687,7 +1687,7 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_AbortPipes: Failed to alloc memory for urb\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; return ntStatus; @@ -1731,7 +1731,7 @@ if (result == 2) KeClearEvent(&DeviceExtension->StopEvent); - KeReleaseSpinLock(&DeviceExtension->IOCountLock, oldIrql); + KeReleaseSpinLock(&DeviceExtension->IOCountLock, oldIrql); FreeBT_DbgPrint(3, ("FreeBT_IoIncrement::%d\n", result)); @@ -1752,7 +1752,7 @@ KeSetEvent(&DeviceExtension->StopEvent, IO_NO_INCREMENT, FALSE); if(result == 0) - { + { ASSERT(Removed == DeviceExtension->DeviceState); KeSetEvent(&DeviceExtension->RemoveEvent, IO_NO_INCREMENT, FALSE); @@ -1790,35 +1790,35 @@ NTSTATUS ReleaseMemory(IN PDEVICE_OBJECT DeviceObject) { // Disconnect from the interrupt and unmap any I/O ports - PDEVICE_EXTENSION deviceExtension; - UNICODE_STRING uniDeviceName; - NTSTATUS ntStatus; + PDEVICE_EXTENSION deviceExtension; + UNICODE_STRING uniDeviceName; + NTSTATUS ntStatus; deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; if (deviceExtension->UsbConfigurationDescriptor) - { - FreeBT_DbgPrint(3, ("FBTUSB: ReleaseMemory: Freeing UsbConfigurationDescriptor\n")); + { + FreeBT_DbgPrint(3, ("FBTUSB: ReleaseMemory: Freeing UsbConfigurationDescriptor\n")); ExFreePool(deviceExtension->UsbConfigurationDescriptor); deviceExtension->UsbConfigurationDescriptor = NULL; } if(deviceExtension->UsbInterface) - { - FreeBT_DbgPrint(3, ("FBTUSB: ReleaseMemory: Freeing UsbInterface\n")); + { + FreeBT_DbgPrint(3, ("FBTUSB: ReleaseMemory: Freeing UsbInterface\n")); ExFreePool(deviceExtension->UsbInterface); deviceExtension->UsbInterface = NULL; } if(deviceExtension->PipeContext) - { - RtlInitUnicodeString(&uniDeviceName, deviceExtension->wszDosDeviceName); - ntStatus = IoDeleteSymbolicLink(&uniDeviceName); - if (!NT_SUCCESS(ntStatus)) - FreeBT_DbgPrint(3, ("FBTUSB: Failed to delete symbolic link %ws\n", deviceExtension->wszDosDeviceName)); - - FreeBT_DbgPrint(3, ("FBTUSB: ReleaseMemory: Freeing PipeContext %p\n", deviceExtension->PipeContext)); + { + RtlInitUnicodeString(&uniDeviceName, deviceExtension->wszDosDeviceName); + ntStatus = IoDeleteSymbolicLink(&uniDeviceName); + if (!NT_SUCCESS(ntStatus)) + FreeBT_DbgPrint(3, ("FBTUSB: Failed to delete symbolic link %ws\n", deviceExtension->wszDosDeviceName)); + + FreeBT_DbgPrint(3, ("FBTUSB: ReleaseMemory: Freeing PipeContext %p\n", deviceExtension->PipeContext)); ExFreePool(deviceExtension->PipeContext); deviceExtension->PipeContext = NULL; @@ -1831,7 +1831,7 @@ PCHAR PnPMinorFunctionString (UCHAR MinorFunction) { switch (MinorFunction) - { + { case IRP_MN_START_DEVICE: return "IRP_MN_START_DEVICE\n"; Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c [iso-8859-1] Tue May 1 16:53:02 2012 @@ -22,9 +22,9 @@ // Handle power events NTSTATUS FreeBT_DispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS ntStatus; + NTSTATUS ntStatus = STATUS_SUCCESS; PIO_STACK_LOCATION irpStack; - PUNICODE_STRING tagString; + //PUNICODE_STRING tagString; PDEVICE_EXTENSION deviceExtension; irpStack = IoGetCurrentIrpStackLocation(Irp); @@ -38,7 +38,7 @@ // it should return STATUS_PENDING and queue all incoming // IRPs until the IRP completes. if (Removed == deviceExtension->DeviceState) - { + { // Even if a driver fails the IRP, it must nevertheless call // PoStartNextPowerIrp to inform the Power Manager that it @@ -53,7 +53,7 @@ } if (NotStarted == deviceExtension->DeviceState) - { + { // if the device is not started yet, pass it down PoStartNextPowerIrp(Irp); IoSkipCurrentIrpStackLocation(Irp); @@ -66,7 +66,7 @@ FreeBT_IoIncrement(deviceExtension); switch(irpStack->MinorFunction) - { + { case IRP_MN_SET_POWER: // The Power Manager sends this IRP for one of the // following reasons: @@ -82,7 +82,7 @@ IoMarkIrpPending(Irp); switch(irpStack->Parameters.Power.Type) - { + { case SystemPowerState: HandleSystemSetPower(DeviceObject, Irp); ntStatus = STATUS_PENDING; @@ -108,7 +108,7 @@ IoMarkIrpPending(Irp); switch(irpStack->Parameters.Power.Type) - { + { case SystemPowerState: HandleSystemQueryPower(DeviceObject, Irp); ntStatus = STATUS_PENDING; @@ -144,7 +144,7 @@ PoStartNextPowerIrp(Irp); ntStatus = PoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: Lower drivers failed the wait-wake Irp\n")); } @@ -168,7 +168,7 @@ IoSkipCurrentIrpStackLocation(Irp); ntStatus = PoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_DispatchPower: Lower drivers failed this Irp\n")); } @@ -205,7 +205,7 @@ // Fail a query for a power state incompatible with waking up the system if ((deviceExtension->WaitWakeEnable) && (systemState > deviceExtension->DeviceCapabilities.SystemWake)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HandleSystemQueryPower: Query for an incompatible system power state\n")); PoStartNextPowerIrp(Irp); @@ -222,7 +222,7 @@ // if querying for a lower S-state, issue a wait-wake if((systemState > deviceExtension->SysPower) && (deviceExtension->WaitWakeEnable)) - { + { IssueWaitWake(deviceExtension); } @@ -296,7 +296,7 @@ deviceExtension->DevPower - 1)); if (deviceExtension->WaitWakeEnable && deviceState > deviceExtension->DeviceCapabilities.DeviceWake) - { + { PoStartNextPowerIrp(Irp); Irp->IoStatus.Status = ntStatus = STATUS_INVALID_DEVICE_STATE; Irp->IoStatus.Information = 0; @@ -310,16 +310,16 @@ } if (deviceState < deviceExtension->DevPower) - { + { ntStatus = STATUS_SUCCESS; } else - { + { ntStatus = HoldIoRequests(DeviceObject, Irp); if(STATUS_PENDING == ntStatus) - { + { return ntStatus; } @@ -332,13 +332,13 @@ Irp->IoStatus.Status = ntStatus; Irp->IoStatus.Information = 0; if(!NT_SUCCESS(ntStatus)) - { + { IoCompleteRequest(Irp, IO_NO_INCREMENT); } else - { + { IoSkipCurrentIrpStackLocation(Irp); ntStatus=PoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); @@ -357,7 +357,7 @@ NTSTATUS SysPoCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) { NTSTATUS ntStatus; - PIO_STACK_LOCATION irpStack; + PIO_STACK_LOCATION irpStack; ntStatus = Irp->IoStatus.Status; irpStack = IoGetCurrentIrpStackLocation(Irp); @@ -366,7 +366,7 @@ // lower drivers failed this Irp if(!NT_SUCCESS(ntStatus)) - { + { PoStartNextPowerIrp(Irp); FreeBT_DbgPrint(3, ("FBTUSB: SysPoCompletionRoutine::")); FreeBT_IoDecrement(DeviceExtension); @@ -377,7 +377,7 @@ // ..otherwise update the cached system power state (IRP_MN_SET_POWER) if(irpStack->MinorFunction == IRP_MN_SET_POWER) - { + { DeviceExtension->SysPower = irpStack->Parameters.Power.State.SystemState; } @@ -415,14 +415,14 @@ powerContext = (PPOWER_COMPLETION_CONTEXT) ExAllocatePool(NonPagedPool, sizeof(POWER_COMPLETION_CONTEXT)); if (!powerContext) - { + { FreeBT_DbgPrint(1, ("FBTUSB: SendDeviceIrp: Failed to alloc memory for powerContext\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; } else - { + { powerContext->DeviceObject = DeviceObject; powerContext->SIrp = SIrp; @@ -438,9 +438,9 @@ } if (!NT_SUCCESS(ntStatus)) - { + { if (powerContext) - { + { ExFreePool(powerContext); } @@ -516,7 +516,7 @@ deviceExtension->DevPower - 1)); if (newDevState < oldDevState) - { + { FreeBT_DbgPrint(3, ("FBTUSB: HandleDeviceSetPower: Adding power to the device\n")); @@ -531,23 +531,23 @@ ntStatus = PoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); - } + } else - { + { // newDevState >= oldDevState // hold I/O if transition from D0 -> DX (X = 1, 2, 3) // if transition from D1 or D2 to deeper sleep states, // I/O queue is already on hold. if(PowerDeviceD0 == oldDevState && newDevState > oldDevState) - { + { // D0 -> DX transition FreeBT_DbgPrint(3, ("FBTUSB: HandleDeviceSetPower: Removing power from the device\n")); ntStatus = HoldIoRequests(DeviceObject, Irp); if (!NT_SUCCESS(ntStatus)) - { + { PoStartNextPowerIrp(Irp); Irp->IoStatus.Status = ntStatus; Irp->IoStatus.Information = 0; @@ -561,7 +561,7 @@ } else - { + { goto HandleDeviceSetPower_Exit; } @@ -569,7 +569,7 @@ } else if (PowerDeviceD0 == oldDevState && PowerDeviceD0 == newDevState) - { + { // D0 -> D0 // unblock the queue which may have been blocked processing // query irp @@ -594,7 +594,7 @@ ntStatus = PoCallDriver(deviceExtension->TopOfStackDeviceObject, Irp); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HandleDeviceSetPower: Lower drivers failed a power Irp\n")); } @@ -617,13 +617,13 @@ ntStatus = Irp->IoStatus.Status; if(Irp->PendingReturned) - { + { IoMarkIrpPending(Irp); } if(!NT_SUCCESS(ntStatus)) - { + { PoStartNextPowerIrp(Irp); FreeBT_DbgPrint(3, ("FBTUSB: FinishDevPoUpIrp::")); @@ -665,7 +665,7 @@ // save/restore. PoSetPowerState(DeviceObject, DevicePowerState, newState); if(PowerDeviceD0 == newDevState) - { + { KeAcquireSpinLock(&DeviceExtension->DevStateLock, &oldIrql); DeviceExtension->QueueState = AllowRequests; KeReleaseSpinLock(&DeviceExtension->DevStateLock, oldIrql); @@ -701,7 +701,7 @@ newState = irpStack->Parameters.Power.State; if (NT_SUCCESS(ntStatus) && irpStack->MinorFunction == IRP_MN_SET_POWER) - { + { FreeBT_DbgPrint(3, ("FBTUSB: updating cache..\n")); DeviceExtension->DevPower = newState.DeviceState; PoSetPowerState(DeviceObject, DevicePowerState, newState); @@ -734,7 +734,7 @@ context = (PWORKER_THREAD_CONTEXT) ExAllocatePool(NonPagedPool, sizeof(WORKER_THREAD_CONTEXT)); if(context) - { + { item = IoAllocateWorkItem(DeviceObject); context->Irp = Irp; @@ -742,7 +742,7 @@ context->WorkItem = item; if (item) - { + { IoMarkIrpPending(Irp); IoQueueWorkItem(item, HoldIoRequestsWorkerRoutine, DelayedWorkQueue, context); ntStatus = STATUS_PENDING; @@ -750,7 +750,7 @@ } else - { + { FreeBT_DbgPrint(3, ("FBTUSB: HoldIoRequests: Failed to allocate memory for workitem\n")); ExFreePool(context); ntStatus = STATUS_INSUFFICIENT_RESOURCES; @@ -760,7 +760,7 @@ } else - { + { FreeBT_DbgPrint(1, ("FBTUSB: HoldIoRequests: Failed to alloc memory for worker thread context\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; @@ -806,16 +806,16 @@ // now send the Irp down IoCopyCurrentIrpStackLocationToNext(irp); IoSetCompletionRoutine( - irp, - (PIO_COMPLETION_ROUTINE) FinishDevPoDnIrp, - deviceExtension, - TRUE, - TRUE, - TRUE); + irp, + (PIO_COMPLETION_ROUTINE) FinishDevPoDnIrp, + deviceExtension, + TRUE, + TRUE, + TRUE); ntStatus = PoCallDriver(deviceExtension->TopOfStackDeviceObject, irp); if(!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: HoldIoRequestsWorkerRoutine: Lower driver fail a power Irp\n")); } @@ -892,7 +892,7 @@ FreeBT_DbgPrint(3, ("FBTUSB: IssueWaitWake: Entered\n")); if(InterlockedExchange(&DeviceExtension->FlagWWOutstanding, 1)) - { + { return STATUS_DEVICE_BUSY; } @@ -909,7 +909,7 @@ &DeviceExtension->WaitWakeIrp); if(!NT_SUCCESS(ntStatus)) - { + { InterlockedExchange(&DeviceExtension->FlagWWOutstanding, 0); } @@ -928,10 +928,10 @@ Irp = (PIRP) InterlockedExchangePointer(&DeviceExtension->WaitWakeIrp, NULL); if(Irp) - { + { IoCancelIrp(Irp); if(InterlockedExchange(&DeviceExtension->FlagWWCancel, 1)) - { + { PoStartNextPowerIrp(Irp); Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; @@ -949,7 +949,7 @@ { FreeBT_DbgPrint(3, ("FBTUSB: WaitWakeCompletionRoutine: Entered\n")); if(Irp->PendingReturned) - { + { IoMarkIrpPending(Irp); } @@ -958,7 +958,7 @@ // as part of the completion process. If it's already NULL, // avoid race with the CancelWaitWake routine. if(InterlockedExchangePointer(&DeviceExtension->WaitWakeIrp, NULL)) - { + { PoStartNextPowerIrp(Irp); return STATUS_SUCCESS; @@ -969,7 +969,7 @@ // If FlagWWCancel != 0, complete the Irp. // If FlagWWCancel == 0, CancelWaitWake completes it. if(InterlockedExchange(&DeviceExtension->FlagWWCancel, 1)) - { + { PoStartNextPowerIrp(Irp); return STATUS_CANCELLED; @@ -1000,14 +1000,14 @@ InterlockedExchange(&deviceExtension->FlagWWOutstanding, 0); if(!NT_SUCCESS(IoStatus->Status)) - { + { return; } // wake up the device if(deviceExtension->DevPower == PowerDeviceD0) - { + { FreeBT_DbgPrint(3, ("FBTUSB: WaitWakeCallback: Device already powered up...\n")); return; @@ -1026,7 +1026,7 @@ NULL); if(deviceExtension->WaitWakeEnable) - { + { IssueWaitWake(deviceExtension); } @@ -1041,7 +1041,7 @@ PCHAR PowerMinorFunctionString (IN UCHAR MinorFunction) { switch (MinorFunction) - { + { case IRP_MN_SET_POWER: return "IRP_MN_SET_POWER\n"; Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c [iso-8859-1] Tue May 1 16:53:02 2012 @@ -22,18 +22,18 @@ // Read/Write handler NTSTATUS FreeBT_DispatchRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PMDL mdl; - PURB urb; - ULONG totalLength; - ULONG stageLength; - NTSTATUS ntStatus; - ULONG_PTR virtualAddress; - PFILE_OBJECT fileObject; - PDEVICE_EXTENSION deviceExtension; - PIO_STACK_LOCATION irpStack; - PIO_STACK_LOCATION nextStack; - PFREEBT_RW_CONTEXT rwContext; - ULONG maxLength=0; + PMDL mdl; + PURB urb; + ULONG totalLength; + ULONG stageLength; + NTSTATUS ntStatus; + ULONG_PTR virtualAddress; + PFILE_OBJECT fileObject; + PDEVICE_EXTENSION deviceExtension; + PIO_STACK_LOCATION irpStack; + PIO_STACK_LOCATION nextStack; + PFREEBT_RW_CONTEXT rwContext; + //ULONG maxLength=0; urb = NULL; mdl = NULL; @@ -56,7 +56,7 @@ // Make sure that any selective suspend request has been completed. if (deviceExtension->SSEnable) { - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchRead: Waiting on the IdleReqPendEvent\n")); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchRead: Waiting on the IdleReqPendEvent\n")); KeWaitForSingleObject(&deviceExtension->NoIdleReqPendEvent, Executive, KernelMode, @@ -80,7 +80,7 @@ } - FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_DispatchRead: Transfer data length = %d\n", totalLength)); + FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_DispatchRead: Transfer data length = %d\n", totalLength)); if (totalLength == 0) { ntStatus = STATUS_SUCCESS; @@ -189,7 +189,7 @@ FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchRead::")); FreeBT_IoIncrement(deviceExtension); - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchRead: URB sent to lower driver, IRP is pending\n")); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchRead: URB sent to lower driver, IRP is pending\n")); // we return STATUS_PENDING and not the status returned by the lower layer. return STATUS_PENDING; @@ -206,13 +206,13 @@ NTSTATUS FreeBT_ReadCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { - ULONG stageLength; - NTSTATUS ntStatus; - PIO_STACK_LOCATION nextStack; - PFREEBT_RW_CONTEXT rwContext; - PDEVICE_EXTENSION deviceExtension; - - deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; + //ULONG stageLength; + NTSTATUS ntStatus; + //PIO_STACK_LOCATION nextStack; + PFREEBT_RW_CONTEXT rwContext; + PDEVICE_EXTENSION deviceExtension; + + deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; rwContext = (PFREEBT_RW_CONTEXT) Context; ntStatus = Irp->IoStatus.Status; @@ -221,13 +221,13 @@ if (NT_SUCCESS(ntStatus)) { - Irp->IoStatus.Information = rwContext->Urb->UrbBulkOrInterruptTransfer.TransferBufferLength; + Irp->IoStatus.Information = rwContext->Urb->UrbBulkOrInterruptTransfer.TransferBufferLength; } else { - Irp->IoStatus.Information = 0; + Irp->IoStatus.Information = 0; FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_ReadCompletion: - failed with status = %X\n", ntStatus)); } @@ -252,18 +252,18 @@ // Read/Write handler NTSTATUS FreeBT_DispatchWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PMDL mdl; - PURB urb; - ULONG totalLength; - ULONG stageLength; - NTSTATUS ntStatus; - ULONG_PTR virtualAddress; - PFILE_OBJECT fileObject; - PDEVICE_EXTENSION deviceExtension; - PIO_STACK_LOCATION irpStack; - PIO_STACK_LOCATION nextStack; - PFREEBT_RW_CONTEXT rwContext; - ULONG maxLength=0; + PMDL mdl; + PURB urb; + ULONG totalLength; + ULONG stageLength; + NTSTATUS ntStatus; + ULONG_PTR virtualAddress; + PFILE_OBJECT fileObject; + PDEVICE_EXTENSION deviceExtension; + PIO_STACK_LOCATION irpStack; + PIO_STACK_LOCATION nextStack; + PFREEBT_RW_CONTEXT rwContext; + //ULONG maxLength=0; urb = NULL; mdl = NULL; @@ -286,7 +286,7 @@ // Make sure that any selective suspend request has been completed. if (deviceExtension->SSEnable) { - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_WriteDispatch: Waiting on the IdleReqPendEvent\n")); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_WriteDispatch: Waiting on the IdleReqPendEvent\n")); KeWaitForSingleObject(&deviceExtension->NoIdleReqPendEvent, Executive, KernelMode, @@ -310,10 +310,10 @@ } - FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_WriteDispatch: Transfer data length = %d\n", totalLength)); + FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_WriteDispatch: Transfer data length = %d\n", totalLength)); if (totalLength>FBT_HCI_DATA_MAX_SIZE) { - FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_WriteDispatch: Buffer exceeds maximum packet length (%d), failing IRP\n", FBT_HCI_DATA_MAX_SIZE)); + FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_WriteDispatch: Buffer exceeds maximum packet length (%d), failing IRP\n", FBT_HCI_DATA_MAX_SIZE)); ntStatus = STATUS_INVALID_BUFFER_SIZE; ExFreePool(rwContext); goto FreeBT_DispatchWrite_Exit; @@ -322,7 +322,7 @@ if (totalLength<FBT_HCI_DATA_MIN_SIZE) { - FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_WriteDispatch: Zero length buffer, completing IRP\n")); + FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_WriteDispatch: Zero length buffer, completing IRP\n")); ntStatus = STATUS_BUFFER_TOO_SMALL; ExFreePool(rwContext); goto FreeBT_DispatchWrite_Exit; @@ -429,7 +429,7 @@ FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchWrite::")); FreeBT_IoIncrement(deviceExtension); - FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchWrite: URB sent to lower driver, IRP is pending\n")); + FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_DispatchWrite: URB sent to lower driver, IRP is pending\n")); // we return STATUS_PENDING and not the status returned by the lower layer. return STATUS_PENDING; @@ -446,13 +446,13 @@ NTSTATUS FreeBT_WriteCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { - ULONG stageLength; - NTSTATUS ntStatus; - PIO_STACK_LOCATION nextStack; - PFREEBT_RW_CONTEXT rwContext; - PDEVICE_EXTENSION deviceExtension; - - deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; + ULONG stageLength; + NTSTATUS ntStatus; + PIO_STACK_LOCATION nextStack; + PFREEBT_RW_CONTEXT rwContext; + PDEVICE_EXTENSION deviceExtension; + + deviceExtension = (PDEVICE_EXTENSION) DeviceObject->DeviceExtension; rwContext = (PFREEBT_RW_CONTEXT) Context; ntStatus = Irp->IoStatus.Status; @@ -508,7 +508,7 @@ else { // No more data to transfer - FreeBT_DbgPrint(1, ("FBTUSB: FreeNT_WriteCompletion: Write completed, %d bytes written\n", Irp->IoStatus.Information)); + FreeBT_DbgPrint(1, ("FBTUSB: FreeNT_WriteCompletion: Write completed, %d bytes written\n", Irp->IoStatus.Information)); Irp->IoStatus.Information = rwContext->Numxfer; } Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtusb.c [iso-8859-1] Tue May 1 16:53:02 2012 @@ -49,7 +49,7 @@ registryPath->Buffer = (PWSTR) ExAllocatePool(PagedPool, registryPath->MaximumLength); if (!registryPath->Buffer) - { + { FreeBT_DbgPrint(1, ("FBTUSB: Failed to allocate memory for registryPath\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; goto DriverEntry_Exit; @@ -90,7 +90,7 @@ registryPath = &Globals.FreeBT_RegistryPath; if(registryPath->Buffer) - { + { ExFreePool(registryPath->Buffer); registryPath->Buffer = NULL; @@ -107,68 +107,68 @@ // to initialise NTSTATUS NTAPI FreeBT_AddDevice(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - NTSTATUS ntStatus; - PDEVICE_OBJECT deviceObject; - PDEVICE_EXTENSION deviceExtension; - POWER_STATE state; - KIRQL oldIrql; - UNICODE_STRING uniDeviceName; - WCHAR wszDeviceName[255]={0}; - UNICODE_STRING uniDosDeviceName; - LONG instanceNumber=0; + NTSTATUS ntStatus; + PDEVICE_OBJECT deviceObject; + PDEVICE_EXTENSION deviceExtension; + POWER_STATE state; + //KIRQL oldIrql; + UNICODE_STRING uniDeviceName; + WCHAR wszDeviceName[255]={0}; + UNICODE_STRING uniDosDeviceName; + LONG instanceNumber=0; FreeBT_DbgPrint(3, ("FBTUSB: FreeBT_AddDevice: Entered\n")); deviceObject = NULL; - swprintf(wszDeviceName, L"\\Device\\FbtUsb%02d", instanceNumber); - RtlInitUnicodeString(&uniDeviceName, wszDeviceName); - ntStatus=STATUS_OBJECT_NAME_COLLISION; - while (instanceNumber<99 && !NT_SUCCESS(ntStatus)) - { - swprintf(wszDeviceName, L"\\Device\\FbtUsb%02d", instanceNumber); - uniDeviceName.Length = wcslen(wszDeviceName) * sizeof(WCHAR); - FreeBT_DbgPrint(1, ("FBTUSB: Attempting to create device %ws\n", wszDeviceName)); - ntStatus = IoCreateDevice( - DriverObject, // our driver object - sizeof(DEVICE_EXTENSION), // extension size for us - &uniDeviceName, // name for this device - FILE_DEVICE_UNKNOWN, - 0, // device characteristics - FALSE, // Not exclusive - &deviceObject); // Our device object - - if (!NT_SUCCESS(ntStatus)) - instanceNumber++; - - } + swprintf(wszDeviceName, L"\\Device\\FbtUsb%02d", instanceNumber); + RtlInitUnicodeString(&uniDeviceName, wszDeviceName); + ntStatus=STATUS_OBJECT_NAME_COLLISION; + while (instanceNumber<99 && !NT_SUCCESS(ntStatus)) + { + swprintf(wszDeviceName, L"\\Device\\FbtUsb%02d", instanceNumber); + uniDeviceName.Length = wcslen(wszDeviceName) * sizeof(WCHAR); + FreeBT_DbgPrint(1, ("FBTUSB: Attempting to create device %ws\n", wszDeviceName)); + ntStatus = IoCreateDevice( + DriverObject, // our driver object + sizeof(DEVICE_EXTENSION), // extension size for us + &uniDeviceName, // name for this device + FILE_DEVICE_UNKNOWN, + 0, // device characteristics + FALSE, // Not exclusive + &deviceObject); // Our device object + + if (!NT_SUCCESS(ntStatus)) + instanceNumber++; + + } if (!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: Failed to create device object\n")); return ntStatus; } - FreeBT_DbgPrint(1, ("FBTUSB: Created device %ws\n", wszDeviceName)); + FreeBT_DbgPrint(1, ("FBTUSB: Created device %ws\n", wszDeviceName)); deviceExtension = (PDEVICE_EXTENSION) deviceObject->DeviceExtension; deviceExtension->FunctionalDeviceObject = deviceObject; deviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; deviceObject->Flags |= DO_DIRECT_IO; - swprintf(deviceExtension->wszDosDeviceName, L"\\DosDevices\\FbtUsb%02d", instanceNumber); - RtlInitUnicodeString(&uniDosDeviceName, deviceExtension->wszDosDeviceName); - ntStatus=IoCreateSymbolicLink(&uniDosDeviceName, &uniDeviceName); - if (!NT_SUCCESS(ntStatus)) - { - FreeBT_DbgPrint(1, ("FBTUSB: Failed to create symbolic link %ws to %ws, status=0x%08x\n", deviceExtension->wszDosDeviceName, wszDeviceName, ntStatus)); - IoDeleteDevice(deviceObject); - return ntStatus; - - } - - FreeBT_DbgPrint(1, ("FBTUSB: Created symbolic link %ws\n", deviceExtension->wszDosDeviceName)); + swprintf(deviceExtension->wszDosDeviceName, L"\\DosDevices\\FbtUsb%02d", instanceNumber); + RtlInitUnicodeString(&uniDosDeviceName, deviceExtension->wszDosDeviceName); + ntStatus=IoCreateSymbolicLink(&uniDosDeviceName, &uniDeviceName); + if (!NT_SUCCESS(ntStatus)) + { + FreeBT_DbgPrint(1, ("FBTUSB: Failed to create symbolic link %ws to %ws, status=0x%08x\n", deviceExtension->wszDosDeviceName, wszDeviceName, ntStatus)); + IoDeleteDevice(deviceObject); + return ntStatus; + + } + + FreeBT_DbgPrint(1, ("FBTUSB: Created symbolic link %ws\n", deviceExtension->wszDosDeviceName)); KeInitializeSpinLock(&deviceExtension->DevStateLock); @@ -205,10 +205,10 @@ // Delegating to WMILIB ntStatus = FreeBT_WmiRegistration(deviceExtension); if (!NT_SUCCESS(ntStatus)) - { + { FreeBT_DbgPrint(1, ("FBTUSB: FreeBT_WmiRegistration failed with %X\n", ntStatus)); IoDeleteDevice(deviceObject); - IoDeleteSymbolicLink(&uniDosDeviceName); + IoDeleteSymbolicLink(&uniDosDeviceName); return ntStatus; } @@ -216,7 +216,7 @@ // Set the flags as underlying PDO if (PhysicalDeviceObject->Flags & DO_POWER_PAGABLE) - { + { deviceObject->Flags |= DO_POWER_PAGABLE; } @@ -237,12 +237,12 @@ // attachment chain. This is where all the IRPs should be routed. deviceExtension->TopOfStackDeviceObject = IoAttachDeviceToDeviceStack(deviceObject, PhysicalDeviceObject); if (NULL == deviceExtension->TopOfStackDeviceObject) - { + { #ifdef ENABLE_WMI FreeBT_WmiDeRegistration(deviceExtension); #endif IoDeleteDevice(deviceObject); - IoDeleteSymbolicLink(&uniDosDeviceName); + IoDeleteSymbolicLink(&uniDosDeviceName); return STATUS_NO_SUCH_DEVICE; } @@ -253,37 +253,37 @@ NULL, &deviceExtension->InterfaceName); if (!NT_SUCCESS(ntStatus)) - { + { #ifdef ENABLE_WMI FreeBT_WmiDeRegistration(deviceExtension); #endif IoDetachDevice(deviceExtension->TopOfStackDeviceObject); IoDeleteDevice(deviceObject); - IoDeleteSymbolicLink(&uniDosDeviceName); + IoDeleteSymbolicLink(&uniDosDeviceName); return ntStatus; } if (IoIsWdmVersionAvailable(1, 0x20)) - { + { deviceExtension->WdmVersion = WinXpOrBetter; } else if (IoIsWdmVersionAvailable(1, 0x10)) - { + { deviceExtension->WdmVersion = Win2kOrBetter; } else if (IoIsWdmVersionAvailable(1, 0x5)) - { + { deviceExtension->WdmVersion = WinMeOrBetter; } else if (IoIsWdmVersionAvailable(1, 0x0)) - { + { deviceExtension->WdmVersion = Win98OrBetter; } @@ -292,14 +292,14 @@ deviceExtension->SSEnable = 0; // WinXP only: check the registry flag indicating whether - // the device should selectively suspend when idle + // the device should selectively suspend when idle if (WinXpOrBetter == deviceExtension->WdmVersion) - { + { FreeBT_GetRegistryDword(FREEBT_REGISTRY_PARAMETERS_PATH, L"BulkUsbEnable", (PULONG)(&deviceExtension->SSRegistryEnable)); if (deviceExtension->SSRegistryEnable) - { + { // initialize DPC KeInitializeDpc(&deviceExtension->DeferredProcCall, DpcRoutine, deviceObject);

12 years, 7 months

[tfaber] 56468: [NTDLL_APITEST] - Add initial tests for RtlDosSearchPath_U & RtlDosSearchPath_Ustr - Work around Wine ok() silliness - Fix 64 bit warnings

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 1 16:19:17 2012 New Revision: 56468 URL: http://svn.reactos.org/svn/reactos?rev=56468&view=rev Log: [NTDLL_APITEST] - Add initial tests for RtlDosSearchPath_U & RtlDosSearchPath_Ustr - Work around Wine ok() silliness - Fix 64 bit warnings Added: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c (with props) trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Tue May 1 16:19:17 2012 @@ -4,6 +4,8 @@ NtFreeVirtualMemory.c RtlDetermineDosPathNameType.c RtlDoesFileExists.c + RtlDosSearchPath_U.c + RtlDosSearchPath_Ustr.c RtlGetFullPathName_U.c RtlGetFullPathName_Ustr.c RtlGetFullPathName_UstrEx.c Added: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSear… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c (added) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] Tue May 1 16:19:17 2012 @@ -1,0 +1,219 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for RtlDosSearchPath_U + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#define UNICODE +#include <stdio.h> +#include <wine/test.h> +#include <pseh/pseh2.h> +#include <ndk/rtlfuncs.h> + +/* +ULONG +NTAPI +RtlDosSearchPath_U( + IN PCWSTR Path, + IN PCWSTR FileName, + IN PCWSTR Extension, + IN ULONG BufferSize, + OUT PWSTR Buffer, + OUT PWSTR *PartName +); +*/ + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +static +BOOLEAN +CheckStringBuffer( + PCWSTR Buffer, + SIZE_T Length, + SIZE_T MaximumLength, + PCWSTR Expected) +{ + SIZE_T ExpectedLength = wcslen(Expected) * sizeof(WCHAR); + SIZE_T EqualLength; + BOOLEAN Result = TRUE; + SIZE_T i; + + if (Length != ExpectedLength) + { + ok(0, "String length is %lu, expected %lu\n", (ULONG)Length, (ULONG)ExpectedLength); + Result = FALSE; + } + + EqualLength = RtlCompareMemory(Buffer, Expected, Length); + if (EqualLength != Length) + { + ok(0, "String is '%S', expected '%S'\n", Buffer, Expected); + Result = FALSE; + } + + if (Buffer[Length / sizeof(WCHAR)] != UNICODE_NULL) + { + ok(0, "Not null terminated\n"); + Result = FALSE; + } + + /* the function nulls the rest of the buffer! */ + for (i = Length + sizeof(UNICODE_NULL); i < MaximumLength; i++) + { + UCHAR Char = ((PUCHAR)Buffer)[i]; + if (Char != 0) + { + ok(0, "Found 0x%x at offset %lu, expected 0x%x\n", Char, (ULONG)i, 0); + /* don't count this as a failure unless the string was actually wrong */ + //Result = FALSE; + /* don't flood the log */ + break; + } + } + + return Result; +} + +static +BOOLEAN +CheckBuffer( + PVOID Buffer, + SIZE_T Size, + UCHAR Value) +{ + PUCHAR Array = Buffer; + SIZE_T i; + + for (i = 0; i < Size; i++) + if (Array[i] != Value) + { + trace("Expected %x, found %x at offset %lu\n", Value, Array[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +#define InvalidPointer ((PVOID)0x0123456789ABCDEFULL) + +START_TEST(RtlDosSearchPath_U) +{ + NTSTATUS ExceptionStatus; + ULONG Length; + WCHAR Buffer[MAX_PATH]; + PWSTR PartName; + BOOLEAN Okay; + BOOL Success; + WCHAR FileName[MAX_PATH]; + WCHAR CustomPath[MAX_PATH] = L"RtlDosSearchPath_U_TestPath"; + HANDLE Handle; + + swprintf(FileName, L"C:\\%ls", CustomPath); + /* Make sure this directory doesn't exist */ + while (GetFileAttributes(FileName) != INVALID_FILE_ATTRIBUTES) + { + wcscat(CustomPath, L"X"); + swprintf(FileName, L"C:\\%ls", CustomPath); + } + Success = CreateDirectory(FileName, NULL); + ok(Success, "CreateDirectory failed, results might not be accurate\n"); + swprintf(FileName, L"C:\\%ls\\ThisFolderExists", CustomPath); + Success = CreateDirectory(FileName, NULL); + ok(Success, "CreateDirectory failed, results might not be accurate\n"); + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\ThisFileExists", CustomPath); + Handle = CreateFile(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(Handle != INVALID_HANDLE_VALUE, "CreateFile failed, results might not be accurate\n"); + if (Handle != INVALID_HANDLE_VALUE) + CloseHandle(Handle); + + /* NULL parameters */ + StartSeh() RtlDosSearchPath_U(NULL, NULL, NULL, 0, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() Length = RtlDosSearchPath_U(NULL, L"", NULL, 0, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() Length = RtlDosSearchPath_U(NULL, L"", NULL, 0, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() Length = RtlDosSearchPath_U(NULL, L"", NULL, 1, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() Length = RtlDosSearchPath_U(NULL, L"", NULL, 2, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() Length = RtlDosSearchPath_U(L"", NULL, NULL, 0, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + + /* Empty strings - first one that doesn't crash */ + StartSeh() + Length = RtlDosSearchPath_U(L"", L"", NULL, 0, NULL, NULL); + ok(Length == 0, "Length %lu\n", Length); + EndSeh(STATUS_SUCCESS); + + /* Check what's initialized */ + PartName = InvalidPointer; + StartSeh() + Length = RtlDosSearchPath_U(L"", L"", NULL, 0, NULL, &PartName); + ok(Length == 0, "Length = %lu\n", Length); + EndSeh(STATUS_SUCCESS); + ok(PartName == InvalidPointer, "PartName = %p\n", PartName); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + StartSeh() + Length = RtlDosSearchPath_U(L"", L"", NULL, sizeof(Buffer), Buffer, NULL); + ok(Length == 0, "Length %lu\n", Length); + EndSeh(STATUS_SUCCESS); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + PartName = InvalidPointer; + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + StartSeh() + Length = RtlDosSearchPath_U(L"", L"", NULL, sizeof(Buffer), Buffer, &PartName); + ok(Length == 0, "Length %lu\n", Length); + EndSeh(STATUS_SUCCESS); + ok(PartName == InvalidPointer, "PartName = %p\n", PartName); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + /* Empty path string searches in current directory */ + swprintf(FileName, L"C:\\%ls\\ThisFolderExists", CustomPath); + Success = SetCurrentDirectory(FileName); + ok(Success, "SetCurrentDirectory failed\n"); + PartName = InvalidPointer; + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + StartSeh() + Length = RtlDosSearchPath_U(L"", L"ThisFileExists", NULL, sizeof(Buffer), Buffer, &PartName); + ok(Length == wcslen(FileName) * sizeof(WCHAR) + sizeof(L"\\ThisFileExists") - sizeof(UNICODE_NULL), "Length %lu\n", Length); + EndSeh(STATUS_SUCCESS); + ok(PartName == &Buffer[wcslen(FileName) + 1], "PartName = %p\n", PartName); + wcscat(FileName, L"\\ThisFileExists"); + Okay = CheckStringBuffer(Buffer, Length, sizeof(Buffer), FileName); + ok(Okay, "CheckStringBuffer failed\n"); + + /* Absolute path in FileName is also okay */ + PartName = InvalidPointer; + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + StartSeh() + Length = RtlDosSearchPath_U(L"", L"C:\\", NULL, sizeof(Buffer), Buffer, &PartName); + ok(Length == sizeof(L"C:\\") - sizeof(UNICODE_NULL), "Length %lu\n", Length); + EndSeh(STATUS_SUCCESS); + ok(PartName == NULL, "PartName = %p\n", PartName); + Okay = CheckStringBuffer(Buffer, Length, sizeof(Buffer), L"C:\\"); + ok(Okay, "CheckStringBuffer failed\n"); + + /* Empty FileName also works */ + PartName = InvalidPointer; + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + StartSeh() + Length = RtlDosSearchPath_U(L"C:\\", L"", NULL, sizeof(Buffer), Buffer, &PartName); + ok(Length == sizeof(L"C:\\") - sizeof(UNICODE_NULL), "Length %lu\n", Length); + EndSeh(STATUS_SUCCESS); + ok(PartName == NULL, "PartName = %p\n", PartName); + Okay = CheckStringBuffer(Buffer, Length, sizeof(Buffer), L"C:\\"); + ok(Okay, "CheckStringBuffer failed\n"); + + /* Clean up test folder */ + SetCurrentDirectory(L"C:\\"); + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\ThisFileExists", CustomPath); + Success = DeleteFile(FileName); + ok(Success, "DeleteFile failed, test might leave stale file\n"); + swprintf(FileName, L"C:\\%ls\\ThisFolderExists", CustomPath); + Success = RemoveDirectory(FileName); + ok(Success, "RemoveDirectory failed %(lu), test might leave stale directory\n", GetLastError()); + swprintf(FileName, L"C:\\%ls", CustomPath); + Success = RemoveDirectory(FileName); + ok(Success, "RemoveDirectory failed (%lu), test might leave stale directory\n", GetLastError()); +} Propchange: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSear… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c (added) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c [iso-8859-1] Tue May 1 16:19:17 2012 @@ -1,0 +1,226 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for RtlDosSearchPath_Ustr + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <pseh/pseh2.h> +#include <ndk/rtlfuncs.h> + +/* +NTSTATUS +NTAPI +RtlDosSearchPath_Ustr( + IN ULONG Flags, + IN PUNICODE_STRING PathString, + IN PUNICODE_STRING FileNameString, + IN PUNICODE_STRING ExtensionString, + IN PUNICODE_STRING CallerBuffer, + IN OUT PUNICODE_STRING DynamicString OPTIONAL, + OUT PUNICODE_STRING *FullNameOut OPTIONAL, + OUT PSIZE_T FilePartSize OPTIONAL, + OUT PSIZE_T LengthNeeded OPTIONAL +); +*/ + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +#define ok_eq_ulong(value, expected) ok((value) == (expected), #value " = %lu, expected %lu\n", value, expected) +#define ok_eq_hex(value, expected) ok((value) == (expected), #value " = 0x%lx, expected 0x%lx\n", value, expected) +#define ok_eq_pointer(value, expected) ok((value) == (expected), #value " = %p, expected %p\n", value, expected) + +#define ok_eq_ustr(str1, str2) do { \ + ok((str1)->Buffer == (str2)->Buffer, "Buffer modified\n"); \ + ok((str1)->Length == (str2)->Length, "Length modified\n"); \ + ok((str1)->MaximumLength == (str2)->MaximumLength, "MaximumLength modified\n"); \ + } while (0) + +#define InvalidPointer ((PVOID)0x0123456789ABCDEFULL) + +START_TEST(RtlDosSearchPath_Ustr) +{ + NTSTATUS ExceptionStatus; + NTSTATUS Status; + UNICODE_STRING PathString; + UNICODE_STRING FileNameString; + UNICODE_STRING ExtensionString; + UNICODE_STRING CallerBuffer; + UNICODE_STRING DynamicString; + PUNICODE_STRING FullNameOut; + UNICODE_STRING EmptyString; + SIZE_T FilePartSize; + SIZE_T LengthNeeded; + INT i; + + RtlInitUnicodeString(&EmptyString, NULL); + + /* NULLs */ + StartSeh() + Status = RtlDosSearchPath_Ustr(0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + EndSeh(STATUS_SUCCESS); + + RtlInitUnicodeString(&FileNameString, NULL); + StartSeh() + Status = RtlDosSearchPath_Ustr(0, NULL, &FileNameString, NULL, NULL, NULL, NULL, NULL, NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + EndSeh(STATUS_SUCCESS); + + RtlInitUnicodeString(&PathString, NULL); + StartSeh() + Status = RtlDosSearchPath_Ustr(0, &PathString, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&PathString, &EmptyString); + + /* Minimal valid set of parameters */ + RtlInitUnicodeString(&PathString, NULL); + RtlInitUnicodeString(&FileNameString, NULL); + StartSeh() + Status = RtlDosSearchPath_Ustr(0, &PathString, &FileNameString, NULL, NULL, NULL, NULL, NULL, NULL); + ok_eq_hex(Status, STATUS_NO_SUCH_FILE); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&PathString, &EmptyString); + ok_eq_ustr(&FileNameString, &EmptyString); + + /* Check valid flags */ + for (i = 0; i < 32; i++) + { + RtlInitUnicodeString(&PathString, NULL); + RtlInitUnicodeString(&FileNameString, NULL); + StartSeh() + Status = RtlDosSearchPath_Ustr(1 << i, &PathString, &FileNameString, NULL, NULL, NULL, NULL, NULL, NULL); + ok_eq_hex(Status, i > 2 ? STATUS_INVALID_PARAMETER : STATUS_NO_SUCH_FILE); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&PathString, &EmptyString); + ok_eq_ustr(&FileNameString, &EmptyString); + } + + RtlInitUnicodeString(&PathString, NULL); + RtlInitUnicodeString(&FileNameString, NULL); + StartSeh() + Status = RtlDosSearchPath_Ustr(7, &PathString, &FileNameString, NULL, NULL, NULL, NULL, NULL, NULL); + ok_eq_hex(Status, STATUS_NO_SUCH_FILE); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&PathString, &EmptyString); + ok_eq_ustr(&FileNameString, &EmptyString); + + /* Everything except PathString */ + RtlInitUnicodeString(&FileNameString, NULL); + RtlInitUnicodeString(&ExtensionString, NULL); + RtlInitUnicodeString(&CallerBuffer, NULL); + RtlInitUnicodeString(&DynamicString, NULL); + FullNameOut = InvalidPointer; + FilePartSize = (SIZE_T)-1; + LengthNeeded = (SIZE_T)-1; + StartSeh() + Status = RtlDosSearchPath_Ustr(0, + NULL, + &FileNameString, + &ExtensionString, + &CallerBuffer, + &DynamicString, + &FullNameOut, + &FilePartSize, + &LengthNeeded); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&FileNameString, &EmptyString); + ok_eq_ustr(&ExtensionString, &EmptyString); + ok_eq_ustr(&CallerBuffer, &EmptyString); + ok_eq_ustr(&DynamicString, &EmptyString); + ok_eq_pointer(FullNameOut, NULL); + ok_eq_ulong(FilePartSize, 0); + ok_eq_ulong(LengthNeeded, 0); + + /* Everything except FileNameString */ + RtlInitUnicodeString(&PathString, NULL); + RtlInitUnicodeString(&ExtensionString, NULL); + RtlInitUnicodeString(&CallerBuffer, NULL); + RtlInitUnicodeString(&DynamicString, NULL); + FullNameOut = InvalidPointer; + FilePartSize = (SIZE_T)-1; + LengthNeeded = (SIZE_T)-1; + StartSeh() + Status = RtlDosSearchPath_Ustr(0, + &PathString, + NULL, + &ExtensionString, + &CallerBuffer, + &DynamicString, + &FullNameOut, + &FilePartSize, + &LengthNeeded); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&PathString, &EmptyString); + ok_eq_ustr(&ExtensionString, &EmptyString); + ok_eq_ustr(&CallerBuffer, &EmptyString); + ok_eq_ustr(&DynamicString, &EmptyString); + ok_eq_pointer(FullNameOut, NULL); + ok_eq_ulong(FilePartSize, 0); + ok_eq_ulong(LengthNeeded, 0); + + /* Passing CallerBuffer and DynamicString, but not FullNameOut is invalid */ + RtlInitUnicodeString(&PathString, NULL); + RtlInitUnicodeString(&FileNameString, NULL); + RtlInitUnicodeString(&ExtensionString, NULL); + RtlInitUnicodeString(&CallerBuffer, NULL); + RtlInitUnicodeString(&DynamicString, NULL); + FullNameOut = InvalidPointer; + FilePartSize = (SIZE_T)-1; + LengthNeeded = (SIZE_T)-1; + StartSeh() + Status = RtlDosSearchPath_Ustr(0, + &PathString, + &FileNameString, + &ExtensionString, + &CallerBuffer, + &DynamicString, + NULL, + &FilePartSize, + &LengthNeeded); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&PathString, &EmptyString); + ok_eq_ustr(&FileNameString, &EmptyString); + ok_eq_ustr(&ExtensionString, &EmptyString); + ok_eq_ustr(&CallerBuffer, &EmptyString); + ok_eq_ustr(&DynamicString, &EmptyString); + ok_eq_ulong(FilePartSize, 0); + ok_eq_ulong(LengthNeeded, 0); + + /* All parameters given */ + RtlInitUnicodeString(&PathString, NULL); + RtlInitUnicodeString(&FileNameString, NULL); + RtlInitUnicodeString(&ExtensionString, NULL); + RtlInitUnicodeString(&CallerBuffer, NULL); + RtlInitUnicodeString(&DynamicString, NULL); + FullNameOut = InvalidPointer; + FilePartSize = (SIZE_T)-1; + LengthNeeded = (SIZE_T)-1; + StartSeh() + Status = RtlDosSearchPath_Ustr(0, + &PathString, + &FileNameString, + &ExtensionString, + &CallerBuffer, + &DynamicString, + &FullNameOut, + &FilePartSize, + &LengthNeeded); + ok_eq_hex(Status, STATUS_NO_SUCH_FILE); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&PathString, &EmptyString); + ok_eq_ustr(&FileNameString, &EmptyString); + ok_eq_ustr(&ExtensionString, &EmptyString); + ok_eq_ustr(&CallerBuffer, &EmptyString); + ok_eq_ustr(&DynamicString, &EmptyString); + ok_eq_pointer(FullNameOut, NULL); + ok_eq_ulong(FilePartSize, 0); + ok_eq_ulong(LengthNeeded, 0); +} Propchange: trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c [iso-8859-1] Tue May 1 16:19:17 2012 @@ -28,18 +28,18 @@ BOOLEAN CheckStringBuffer( PCWSTR Buffer, - ULONG Length, + SIZE_T Length, SIZE_T MaximumLength, PCWSTR Expected) { - USHORT ExpectedLength = wcslen(Expected) * sizeof(WCHAR); + SIZE_T ExpectedLength = wcslen(Expected) * sizeof(WCHAR); SIZE_T EqualLength; BOOLEAN Result = TRUE; SIZE_T i; if (Length != ExpectedLength) { - ok(0, "String length is %u, expected %u\n", Length, ExpectedLength); + ok(0, "String length is %lu, expected %lu\n", (ULONG)Length, (ULONG)ExpectedLength); Result = FALSE; } @@ -141,6 +141,7 @@ SIZE_T ExpectedFilePartSize; const INT TestCount = sizeof(TestCases) / sizeof(TestCases[0]); INT i; + BOOLEAN Okay; for (i = 0; i < TestCount; i++) { @@ -173,8 +174,8 @@ &ShortName); EndSeh(STATUS_SUCCESS); - ok(CheckStringBuffer(FullPathNameBuffer, Length, sizeof(FullPathNameBuffer), ExpectedPathName), - "Wrong path name '%S', expected '%S'\n", FullPathNameBuffer, ExpectedPathName); + Okay = CheckStringBuffer(FullPathNameBuffer, Length, sizeof(FullPathNameBuffer), ExpectedPathName); + ok(Okay, "Wrong path name '%S', expected '%S'\n", FullPathNameBuffer, ExpectedPathName); if (!ShortName) FilePartSize = 0; Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c [iso-8859-1] Tue May 1 16:19:17 2012 @@ -43,6 +43,7 @@ OUT PATH_TYPE_AND_UNKNOWN *PathType ) //= (PVOID)0x7c83086c // 2003 sp1 x86 +//= (PVOID)0x77ef49f0 // 2003 sp1 x64 //= (PVOID)0x7769a3dd // win7 sp1 wow64 ; @@ -59,18 +60,18 @@ BOOLEAN CheckStringBuffer( PCWSTR Buffer, - ULONG Length, + SIZE_T Length, SIZE_T MaximumLength, PCWSTR Expected) { - USHORT ExpectedLength = wcslen(Expected) * sizeof(WCHAR); + SIZE_T ExpectedLength = wcslen(Expected) * sizeof(WCHAR); SIZE_T EqualLength; BOOLEAN Result = TRUE; SIZE_T i; if (Length != ExpectedLength) { - ok(0, "String length is %u, expected %u\n", Length, ExpectedLength); + ok(0, "String length is %lu, expected %lu\n", (ULONG)Length, (ULONG)ExpectedLength); Result = FALSE; } @@ -197,6 +198,7 @@ const WCHAR *ExpectedShortName; const INT TestCount = sizeof(TestCases) / sizeof(TestCases[0]); INT i; + BOOLEAN Okay; for (i = 0; i < TestCount; i++) { @@ -240,8 +242,8 @@ &PathType); EndSeh(STATUS_SUCCESS); ok_eq_ustr(&FileName, &TempString); - ok(CheckStringBuffer(FullPathNameBuffer, Length, sizeof(FullPathNameBuffer), ExpectedPathName), - "Wrong path name '%S', expected '%S'\n", FullPathNameBuffer, ExpectedPathName); + Okay = CheckStringBuffer(FullPathNameBuffer, Length, sizeof(FullPathNameBuffer), ExpectedPathName); + ok(Okay, "Wrong path name '%S', expected '%S'\n", FullPathNameBuffer, ExpectedPathName); switch (TestCases[i].FilePartPrefixType) { case PrefixNone: @@ -306,6 +308,7 @@ BOOLEAN NameInvalid; BOOLEAN NameInvalidArray[sizeof(ULONGLONG)]; PATH_TYPE_AND_UNKNOWN PathType; + BOOLEAN Okay; if (!RtlGetFullPathName_Ustr) { @@ -414,7 +417,8 @@ ok(PathType.Unknown == 1234 || broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %d\n", PathType.Unknown); ok(NameInvalidArray[0] == FALSE, "NameInvalid = %u\n", NameInvalidArray[0]); - ok(CheckBuffer(NameInvalidArray + 1, sizeof(NameInvalidArray) - sizeof(NameInvalidArray[0]), 0x55), "CheckBuffer failed\n"); + Okay = CheckBuffer(NameInvalidArray + 1, sizeof(NameInvalidArray) - sizeof(NameInvalidArray[0]), 0x55); + ok(Okay, "CheckBuffer failed\n"); /* Give it a valid path */ RtlInitUnicodeString(&FileName, L"C:\\test"); Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] Tue May 1 16:19:17 2012 @@ -40,19 +40,19 @@ PCUNICODE_STRING String, PCWSTR Expected) { - USHORT Length = wcslen(Expected) * sizeof(WCHAR); + SIZE_T ExpectedLength = wcslen(Expected) * sizeof(WCHAR); SIZE_T EqualLength; BOOLEAN Result = TRUE; SIZE_T i; - if (String->Length != Length) - { - ok(0, "String length is %u, expected %u\n", String->Length, Length); + if (String->Length != ExpectedLength) + { + ok(0, "String length is %u, expected %lu\n", String->Length, (ULONG)ExpectedLength); Result = FALSE; } - EqualLength = RtlCompareMemory(String->Buffer, Expected, Length); - if (EqualLength != Length) + EqualLength = RtlCompareMemory(String->Buffer, Expected, ExpectedLength); + if (EqualLength != ExpectedLength) { ok(0, "String is '%wZ', expected '%S'\n", String, Expected); Result = FALSE; @@ -175,6 +175,7 @@ SIZE_T ExpectedFilePartSize; const INT TestCount = sizeof(TestCases) / sizeof(TestCases[0]); INT i; + BOOLEAN Okay; for (i = 0; i < TestCount; i++) { @@ -224,8 +225,8 @@ ok_eq_ustr(&FileName, &TempString); ok(FullPathName.Buffer == FullPathNameBuffer, "Buffer modified\n"); ok(FullPathName.MaximumLength == sizeof(FullPathNameBuffer), "MaximumLength modified\n"); - ok(CheckStringBuffer(&FullPathName, ExpectedPathName), - "Wrong path name '%wZ', expected '%S'\n", &FullPathName, ExpectedPathName); + Okay = CheckStringBuffer(&FullPathName, ExpectedPathName); + ok(Okay, "Wrong path name '%wZ', expected '%S'\n", &FullPathName, ExpectedPathName); ok(StringUsed == &FullPathName, "StringUsed = %p, expected %p\n", StringUsed, &FullPathName); switch (TestCases[i].FilePartPrefixType) { @@ -284,6 +285,7 @@ BOOLEAN NameInvalidArray[sizeof(ULONGLONG)]; RTL_PATH_TYPE PathType; SIZE_T LengthNeeded; + BOOLEAN Okay; /* NULL parameters */ StartSeh() @@ -376,7 +378,8 @@ ok_eq_ustr(&FileName, &TempString); ok(PathType == RtlPathTypeUnknown, "PathType = %d\n", PathType); ok(NameInvalidArray[0] == FALSE, "NameInvalid = %u\n", NameInvalidArray[0]); - ok(CheckBuffer(NameInvalidArray + 1, sizeof(NameInvalidArray) - sizeof(NameInvalidArray[0]), 0x55), "CheckBuffer failed\n"); + Okay = CheckBuffer(NameInvalidArray + 1, sizeof(NameInvalidArray) - sizeof(NameInvalidArray[0]), 0x55); + ok(Okay, "CheckBuffer failed\n"); /* Give it a valid path */ RtlInitUnicodeString(&FileName, L"C:\\test"); Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Tue May 1 16:19:17 2012 @@ -10,6 +10,8 @@ extern void func_NtSystemInformation(void); extern void func_RtlDetermineDosPathNameType(void); extern void func_RtlDoesFileExists(void); +extern void func_RtlDosSearchPath_U(void); +extern void func_RtlDosSearchPath_Ustr(void); extern void func_RtlGetFullPathName_U(void); extern void func_RtlGetFullPathName_Ustr(void); extern void func_RtlGetFullPathName_UstrEx(void); @@ -24,6 +26,8 @@ { "NtSystemInformation", func_NtSystemInformation }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType }, { "RtlDoesFileExists", func_RtlDoesFileExists }, + { "RtlDosSearchPath_U", func_RtlDosSearchPath_U }, + { "RtlDosSearchPath_Ustr", func_RtlDosSearchPath_Ustr }, { "RtlGetFullPathName_U", func_RtlGetFullPathName_U }, { "RtlGetFullPathName_Ustr", func_RtlGetFullPathName_Ustr }, { "RtlGetFullPathName_UstrEx", func_RtlGetFullPathName_UstrEx },

12 years, 7 months

[tfaber] 56467: [CRT:INTRIN_X86] - Use correct check for x64 architecture - Fix Interlocked*64 return types - Add _InterlockedXor64

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 1 15:45:49 2012 New Revision: 56467 URL: http://svn.reactos.org/svn/reactos?rev=56467&view=rev Log: [CRT:INTRIN_X86] - Use correct check for x64 architecture - Fix Interlocked*64 return types - Add _InterlockedXor64 Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Tue May 1 15:45:49 2012 @@ -75,7 +75,7 @@ /* TODO: __getcallerseflags but how??? */ /* Maybe the same for x86? */ -#ifdef _x86_64 +#ifdef __x86_64__ #define _alloca(s) __builtin_alloca(s) #endif @@ -109,10 +109,10 @@ _WriteBarrier(); } -#ifdef _x86_64 +#ifdef __x86_64__ __INTRIN_INLINE void __faststorefence(void) { - long local; + long local; __asm__ __volatile__("lock; orl $0, %0;" : : "m"(local)); } #endif @@ -198,7 +198,7 @@ } #if defined(_M_AMD64) -__INTRIN_INLINE long _InterlockedAnd64(volatile long long * const value, const long long mask) +__INTRIN_INLINE long long _InterlockedAnd64(volatile long long * const value, const long long mask) { return __sync_fetch_and_and(value, mask); } @@ -220,7 +220,7 @@ } #if defined(_M_AMD64) -__INTRIN_INLINE long _InterlockedOr64(volatile long long * const value, const long long mask) +__INTRIN_INLINE long long _InterlockedOr64(volatile long long * const value, const long long mask) { return __sync_fetch_and_or(value, mask); } @@ -240,6 +240,13 @@ { return __sync_fetch_and_xor(value, mask); } + +#if defined(_M_AMD64) +__INTRIN_INLINE long long _InterlockedXor64(volatile long long * const value, const long long mask) +{ + return __sync_fetch_and_xor(value, mask); +} +#endif #else

12 years, 7 months

[tkreuzer] 56466: [WIN32K] Fix a typo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 1 14:59:24 2012 New Revision: 56466 URL: http://svn.reactos.org/svn/reactos?rev=56466&view=rev Log: [WIN32K] Fix a typo Modified: trunk/reactos/win32ss/gdi/eng/rlecomp.c Modified: trunk/reactos/win32ss/gdi/eng/rlecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/rlecomp.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/rlecomp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/rlecomp.c [iso-8859-1] Tue May 1 14:59:24 2012 @@ -33,7 +33,7 @@ if ((Format == BMF_4RLE) || (Format == BMF_4BPP)) shift = 1; - else if ((Format != BMF_8RLE) || (Format == BMF_8BPP)) + else if ((Format != BMF_8RLE) && (Format != BMF_8BPP)) return; width = ((Size.cx + shift) >> shift);

12 years, 7 months

[tkreuzer] 56465: [WIN32K] Try to fix RLE regression

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 1 14:57:23 2012 New Revision: 56465 URL: http://svn.reactos.org/svn/reactos?rev=56465&view=rev Log: [WIN32K] Try to fix RLE regression Modified: trunk/reactos/win32ss/gdi/eng/rlecomp.c Modified: trunk/reactos/win32ss/gdi/eng/rlecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/rlecomp.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/rlecomp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/rlecomp.c [iso-8859-1] Tue May 1 14:57:23 2012 @@ -31,9 +31,9 @@ BYTE *temp; INT shift = 0; - if (Format == BMF_4RLE) + if ((Format == BMF_4RLE) || (Format == BMF_4BPP)) shift = 1; - else if(Format != BMF_8RLE) + else if ((Format != BMF_8RLE) || (Format == BMF_8BPP)) return; width = ((Size.cx + shift) >> shift);

12 years, 7 months

[tkreuzer] 56464: [WIN32K] - Fix RLE hack (thanks to Mephisto) - Remove obsolete flags

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 1 13:57:18 2012 New Revision: 56464 URL: http://svn.reactos.org/svn/reactos?rev=56464&view=rev Log: [WIN32K] - Fix RLE hack (thanks to Mephisto) - Remove obsolete flags Modified: trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/gdi/eng/surface.h trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Tue May 1 13:57:18 2012 @@ -143,8 +143,6 @@ PVOID pvSection; ASSERT(!pvBits || (iType == STYPE_BITMAP)); - ASSERT(pvBits || !(fjBitmap & BMF_DONT_FREE)); - ASSERT(!pvBits || !(fjBitmap & BMF_SINGLEALLOC)); /* Verify format */ if ((iFormat < BMF_1BPP) || (iFormat > BMF_PNG)) Modified: trunk/reactos/win32ss/gdi/eng/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] Tue May 1 13:57:18 2012 @@ -80,11 +80,7 @@ #define ABORT_SURFACE 0x40000000 #define PDEV_SURFACE 0x80000000 - -#define BMF_DONT_FREE 0x100 -#define BMF_RLE_HACK 0x200 -#define BMF_SINGLEALLOC 0x400 -#define BMF_POOLALLOC 0x800 +#define BMF_POOLALLOC 0x100 /* Internal interface */ Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Tue May 1 13:57:18 2012 @@ -1164,7 +1164,7 @@ 1, 1, BMF_32BPP, - BMF_DONT_FREE, + 0, 0, &ulRGBColor); if (psurfDest) Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Tue May 1 13:57:18 2012 @@ -84,7 +84,7 @@ } /* The infamous RLE hack */ - if ((iFormat == BMF_4RLE) || (iFormat == BMF_8RLE)) + if (pvCompressedBits) { SIZEL sizl; LONG lDelta; @@ -95,7 +95,6 @@ pvBits = psurf->SurfObj.pvBits; DecompressBitmap(sizl, pvCompressedBits, pvBits, lDelta, iFormat); - psurf->SurfObj.fjBitmap |= BMF_RLE_HACK; } /* Get the handle for the bitmap */ Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue May 1 13:57:18 2012 @@ -1595,7 +1595,6 @@ bmp->dwOffset = offset; bmp->flags = API_BITMAP; bmp->biClrImportant = bi->biClrImportant; - bmp->SurfObj.fjBitmap &= ~BMF_DONT_FREE; /* HACK */ if(hpal != (HPALETTE)0xFFFFFFFF)

12 years, 7 months

[tkreuzer] 56463: [WIN32K] Fix gcc uninitialized variable warning

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 1 12:59:37 2012 New Revision: 56463 URL: http://svn.reactos.org/svn/reactos?rev=56463&view=rev Log: [WIN32K] Fix gcc uninitialized variable warning Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Tue May 1 12:59:37 2012 @@ -56,7 +56,7 @@ { PSURFACE psurf; HBITMAP hbmp; - PVOID pvCompressedBits; + PVOID pvCompressedBits = NULL; /* Verify format */ if (iFormat < BMF_1BPP || iFormat > BMF_PNG) return NULL;

12 years, 7 months

[tkreuzer] 56462: [WIN32K] Use user mode mem for bitmaps larger than 4K to save pool memory.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 1 12:47:21 2012 New Revision: 56462 URL: http://svn.reactos.org/svn/reactos?rev=56462&view=rev Log: [WIN32K] Use user mode mem for bitmaps larger than 4K to save pool memory. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Tue May 1 12:47:21 2012 @@ -143,7 +143,7 @@ IN OPTIONAL LPBYTE pUnsafeBits) { HBITMAP hbmp; - ULONG cRealBpp, cjWidthBytes, iFormat; + ULONG cRealBpp, cjWidthBytes, iFormat, fjBitmap; ULONGLONG cjSize; PSURFACE psurf; @@ -164,13 +164,16 @@ EngSetLastError(ERROR_INVALID_PARAMETER); return NULL; } + + /* Allocations larger than PAGE_SIZE go into user mem */ + fjBitmap = (cjSize > PAGE_SIZE) ? BMF_USERMEM : 0; /* Allocate the surface (but don't set the bits) */ psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat, - 0, + fjBitmap, 0, NULL); if (!psurf)

12 years, 7 months

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 May 2012