[ros-diffs] [ion] 55728: [NTOSKRNL]: Fix ntdll:om winetest. When querying for filenames if the caller did not specify a buffer large enough (which they normally don't, initially), we would just fail but not te...

Author: ion
Date: Mon Feb 20 00:11:24 2012
New Revision: 55728

URL: http://svn.reactos.org/svn/reactos?rev=55728&view=rev
Log:
[NTOSKRNL]: Fix ntdll:om winetest. When querying for filenames if the caller did not
specify a buffer large enough (which they normally don't, initially), we would just
fail but not tell them how large to request it (so they'd get back an uninitailized
huge value).

Modified:
    trunk/reactos/ntoskrnl/io/iomgr/file.c
    trunk/reactos/ntoskrnl/ob/obname.c

Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Mon Feb 20 00:11:24 2012
@@ -1317,6 +1317,7 @@
     if (Length < sizeof(OBJECT_NAME_INFORMATION))
     {
         /* Wrong length, fail */
+        *ReturnLength = sizeof(OBJECT_NAME_INFORMATION);
         return STATUS_INFO_LENGTH_MISMATCH;
     }
 

Modified: trunk/reactos/ntoskrnl/ob/obname.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5…
==============================================================================
--- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Mon Feb 20 00:11:24 2012
@@ -1120,7 +1120,7 @@
             ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize +
                                                           sizeof(UNICODE_NULL));
             ObjectNameInfo->Name.Buffer = ObjectName;
-            _SEH2_YIELD(return STATUS_SUCCESS);
+            Status = STATUS_SUCCESS;
         }
         else
         {