Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[cgutman] 55057: [CDFS] - Prevent an infinite loop in CdfsDeviceIoControl if the the verify request is successful but IoCallDriver keeps returning STATUS_VERIFY_REQUIRED

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 21 22:16:46 2012 New Revision: 55057 URL: http://svn.reactos.org/svn/reactos?rev=55057&view=rev Log: [CDFS] - Prevent an infinite loop in CdfsDeviceIoControl if the the verify request is successful but IoCallDriver keeps returning STATUS_VERIFY_REQUIRED Modified: trunk/reactos/drivers/filesystems/cdfs/common.c Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] Sat Jan 21 22:16:46 2012 @@ -154,6 +154,7 @@ KEVENT Event; PIRP Irp; NTSTATUS Status; + BOOLEAN LastChance = FALSE; DPRINT("CdfsDeviceIoControl(DeviceObject %x, CtlCode %x, " "InputBuffer %x, InputBufferSize %x, OutputBuffer %x, " @@ -208,20 +209,29 @@ { PDEVICE_OBJECT DeviceToVerify; - DPRINT1("STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); IoSetDeviceToVerify(PsGetCurrentThread(), NULL); if (DeviceToVerify) { Status = IoVerifyVolume(DeviceToVerify, FALSE); - DPRINT1("IoVerifyVolume() returned (Status %lx)\n", Status); - } - - if (NT_SUCCESS(Status)) + DPRINT("IoVerifyVolume() returned (Status %lx)\n", Status); + } + + if (NT_SUCCESS(Status) && !LastChance) { DPRINT1("Volume verify succeeded; trying request again\n"); + LastChance = TRUE; goto again; + } + else if (NT_SUCCESS(Status)) + { + DPRINT1("Failed to read after successful verify, aborting\n"); + Status = STATUS_DEVICE_NOT_READY; + } + else + { + DPRINT1("IoVerifyVolume() failed (Status %lx)\n", Status); } }

12 years, 11 months

