Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52358: [NTOSKRNL] - Send IRP_MN_QUERY_POWER and IRP_MN_SET_POWER to all enumerated devices prior to a system power state change - We don't mind failure right now since our drivers suck
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 04:25:33 2011 New Revision: 52358 URL: http://svn.reactos.org/svn/reactos?rev=52358&view=rev Log: [NTOSKRNL] - Send IRP_MN_QUERY_POWER and IRP_MN_SET_POWER to all enumerated devices prior to a system power state change - We don't mind failure right now since our drivers suck Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/po/poshtdwn.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sun Jun 19 04:25:33 2011 @@ -696,6 +696,11 @@ OUT PULONG Disposition OPTIONAL ); + +NTSTATUS +IopTraverseDeviceTree( + PDEVICETREE_TRAVERSE_CONTEXT Context); + // // PnP Routines // Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] Sun Jun 19 04:25:33 2011 @@ -291,7 +291,8 @@ NTSTATUS NTAPI PopSetSystemPowerState( - SYSTEM_POWER_STATE PowerState + SYSTEM_POWER_STATE PowerState, + POWER_ACTION PowerAction ); VOID Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Sun Jun 19 04:25:33 2011 @@ -84,6 +84,7 @@ /* Try platform driver first, then legacy */ //PopInvokeSystemStateHandler(PowerStateShutdownReset, NULL); + PopSetSystemPowerState(PowerSystemShutdown, SystemAction); HalReturnToFirmware(HalRebootRoutine); break; @@ -102,7 +103,7 @@ //PopInvokeSystemStateHandler(PowerStateShutdownOff, NULL); /* ReactOS Hack */ - PopSetSystemPowerState(PowerSystemShutdown); + PopSetSystemPowerState(PowerSystemShutdown, SystemAction); PopShutdownHandler(); /* If that didn't work, call the HAL */ Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=52… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Jun 19 04:25:33 2011 @@ -23,6 +23,13 @@ PVOID Context; } REQUEST_POWER_ITEM, *PREQUEST_POWER_ITEM; +typedef struct _POWER_STATE_TRAVERSE_CONTEXT +{ + SYSTEM_POWER_STATE SystemPowerState; + POWER_ACTION PowerAction; + PDEVICE_OBJECT PowerDevice; +} POWER_STATE_TRAVERSE_CONTEXT, *PPOWER_STATE_TRAVERSE_CONTEXT; + PDEVICE_NODE PopSystemPowerDeviceNode = NULL; BOOLEAN PopAcpiPresent = FALSE; POP_POWER_ACTION PopAction; @@ -64,53 +71,33 @@ } NTSTATUS -NTAPI -PopSetSystemPowerState(SYSTEM_POWER_STATE PowerState) -{ +PopSendQuerySystemPowerState(PDEVICE_OBJECT DeviceObject, SYSTEM_POWER_STATE SystemState, POWER_ACTION PowerAction) +{ + KEVENT Event; IO_STATUS_BLOCK IoStatusBlock; - PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION IrpSp; - PDEVICE_OBJECT Fdo; + PIRP Irp; NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - if (!PopAcpiPresent) return STATUS_NOT_IMPLEMENTED; - - Status = IopGetSystemPowerDeviceObject(&DeviceObject); - if (!NT_SUCCESS(Status)) - { - DPRINT1("No system power driver available\n"); - return STATUS_UNSUCCESSFUL; - } - - Fdo = IoGetAttachedDeviceReference(DeviceObject); - - if (Fdo == DeviceObject) - { - DPRINT("An FDO was not attached\n"); - return STATUS_UNSUCCESSFUL; - } - + KeInitializeEvent(&Event, NotificationEvent, FALSE); - + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_POWER, - Fdo, + DeviceObject, NULL, 0, NULL, &Event, &IoStatusBlock); - + IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->MinorFunction = IRP_MN_SET_POWER; + IrpSp->MinorFunction = IRP_MN_QUERY_POWER; IrpSp->Parameters.Power.Type = SystemPowerState; - IrpSp->Parameters.Power.State.SystemState = PowerState; - - DPRINT("Calling ACPI driver"); - Status = PoCallDriver(Fdo, Irp); + IrpSp->Parameters.Power.State.SystemState = SystemState; + IrpSp->Parameters.Power.ShutdownType = PowerAction; + + Status = PoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, @@ -118,10 +105,176 @@ KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; - } - - ObDereferenceObject(Fdo); + Status = IoStatusBlock.Status; + } + + return Status; +} + +NTSTATUS +PopSendSetSystemPowerState(PDEVICE_OBJECT DeviceObject, SYSTEM_POWER_STATE SystemState, POWER_ACTION PowerAction) +{ + KEVENT Event; + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION IrpSp; + PIRP Irp; + NTSTATUS Status; + + KeInitializeEvent(&Event, + NotificationEvent, + FALSE); + + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_POWER, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &IoStatusBlock); + + IrpSp = IoGetNextIrpStackLocation(Irp); + IrpSp->MinorFunction = IRP_MN_SET_POWER; + IrpSp->Parameters.Power.Type = SystemPowerState; + IrpSp->Parameters.Power.State.SystemState = SystemState; + IrpSp->Parameters.Power.ShutdownType = PowerAction; + + Status = PoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + return Status; +} + +NTSTATUS +PopQuerySystemPowerStateTraverse(PDEVICE_NODE DeviceNode, + PVOID Context) +{ + PPOWER_STATE_TRAVERSE_CONTEXT PowerStateContext = Context; + NTSTATUS Status; + + DPRINT("PopQuerySystemPowerStateTraverse(%p, %p)\n", DeviceNode, Context); + + if (DeviceNode == IopRootDeviceNode) + return STATUS_SUCCESS; + + if (DeviceNode->Flags & DNF_LEGACY_DRIVER) + return STATUS_SUCCESS; + + Status = PopSendQuerySystemPowerState(DeviceNode->PhysicalDeviceObject, + PowerStateContext->SystemPowerState, + PowerStateContext->PowerAction); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Device '%wZ' failed IRP_MN_QUERY_POWER\n", &DeviceNode->InstancePath); + } + +#if 0 + return Status; +#else + return STATUS_SUCCESS; +#endif +} + +NTSTATUS +PopSetSystemPowerStateTraverse(PDEVICE_NODE DeviceNode, + PVOID Context) +{ + PPOWER_STATE_TRAVERSE_CONTEXT PowerStateContext = Context; + NTSTATUS Status; + + DPRINT("PopSetSystemPowerStateTraverse(%p, %p)\n", DeviceNode, Context); + + if (DeviceNode == IopRootDeviceNode) + return STATUS_SUCCESS; + + if (DeviceNode->PhysicalDeviceObject == PowerStateContext->PowerDevice) + return STATUS_SUCCESS; + + if (DeviceNode->Flags & DNF_LEGACY_DRIVER) + return STATUS_SUCCESS; + + Status = PopSendSetSystemPowerState(DeviceNode->PhysicalDeviceObject, + PowerStateContext->SystemPowerState, + PowerStateContext->PowerAction); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Device '%wZ' failed IRP_MN_SET_POWER\n", &DeviceNode->InstancePath); + } + +#if 0 + return Status; +#else + return STATUS_SUCCESS; +#endif +} + +NTSTATUS +NTAPI +PopSetSystemPowerState(SYSTEM_POWER_STATE PowerState, POWER_ACTION PowerAction) +{ + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + DEVICETREE_TRAVERSE_CONTEXT Context; + POWER_STATE_TRAVERSE_CONTEXT PowerContext; + + Status = IopGetSystemPowerDeviceObject(&DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No system power driver available\n"); + Fdo = NULL; + } + else + { + Fdo = IoGetAttachedDeviceReference(DeviceObject); + if (Fdo == DeviceObject) + { + DPRINT("An FDO was not attached\n"); + return STATUS_UNSUCCESSFUL; + } + } + + /* Set up context */ + PowerContext.PowerAction = PowerAction; + PowerContext.SystemPowerState = PowerState; + PowerContext.PowerDevice = Fdo; + + /* Query for system power change */ + IopInitDeviceTreeTraverseContext(&Context, + IopRootDeviceNode, + PopQuerySystemPowerStateTraverse, + &PowerContext); + + Status = IopTraverseDeviceTree(&Context); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Query system power state failed; changing state anyway\n"); + } + + /* Set system power change */ + IopInitDeviceTreeTraverseContext(&Context, + IopRootDeviceNode, + PopSetSystemPowerStateTraverse, + &PowerContext); + + IopTraverseDeviceTree(&Context); + + if (!PopAcpiPresent) return STATUS_NOT_IMPLEMENTED; + + if (Fdo != NULL) + { + if (PowerAction != PowerActionShutdownReset) + PopSendSetSystemPowerState(Fdo, PowerState, PowerAction); + + ObDereferenceObject(Fdo); + } return Status; }

