From bd880924d98af170b0d658c866da7ca83b12576c Mon Sep 17 00:00:00 2001 From: Alexander Shaposhnikov Date: Mon, 6 Nov 2017 19:28:12 +0200 Subject: [PATCH 01/21] Update pull request template with additional info --- .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c475bf0ce8b0d..8622a6e683aa9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,9 +5,15 @@ _Do a quick recap of your work here._ JIRA issue: [CORE-XXXX](https://jira.reactos.org/browse/CORE-XXXX) ## Proposed changes + +_Describe what you propose to change/add/fix with this pull request._ + - - ## TODO -- [ ] Task 1 -- [ ] Task 2 + +_Use a TODO when your pull request is Work in Progress._ + +- [ ] +- [ ] From 3cbcb1badee213fdbadaa2db99086d21a8775fe8 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:38:01 +0100 Subject: [PATCH 02/21] [CDFS_NEW] Fix headers inclusion so that it can work on a *nix platform --- drivers/filesystems/cdfs_new/allocsup.c | 2 +- drivers/filesystems/cdfs_new/cachesup.c | 2 +- drivers/filesystems/cdfs_new/cddata.c | 2 +- drivers/filesystems/cdfs_new/cdinit.c | 2 +- drivers/filesystems/cdfs_new/cdprocs.h | 6 +++--- drivers/filesystems/cdfs_new/cleanup.c | 2 +- drivers/filesystems/cdfs_new/close.c | 2 +- drivers/filesystems/cdfs_new/create.c | 2 +- drivers/filesystems/cdfs_new/devctrl.c | 2 +- drivers/filesystems/cdfs_new/deviosup.c | 2 +- drivers/filesystems/cdfs_new/dirctrl.c | 2 +- drivers/filesystems/cdfs_new/dirsup.c | 2 +- drivers/filesystems/cdfs_new/fieldoff.c | 2 +- drivers/filesystems/cdfs_new/fileinfo.c | 2 +- drivers/filesystems/cdfs_new/filobsup.c | 2 +- drivers/filesystems/cdfs_new/fsctrl.c | 2 +- drivers/filesystems/cdfs_new/fspdisp.c | 2 +- drivers/filesystems/cdfs_new/lockctrl.c | 2 +- drivers/filesystems/cdfs_new/namesup.c | 2 +- drivers/filesystems/cdfs_new/pathsup.c | 2 +- drivers/filesystems/cdfs_new/pnp.c | 2 +- drivers/filesystems/cdfs_new/prefxsup.c | 2 +- drivers/filesystems/cdfs_new/read.c | 2 +- drivers/filesystems/cdfs_new/resrcsup.c | 2 +- drivers/filesystems/cdfs_new/strucsup.c | 2 +- drivers/filesystems/cdfs_new/verfysup.c | 2 +- drivers/filesystems/cdfs_new/volinfo.c | 2 +- drivers/filesystems/cdfs_new/workque.c | 2 +- 28 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/filesystems/cdfs_new/allocsup.c b/drivers/filesystems/cdfs_new/allocsup.c index d3129a3b46f33..b875eca1437af 100755 --- a/drivers/filesystems/cdfs_new/allocsup.c +++ b/drivers/filesystems/cdfs_new/allocsup.c @@ -44,7 +44,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/cachesup.c b/drivers/filesystems/cdfs_new/cachesup.c index b31422f97e035..87b75bbc51c6b 100755 --- a/drivers/filesystems/cdfs_new/cachesup.c +++ b/drivers/filesystems/cdfs_new/cachesup.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/cddata.c b/drivers/filesystems/cdfs_new/cddata.c index db9d8940de63b..dbd572a797c51 100755 --- a/drivers/filesystems/cdfs_new/cddata.c +++ b/drivers/filesystems/cdfs_new/cddata.c @@ -17,7 +17,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" #ifdef CD_SANITY BOOLEAN CdTestTopLevel = TRUE; diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs_new/cdinit.c index f0faef6af3957..e66bd75377b54 100755 --- a/drivers/filesystems/cdfs_new/cdinit.c +++ b/drivers/filesystems/cdfs_new/cdinit.c @@ -13,7 +13,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs_new/cdprocs.h index 87fcc5a37d434..c9d34d2517c93 100755 --- a/drivers/filesystems/cdfs_new/cdprocs.h +++ b/drivers/filesystems/cdfs_new/cdprocs.h @@ -28,9 +28,9 @@ Module Name: #endif #include "nodetype.h" -#include "Cd.h" -#include "CdStruc.h" -#include "CdData.h" +#include "cd.h" +#include "cdstruc.h" +#include "cddata.h" //**** x86 compiler bug **** diff --git a/drivers/filesystems/cdfs_new/cleanup.c b/drivers/filesystems/cdfs_new/cleanup.c index 70faad7209cae..4c621e5c2f5a0 100755 --- a/drivers/filesystems/cdfs_new/cleanup.c +++ b/drivers/filesystems/cdfs_new/cleanup.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/close.c b/drivers/filesystems/cdfs_new/close.c index 9090c6e2c8bd7..d2827793c6413 100755 --- a/drivers/filesystems/cdfs_new/close.c +++ b/drivers/filesystems/cdfs_new/close.c @@ -42,7 +42,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/create.c b/drivers/filesystems/cdfs_new/create.c index 1458ea2d44a23..bb072da107290 100755 --- a/drivers/filesystems/cdfs_new/create.c +++ b/drivers/filesystems/cdfs_new/create.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/devctrl.c b/drivers/filesystems/cdfs_new/devctrl.c index 7efebef13a43c..786a36d9240c6 100755 --- a/drivers/filesystems/cdfs_new/devctrl.c +++ b/drivers/filesystems/cdfs_new/devctrl.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/deviosup.c b/drivers/filesystems/cdfs_new/deviosup.c index 50bafd3936017..0c5c9d2bff7b2 100755 --- a/drivers/filesystems/cdfs_new/deviosup.c +++ b/drivers/filesystems/cdfs_new/deviosup.c @@ -13,7 +13,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/dirctrl.c b/drivers/filesystems/cdfs_new/dirctrl.c index 3964904a5fcad..29265a844a1ba 100755 --- a/drivers/filesystems/cdfs_new/dirctrl.c +++ b/drivers/filesystems/cdfs_new/dirctrl.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/dirsup.c b/drivers/filesystems/cdfs_new/dirsup.c index 6e02c2e9439a9..6a652eb84babf 100755 --- a/drivers/filesystems/cdfs_new/dirsup.c +++ b/drivers/filesystems/cdfs_new/dirsup.c @@ -65,7 +65,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/fieldoff.c b/drivers/filesystems/cdfs_new/fieldoff.c index c307c10834752..63bc236e032d7 100755 --- a/drivers/filesystems/cdfs_new/fieldoff.c +++ b/drivers/filesystems/cdfs_new/fieldoff.c @@ -1,4 +1,4 @@ -#include "CdProcs.h" +#include "cdprocs.h" #include #define doit(a,b) { printf("%s %04lx %4lx %s\n", #a, FIELD_OFFSET(a,b), sizeof(d.b), #b); } diff --git a/drivers/filesystems/cdfs_new/fileinfo.c b/drivers/filesystems/cdfs_new/fileinfo.c index c357d3c9969ae..b4a185a98a913 100755 --- a/drivers/filesystems/cdfs_new/fileinfo.c +++ b/drivers/filesystems/cdfs_new/fileinfo.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/filobsup.c b/drivers/filesystems/cdfs_new/filobsup.c index 909d1a89a2760..00ab96b9746d9 100755 --- a/drivers/filesystems/cdfs_new/filobsup.c +++ b/drivers/filesystems/cdfs_new/filobsup.c @@ -13,7 +13,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs_new/fsctrl.c index 7a0bdbd6740c8..95dda725a6190 100755 --- a/drivers/filesystems/cdfs_new/fsctrl.c +++ b/drivers/filesystems/cdfs_new/fsctrl.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/fspdisp.c b/drivers/filesystems/cdfs_new/fspdisp.c index b7c4e80b62ab5..a3b89b96cfb3d 100755 --- a/drivers/filesystems/cdfs_new/fspdisp.c +++ b/drivers/filesystems/cdfs_new/fspdisp.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/lockctrl.c b/drivers/filesystems/cdfs_new/lockctrl.c index a986fb35ec364..149d4ecb5cc33 100755 --- a/drivers/filesystems/cdfs_new/lockctrl.c +++ b/drivers/filesystems/cdfs_new/lockctrl.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/namesup.c b/drivers/filesystems/cdfs_new/namesup.c index 8cdfb12d41534..08c9d62922679 100755 --- a/drivers/filesystems/cdfs_new/namesup.c +++ b/drivers/filesystems/cdfs_new/namesup.c @@ -13,7 +13,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/pathsup.c b/drivers/filesystems/cdfs_new/pathsup.c index 607a10502b58a..2428c9d5f2c16 100755 --- a/drivers/filesystems/cdfs_new/pathsup.c +++ b/drivers/filesystems/cdfs_new/pathsup.c @@ -73,7 +73,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/pnp.c b/drivers/filesystems/cdfs_new/pnp.c index 1447536d740a9..c9106fe95821c 100755 --- a/drivers/filesystems/cdfs_new/pnp.c +++ b/drivers/filesystems/cdfs_new/pnp.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/prefxsup.c b/drivers/filesystems/cdfs_new/prefxsup.c index c00b98e50e99f..75d6b027d4773 100755 --- a/drivers/filesystems/cdfs_new/prefxsup.c +++ b/drivers/filesystems/cdfs_new/prefxsup.c @@ -13,7 +13,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/read.c b/drivers/filesystems/cdfs_new/read.c index 9e18fd3043130..cadf3c464fb32 100755 --- a/drivers/filesystems/cdfs_new/read.c +++ b/drivers/filesystems/cdfs_new/read.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/resrcsup.c b/drivers/filesystems/cdfs_new/resrcsup.c index b062c1b7c65a1..66224050cfbae 100755 --- a/drivers/filesystems/cdfs_new/resrcsup.c +++ b/drivers/filesystems/cdfs_new/resrcsup.c @@ -13,7 +13,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/strucsup.c b/drivers/filesystems/cdfs_new/strucsup.c index be42daf6cfe9a..58210ad7a1ff5 100755 --- a/drivers/filesystems/cdfs_new/strucsup.c +++ b/drivers/filesystems/cdfs_new/strucsup.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/verfysup.c b/drivers/filesystems/cdfs_new/verfysup.c index dae9c01147761..24c671afc273d 100755 --- a/drivers/filesystems/cdfs_new/verfysup.c +++ b/drivers/filesystems/cdfs_new/verfysup.c @@ -13,7 +13,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/volinfo.c b/drivers/filesystems/cdfs_new/volinfo.c index 2abce7f739941..d0962fb4b8f0a 100755 --- a/drivers/filesystems/cdfs_new/volinfo.c +++ b/drivers/filesystems/cdfs_new/volinfo.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/workque.c b/drivers/filesystems/cdfs_new/workque.c index 83db3a49c5670..f242c8cca3685 100755 --- a/drivers/filesystems/cdfs_new/workque.c +++ b/drivers/filesystems/cdfs_new/workque.c @@ -14,7 +14,7 @@ Module Name: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module From 755bdb5d0b09e1df374f197c59639c0d78b86d6f Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:42:27 +0100 Subject: [PATCH 03/21] [CDFS_NEW] Remove a no longer required build hack --- drivers/filesystems/cdfs_new/cdprocs.h | 46 ++++++++-------- .../filesystems/cdfs_new/wdk_wnet_to_ros.diff | 53 ------------------- 2 files changed, 22 insertions(+), 77 deletions(-) diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs_new/cdprocs.h index c9d34d2517c93..4cb7da2098212 100755 --- a/drivers/filesystems/cdfs_new/cdprocs.h +++ b/drivers/filesystems/cdfs_new/cdprocs.h @@ -44,30 +44,28 @@ Module Name: // Here are the different pool tags. // -/* ReactOS Change: GCC doesn't understand this, use TAG macro */ -#include -#define TAG_CCB TAG('c','c','d','C') // Ccb -#define TAG_CDROM_TOC TAG('c','t','d','C') // TOC -#define TAG_DIRENT_NAME TAG('n','d','d','C') // CdName in dirent -#define TAG_ENUM_EXPRESSION TAG('e','e','d','C') // Search expression for enumeration -#define TAG_FCB_DATA TAG('d','f','d','C') // Data Fcb -#define TAG_FCB_INDEX TAG('i','f','d','C') // Index Fcb -#define TAG_FCB_NONPAGED TAG('n','f','d','C') // Nonpaged Fcb -#define TAG_FCB_TABLE TAG('t','f','d','C') // Fcb Table entry -#define TAG_FILE_NAME TAG('n','F','d','C') // Filename buffer -#define TAG_GEN_SHORT_NAME TAG('s','g','d','C') // Generated short name -#define TAG_IO_BUFFER TAG('f','b','d','C') // Temporary IO buffer -#define TAG_IO_CONTEXT TAG('o','i','d','C') // Io context for async reads -#define TAG_IRP_CONTEXT TAG('c','i','d','C') // Irp Context -#define TAG_IRP_CONTEXT_LITE TAG('l','i','d','C') // Irp Context lite -#define TAG_MCB_ARRAY TAG('a','m','d','C') // Mcb array -#define TAG_PATH_ENTRY_NAME TAG('n','P','d','C') // CdName in path entry -#define TAG_PREFIX_ENTRY TAG('e','p','d','C') // Prefix Entry -#define TAG_PREFIX_NAME TAG('n','p','d','C') // Prefix Entry name -#define TAG_SPANNING_PATH_TABLE TAG('p','s','d','C') // Buffer for spanning path table -#define TAG_UPCASE_NAME TAG('n','u','d','C') // Buffer for upcased name -#define TAG_VOL_DESC TAG('d','v','d','C') // Buffer for volume descriptor -#define TAG_VPB TAG('p','v','d','C') // Vpb allocated in filesystem +#define TAG_CCB 'ccdC' // Ccb +#define TAG_CDROM_TOC 'ctdC' // TOC +#define TAG_DIRENT_NAME 'nddC' // CdName in dirent +#define TAG_ENUM_EXPRESSION 'eedC' // Search expression for enumeration +#define TAG_FCB_DATA 'dfdC' // Data Fcb +#define TAG_FCB_INDEX 'ifdC' // Index Fcb +#define TAG_FCB_NONPAGED 'nfdC' // Nonpaged Fcb +#define TAG_FCB_TABLE 'tfdC' // Fcb Table entry +#define TAG_FILE_NAME 'nFdC' // Filename buffer +#define TAG_GEN_SHORT_NAME 'sgdC' // Generated short name +#define TAG_IO_BUFFER 'fbdC' // Temporary IO buffer +#define TAG_IO_CONTEXT 'oidC' // Io context for async reads +#define TAG_IRP_CONTEXT 'cidC' // Irp Context +#define TAG_IRP_CONTEXT_LITE 'lidC' // Irp Context lite +#define TAG_MCB_ARRAY 'amdC' // Mcb array +#define TAG_PATH_ENTRY_NAME 'nPdC' // CdName in path entry +#define TAG_PREFIX_ENTRY 'epdC' // Prefix Entry +#define TAG_PREFIX_NAME 'npdC' // Prefix Entry name +#define TAG_SPANNING_PATH_TABLE 'psdC' // Buffer for spanning path table +#define TAG_UPCASE_NAME 'nudC' // Buffer for upcased name +#define TAG_VOL_DESC 'dvdC' // Buffer for volume descriptor +#define TAG_VPB 'pvdC' // Vpb allocated in filesystem // // Tag all of our allocations if tagging is turned on diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index 5893bed5cd506..1bcaa33c9a813 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -403,59 +403,6 @@ Index: drivers/filesystems/cdfs_new/cdprocs.h =================================================================== --- drivers/filesystems/cdfs_new/cdprocs.h (revision 34615) +++ drivers/filesystems/cdfs_new/cdprocs.h (working copy) -@@ -44,28 +44,30 @@ - // Here are the different pool tags. - // - --#define TAG_CCB 'ccdC' // Ccb --#define TAG_CDROM_TOC 'ctdC' // TOC --#define TAG_DIRENT_NAME 'nddC' // CdName in dirent --#define TAG_ENUM_EXPRESSION 'eedC' // Search expression for enumeration --#define TAG_FCB_DATA 'dfdC' // Data Fcb --#define TAG_FCB_INDEX 'ifdC' // Index Fcb --#define TAG_FCB_NONPAGED 'nfdC' // Nonpaged Fcb --#define TAG_FCB_TABLE 'tfdC' // Fcb Table entry --#define TAG_FILE_NAME 'nFdC' // Filename buffer --#define TAG_GEN_SHORT_NAME 'sgdC' // Generated short name --#define TAG_IO_BUFFER 'fbdC' // Temporary IO buffer --#define TAG_IO_CONTEXT 'oidC' // Io context for async reads --#define TAG_IRP_CONTEXT 'cidC' // Irp Context --#define TAG_IRP_CONTEXT_LITE 'lidC' // Irp Context lite --#define TAG_MCB_ARRAY 'amdC' // Mcb array --#define TAG_PATH_ENTRY_NAME 'nPdC' // CdName in path entry --#define TAG_PREFIX_ENTRY 'epdC' // Prefix Entry --#define TAG_PREFIX_NAME 'npdC' // Prefix Entry name --#define TAG_SPANNING_PATH_TABLE 'psdC' // Buffer for spanning path table --#define TAG_UPCASE_NAME 'nudC' // Buffer for upcased name --#define TAG_VOL_DESC 'dvdC' // Buffer for volume descriptor --#define TAG_VPB 'pvdC' // Vpb allocated in filesystem -+/* ReactOS Change: GCC doesn't understand this, use TAG macro */ -+#include -+#define TAG_CCB TAG('c','c','d','C') // Ccb -+#define TAG_CDROM_TOC TAG('c','t','d','C') // TOC -+#define TAG_DIRENT_NAME TAG('n','d','d','C') // CdName in dirent -+#define TAG_ENUM_EXPRESSION TAG('e','e','d','C') // Search expression for enumeration -+#define TAG_FCB_DATA TAG('d','f','d','C') // Data Fcb -+#define TAG_FCB_INDEX TAG('i','f','d','C') // Index Fcb -+#define TAG_FCB_NONPAGED TAG('n','f','d','C') // Nonpaged Fcb -+#define TAG_FCB_TABLE TAG('t','f','d','C') // Fcb Table entry -+#define TAG_FILE_NAME TAG('n','F','d','C') // Filename buffer -+#define TAG_GEN_SHORT_NAME TAG('s','g','d','C') // Generated short name -+#define TAG_IO_BUFFER TAG('f','b','d','C') // Temporary IO buffer -+#define TAG_IO_CONTEXT TAG('o','i','d','C') // Io context for async reads -+#define TAG_IRP_CONTEXT TAG('c','i','d','C') // Irp Context -+#define TAG_IRP_CONTEXT_LITE TAG('l','i','d','C') // Irp Context lite -+#define TAG_MCB_ARRAY TAG('a','m','d','C') // Mcb array -+#define TAG_PATH_ENTRY_NAME TAG('n','P','d','C') // CdName in path entry -+#define TAG_PREFIX_ENTRY TAG('e','p','d','C') // Prefix Entry -+#define TAG_PREFIX_NAME TAG('n','p','d','C') // Prefix Entry name -+#define TAG_SPANNING_PATH_TABLE TAG('p','s','d','C') // Buffer for spanning path table -+#define TAG_UPCASE_NAME TAG('n','u','d','C') // Buffer for upcased name -+#define TAG_VOL_DESC TAG('d','v','d','C') // Buffer for volume descriptor -+#define TAG_VPB TAG('p','v','d','C') // Vpb allocated in filesystem - - // - // Tag all of our allocations if tagging is turned on @@ -902,33 +904,39 @@ } From 2639dd673636e4848a4fe33b9a4cd142efcc84f8 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:44:13 +0100 Subject: [PATCH 04/21] [CDFS_NEW] Remove a no longer required build hack --- drivers/filesystems/cdfs_new/nodetype.h | 2 -- drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/drivers/filesystems/cdfs_new/nodetype.h b/drivers/filesystems/cdfs_new/nodetype.h index 67939548159e5..b227332b035b0 100755 --- a/drivers/filesystems/cdfs_new/nodetype.h +++ b/drivers/filesystems/cdfs_new/nodetype.h @@ -97,8 +97,6 @@ typedef CSHORT NODE_BYTE_SIZE; #define CDFS_BUG_CHECK_VOLINFO (0x001b0000) #define CDFS_BUG_CHECK_WORKQUE (0x001c0000) -/* ReactOS Change: Need to add to reactos.mc */ -#define CDFS_FILE_SYSTEM ((ULONG)0x00000026L) #define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); } #endif // _NODETYPE_ diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index 1bcaa33c9a813..9221a7f0d7d6f 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -885,19 +885,6 @@ Index: drivers/filesystems/cdfs_new/fileinfo.c CdFastQueryNetworkInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, -Index: drivers/filesystems/cdfs_new/nodetype.h -=================================================================== ---- drivers/filesystems/cdfs_new/nodetype.h (revision 34615) -+++ drivers/filesystems/cdfs_new/nodetype.h (working copy) -@@ -97,6 +97,8 @@ - #define CDFS_BUG_CHECK_VOLINFO (0x001b0000) - #define CDFS_BUG_CHECK_WORKQUE (0x001c0000) - -+/* ReactOS Change: Need to add to reactos.mc */ -+#define CDFS_FILE_SYSTEM ((ULONG)0x00000026L) - #define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); } - - #endif // _NODETYPE_ Index: drivers/filesystems/cdfs_new/fsctrl.c =================================================================== --- drivers/filesystems/cdfs_new/fsctrl.c (revision 34615) From 818025ecc8006c19ce6f6139b21294795f51bafd Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:46:43 +0100 Subject: [PATCH 05/21] [CDFS_NEW] Remove a no longer required build hack --- drivers/filesystems/cdfs_new/fsctrl.c | 2 +- drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs_new/fsctrl.c index 95dda725a6190..31c4965f9f165 100755 --- a/drivers/filesystems/cdfs_new/fsctrl.c +++ b/drivers/filesystems/cdfs_new/fsctrl.c @@ -2295,7 +2295,7 @@ Return Value: Status = ObReferenceObjectByHandle( Handle, 0, - IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibility with exported kernel data */ + *IoFileObjectType, KernelMode, (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */ NULL ); diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index 9221a7f0d7d6f..ed075d0a1a25a 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -935,12 +935,9 @@ Index: drivers/filesystems/cdfs_new/fsctrl.c CdIsVolumeDirty ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp -@@ -2294,9 +2295,9 @@ - - Status = ObReferenceObjectByHandle( Handle, +@@ -2296,9 +2297,9 @@ 0, -- *IoFileObjectType, -+ IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibility with exported kernel data */ + *IoFileObjectType, KernelMode, - &FileToMarkBad, + (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */ From 3d4b8783fd0b9b8231a46e7b914447b86255e35b Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:49:47 +0100 Subject: [PATCH 06/21] [CDFS_NEW] Force calling convention to allow build --- drivers/filesystems/cdfs_new/pnp.c | 2 ++ .../filesystems/cdfs_new/wdk_wnet_to_ros.diff | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/filesystems/cdfs_new/pnp.c b/drivers/filesystems/cdfs_new/pnp.c index c9106fe95821c..596ac288c7bf9 100755 --- a/drivers/filesystems/cdfs_new/pnp.c +++ b/drivers/filesystems/cdfs_new/pnp.c @@ -51,6 +51,7 @@ CdPnpCancelRemove ( ); NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdPnpCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -774,6 +775,7 @@ Return Value: // NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdPnpCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index ed075d0a1a25a..738aacd9eff75 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -973,6 +973,26 @@ Index: drivers/filesystems/cdfs_new/fsctrl.c VOLUME_ID_LENGTH, (PCHAR) Vcb->Vpb->VolumeLabel ); +Index: drivers/filesystems/cdfs_new/pnp.c +=================================================================== +--- drivers/filesystems/cdfs_new/pnp.c (revision 34615) ++++ drivers/filesystems/cdfs_new/pnp.c (working copy) +@@ -51,6 +51,7 @@ + ); + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdPnpCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -774,6 +775,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdPnpCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, Index: drivers/filesystems/cdfs_new/workque.c =================================================================== --- drivers/filesystems/cdfs_new/workque.c (revision 34615) From 7b19676e2b541983f1062ba1c563099284646010 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:52:43 +0100 Subject: [PATCH 07/21] [CDFS_NEW] Force calling convention to allow build --- drivers/filesystems/cdfs_new/devctrl.c | 2 ++ .../filesystems/cdfs_new/wdk_wnet_to_ros.diff | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/filesystems/cdfs_new/devctrl.c b/drivers/filesystems/cdfs_new/devctrl.c index 786a36d9240c6..41461526dfd1d 100755 --- a/drivers/filesystems/cdfs_new/devctrl.c +++ b/drivers/filesystems/cdfs_new/devctrl.c @@ -27,6 +27,7 @@ Module Name: // NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdDevCtrlCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -171,6 +172,7 @@ Return Value: // NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdDevCtrlCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index 738aacd9eff75..46023ebfb932d 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -844,6 +844,26 @@ Index: drivers/filesystems/cdfs_new/cleanup.c // // If appropriate, try to spark teardown by purging the volume. Should +Index: drivers/filesystems/cdfs_new/devctrl.c +=================================================================== +--- drivers/filesystems/cdfs_new/devctrl.c (revision 34615) ++++ drivers/filesystems/cdfs_new/devctrl.c (working copy) +@@ -27,6 +27,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdDevCtrlCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -171,6 +172,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdDevCtrlCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, Index: drivers/filesystems/cdfs_new/strucsup.c =================================================================== --- drivers/filesystems/cdfs_new/strucsup.c (revision 34615) From e4da7ecc50b59b9f8283d84b3707fa69c595a57d Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:55:34 +0100 Subject: [PATCH 08/21] [CDFS_NEW] Remove a broken change (lol?!) that prevented the driver to properly work in ROS... Dropping SEH doesn't mean dropping code! --- drivers/filesystems/cdfs_new/cdprocs.h | 4 ++-- drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs_new/cdprocs.h index 4cb7da2098212..921f523720063 100755 --- a/drivers/filesystems/cdfs_new/cdprocs.h +++ b/drivers/filesystems/cdfs_new/cdprocs.h @@ -1889,8 +1889,8 @@ CdCommonPnp ( // Implemented in Pnp.c #define GetExceptionCode() 0 #define AbnormalTermination() 0 -#define try_return(S) { goto try_exit; } -#define try_leave(S) { leave; } +#define try_return(S) { S; goto try_exit; } +#define try_leave(S) { S; leave; } // diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index 46023ebfb932d..b785ad9107212 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -564,10 +564,8 @@ Index: drivers/filesystems/cdfs_new/cdprocs.h +#define GetExceptionCode() 0 +#define AbnormalTermination() 0 --#define try_return(S) { S; goto try_exit; } --#define try_leave(S) { S; leave; } -+#define try_return(S) { goto try_exit; } -+#define try_leave(S) { leave; } + #define try_return(S) { S; goto try_exit; } + #define try_leave(S) { S; leave; } + // From 8b2fd60829eeeb28fcafc0ef2511f7bed04ffd64 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:58:49 +0100 Subject: [PATCH 09/21] [CDFS_NEW] Add a CMakeFile and a registry file. When using both, you get a driver that builds and works in ROS. Could install ROS with it! :-) --- drivers/filesystems/cdfs_new/CMakeLists.txt | 37 +++++++++++++++++++++ drivers/filesystems/cdfs_new/cdfs_reg.inf | 7 ++++ 2 files changed, 44 insertions(+) create mode 100644 drivers/filesystems/cdfs_new/CMakeLists.txt create mode 100644 drivers/filesystems/cdfs_new/cdfs_reg.inf diff --git a/drivers/filesystems/cdfs_new/CMakeLists.txt b/drivers/filesystems/cdfs_new/CMakeLists.txt new file mode 100644 index 0000000000000..c0b56e99db6c1 --- /dev/null +++ b/drivers/filesystems/cdfs_new/CMakeLists.txt @@ -0,0 +1,37 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) + +list(APPEND SOURCE + allocsup.c + cachesup.c + cddata.c + cdinit.c + cleanup.c + close.c + create.c + devctrl.c + deviosup.c + dirctrl.c + dirsup.c + fileinfo.c + filobsup.c + fsctrl.c + fspdisp.c + lockctrl.c + namesup.c + pathsup.c + pnp.c + prefxsup.c + read.c + resrcsup.c + strucsup.c + verfysup.c + volinfo.c + workque.c) + +add_library(cdfs SHARED ${SOURCE} cdfs.rc) +set_module_type(cdfs kernelmodedriver) +target_link_libraries(cdfs ${PSEH_LIB} memcmp) +add_importlibs(cdfs ntoskrnl hal) +add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(cdfs_reg.inf) diff --git a/drivers/filesystems/cdfs_new/cdfs_reg.inf b/drivers/filesystems/cdfs_new/cdfs_reg.inf new file mode 100644 index 0000000000000..9ae7413c61376 --- /dev/null +++ b/drivers/filesystems/cdfs_new/cdfs_reg.inf @@ -0,0 +1,7 @@ +; Cdfs (ISO96660) filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 From fa1c60db50d456fe39e315fbbe18bbee78af4105 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 20:01:36 +0100 Subject: [PATCH 10/21] [CDFS_NEW] You know... RBuild has been gone for ages! --- .../filesystems/cdfs_new/wdk_wnet_to_ros.diff | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index b785ad9107212..a4bface2e44ca 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -269,28 +269,6 @@ Index: drivers/filesystems/cdfs_new/volinfo.c // // Set the information field to the number of bytes actually filled in // -Index: drivers/filesystems/cdfs_new/cdfs.rbuild -=================================================================== ---- drivers/filesystems/cdfs_new/cdfs.rbuild (revision 34615) -+++ drivers/filesystems/cdfs_new/cdfs.rbuild (working copy) -@@ -1,8 +1,8 @@ - - -- -+ - -- . -+ . - ntoskrnl - hal - allocsup.c -@@ -32,6 +32,5 @@ - volinfo.c - workque.c - cdfs.rc -- -fms-extensions - cdprocs.h - Index: drivers/filesystems/cdfs_new/cddata.c =================================================================== --- drivers/filesystems/cdfs_new/cddata.c (revision 34615) From 03d5be6437a1f2e4376ac117421133ebfdde799e Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 20:09:23 +0100 Subject: [PATCH 11/21] [CDFS_NEW] Add a hack that allows locking a volume and thus, unmounting it. All that work, just to be able to do this... --- drivers/filesystems/cdfs_new/fsctrl.c | 10 ++++++++++ .../filesystems/cdfs_new/wdk_wnet_to_ros.diff | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs_new/fsctrl.c index 31c4965f9f165..562bdc64823b9 100755 --- a/drivers/filesystems/cdfs_new/fsctrl.c +++ b/drivers/filesystems/cdfs_new/fsctrl.c @@ -225,6 +225,16 @@ Return Value: CdReleaseVcb( IrpContext, Vcb ); Status = CcWaitForCurrentLazyWriterActivity(); +#ifdef __REACTOS__ + if (Status == STATUS_NOT_IMPLEMENTED) + { + Status = STATUS_SUCCESS; + } + else + { + DbgPrint("CcWaitForCurrentLazyWriterActivity got implemented! Remove hack in %s:%s\n", __FILE__, __LINE__); + } +#endif // // This is intentional. If we were able to get the Vcb before, just diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index a4bface2e44ca..b27df5692d57b 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -895,6 +895,23 @@ Index: drivers/filesystems/cdfs_new/fsctrl.c CdIsVolumeDirty ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp +@@ -225,6 +225,16 @@ + CdReleaseVcb( IrpContext, Vcb ); + + Status = CcWaitForCurrentLazyWriterActivity(); ++#ifdef __REACTOS__ ++ if (Status == STATUS_NOT_IMPLEMENTED) ++ { ++ Status = STATUS_SUCCESS; ++ } ++ else ++ { ++ DbgPrint("CcWaitForCurrentLazyWriterActivity got implemented! Remove hack in %s:%s\n", __FILE__, __LINE__); ++ } ++#endif + + // + // This is intentional. If we were able to get the Vcb before, just @@ -918,7 +919,7 @@ if (CdIsRemount( IrpContext, Vcb, &OldVcb )) { From e88eeb21af4b778f19b10e2d0e9f1c4361d6838d Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 21:45:55 +0100 Subject: [PATCH 12/21] [NTOSKRNL] Make the CcWaitForCurrentLazyWriterActivity() stub return success instead of hacking FSDs. Suggested by Thomas --- drivers/filesystems/cdfs_new/fsctrl.c | 10 ---------- .../filesystems/cdfs_new/wdk_wnet_to_ros.diff | 17 ----------------- ntoskrnl/cc/copy.c | 2 +- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs_new/fsctrl.c index 562bdc64823b9..31c4965f9f165 100755 --- a/drivers/filesystems/cdfs_new/fsctrl.c +++ b/drivers/filesystems/cdfs_new/fsctrl.c @@ -225,16 +225,6 @@ Return Value: CdReleaseVcb( IrpContext, Vcb ); Status = CcWaitForCurrentLazyWriterActivity(); -#ifdef __REACTOS__ - if (Status == STATUS_NOT_IMPLEMENTED) - { - Status = STATUS_SUCCESS; - } - else - { - DbgPrint("CcWaitForCurrentLazyWriterActivity got implemented! Remove hack in %s:%s\n", __FILE__, __LINE__); - } -#endif // // This is intentional. If we were able to get the Vcb before, just diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index b27df5692d57b..a4bface2e44ca 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -895,23 +895,6 @@ Index: drivers/filesystems/cdfs_new/fsctrl.c CdIsVolumeDirty ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp -@@ -225,6 +225,16 @@ - CdReleaseVcb( IrpContext, Vcb ); - - Status = CcWaitForCurrentLazyWriterActivity(); -+#ifdef __REACTOS__ -+ if (Status == STATUS_NOT_IMPLEMENTED) -+ { -+ Status = STATUS_SUCCESS; -+ } -+ else -+ { -+ DbgPrint("CcWaitForCurrentLazyWriterActivity got implemented! Remove hack in %s:%s\n", __FILE__, __LINE__); -+ } -+#endif - - // - // This is intentional. If we were able to get the Vcb before, just @@ -918,7 +919,7 @@ if (CdIsRemount( IrpContext, Vcb, &OldVcb )) { diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 9f6cead1c90c2..15c6ceb81b67f 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -524,7 +524,7 @@ CcWaitForCurrentLazyWriterActivity ( VOID) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } /* From cf7a36b76e868ac82d8dd22aa7c9fc320ae98e5f Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Tue, 7 Nov 2017 02:50:24 +0100 Subject: [PATCH 13/21] [RAPPS-DB] CORE-13947 IrfanView 4.44 fix download URL --- media/rapps/irfanview.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/rapps/irfanview.txt b/media/rapps/irfanview.txt index e8c031151b40c..b602c357b9b9f 100644 --- a/media/rapps/irfanview.txt +++ b/media/rapps/irfanview.txt @@ -6,7 +6,7 @@ Description = Viewer for all kinds of graphics/audio files/video files. Size = 2.1 MiB Category = 3 URLSite = http://www.irfanview.com/ -URLDownload = http://www.tucows.com/download/windows/files/iview444_setup.exe +URLDownload = https://web.archive.org/web/20170418115956/http://www.tucows.com/download/windows/files/iview444_setup.exe SHA1 = d9675c2c4fce810134718b74b0c598957c8ebcf4 CDPath = none From 94298313c03c791d1ed472125ebf86f4258d2354 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Tue, 7 Nov 2017 07:54:15 +0100 Subject: [PATCH 14/21] [CDFS_NEW] Fix diff --- .../filesystems/cdfs_new/wdk_wnet_to_ros.diff | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index a4bface2e44ca..cc84eb55c2e77 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -147,6 +147,14 @@ Index: drivers/filesystems/cdfs_new/devctrl.c =================================================================== --- drivers/filesystems/cdfs_new/devctrl.c (revision 34615) +++ drivers/filesystems/cdfs_new/devctrl.c (working copy) +@@ -27,6 +27,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdDevCtrlCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, @@ -64,7 +64,7 @@ PIO_STACK_LOCATION IrpSp; PIO_STACK_LOCATION NextIrpSp; @@ -156,6 +164,14 @@ Index: drivers/filesystems/cdfs_new/devctrl.c PAGED_CODE(); +@@ -171,6 +172,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdDevCtrlCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, Index: drivers/filesystems/cdfs_new/close.c =================================================================== --- drivers/filesystems/cdfs_new/close.c (revision 34615) @@ -820,26 +836,6 @@ Index: drivers/filesystems/cdfs_new/cleanup.c // // If appropriate, try to spark teardown by purging the volume. Should -Index: drivers/filesystems/cdfs_new/devctrl.c -=================================================================== ---- drivers/filesystems/cdfs_new/devctrl.c (revision 34615) -+++ drivers/filesystems/cdfs_new/devctrl.c (working copy) -@@ -27,6 +27,7 @@ - // - - NTSTATUS -+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ - CdDevCtrlCompletionRoutine ( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, -@@ -171,6 +172,7 @@ - // - - NTSTATUS -+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ - CdDevCtrlCompletionRoutine ( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, Index: drivers/filesystems/cdfs_new/strucsup.c =================================================================== --- drivers/filesystems/cdfs_new/strucsup.c (revision 34615) From 09d3111673be8d44a6ebddbdda29820a47a5372f Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Tue, 7 Nov 2017 18:27:49 +0100 Subject: [PATCH 15/21] [RAPPS-DB] CORE-13947 update to IrfanView 4.50 & IrfanView Plugins to 4.50 (fixes broken link of plugins, workarounds MFC42.dll issue in old 4.44 setup and workarounds missing rapps-progress-dialog) --- media/rapps/irfanview.txt | 18 +++++++++--------- media/rapps/irfanviewplugins.txt | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/media/rapps/irfanview.txt b/media/rapps/irfanview.txt index b602c357b9b9f..d0abf41f5b2d4 100644 --- a/media/rapps/irfanview.txt +++ b/media/rapps/irfanview.txt @@ -1,19 +1,19 @@ [Section] Name = IrfanView -Version = 4.44 +Version = 4.50 License = Freeware (for personal use) Description = Viewer for all kinds of graphics/audio files/video files. -Size = 2.1 MiB +Size = 2.3 MiB Category = 3 URLSite = http://www.irfanview.com/ -URLDownload = https://web.archive.org/web/20170418115956/http://www.tucows.com/download/windows/files/iview444_setup.exe -SHA1 = d9675c2c4fce810134718b74b0c598957c8ebcf4 +URLDownload = http://www.tucows.com/download/windows/files/iview450_setup.exe +SHA1 = 6f977a3c49f5b7c3bf85a47739a92facaa457820 CDPath = none [Section.0407] License = Freeware für nichtkommerzielle Nutzung Description = Anzeigeprogramm für alle Arten von Grafik-/Audio- oder Video-Dateien. -Size = 2,1 MiB +Size = 2,3 MiB [Section.0a] License = Gratuito (para uso personal) @@ -22,7 +22,7 @@ Description = Visor para toda clase de archivos de imagen, audio y video. [Section.040c] License = Gratuit (pour un usage personnel) Description = Visionneur pour tous les types de fichiers graphiques/audio/vidéo. -Size = 2,1 Mio +Size = 2,3 Mio [Section.0410] License = Gratuita (per uso personale) @@ -39,17 +39,17 @@ Description = Przeglądarka dla bardzo wielu typów obrazów, plików audio oraz [Section.0418] License = Gratuită (pentru uz personal) Description = Lector pentru multiple formaturi de fișiere grafice/audio/video. -Size = 2,1 Mio +Size = 2,3 Mio [Section.0419] License = Бесплатно (для личного пользования) Description = Программа для просмотра всевозможных графических, звуковых, видео файлов. -Size = 2,1 МиБ +Size = 2,3 МиБ [Section.041f] License = Şahsî kullanım için ücretsiz. Description = Çizgelerin, ses kütüklerinin, vidyo kütüklerinin tüm türleri için görüntüleyici. -Size = 2,1 MiB +Size = 2,3 MiB [Section.0422] License = Freeware (для домашнього використання) diff --git a/media/rapps/irfanviewplugins.txt b/media/rapps/irfanviewplugins.txt index e304781e117b2..b247fe5b2ea5d 100644 --- a/media/rapps/irfanviewplugins.txt +++ b/media/rapps/irfanviewplugins.txt @@ -1,19 +1,19 @@ [Section] Name = IrfanView Plugins -Version = 4.44 +Version = 4.50 License = Freeware (for personal use) Description = Additional Plugins for supporting more file types. -Size = 15.5 MiB +Size = 15.7 MiB Category = 3 URLSite = http://www.irfanview.com/ -URLDownload = http://www.tucows.com/download/windows/files/irfanview_plugins_444_setup.exe -SHA1 = ad5e60a6c807384ac87813c96190c652dbef8f3e +URLDownload = http://www.tucows.com/download/windows/files/irfanview_plugins_450_setup.exe +SHA1 = b47a0c6b04454229c0600a8ee5e834e60c8a2c7b CDPath = none [Section.0407] License = Freeware für nichtkommerzielle Nutzung Description = Zusätzliche Plugins zur Unterstützung von weiteren Dateitypen. -Size = 15,5 MiB +Size = 15,7 MiB [Section.0a] License = Gratuito (para uso personal) @@ -22,7 +22,7 @@ Description = Complementos adicionales para visualizar más formatos. [Section.040c] License = Gratuit (pour un usage personnel) Description = Modules additionnels pour supporter plus de types de fichiers. -Size = 15,5 Mio +Size = 15,7 Mio [Section.0410] License = Gratuita (per uso personale) @@ -39,18 +39,18 @@ Description = Wtyczki otwierające dodatkowe typy plików w Irfanview. [Section.0418] License = Gratuită (pentru uz personal) Description = Extensii adiționale pentru a spori numărul de formate de fișiere recunoscute. -Size = 15,5 Mio +Size = 15,7 Mio [Section.0419] License = Бесплатно (для личного пользования) Description = Плагины для поддержки дополнительных типов файлов. -Size = 15,5 МиБ +Size = 15,7 МиБ [Section.041f] Name = IrfanView Eklentileri License = Şahsî kullanım için ücretsiz. Description = Daha çok kütük türü desteklemek için eklentiler. -Size = 15,5 MiB +Size = 15,7 MiB [Section.0422] License = Freeware (для домашнього використання) From 23bc0b505228159c927877a399dce0865964b97b Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Tue, 7 Nov 2017 19:25:46 +0100 Subject: [PATCH 16/21] [RAPPS-DB] CORE-13199 pingus.txt fix typo in spanish description spotted by Javier Fernandez --- media/rapps/pingus.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/rapps/pingus.txt b/media/rapps/pingus.txt index 86f01b7d4b9a0..ff8062733e164 100644 --- a/media/rapps/pingus.txt +++ b/media/rapps/pingus.txt @@ -15,7 +15,7 @@ Description = Freies Lemmings-ähnliches Puzzle Spiel. Size = 15,8 MiB [Section.0a] -Description = Un juego de puzles parecido a los Lemmings. +Description = Un juego de puzzles parecido a los Lemmings. [Section.0410] Description = Pingus è un gioco gratuito simile a Lemmings. From e0b32f28f401742f80b78ce7958d7afa70b041ba Mon Sep 17 00:00:00 2001 From: Jared Smudde Date: Mon, 6 Nov 2017 15:17:56 -0600 Subject: [PATCH 17/21] [mspaint] Replace the current 16 pixel program icon with one from the Tango icon theme. --- base/applications/mspaint/icons/paint.ico | Bin 22486 -> 22486 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/base/applications/mspaint/icons/paint.ico b/base/applications/mspaint/icons/paint.ico index 730f8d44a2718b4e0be673e1e6312f83f4767904..e14e1db16e28f5b09bea079cb5c443acb5e2ad49 100644 GIT binary patch delta 1081 zcmYk5TS(Jk7{;GzHV>K3>E_I}O{;ZK%d@6AtBWoq?52y5x(Ff5l28aQs_E3tIY+^$ zAjnma2aIftx~MJ&5rt3@L=Nd97Z4zK%d_atyYVMh6Xqs4%loqSS%Kt zXgZ1X^mKT=UJMTpqo$??R;v{{y&j2)iO9{(MRj#G3JVKiFc^@KkN}-d2aQI9$S?Tb z5FZr`8{$;QLtp`vp1|P zWE$6-%qt3MI(@n!W8L48GUc;2DOr=EONpt z03kaNR%8RdQL`psJ_%SjDfOG^GLm}xv$VyWYGGZf3q`poqc>I$XjKV@6? zaWzjZb@5S!k1BjrWj{&jlrG~LrGqvIZ4lZZv_WWt(pAq6t6`Al3C$ClCp1rJp3uB& z%BeAqmfxf0Ld%7g3oRE~{;SjNE?Sz8At+9Q@|&OtK@ox?r0<8Xsxl{&RJD_;Sz;(8 zOGuV-_|xfemUDcAxvQ&7PabE;qmV}-k3t@on(WTbs--4Q+$PKm$}NOh2(u98MZ!F% ztv;U0CbQYq>ndgRnB~u>%&K=iBT+n~khc3MXL`Ss^3y XWMrO8YEja%HJF~X%0vc$E! z7myl52q!9u)U^LfYsU_U^TSpPwIAEME+hbS~zxxR{<$hNX5vF!2e8y`wGs=yaqN z@ev-u#KpWCoK7i+b6`09Z?m!1?pG+(W z5@=XWM%kB&Fh5FbkIxD{z3G3*(!QvFdaz4n`G2Gk}f5UUV>-On6<7MG&hJCf;dS6DWY5 zV>sEP4*UISQAkR?i}3JpJg93!@xw;E>K#CKMGF!+TwF=xfLGswDn1Vk1_S;5{b=gw z#^~r63b{>)DyfHObO!nd22fgFhM=Gz@OV7*4Zg?w;Sp3dKEl;(E*SBd7#bP^yRZ=1 z+1Y6Bc!U18A5eL^t{tIwi%?$q00V=ANM@xXH8m9#4V~y48V0Al0g3tdQGD+nIyyTL zc`FhR1WkDU>K&4^1qi#7gUsA~@M|8z+S(cdfdD-{J!oldLnW7syn+HGrKEtv;e=+$ zW`!2Z#))!1?L7V!&MvNQ?&mzFl+||j4vtP|r})H4YnxN2&)7~12M!)OeB|h{<03Y< zu-v_8@4o$3BHn7UZTk*Wvz@y{yvgtfqaTeoZ}~~YtJmn$)~+*HzhR?DSh{Sv?uwOq ztG*Yp=C|K1($dyhyhOxG$||aA^VKyLEF2f+d@T>mRlvM&6vtWmE7Hlx0<-0WEHOip zv@>UY0jV#^KHjmy(x>Xc3tgaMHo(ZwQdGL2 zM{aShjJU0>t!idQy1vUy|HZNfMWeniS(IJ*ZO9^lb10MTN!kD4+1eQC3FQi{`ebCgPe$T&k+KW1?uB+UJE7 ziNcavDvn(?QdUw#@9XQWa`kf24c#cNsDA2{&8+y?825%JgE^zbSXJLn(V{c|s^f73 z2;K|2aXnORrINa%gTs=_^0Gt2BV(z;4F%1QD37!X%7YPIO0XzCF)>ueQc1(z&DE5! zQO%!S4MJZ|NzJE-@;1sUfcctWK|v8aN_enFNKoLBuGa%rWi|C9LgW4F_OX&G-U$6J zo9cbp-Pzh$%NjS{VTL6*_=XHHa`=?`fv|V-Uaiy|Q}<@W%x=oq?ov-#UP{Zjv7DV= zvh`xp$B^{ukLDK=+l}JiQrhOh9EYUJH{#w!qo_jhY~Y5 zUOX}RPb&pT*_=F3eJwQj>3S{YiAP7KyILP*R4}i;+ibjC2@;CRG5jZk9z~74WJ>rX zr^3S0j7E=)WKxpT;6J63fng^9AhK%*k;EszX+V0r^WkltAp@ARM0wJuqov`yW|eNk zQk_MyGO}{BCiU??_zx*0KXgZO-JD5%riqh1mYW$0`IE}z Date: Wed, 8 Nov 2017 20:23:33 +0100 Subject: [PATCH 18/21] [RAPPS-DB] CORE-12284 LibreOffice 5.1.1.3 (LibreOfficeStill) --- media/rapps/libreofficestill.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/media/rapps/libreofficestill.txt b/media/rapps/libreofficestill.txt index c3a5002b768de..b937521c62deb 100644 --- a/media/rapps/libreofficestill.txt +++ b/media/rapps/libreofficestill.txt @@ -1,25 +1,25 @@ [Section] Name = LibreOffice -Version = 5.3.5 +Version = 5.1.1.3 License = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 204.7 MiB +Size = 211.5 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.3.5/win/x86/LibreOffice_5.3.5_Win_x86.msi -SHA1 = c8ac1971e8a52351f6e4d24462b94a759eadee2b +URLDownload = http://downloadarchive.documentfoundation.org/libreoffice/old/5.1.1.3/win/x86/LibreOffice_5.1.1.3_Win_x86.msi +SHA1 = 39b9e7cb681245728f2372e1f4cc3de089cdfcb0 CDPath = none [Section.0407] Description = Vorher bekannt als OpenOffice. Quelloffene Office Suite. -Size = 204,7 MiB +Size = 211,5 MiB [Section.0a] Description = La suite de ofimática de código abierto. Descendiente de OpenOffice. [Section.040c] Description = Précédemment appelé OpenOffice. Suite bureautique open source. -Size = 204,7 Mio +Size = 211,5 Mio [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. @@ -32,15 +32,15 @@ Description = Otwarty pakiet biurowy. [Section.0418] Description = Suită completă de aplicații de birotică, cu surse deschise. Reprezintă o bifurcare a dezvoltării OpenOffice. -Size = 204,7 Mio +Size = 211,5 Mio [Section.0419] Description = Кросплатформенный, свободно распространяемый офисный пакет с открытым исходным кодом, созданный как ответвление OpenOffice. -Size = 204,7 МиБ +Size = 211,5 МиБ [Section.041f] Description = Güçlü ve açık kaynak bir ofis paketi. OpenOffice'ten çatallanılmıştır. -Size = 204,7 MiB +Size = 211,5 MiB [Section.0422] Description = Відкритий офісний пакет. From d9fa47c33f6a02ec2ab79db2c9479c2759e70480 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Wed, 8 Nov 2017 20:41:13 +0100 Subject: [PATCH 19/21] [RAPPS-DB] CORE-12284 LibreOffice 5.4.3.2 (as 2nd option) --- media/rapps/libreoffice.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/media/rapps/libreoffice.txt b/media/rapps/libreoffice.txt index 43f739d7498b6..b32cc8384012e 100644 --- a/media/rapps/libreoffice.txt +++ b/media/rapps/libreoffice.txt @@ -1,25 +1,25 @@ [Section] Name = LibreOffice -Version = 5.4.0 +Version = 5.4.3.2 License = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 213.3 MiB +Size = 214.9 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.4.0/win/x86/LibreOffice_5.4.0_Win_x86.msi -SHA1 = 415c2f726fa0d047ea7390133c4b8cb1084c4119 +URLDownload = http://downloadarchive.documentfoundation.org/libreoffice/old/5.4.3.2/win/x86/LibreOffice_5.4.3.2_Win_x86.msi +SHA1 = 622a73946b1a6c033f13e2a6e348d697ba67fb1b CDPath = none [Section.0407] Description = Vorher bekannt als OpenOffice. Quelloffene Office Suite. -Size = 213,3 MiB +Size = 214,9 MiB [Section.0a] Description = La suite de ofimática de código abierto. Descendiente de OpenOffice. [Section.040c] Description = Précédemment appelé OpenOffice. Suite bureautique open source. -Size = 213,3 Mio +Size = 214,9 Mio [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. @@ -32,15 +32,15 @@ Description = Otwarty pakiet biurowy. [Section.0418] Description = Suită completă de aplicații de birotică, cu surse deschise. Reprezintă o bifurcare a dezvoltării OpenOffice. -Size = 213,3 Mio +Size = 214,9 Mio [Section.0419] Description = Кросплатформенный, свободно распространяемый офисный пакет с открытым исходным кодом, созданный как ответвление OpenOffice. -Size = 213,3 МиБ +Size = 214,9 МиБ [Section.041f] Description = Güçlü ve açık kaynak bir ofis paketi. OpenOffice'ten çatallanılmıştır. -Size = 213,3 MiB +Size = 214,9 MiB [Section.0422] Description = Відкритий офісний пакет. From e6232afb4708ff42dbf95f90c5fd1abca49b015c Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Wed, 8 Nov 2017 21:01:38 +0100 Subject: [PATCH 20/21] [RAPPS-DB] CORE-12284 LibreOffice HelpPack 5.4.3.2 --- media/rapps/libreofficehelp.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/media/rapps/libreofficehelp.txt b/media/rapps/libreofficehelp.txt index 7a06a7a7c0d2e..71dc9e0e32020 100644 --- a/media/rapps/libreofficehelp.txt +++ b/media/rapps/libreofficehelp.txt @@ -1,21 +1,21 @@ [Section] Name = LibreOffice Help Pack -Version = 5.4.0 +Version = 5.4.3.2 License = GPLv3 Description = Offline help content of LibreOffice. Size = 5.1 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.4.0/win/x86/LibreOffice_5.4.0_Win_x86_helppack_en-US.msi -SHA1 = a9152434e49248bdecbf3bdc2604deaf60ab4da0 +URLDownload = http://downloadarchive.documentfoundation.org/libreoffice/old/5.4.3.2/win/x86/LibreOffice_5.4.3.2_Win_x86_helppack_en-US.msi +SHA1 = ef42262d4b205cde622dbbd3293e56c1c22e298a CDPath = none [Section.0407] Name = LibreOffice Help Pack Description = Offline Hilfe für LibreOffice. Size = 7,2 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.4.0/win/x86/LibreOffice_5.4.0_Win_x86_helppack_de.msi -SHA1 = 3be98a1cf7ff8dbd07328fad6d55bda554da88b2 +URLDownload = http://downloadarchive.documentfoundation.org/libreoffice/old/5.4.3.2/win/x86/LibreOffice_5.4.3.2_Win_x86_helppack_de.msi +SHA1 = 879b8203ffe4fce1dbaf53cc37caef7c2d6da202 [Section.0418] Description = Conținut de asistență și ajutor (în limba engleză) pentru LibreOffice. @@ -25,28 +25,28 @@ Size = 5,1 Mio Name = LibreOffice Справочный пакет Description = Оффлайн справка для LibreOffice. Size = 7,3 МиБ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.4.0/win/x86/LibreOffice_5.4.0_Win_x86_helppack_ru.msi -SHA1 = 6fe8a878a22dea1eb896eac97547169c305209ce +URLDownload = http://downloadarchive.documentfoundation.org/libreoffice/old/5.4.3.2/win/x86/LibreOffice_5.4.3.2_Win_x86_helppack_ru.msi +SHA1 = e5ac68863fbe15788face7c3a4b83e7bbc5f40f0 [Section.0a] Name = LibreOffice — Paquete de ayuda Description = Páginas de ayuda para LibreOffice. Size = 7.1 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.4.0/win/x86/LibreOffice_5.4.0_Win_x86_helppack_es.msi -SHA1 = f963e1f478e3e3feeced6d5ad46e7316ae5eb8f5 +URLDownload = http://downloadarchive.documentfoundation.org/libreoffice/old/5.4.3.2/win/x86/LibreOffice_5.4.3.2_Win_x86_helppack_es.msi +SHA1 = 05a53954126e798c9f561b8039d0dbd43dc1a7e3 [Section.041f] Name = LibreOffice Yardım Paketi License = GPL sürüm 3 Description = LibreOffice'in çevrim dışı yardım içeriği. Size = 7,0 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.4.0/win/x86/LibreOffice_5.4.0_Win_x86_helppack_tr.msi -SHA1 = 40583526ec946f073b53164afed2c68adef1165e +URLDownload = http://downloadarchive.documentfoundation.org/libreoffice/old/5.4.3.2/win/x86/LibreOffice_5.4.3.2_Win_x86_helppack_tr.msi +SHA1 = df5d5a56c60c4f27c801c4972aa8a68b35f097e3 [Section.0804] Name = LibreOffice 帮助包 Description = LibreOffice 的脱机帮助内容。 Size = 9.6 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.4.0/win/x86/LibreOffice_5.4.0_Win_x86_helppack_zh-CN.msi -SHA1 = 6608a2fb8d10540db74e6461003077c0b32566ce +URLDownload = http://downloadarchive.documentfoundation.org/libreoffice/old/5.4.3.2/win/x86/LibreOffice_5.4.3.2_Win_x86_helppack_zh-CN.msi +SHA1 = b27b697894534beead2366a08aa6d798f56c1989 From 22f1c0650f5f3fe35e9dc90bf8be01fcf36f5907 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Wed, 8 Nov 2017 23:03:02 +0100 Subject: [PATCH 21/21] [RAPPS-DB] CORE-13027 add Npackd 1.23 - GPLv3 licensed packet manager --- media/rapps/npackd.txt | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 media/rapps/npackd.txt diff --git a/media/rapps/npackd.txt b/media/rapps/npackd.txt new file mode 100644 index 0000000000000..2ee5443829691 --- /dev/null +++ b/media/rapps/npackd.txt @@ -0,0 +1,28 @@ +[Section] +Name = Npackd +Version = 1.23 +License = GPLv3 +Description = A powerful packet manager that offers software in different versions. +Size = 8.1 MiB +Category = 5 +URLSite = http://npackd.appspot.com +URLDownload = https://github.com/tim-lebedkov/npackd-cpp/releases/download/version_1.23/Npackd32-1.23.msi +SHA1 = fefef7531f9c03a081403efae7a6d560cfe3cdb9 +CDPath = none + +[Section.0407] +Description = Leistungsstarke Paketverwaltung, bietet die Installation von Software in verschiedenen Versionen an. +Size = 8,1 MiB + +[Section.040c] +Size = 8,1 Mio + +[Section.0418] +Size = 8,1 Mio + +[Section.0419] +Size = 8,1 МиБ + +[Section.041f] +Size = 8,1 MiB +