[cgutman] 55056: [USB-BRINGUP-TRUNK] - Add a class2 hack to recognize and assign drive letters to storage devices added while the system is running

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 21 22:08:33 2012 New Revision: 55056 URL: http://svn.reactos.org/svn/reactos?rev=55056&view=rev Log: [USB-BRINGUP-TRUNK] - Add a class2 hack to recognize and assign drive letters to storage devices added while the system is running Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] Sat Jan 21 22:08:33 2012 @@ -130,6 +130,164 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +ScsiClassPlugPlay( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + if (IrpSp->MinorFunction == IRP_MN_START_DEVICE) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + else + { + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } +} + +/* This is a hack to assign drive letters with a non-PnP storage stack */ +NTSTATUS +NTAPI +ScsiClassAssignDriveLetter(VOID) +{ + WCHAR Buffer1[100]; + WCHAR Buffer2[100]; + UNICODE_STRING DriveLetterU, PartitionU; + NTSTATUS Status; + ULONG Index, PartitionNumber, DeviceNumber; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + HANDLE PartitionHandle; + + /* We assume this device does not current have a drive letter */ + + Index = 0; + DeviceNumber = 0; + PartitionNumber = 1; + DriveLetterU.Buffer = Buffer1; + DriveLetterU.MaximumLength = sizeof(Buffer1); + PartitionU.Buffer = Buffer2; + PartitionU.MaximumLength = sizeof(Buffer2); + + /* Determine the correct disk number */ + do + { + /* Check that the disk exists */ + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\HardDisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); + InitializeObjectAttributes(&ObjectAttributes, + &PartitionU, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenFile(&PartitionHandle, + FILE_READ_ATTRIBUTES, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Return the last one that worked */ + DeviceNumber--; + } + else + { + ZwClose(PartitionHandle); + DeviceNumber++; + } + } while (Status == STATUS_SUCCESS); + + /* Create the symbolic link to PhysicalDriveX */ + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\Harddisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DeviceNumber) * sizeof(WCHAR); + + Status = IoCreateSymbolicLink(&DriveLetterU, &PartitionU); + if (!NT_SUCCESS(Status)) + { + /* Failed to create symbolic link */ + return Status; + } + + DbgPrint("HACK: Created symbolic link %wZ -> %wZ\n", &PartitionU, &DriveLetterU); + + while (TRUE) + { + /* Check that the disk exists */ + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\Harddisk%d\\Partition%d", DeviceNumber, PartitionNumber) * sizeof(WCHAR); + InitializeObjectAttributes(&ObjectAttributes, + &PartitionU, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenFile(&PartitionHandle, + FILE_READ_ATTRIBUTES, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (!NT_SUCCESS(Status)) + break; + else + { + ZwClose(PartitionHandle); + + /* Assign it a drive letter */ + do + { + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\%C:", ('C' + Index)) * sizeof(WCHAR); + + Status = IoCreateSymbolicLink(&DriveLetterU, &PartitionU); + + Index++; + } while (Status != STATUS_SUCCESS); + + DbgPrint("HACK: Created symbolic link %wZ -> %wZ\n", &PartitionU, &DriveLetterU); + PartitionNumber++; + } + } + + return STATUS_SUCCESS; +} + +typedef struct _CLASS_DRIVER_EXTENSION { + ULONG PortNumber; + CLASS_INIT_DATA InitializationData; +} CLASS_DRIVER_EXTENSION, *PCLASS_DRIVER_EXTENSION; + +NTSTATUS +NTAPI +ScsiClassAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PCLASS_DRIVER_EXTENSION DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + + if (DriverExtension->InitializationData.ClassFindDevices(DriverObject, NULL, &DriverExtension->InitializationData, + PhysicalDeviceObject, DriverExtension->PortNumber)) + { + /* Assign a drive letter */ + ScsiClassAssignDriveLetter(); + + /* Increment the port number */ + DriverExtension->PortNumber++; + } + else + { + /* Failed to find device */ + DbgPrint("FAILED TO FIND DEVICE!\n"); + } + + return STATUS_SUCCESS; +} + + ULONG NTAPI @@ -162,7 +320,6 @@ PDRIVER_OBJECT DriverObject = Argument1; - ULONG portNumber = 0; PDEVICE_OBJECT portDeviceObject; NTSTATUS status; STRING deviceNameString; @@ -170,6 +327,7 @@ PFILE_OBJECT fileObject; CCHAR deviceNameBuffer[256]; BOOLEAN deviceFound = FALSE; + PCLASS_DRIVER_EXTENSION DriverExtension; DebugPrint((3,"\n\nSCSI Class Driver\n")); @@ -200,6 +358,16 @@ return (ULONG) STATUS_REVISION_MISMATCH; } + status = IoAllocateDriverObjectExtension(DriverObject, + DriverObject, + sizeof(CLASS_DRIVER_EXTENSION), + (PVOID *)&DriverExtension); + if (!NT_SUCCESS(status)) + return status; + + RtlCopyMemory(&DriverExtension->InitializationData, InitializationData, sizeof(CLASS_INIT_DATA)); + DriverExtension->PortNumber = 0; + // // Update driver object with entry points. // @@ -208,10 +376,12 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = ScsiClassCreateClose; DriverObject->MajorFunction[IRP_MJ_READ] = ScsiClassReadWrite; DriverObject->MajorFunction[IRP_MJ_WRITE] = ScsiClassReadWrite; + DriverObject->MajorFunction[IRP_MJ_PNP] = ScsiClassPlugPlay; DriverObject->MajorFunction[IRP_MJ_SCSI] = ScsiClassInternalIoControl; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ScsiClassDeviceControlDispatch; DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = ScsiClassShutdownFlush; DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = ScsiClassShutdownFlush; + DriverObject->DriverExtension->AddDevice = ScsiClassAddDevice; if (InitializationData->ClassStartIo) { DriverObject->DriverStartIo = InitializationData->ClassStartIo; @@ -223,7 +393,7 @@ do { - sprintf(deviceNameBuffer, "\\Device\\ScsiPort%lu", portNumber); + sprintf(deviceNameBuffer, "\\Device\\ScsiPort%lu", DriverExtension->PortNumber); DebugPrint((2, "ScsiClassInitialize: Open Port %s\n", deviceNameBuffer)); @@ -249,7 +419,7 @@ // if (InitializationData->ClassFindDevices(DriverObject, Argument2, InitializationData, - portDeviceObject, portNumber)) { + portDeviceObject, DriverExtension->PortNumber)) { deviceFound = TRUE; } @@ -259,7 +429,7 @@ // Check next SCSI adapter. // - portNumber++; + DriverExtension->PortNumber++; } while(NT_SUCCESS(status));

12 years, 11 months