1 0

[cgutman] 52357: [PCIIDEX] - Don't ASSERT if we get an IRP that we don't understand
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 04:21:41 2011 New Revision: 52357 URL: http://svn.reactos.org/svn/reactos?rev=52357&view=rev Log: [PCIIDEX] - Don't ASSERT if we get an IRP that we don't understand Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/miniport.c [iso-8859-1] Sun Jun 19 04:21:41 2011 @@ -34,7 +34,6 @@ else { DPRINT1("PDO stub for major function 0x%lx\n", MajorFunction); - ASSERT(FALSE); Status = STATUS_NOT_SUPPORTED; } Irp->IoStatus.Information = 0;

1 0

[cgutman] 52356: [NTOSKRNL] - Change the resource type if HalTranslateBusAddress indicates that we got the address type wrong
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 01:42:05 2011 New Revision: 52356 URL: http://svn.reactos.org/svn/reactos?rev=52356&view=rev Log: [NTOSKRNL] - Change the resource type if HalTranslateBusAddress indicates that we got the address type wrong Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Jun 19 01:42:05 2011 @@ -757,6 +757,13 @@ Status = STATUS_UNSUCCESSFUL; DPRINT1("Failed to translate port resource (Start: 0x%I64x)\n", DescriptorRaw->u.Port.Start.QuadPart); goto cleanup; + } + + if (AddressSpace == 0) + { + /* This is actually a memory resource */ + DescriptorRaw->Type = CmResourceTypeMemory; + DescriptorTranslated->Type = CmResourceTypeMemory; } break; } @@ -793,6 +800,13 @@ DPRINT1("Failed to translate memory resource (Start: 0xI64x)\n", DescriptorRaw->u.Memory.Start.QuadPart); goto cleanup; } + + if (AddressSpace != 0) + { + /* This is actually an I/O port resource */ + DescriptorRaw->Type = CmResourceTypePort; + DescriptorTranslated->Type = CmResourceTypePort; + } } case CmResourceTypeDma:

