From: Stefan Jones <cretin@gentoo.org>
Date: Wed, 17 Nov 2004 16:58:53 +0000 (+0000)
Subject: ntddk patch, bug #70949
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=56926bcdfeaa764cd54505ad37b4d868d1c4dd56;p=gentoo.git

ntddk patch, bug #70949
---

diff --git a/dev-util/xmingw-w32api/ChangeLog b/dev-util/xmingw-w32api/ChangeLog
index ef1c90473a55..78307c7c0eb7 100644
--- a/dev-util/xmingw-w32api/ChangeLog
+++ b/dev-util/xmingw-w32api/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/xmingw-w32api
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-w32api/ChangeLog,v 1.8 2004/10/25 16:36:02 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-w32api/ChangeLog,v 1.9 2004/11/17 16:58:53 cretin Exp $
+
+  17 Nov 2004; Stefan Jones <cretin@gentoo.org> +xmingw-w32api-3.1-ntddk.patch:
+  Patch for bug #70949
 
   25 Oct 2004; Stefan Jones <cretin@gentoo.org>
   +xmingw-w32api-3.1-include.patch :
diff --git a/dev-util/xmingw-w32api/Manifest b/dev-util/xmingw-w32api/Manifest
index 1e68413b54d5..8203cac4fa7a 100644
--- a/dev-util/xmingw-w32api/Manifest
+++ b/dev-util/xmingw-w32api/Manifest
@@ -1,7 +1,8 @@
-MD5 dc1938a6cf3c9cc2fe941ee829cda28b xmingw-w32api-3.1.ebuild 1295
+MD5 470a037da2f5b34d3cd03637d075a65a xmingw-w32api-3.1.ebuild 1345
 MD5 3af0b7974460c378bf9179e861e44dd1 xmingw-w32api-2.5.ebuild 1282
 MD5 97899c3c72753be4e2ae55c50c7ddd3f xmingw-w32api-2.4.ebuild 1229
-MD5 d4dee1beb9815cd69cb7f0162f7eba5a ChangeLog 933
+MD5 608b8a35fb35c830743668f683aa618e ChangeLog 1037
+MD5 6656dd30699ece073e2497672ae3b0b6 files/xmingw-w32api-3.1-ntddk.patch 2083
 MD5 3de99c6776ed74f7cec551053ffeeb51 files/digest-xmingw-w32api-2.4 139
 MD5 70366dfb6bfcc5deef952bbc9b2c33d8 files/digest-xmingw-w32api-2.5 139
 MD5 6c5af963ba1af1f11981e093627f01e0 files/digest-xmingw-w32api-3.1 140
diff --git a/dev-util/xmingw-w32api/files/xmingw-w32api-3.1-ntddk.patch b/dev-util/xmingw-w32api/files/xmingw-w32api-3.1-ntddk.patch
new file mode 100644
index 000000000000..38f25e06bb7f
--- /dev/null
+++ b/dev-util/xmingw-w32api/files/xmingw-w32api-3.1-ntddk.patch
@@ -0,0 +1,68 @@
+diff -urN -x '*.o' -x '*.a' -x Makefile -x 'config.*' w32api-3.1/include/ddk/ntapi.h w32api-3.1-mod/include/ddk/ntapi.h
+--- w32api-3.1/include/ddk/ntapi.h	2004-09-05 18:16:15.000000000 +0300
++++ w32api-3.1-mod/include/ddk/ntapi.h	2004-10-23 19:53:30.000000000 +0200
+@@ -671,6 +671,20 @@
+   OUT PULONG  ReturnLength  OPTIONAL);
+ 
+ NTOSAPI
++NTAPI
++NTSTATUS
++NtQueryFullAttributesFile(
++    IN POBJECT_ATTRIBUTES ObjectAttributes,
++    OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation);
++
++NTOSAPI
++NTAPI
++NTSTATUS
++ZwQueryFullAttributesFile(
++    IN POBJECT_ATTRIBUTES ObjectAttributes,
++    OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation);
++
++NTOSAPI
+ NTSTATUS
+ NTAPI
+ ZwSetSystemInformation(
+diff -urN -x '*.o' -x '*.a' -x Makefile -x 'config.*' w32api-3.1/include/ddk/winddk.h w32api-3.1-mod/include/ddk/winddk.h
+--- w32api-3.1/include/ddk/winddk.h	2004-09-05 18:16:15.000000000 +0300
++++ w32api-3.1-mod/include/ddk/winddk.h	2004-10-23 19:53:30.000000000 +0200
+@@ -4395,6 +4395,15 @@
+   IN PCWSTR  Path,
+   IN PCWSTR  ValueName);
+ 
++NTOSAPI
++BOOL
++DDKAPI
++RtlDosPathNameToNtPathName_U(
++  IN PCWSTR  DosPathName,
++  OUT PUNICODE_STRING  NtPathName,
++  OUT PCWSTR  *NtFileNamePart,
++  OUT VOID  *DirectoryInfo);
++
+ /*
+  * BOOLEAN
+  * RtlEqualLuid( 
+diff -urN -x '*.o' -x '*.a' -x Makefile -x 'config.*' w32api-3.1/lib/ddk/ntoskrnl.def w32api-3.1-mod/lib/ddk/ntoskrnl.def
+--- w32api-3.1/lib/ddk/ntoskrnl.def	2004-09-05 18:16:16.000000000 +0300
++++ w32api-3.1-mod/lib/ddk/ntoskrnl.def	2004-10-23 19:58:27.000000000 +0200
+@@ -1316,10 +1316,10 @@
+ ;ZwQueryBootOptions
+ ZwQueryDefaultLocale@8
+ ZwQueryDefaultUILanguage@4
+-;ZwQueryDirectoryFile
++ZwQueryDirectoryFile@44
+ ZwQueryDirectoryObject@28
+ ;ZwQueryEaFile
+-;ZwQueryFullAttributesFile
++ZwQueryFullAttributesFile@8
+ ZwQueryInformationFile@20
+ ZwQueryInformationJobObject@20
+ ZwQueryInformationProcess@20
+@@ -1333,7 +1333,7 @@
+ ZwQuerySymbolicLinkObject@12
+ ZwQuerySystemInformation@16
+ ZwQueryValueKey@24
+-;ZwQueryVolumeInformationFile
++ZwQueryVolumeInformationFile@20
+ ZwReadFile@36
+ ZwReplaceKey@12
+ ZwRequestWaitReplyPort@12
diff --git a/dev-util/xmingw-w32api/xmingw-w32api-3.1.ebuild b/dev-util/xmingw-w32api/xmingw-w32api-3.1.ebuild
index eff4c5b9914f..c34c4c6cd48f 100644
--- a/dev-util/xmingw-w32api/xmingw-w32api-3.1.ebuild
+++ b/dev-util/xmingw-w32api/xmingw-w32api-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-w32api/xmingw-w32api-3.1.ebuild,v 1.2 2004/10/25 16:36:02 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-w32api/xmingw-w32api-3.1.ebuild,v 1.3 2004/11/17 16:58:53 cretin Exp $
 
 inherit eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	ln -s ${MY_P} w32api
 	ln -s ${RUNTIME} mingw
 	epatch ${FILESDIR}/xmingw-w32api-3.1-include.patch
+	epatch ${FILESDIR}/xmingw-w32api-3.1-ntddk.patch
 }
 
 src_compile() {