[tfaber] 55055: [KERNEL32] - Fix MSVC build

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jan 21 21:36:17 2012 New Revision: 55055 URL: http://svn.reactos.org/svn/reactos?rev=55055&view=rev Log: [KERNEL32] - Fix MSVC build Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Jan 21 21:36:17 2012 @@ -59,8 +59,7 @@ 0, NULL, 0 - }, - {} + } }; PSAFER_REPLACE_PROCESS_THREAD_TOKENS g_SaferReplaceProcessThreadTokens;

12 years, 11 months

[janderwald] 55054: [INF] - Add Microsoft Mice Device Description - fixes hid device entries where instead of device description the device id is displayed

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jan 21 18:18:25 2012 New Revision: 55054 URL: http://svn.reactos.org/svn/reactos?rev=55054&view=rev Log: [INF] - Add Microsoft Mice Device Description - fixes hid device entries where instead of device description the device id is displayed Modified: branches/usb-bringup-trunk/media/inf/input.inf Modified: branches/usb-bringup-trunk/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/inp… ============================================================================== --- branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] Sat Jan 21 18:18:25 2012 @@ -67,3 +67,13 @@ StdMfg = "(Standard Human Interface Devices)" MSMice = "Microsoft" + +USB\VID_045E&PID_0009.DeviceDesc="Microsoft IntelliMouse (USB)" +USB\VID_045E&PID_001E.DeviceDesc="Microsoft IntelliMouse Explorer (USB)" +USB\VID_045E&PID_0023.DeviceDesc="Microsoft Trackball Optical (USB)" +USB\VID_045E&PID_0024.DeviceDesc="Microsoft Trackball Explorer (USB)" +USB\VID_045E&PID_0025.DeviceDesc="Microsoft IntelliMouse mit IntelliEye (USB)" +USB\VID_045E&PID_0029.DeviceDesc="Microsoft IntelliMouse Web (USB)" +USB\VID_045E&PID_0039.DeviceDesc="Microsoft IntelliMouse Optical (USB)" +USB\VID_045E&PID_0040.DeviceDesc="Microsoft Wheel Mouse Optical (USB)" +USB\VID_045E&PID_0047.DeviceDesc="Microsoft IntelliMouse Explorer 3.0 (USB)"

12 years, 11 months

[pschweitzer] 55053: [MSI] Add forgotten dependency on CMake. Should fix build (finally)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jan 21 18:00:41 2012 New Revision: 55053 URL: http://svn.reactos.org/svn/reactos?rev=55053&view=rev Log: [MSI] Add forgotten dependency on CMake. Should fix build (finally) Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sat Jan 21 18:00:41 2012 @@ -75,7 +75,7 @@ set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine) add_dependencies(msi msi_idlheader) -add_delay_importlibs(msi odbccp32 crypt32 imagehlp) +add_delay_importlibs(msi odbccp32 crypt32 imagehlp wintrust) add_importlibs(msi advapi32

12 years, 11 months

[pschweitzer] 55052: [BOOTDATA] Register CLSIDs for MSI

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jan 21 17:57:39 2012 New Revision: 55052 URL: http://svn.reactos.org/svn/reactos?rev=55052&view=rev Log: [BOOTDATA] Register CLSIDs for MSI Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Sat Jan 21 17:57:39 2012 @@ -280,6 +280,10 @@ HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" HKCR,"CLSID",,0x00000012 + +; For msi.dll +HKCR, "CLSID\{000C101D-0000-0000-C000-000000000046}", "DllVersion", "3.1.4000" +HKCR, "CLSID\{000C1090-0000-0000-C000-000000000046}", "InProcHandler32", "ole32.dll" ; For Shell32.dll HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","",0x00000000,"Computer Search Results Folder"

12 years, 11 months