1 0

[cgutman] 52355: [VIDEOPRT] - Initialize PnP IRPs with the correct status
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 01:40:10 2011 New Revision: 52355 URL: http://svn.reactos.org/svn/reactos?rev=52355&view=rev Log: [VIDEOPRT] - Initialize PnP IRPs with the correct status Modified: trunk/reactos/drivers/video/videoprt/agp.c Modified: trunk/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/agp… ============================================================================== --- trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] Sun Jun 19 01:40:10 2011 @@ -56,8 +56,8 @@ IoStatusBlock); /* PNP IRPs are always initialized with a status code of - STATUS_NOT_IMPLEMENTED */ - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + STATUS_NOT_SUPPORTED */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; IrpSp = IoGetNextIrpStackLocation(Irp);

1 0

[akhaldi] 52354: [XMLLITE_WINETEST] * Fix msvc build.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 23:04:39 2011 New Revision: 52354 URL: http://svn.reactos.org/svn/reactos?rev=52354&view=rev Log: [XMLLITE_WINETEST] * Fix msvc build. Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/CMakeLi… ============================================================================== --- trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] Sat Jun 18 23:04:39 2011 @@ -1,10 +1,13 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) add_executable(xmllite_winetest reader.c testlist.c) target_link_libraries(xmllite_winetest wine) + +if(MSVC) + target_link_libraries(xmllite_winetest uuid) +endif() + set_module_type(xmllite_winetest win32cui) add_importlibs(xmllite_winetest xmllite ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET xmllite_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Sat Jun 18 23:04:39 2011 @@ -32,8 +32,8 @@ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); -HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, +HRESULT (WINAPI *pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +HRESULT (WINAPI *pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, IMalloc *pMalloc, LPCWSTR encoding, BOOL hint,

