Bug 1456 : patch from w3seek : Fix a bug in CreateDirectoryEx that makes the function attempt to create the template directory again

svn path=/trunk/; revision=21835
This commit is contained in:
Magnus Olsen 2006-05-07 18:17:50 +00:00
parent bad04e557d
commit b8c0b29fc9

View file

@ -191,12 +191,6 @@ CreateDirectoryExW (
return FALSE; return FALSE;
} }
InitializeObjectAttributes(&ObjectAttributes,
&NtPathU,
OBJ_CASE_INSENSITIVE,
NULL,
(lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL));
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&NtTemplatePathU, &NtTemplatePathU,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE,
@ -257,6 +251,12 @@ OpenTemplateDir:
goto Cleanup; goto Cleanup;
} }
InitializeObjectAttributes(&ObjectAttributes,
&NtPathU,
OBJ_CASE_INSENSITIVE,
NULL,
(lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL));
/* /*
* Query the basic file attributes from the template directory * Query the basic file attributes from the template directory
*/ */
@ -358,6 +358,7 @@ OpenTemplateDir:
/* /*
* Create the new directory * Create the new directory
*/ */
Status = NtCreateFile (&DirectoryHandle, Status = NtCreateFile (&DirectoryHandle,
DesiredAccess, DesiredAccess,
&ObjectAttributes, &ObjectAttributes,