[pschweitzer] 55051: [PSDK] Sync rpcproxy.h with Wine head

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jan 21 17:46:22 2012 New Revision: 55051 URL: http://svn.reactos.org/svn/reactos?rev=55051&view=rev Log: [PSDK] Sync rpcproxy.h with Wine head Modified: trunk/reactos/include/psdk/rpcproxy.h Modified: trunk/reactos/include/psdk/rpcproxy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcproxy.h?re… ============================================================================== --- trunk/reactos/include/psdk/rpcproxy.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcproxy.h [iso-8859-1] Sat Jan 21 17:46:22 2012 @@ -203,6 +203,9 @@ RPCRTAPI HRESULT RPC_ENTRY NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid ); +HRESULT __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; + #define CSTDSTUBBUFFERRELEASE(pFactory) \ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \ { return NdrCStdStubBuffer_Release(This, (IPSFactoryBuffer *)pFactory); } @@ -285,6 +288,15 @@ # define DLLCANUNLOADNOW_ENTRY DllCanUnloadNow #endif +#ifdef WINE_REGISTER_DLL +# define WINE_DO_REGISTER_DLL(pfl, clsid) return __wine_register_resources( hProxyDll ) +# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return __wine_unregister_resources( hProxyDll ) +#else +# define WINE_DO_REGISTER_DLL(pfl, clsid) return NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) ) +# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) ) +#endif + + #define DLLDATA_GETPROXYDLLINFO(pfl, rclsid) \ void RPC_ENTRY GetProxyDllInfo(const ProxyFileInfo ***ppProxyFileInfo, \ const CLSID **ppClsid) DECLSPEC_HIDDEN; \ @@ -329,16 +341,16 @@ HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) \ { \ - return NdrDllRegisterProxy(hProxyDll, (pfl), (factory_clsid)); \ + WINE_DO_REGISTER_DLL( (pfl), (factory_clsid) ); \ } \ \ HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) \ { \ - return NdrDllUnregisterProxy(hProxyDll, (pfl), (factory_clsid)); \ + WINE_DO_UNREGISTER_DLL( (pfl), (factory_clsid) ); \ } -#ifdef REGISTER_PROXY_DLL +#if defined(REGISTER_PROXY_DLL) || defined(WINE_REGISTER_DLL) # define DLLREGISTRY_ROUTINES(pfl, factory_clsid) \ REGISTER_PROXY_DLL_ROUTINES(pfl, factory_clsid) #else

12 years, 11 months

[pschweitzer] 55050: [IMAGEHLP] Fix CMake build (will be that way after sync) [MSI] Allow warnings for the moment This should fix CMake build~

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jan 21 17:41:53 2012 New Revision: 55050 URL: http://svn.reactos.org/svn/reactos?rev=55050&view=rev Log: [IMAGEHLP] Fix CMake build (will be that way after sync) [MSI] Allow warnings for the moment This should fix CMake build~ Modified: trunk/reactos/dll/win32/imagehlp/modify.c trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Sat Jan 21 17:41:53 2012 @@ -45,7 +45,7 @@ * BindImageEx (IMAGEHLP.@) */ BOOL IMAGEAPI BindImageEx( - DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath, + DWORD Flags, LPCSTR ImageName, LPCSTR DllPath, LPCSTR SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine) { FIXME("(%d, %s, %s, %s, %p): stub\n", Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sat Jan 21 17:41:53 2012 @@ -97,6 +97,8 @@ add_pch(msi msipriv.h) add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) +allow_warnings(msi) + endif(NOT MSVC) add_importlib_target(msi.spec)

12 years, 11 months

[janderwald] 55049: [HIDCLASS] - Remove asserts which are hit during shutdown

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jan 21 17:32:59 2012 New Revision: 55049 URL: http://svn.reactos.org/svn/reactos?rev=55049&view=rev Log: [HIDCLASS] - Remove asserts which are hit during shutdown Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sat Jan 21 17:32:59 2012 @@ -117,7 +117,6 @@ IN PDRIVER_OBJECT DriverObject) { UNIMPLEMENTED - ASSERT(FALSE); } NTSTATUS @@ -848,7 +847,6 @@ IN PIRP Irp) { UNIMPLEMENTED - ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; }

12 years, 11 months

[pschweitzer] 55048: [PSDK] Fix CMake msi.dll build?

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jan 21 17:29:25 2012 New Revision: 55048 URL: http://svn.reactos.org/svn/reactos?rev=55048&view=rev Log: [PSDK] Fix CMake msi.dll build? Modified: trunk/reactos/include/psdk/imagehlp.h Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Sat Jan 21 17:29:25 2012 @@ -268,7 +268,7 @@ BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32); BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32,DWORD); BOOL IMAGEAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); -BOOL IMAGEAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE); +BOOL IMAGEAPI BindImageEx(IN DWORD,IN LPCSTR,IN LPCSTR,IN LPCSTR,IN PIMAGEHLP_STATUS_ROUTINE); BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG_PTR*, OUT ULONG*, IN OUT ULONG_PTR*, IN ULONG); PLOADED_IMAGE IMAGEAPI ImageLoad(LPSTR,LPSTR);

12 years, 11 months

← Newer
1
...
28
29
30
31
32
33
34
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012