1 0

[akhaldi] 52353: [GLU32] * Fix linking in msvc build. * Remove /OPT:NOWIN98 linker flag.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 22:51:34 2011 New Revision: 52353 URL: http://svn.reactos.org/svn/reactos?rev=52353&view=rev Log: [GLU32] * Fix linking in msvc build. * Remove /OPT:NOWIN98 linker flag. Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt trunk/reactos/dll/win32/glu32/include/gluos.h Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:51:34 2011 @@ -109,7 +109,10 @@ add_library(glu32 SHARED ${SOURCE}) set_entrypoint(glu32 0) -target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames) + +if(NOT MSVC) + target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames) +endif() add_importlibs(glu32 opengl32 Modified: trunk/reactos/dll/win32/glu32/include/gluos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/include/gl… ============================================================================== --- trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] Sat Jun 18 22:51:34 2011 @@ -108,9 +108,11 @@ #pragma warning(disable : 4761) #endif +/* #if defined(_MSC_VER) && _MSC_VER >= 1200 #pragma comment(linker, "/OPT:NOWIN98") #endif +*/ #ifndef GLAPIENTRY #define GLAPIENTRY APIENTRY

1 0

[akhaldi] 52352: [CMAKE] * Remove duplicate _DLL and __USE_CRTIMP definitions. * Link some modules to uuid/oldnames in msvc build.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 22:02:28 2011 New Revision: 52352 URL: http://svn.reactos.org/svn/reactos?rev=52352&view=rev Log: [CMAKE] * Remove duplicate _DLL and __USE_CRTIMP definitions. * Link some modules to uuid/oldnames in msvc build. Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/comdlg32/CMakeLists.txt trunk/rostests/winetests/inetcomm/CMakeLists.txt trunk/rostests/winetests/itss/CMakeLists.txt trunk/rostests/winetests/jscript/CMakeLists.txt trunk/rostests/winetests/msctf/CMakeLists.txt trunk/rostests/winetests/mstask/CMakeLists.txt trunk/rostests/winetests/msvcrt/CMakeLists.txt trunk/rostests/winetests/qmgr/CMakeLists.txt Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -38,6 +36,11 @@ add_executable(comctl32_winetest ${SOURCE}) target_link_libraries(comctl32_winetest wine) + +if(MSVC) + target_link_libraries(comctl32_winetest uuid) +endif() + set_module_type(comctl32_winetest win32cui) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET comctl32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE filedlg.c @@ -12,6 +10,11 @@ add_executable(comdlg32_winetest ${SOURCE}) target_link_libraries(comdlg32_winetest wine) + +if(MSVC) + target_link_libraries(comdlg32_winetest uuid) +endif() + set_module_type(comdlg32_winetest win32cui) add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET comdlg32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE mimeintl.c @@ -10,6 +8,11 @@ add_executable(inetcomm_winetest ${SOURCE}) target_link_libraries(inetcomm_winetest wine) + +if(MSVC) + target_link_libraries(inetcomm_winetest uuid) +endif() + set_module_type(inetcomm_winetest win32cui) add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET inetcomm_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/CMakeLists… ============================================================================== --- trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,12 +1,15 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) set_rc_compiler() add_executable(itss_winetest protocol.c testlist.c rsrc.rc) target_link_libraries(itss_winetest wine) + +if(MSVC) + target_link_libraries(itss_winetest uuid) +endif() + set_module_type(itss_winetest win32cui) add_importlibs(itss_winetest ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET itss_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/CMakeLi… ============================================================================== --- trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) set_rc_compiler() @@ -14,6 +12,11 @@ add_executable(jscript_winetest ${SOURCE}) target_link_libraries(jscript_winetest wine) + +if(MSVC) + target_link_libraries(jscript_winetest uuid) +endif() + set_module_type(jscript_winetest win32cui) add_importlibs(jscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET jscript_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/CMakeList… ============================================================================== --- trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,10 +1,13 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) add_executable(msctf_winetest inputprocessor.c testlist.c) target_link_libraries(msctf_winetest wine) + +if(MSVC) + target_link_libraries(msctf_winetest uuid) +endif() + set_module_type(msctf_winetest win32cui) add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET msctf_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE task.c @@ -11,6 +9,11 @@ add_executable(mstask_winetest ${SOURCE}) target_link_libraries(mstask_winetest wine) + +if(MSVC) + target_link_libraries(mstask_winetest uuid) +endif() + set_module_type(mstask_winetest win32cui) add_importlibs(mstask_winetest ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET mstask_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,8 +1,7 @@ add_definitions( -D__ROS_LONG64__ - -D_CRT_NONSTDC_NO_DEPRECATE - -D_DLL -D__USE_CRTIMP) + -D_CRT_NONSTDC_NO_DEPRECATE) list(APPEND SOURCE cpp.c @@ -22,6 +21,11 @@ time.c) add_executable(msvcrt_winetest ${SOURCE}) + +if(MSVC) + target_link_libraries(msvcrt_winetest oldnames) +endif() + set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest msvcrt kernel32 ntdll) add_cd_file(TARGET msvcrt_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/CMakeLists… ============================================================================== --- trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE enum_files.c @@ -13,6 +11,11 @@ add_executable(qmgr_winetest ${SOURCE}) target_link_libraries(qmgr_winetest wine) + +if(MSVC) + target_link_libraries(qmgr_winetest uuid) +endif() + set_module_type(qmgr_winetest win32cui) add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 52351: [WINEMP3.ACM] * Fix msvc build.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 21:44:52 2011 New Revision: 52351 URL: http://svn.reactos.org/svn/reactos?rev=52351&view=rev Log: [WINEMP3.ACM] * Fix msvc build. Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Jun 18 21:44:52 2011 @@ -15,7 +15,7 @@ set_entrypoint(winemp3.acm 0) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") -target_link_libraries(winemp3.acm wine libmpg123) +target_link_libraries(winemp3.acm wine libmpg123 oldnames) add_importlibs(winemp3.acm winmm

