[ros-diffs] [reactos] 01/01: [CDFS_NEW] Fix diff
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94298313c03c791d1ed472125ebf86f4258d2354 commit 94298313c03c791d1ed472125ebf86f4258d2354 Author: Pierre Schweitzer AuthorDate: Tue Nov 7 07:54:15 2017 +0100 [CDFS_NEW] Fix diff --- drivers/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 a4bface2e4..cc84eb55c2 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)
[ros-diffs] [reactos] 01/01: [RAPPS-DB] CORE-13947 IrfanView 4.44 fix download URL
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf7a36b76e868ac82d8dd22aa7c9fc320ae98e5f commit cf7a36b76e868ac82d8dd22aa7c9fc320ae98e5f Author: Joachim Henze AuthorDate: Tue Nov 7 02:50:24 2017 +0100 [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 e8c031151b..b602c357b9 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
[ros-diffs] [reactos] 01/01: [NTOSKRNL] Make the CcWaitForCurrentLazyWriterActivity() stub return success instead of hacking FSDs. Suggested by Thomas
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e88eeb21af4b778f19b10e2d0e9f1c4361d6838d commit e88eeb21af4b778f19b10e2d0e9f1c4361d6838d Author: Pierre Schweitzer AuthorDate: Mon Nov 6 21:45:55 2017 +0100 [NTOSKRNL] Make the CcWaitForCurrentLazyWriterActivity() stub return success instead of hacking FSDs. Suggested by Thomas --- drivers/filesystems/cdfs_new/fsctrl.c | 10 -- drivers/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 562bdc6482..31c4965f9f 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 b27df5692d..a4bface2e4 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 9f6cead1c9..15c6ceb81b 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; } /*
[ros-diffs] [reactos] 01/01: [CDFS_NEW] Add a hack that allows locking a volume and thus, unmounting it. All that work, just to be able to do this...
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03d5be6437a1f2e4376ac117421133ebfdde799e commit 03d5be6437a1f2e4376ac117421133ebfdde799e Author: Pierre Schweitzer AuthorDate: Mon Nov 6 20:09:23 2017 +0100 [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 ++ drivers/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 31c4965f9f..562bdc6482 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 a4bface2e4..b27df5692d 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 )) {
[ros-diffs] [reactos] 07/09: [CDFS_NEW] Remove a broken change (lol?!) that prevented the driver to properly work in ROS... Dropping SEH doesn't mean dropping code!
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4da7ecc50b59b9f8283d84b3707fa69c595a57d commit e4da7ecc50b59b9f8283d84b3707fa69c595a57d Author: Pierre Schweitzer AuthorDate: Mon Nov 6 19:55:34 2017 +0100 [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 4cb7da2098..921f523720 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 46023ebfb9..b785ad9107 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; } + //
[ros-diffs] [reactos] 09/09: [CDFS_NEW] You know... RBuild has been gone for ages!
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa1c60db50d456fe39e315fbbe18bbee78af4105 commit fa1c60db50d456fe39e315fbbe18bbee78af4105 Author: Pierre Schweitzer AuthorDate: Mon Nov 6 20:01:36 2017 +0100 [CDFS_NEW] You know... RBuild has been gone for ages! --- drivers/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 b785ad9107..a4bface2e4 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)
[ros-diffs] [reactos] 06/09: [CDFS_NEW] Force calling convention to allow build
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b19676e2b541983f1062ba1c563099284646010 commit 7b19676e2b541983f1062ba1c563099284646010 Author: Pierre Schweitzer AuthorDate: Mon Nov 6 19:52:43 2017 +0100 [CDFS_NEW] Force calling convention to allow build --- drivers/filesystems/cdfs_new/devctrl.c| 2 ++ drivers/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 786a36d924..41461526df 100755 --- a/drivers/filesystems/cdfs_new/devctrl.c +++ b/drivers/filesystems/cdfs_new/devctrl.c @@ -27,6 +27,7 @@ Abstract: // 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 738aacd9ef..46023ebfb9 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)
[ros-diffs] [reactos] 08/09: [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! :-)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b2fd60829eeeb28fcafc0ef2511f7bed04ffd64 commit 8b2fd60829eeeb28fcafc0ef2511f7bed04ffd64 Author: Pierre Schweitzer AuthorDate: Mon Nov 6 19:58:49 2017 +0100 [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(+) diff --git a/drivers/filesystems/cdfs_new/CMakeLists.txt b/drivers/filesystems/cdfs_new/CMakeLists.txt new file mode 100644 index 00..c0b56e99db --- /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 00..9ae7413c61 --- /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,0x +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x,"File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x0002,"system32\drivers\cdfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x0003 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x0002
[ros-diffs] [reactos] 01/09: [CDFS_NEW] Fix headers inclusion so that it can work on a *nix platform
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cbcb1badee213fdbadaa2db99086d21a8775fe8 commit 3cbcb1badee213fdbadaa2db99086d21a8775fe8 Author: Pierre Schweitzer AuthorDate: Mon Nov 6 19:38:01 2017 +0100 [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 d3129a3b46..b875eca143 100755 --- a/drivers/filesystems/cdfs_new/allocsup.c +++ b/drivers/filesystems/cdfs_new/allocsup.c @@ -44,7 +44,7 @@ Abstract: --*/ -#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 b31422f97e..87b75bbc51 100755 --- a/drivers/filesystems/cdfs_new/cachesup.c +++ b/drivers/filesystems/cdfs_new/cachesup.c @@ -14,7 +14,7 @@ Abstract: --*/ -#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 db9d8940de..dbd572a797 100755 --- a/drivers/filesystems/cdfs_new/cddata.c +++ b/drivers/filesystems/cdfs_new/cddata.c @@ -17,7 +17,7 @@ Abstract: --*/ -#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 f0faef6af3..e66bd75377 100755 --- a/drivers/filesystems/cdfs_new/cdinit.c +++ b/drivers/filesystems/cdfs_new/cdinit.c @@ -13,7 +13,7 @@ Abstract: --*/ -#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 87fcc5a37d..c9d34d2517 100755 --- a/drivers/filesystems/cdfs_new/cdprocs.h +++ b/drivers/filesystems/cdfs_new/cdprocs.h @@ -28,9 +28,9 @@ Abstract: #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 70faad7209..4c621e5c2f 100755 --- a/drivers/filesystems/cdfs_new/cleanup.c +++ b/drivers/filesystems/cdfs_new/cleanup.c @@ -14,7 +14,7 @@ Abstract: --*/ -#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 9090c6e2c8..d2827793c6 100755 --- a/drivers/filesystems/cdfs_new/close.c +++ b/drivers/filesystems/cdfs_new/close.c @@ -42,7 +42,7 @@ Abstract: --*/ -#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 1458ea2d44..bb072da107 100755 --- a/drivers/filesystems/cdfs_new/create.c +++ b/drivers/filesystems/cdfs_new/create.c @@ -14,7 +14,7 @@ Abstract: --*/ -#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 7efebef13a..786a36d924 100755 --- a/drivers/filesystems/cdfs_new/devctrl.c +++ b/drivers/filesystems/cdfs_new/devctrl.c @@ -14,7 +14,7 @@ Abstract: --*/ -#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/files
[ros-diffs] [reactos] 05/09: [CDFS_NEW] Force calling convention to allow build
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d4b8783fd0b9b8231a46e7b914447b86255e35b commit 3d4b8783fd0b9b8231a46e7b914447b86255e35b Author: Pierre Schweitzer AuthorDate: Mon Nov 6 19:49:47 2017 +0100 [CDFS_NEW] Force calling convention to allow build --- drivers/filesystems/cdfs_new/pnp.c| 2 ++ drivers/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 c9106fe958..596ac288c7 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 ed075d0a1a..738aacd9ef 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)
[ros-diffs] [reactos] 02/09: [CDFS_NEW] Remove a no longer required build hack
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=755bdb5d0b09e1df374f197c59639c0d78b86d6f commit 755bdb5d0b09e1df374f197c59639c0d78b86d6f Author: Pierre Schweitzer AuthorDate: Mon Nov 6 19:42:27 2017 +0100 [CDFS_NEW] Remove a no longer required build hack --- drivers/filesystems/cdfs_new/cdprocs.h| 46 ++-- drivers/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 c9d34d2517..4cb7da2098 100755 --- a/drivers/filesystems/cdfs_new/cdprocs.h +++ b/drivers/filesystems/cdfs_new/cdprocs.h @@ -44,30 +44,28 @@ Abstract: // 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_DATATAG('d','f','d','C') // Data Fcb -#define TAG_FCB_INDEX TAG('i','f','d','C') // Index Fcb -#define TAG_FCB_NONPAGEDTAG('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_LITETAG('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_ENTRYTAG('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_DESCTAG('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 5893bed5cd..1bcaa33c9a 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' //
[ros-diffs] [reactos] 04/09: [CDFS_NEW] Remove a no longer required build hack
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=818025ecc8006c19ce6f6139b21294795f51bafd commit 818025ecc8006c19ce6f6139b21294795f51bafd Author: Pierre Schweitzer AuthorDate: Mon Nov 6 19:46:43 2017 +0100 [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 95dda725a6..31c4965f9f 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 9221a7f0d7..ed075d0a1a 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" */
[ros-diffs] [reactos] 03/09: [CDFS_NEW] Remove a no longer required build hack
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2639dd673636e4848a4fe33b9a4cd142efcc84f8 commit 2639dd673636e4848a4fe33b9a4cd142efcc84f8 Author: Pierre Schweitzer AuthorDate: Mon Nov 6 19:44:13 2017 +0100 [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 6793954815..b227332b03 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 (0x001b) #define CDFS_BUG_CHECK_WORKQUE (0x001c) -/* ReactOS Change: Need to add to reactos.mc */ -#define CDFS_FILE_SYSTEM ((ULONG)0x0026L) #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 1bcaa33c9a..9221a7f0d7 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 (0x001b) - #define CDFS_BUG_CHECK_WORKQUE (0x001c) - -+/* ReactOS Change: Need to add to reactos.mc */ -+#define CDFS_FILE_SYSTEM ((ULONG)0x0026L) - #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)
[ros-diffs] [reactos] 01/01: Update pull request template with additional info
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd880924d98af170b0d658c866da7ca83b12576c commit bd880924d98af170b0d658c866da7ca83b12576c Author: Alexander Shaposhnikov AuthorDate: Mon Nov 6 19:28:12 2017 +0200 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 c475bf0ce8..8622a6e683 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-](https://jira.reactos.org/browse/CORE-) ## 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._ + +- [ ] +- [ ]