Fix line endings

Files checked into the repository should use unix line endings

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/include/version.hx b/include/version.hx
index bbf34b98e8dc4c1ed8e031f226e787385dedcb01..a997c9455dfe451719f42ff8a1bc5ec77273ab03 100644 (file)
--- a/include/version.hx
+++ b/include/version.hx
@@ -1,58 +1,58 @@
-/* Copyright (c) Citrix Systems Inc.\r
- * All rights reserved.\r
- * \r
- * Redistribution and use in source and binary forms, \r
- * with or without modification, are permitted provided \r
- * that the following conditions are met:\r
- * \r
- * *   Redistributions of source code must retain the above \r
- *     copyright notice, this list of conditions and the \r
- *     following disclaimer.\r
- * *   Redistributions in binary form must reproduce the above \r
- *     copyright notice, this list of conditions and the \r
- *     following disclaimer in the documentation and/or other \r
- *     materials provided with the distribution.\r
- * \r
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND \r
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, \r
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF \r
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE \r
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR \r
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, \r
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, \r
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR \r
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS \r
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \r
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING \r
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE \r
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \r
- * SUCH DAMAGE.\r
- */\r
-\r
-#define COMPANY_NAME_STR       "@COMPANY_NAME@"\r
-#define PRODUCT_NAME_STR       "@PRODUCT_NAME@"\r
-\r
-#define MAJOR_VERSION  @MAJOR_VERSION@\r
-#define MAJOR_VERSION_STR      "@MAJOR_VERSION@"\r
-\r
-#define MINOR_VERSION  @MINOR_VERSION@\r
-#define MINOR_VERSION_STR      "@MINOR_VERSION@"\r
-\r
-#define MICRO_VERSION  @MICRO_VERSION@\r
-#define MICRO_VERSION_STR      "@MICRO_VERSION@"\r
-\r
-#define BUILD_NUMBER   @BUILD_NUMBER@\r
-#define BUILD_NUMBER_STR       "@BUILD_NUMBER@"\r
-\r
-#define YEAR   @YEAR@\r
-#define YEAR_STR       "@YEAR@"\r
-\r
-#define MONTH  @MONTH@\r
-#define MONTH_STR      "@MONTH@"\r
-\r
-#define DAY    @DAY@\r
-#define DAY_STR        "@DAY@"\r
-\r
-#define OBJECT_PREFIX_STR   "@OBJECT_PREFIX@"\r
-#define OBJECT_GUID(_Name)  @OBJECT_PREFIX@ ## _Name ## _GUID\r
-\r
+/* Copyright (c) Citrix Systems Inc.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, 
+ * with or without modification, are permitted provided 
+ * that the following conditions are met:
+ * 
+ * *   Redistributions of source code must retain the above 
+ *     copyright notice, this list of conditions and the 
+ *     following disclaimer.
+ * *   Redistributions in binary form must reproduce the above 
+ *     copyright notice, this list of conditions and the 
+ *     following disclaimer in the documentation and/or other 
+ *     materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE.
+ */
+
+#define COMPANY_NAME_STR       "@COMPANY_NAME@"
+#define PRODUCT_NAME_STR       "@PRODUCT_NAME@"
+
+#define MAJOR_VERSION  @MAJOR_VERSION@
+#define MAJOR_VERSION_STR      "@MAJOR_VERSION@"
+
+#define MINOR_VERSION  @MINOR_VERSION@
+#define MINOR_VERSION_STR      "@MINOR_VERSION@"
+
+#define MICRO_VERSION  @MICRO_VERSION@
+#define MICRO_VERSION_STR      "@MICRO_VERSION@"
+
+#define BUILD_NUMBER   @BUILD_NUMBER@
+#define BUILD_NUMBER_STR       "@BUILD_NUMBER@"
+
+#define YEAR   @YEAR@
+#define YEAR_STR       "@YEAR@"
+
+#define MONTH  @MONTH@
+#define MONTH_STR      "@MONTH@"
+
+#define DAY    @DAY@
+#define DAY_STR        "@DAY@"
+
+#define OBJECT_PREFIX_STR   "@OBJECT_PREFIX@"
+#define OBJECT_GUID(_Name)  @OBJECT_PREFIX@ ## _Name ## _GUID
+

