This is an automated email from the git hooks/post-receive script. mgilbert pushed a commit to branch master in repository wine.
commit 2bb17745dfc58b663323f9bba28a22465f3c29f3 Author: Austin English <[email protected]> Date: Tue Dec 15 23:56:01 2015 -0600 ndis.sys: Add NdisAllocateMemoryWithTag stub. Signed-off-by: Austin English <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> --- dlls/ndis.sys/main.c | 7 +++++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/Makefile.in | 1 + dlls/ndis.sys/main.c => include/ddk/ndis.h | 26 +++++++++----------------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 820b4af..b2c1da4 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/ndis.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ndis); @@ -36,3 +37,9 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_SUCCESS; } + +NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **address, UINT length, ULONG tag) +{ + FIXME("(%p, %u, %u): stub\n", address, length, tag); + return NDIS_STATUS_FAILURE; +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index bd83b48..1017296 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -12,7 +12,7 @@ @ stub NdisAllocateBufferPool @ stub NdisAllocateFromBlockPool @ stub NdisAllocateMemory -@ stub NdisAllocateMemoryWithTag +@ stdcall NdisAllocateMemoryWithTag(ptr long long) @ stub NdisAllocatePacket @ stub NdisAllocatePacketPool @ stub NdisAllocatePacketPoolEx diff --git a/include/Makefile.in b/include/Makefile.in index ea0e3fd..129ff6d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -276,6 +276,7 @@ HEADER_SRCS = \ ddk/hidtypes.h \ ddk/imm.h \ ddk/mountmgr.h \ + ddk/ndis.h \ ddk/ntddcdvd.h \ ddk/ntddk.h \ ddk/ntddser.h \ diff --git a/dlls/ndis.sys/main.c b/include/ddk/ndis.h similarity index 64% copy from dlls/ndis.sys/main.c copy to include/ddk/ndis.h index 820b4af..a57d9f8 100644 --- a/dlls/ndis.sys/main.c +++ b/include/ddk/ndis.h @@ -1,7 +1,7 @@ /* - * ndis.sys + * ndis.h * - * Copyright 2014 Austin English + * Copyright 2015 Austin English * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,22 +17,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _NDIS_ +#define _NDIS_ -#include <stdarg.h> +typedef void *NDIS_HANDLE, *PNDIS_HANDLE; +typedef int NDIS_STATUS, *PNDIS_STATUS; -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "ddk/wdm.h" -#include "wine/debug.h" +#define NDIS_STATUS_FAILURE ((NDIS_STATUS) STATUS_UNSUCCESSFUL) -WINE_DEFAULT_DEBUG_CHANNEL(ndis); +NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); -NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) -{ - TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); - - return STATUS_SUCCESS; -} +#endif /* _NDIS_ */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
