Author: pschweitzer
Date: Sun Dec 2 21:04:31 2012
New Revision: 57791
URL: http://svn.reactos.org/svn/reactos?rev=57791&view=rev
Log:
[CDFS]
Allow apply the fix from r57789 to CDFS. Even if it doesn't solve the issue, it keeps being right
Ref: WDK
Modified:
trunk/reactos/drivers/filesystems/cdfs/dirctl.c
Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d…
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Sun Dec 2 21:04:31 2012
@@ -586,7 +586,15 @@
Buffer = Irp->UserBuffer;
}
- if (SearchPattern != NULL)
+ /* Allocate search pattern in case:
+ * -> We don't have one already in context
+ * -> We have been given an input pattern
+ * -> The pattern length is not null
+ * -> The pattern buffer is not null
+ * Otherwise, we'll fall later and allocate a match all (*) pattern
+ */
+ if (SearchPattern != NULL &&
+ SearchPattern->Length != 0 && SearchPattern->Buffer != NULL)
{
if (Ccb->DirectorySearchPattern.Buffer == NULL)
{
Author: pschweitzer
Date: Sun Dec 2 16:42:54 2012
New Revision: 57789
URL: http://svn.reactos.org/svn/reactos?rev=57789&view=rev
Log:
[FASTFAT]
Handle special cases with search patterns in DoQuery().
This may (should?) fix kernel32_winetest::path test
Ref: WDK
Modified:
trunk/reactos/drivers/filesystems/fastfat/dir.c
Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Sun Dec 2 16:42:54 2012
@@ -427,7 +427,15 @@
#endif
FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass;
- if (pSearchPattern)
+ /* Allocate search pattern in case:
+ * -> We don't have one already in context
+ * -> We have been given an input pattern
+ * -> The pattern length is not null
+ * -> The pattern buffer is not null
+ * Otherwise, we'll fall later and allocate a match all (*) pattern
+ */
+ if (pSearchPattern &&
+ pSearchPattern->Length != 0 && pSearchPattern->Buffer != NULL)
{
if (!pCcb->SearchPattern.Buffer)
{
@@ -606,4 +614,4 @@
return Status;
}
-/* EOF */
+/* EOF */