diff --git a/src/xeniface.inf b/src/xeniface.inf
index 4fb3edb1ccd5945ed9f9e05ec2a2027309b43d48..a5969b99480a2a4f01e7e55854e62d3d918437d5 100644 (file)
--- a/src/xeniface.inf
+++ b/src/xeniface.inf
@@ -1,96 +1,96 @@
-; Copyright (c) Citrix Systems Inc.\r
-; All rights reserved.\r
-;\r
-; Redistribution and use in source and binary forms, \r
-; with or without modification, are permitted provided \r
-; that the following conditions are met:\r
-;\r
-; *   Redistributions of source code must retain the above \r
-;     copyright notice, this list of conditions and the \r
-;     following disclaimer.\r
-; *   Redistributions in binary form must reproduce the above \r
-;     copyright notice, this list of conditions and the \r
-;     following disclaimer in the documentation and/or other \r
-;     materials provided with the distribution.\r
-;\r
-; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND \r
-; CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, \r
-; INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF \r
-; MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE \r
-; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR \r
-; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, \r
-; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, \r
-; BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR \r
-; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS \r
-; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \r
-; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING \r
-; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE \r
-; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \r
-; SUCH DAMAGE.\r
-\r
-[Version]\r
-Signature="$WINDOWS NT$"\r
-Class=System\r
-ClassGUID={4d36e97d-e325-11ce-bfc1-08002be10318} \r
-Provider=%Company%\r
-DriverVer=01/01/1900,0.0.0.0\r
-CatalogFile=xeniface.cat\r
-\r
-[DestinationDirs]\r
-DefaultDestDir = 12\r
-ServiceDestDir.NT.Copy = 11\r
-\r
-[Manufacturer]\r
-%Company%=Inst,NT$ARCH$\r
-\r
-[Inst.NT$ARCH$]\r
-; DisplayName              Section           DeviceID\r
-; -----------              -------           --------\r
-\r
-%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XSC000&DEV_IFACE&REV_00000001\r
-%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XS0001&DEV_IFACE&REV_00000001\r
-%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XS0002&DEV_IFACE&REV_00000001\r
-\r
-[XenIface_Device.NT$ARCH$]\r
-CopyFiles=XenIface_Device.NT.Copy, ServiceDestDir.NT.Copy\r
-\r
-[XenIFace_Device.NT.Copy]\r
-xeniface.sys\r
-\r
-[ServiceDestDir.NT.Copy]\r
-liteagent.exe\r
-\r
-[Xeniface_Device.NT$ARCH$.Services]\r
-AddService = xeniface, %SPSVCINST_ASSOCSERVICE%, xeniface_Service_Inst\r
-AddService = xenlite, %LITESVC_FLAGS%, xenlite_Service_Inst\r
-\r
-[xeniface_Service_Inst]\r
-DisplayName    = %XenIfaceDevice.DeviceDesc%\r
-ServiceType    = 1               ; SERVICE_KERNEL_DRIVER\r
-StartType      = 3               ; SERVICE_DEMAND_START \r
-ErrorControl   = 1               ; SERVICE_ERROR_NORMAL\r
-ServiceBinary  = %12%\xeniface.sys\r
-LoadOrderGroup = Extended Base\r
-\r
-[xenlite_Service_Inst]\r
-DisplayName    = %xenlite.SVCDESC%\r
-ServiceType    = 16              ; SERVICE_WIN32_OWN_PROCESS\r
-StartType      = 2               ; SERVICE_AUTO_START \r
-ErrorControl   = 1               ; SERVICE_ERROR_NORMAL\r
-ServiceBinary  = %11%\liteagent.exe\r
-\r
-[SourceDisksNames]\r
-1 = %DiskId1%,,,""\r
-\r
-[SourceDisksFiles]\r
-xeniface.sys  = 1,,\r
-liteagent.exe = 1,,\r
-\r
-[Strings]\r
-SPSVCINST_ASSOCSERVICE= 0x00000002\r
-Company= "@COMPANY_NAME@" \r
-DiskId1 = "@PRODUCT_NAME@ Interface Package"\r
-XenIfaceDevice.DeviceDesc = "@PRODUCT_NAME@ Interface"\r
-LITESVC_FLAGS= 0x00000800\r
-xenlite.SVCDESC= "@PRODUCT_NAME@ Interface Service"\r
-\r
+; Copyright (c) Citrix Systems Inc.
+; All rights reserved.
+;
+; Redistribution and use in source and binary forms, 
+; with or without modification, are permitted provided 
+; that the following conditions are met:
+;
+; *   Redistributions of source code must retain the above 
+;     copyright notice, this list of conditions and the 
+;     following disclaimer.
+; *   Redistributions in binary form must reproduce the above 
+;     copyright notice, this list of conditions and the 
+;     following disclaimer in the documentation and/or other 
+;     materials provided with the distribution.
+;
+; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+; CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+; INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+; MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+; BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+; SUCH DAMAGE.
+
+[Version]
+Signature="$WINDOWS NT$"
+Class=System
+ClassGUID={4d36e97d-e325-11ce-bfc1-08002be10318} 
+Provider=%Company%
+DriverVer=01/01/1900,0.0.0.0
+CatalogFile=xeniface.cat
+
+[DestinationDirs]
+DefaultDestDir = 12
+ServiceDestDir.NT.Copy = 11
+
+[Manufacturer]
+%Company%=Inst,NT$ARCH$
+
+[Inst.NT$ARCH$]
+; DisplayName              Section           DeviceID
+; -----------              -------           --------
+
+%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XSC000&DEV_IFACE&REV_00000001
+%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XS0001&DEV_IFACE&REV_00000001
+%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XS0002&DEV_IFACE&REV_00000001
+
+[XenIface_Device.NT$ARCH$]
+CopyFiles=XenIface_Device.NT.Copy, ServiceDestDir.NT.Copy
+
+[XenIFace_Device.NT.Copy]
+xeniface.sys
+
+[ServiceDestDir.NT.Copy]
+liteagent.exe
+
+[Xeniface_Device.NT$ARCH$.Services]
+AddService = xeniface, %SPSVCINST_ASSOCSERVICE%, xeniface_Service_Inst
+AddService = xenlite, %LITESVC_FLAGS%, xenlite_Service_Inst
+
+[xeniface_Service_Inst]
+DisplayName    = %XenIfaceDevice.DeviceDesc%
+ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
+StartType      = 3               ; SERVICE_DEMAND_START 
+ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
+ServiceBinary  = %12%\xeniface.sys
+LoadOrderGroup = Extended Base
+
+[xenlite_Service_Inst]
+DisplayName    = %xenlite.SVCDESC%
+ServiceType    = 16              ; SERVICE_WIN32_OWN_PROCESS
+StartType      = 2               ; SERVICE_AUTO_START 
+ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
+ServiceBinary  = %11%\liteagent.exe
+
+[SourceDisksNames]
+1 = %DiskId1%,,,""
+
+[SourceDisksFiles]
+xeniface.sys  = 1,,
+liteagent.exe = 1,,
+
+[Strings]
+SPSVCINST_ASSOCSERVICE= 0x00000002
+Company= "@COMPANY_NAME@" 
+DiskId1 = "@PRODUCT_NAME@ Interface Package"
+XenIfaceDevice.DeviceDesc = "@PRODUCT_NAME@ Interface"
+LITESVC_FLAGS= 0x00000800
+xenlite.SVCDESC= "@PRODUCT_NAME@ Interface Service"
+