1 0

[akhaldi] 52350: [CMAKE] * Temporarily add liboldnames.a, I mean, oldnames.lib, to the importlibs folder, until we get one for msvc. * Link crtdll to oldnames in msvc build.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 21:39:27 2011 New Revision: 52350 URL: http://svn.reactos.org/svn/reactos?rev=52350&view=rev Log: [CMAKE] * Temporarily add liboldnames.a, I mean, oldnames.lib, to the importlibs folder, until we get one for msvc. * Link crtdll to oldnames in msvc build. Added: trunk/reactos/importlibs/oldnames.lib (with props) Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/crtdll/CMakeLists.txt Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52350… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Jun 18 21:39:27 2011 @@ -29,7 +29,7 @@ set(SPEC2DEF_ARCH i386) endif() -link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/sdk/crt) +link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt) set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") Modified: trunk/reactos/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sat Jun 18 21:39:27 2011 @@ -23,9 +23,11 @@ set_entrypoint(crtdll DllMain@12) -target_link_libraries(crtdll - wine - crt) +target_link_libraries(crtdll wine crt) + +if(MSVC) + target_link_libraries(crtdll oldnames) +endif() add_importlibs(crtdll kernel32 ntdll) add_pch(crtdll precomp.h) Added: trunk/reactos/importlibs/oldnames.lib URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/oldnames.lib?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/oldnames.lib ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[akhaldi] 52349: [CMAKE] * Add missing dependency. * Properly set the compiler flag.
by akhaldi＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: akhaldi Date: Sat Jun 18 20:47:44 2011 New Revision: 52349 URL: http://svn.reactos.org/svn/reactos?rev=52349&view=rev Log: [CMAKE] * Add missing dependency. * Properly set the compiler flag. Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sat Jun 18 20:47:44 2011 @@ -2,7 +2,7 @@ include_directories(include/internal/mingw-w64) if(NOT MSVC) - add_definitions(-Wno-main) + add_compiler_flags(-Wno-main) endif() list(APPEND MSVCRTEX_SOURCE @@ -65,4 +65,4 @@ target_link_libraries(msvcrtex oldnames) endif() -add_dependencies(msvcrtex psdk) +add_dependencies(msvcrtex psdk asm)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs