From 688c43c992619899bb9bfc48620157f9942af66a Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Tue, 13 Oct 2009 21:49:36 +0000
Subject: [PATCH] [BDASUP] -fix some function declarations

svn path=/trunk/; revision=43443
---
 reactos/drivers/multimedia/bdasup/bdasup.c |  8 ++--
 reactos/drivers/storage/floppy/SOURCES     | 52 +++++++++++-----------
 reactos/include/ddk/bdasup.h               |  8 ++--
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/reactos/drivers/multimedia/bdasup/bdasup.c b/reactos/drivers/multimedia/bdasup/bdasup.c
index 0d657c68d74..82a357ae5ce 100644
--- a/reactos/drivers/multimedia/bdasup/bdasup.c
+++ b/reactos/drivers/multimedia/bdasup/bdasup.c
@@ -691,7 +691,7 @@ NTAPI
 BdaPropertyNodeDescriptors(
     IN PIRP Irp,
     IN KSPROPERTY *pKSProperty,
-    OUT GUID *pguidProperty)
+    OUT BDANODE_DESCRIPTOR *pNodeDescriptorProperty)
 {
     UNIMPLEMENTED
     return STATUS_NOT_IMPLEMENTED;
@@ -704,7 +704,7 @@ NTSTATUS
 NTAPI
 BdaPropertyNodeEvents(
     IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
+    IN KSP_NODE *pKSProperty,
     OUT GUID *pguidProperty)
 {
     UNIMPLEMENTED
@@ -718,7 +718,7 @@ NTSTATUS
 NTAPI
 BdaPropertyNodeMethods(
     IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
+    IN KSP_NODE *pKSProperty,
     OUT GUID *pguidProperty)
 {
     UNIMPLEMENTED
@@ -732,7 +732,7 @@ NTSTATUS
 NTAPI
 BdaPropertyNodeProperties(
     IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
+    IN KSP_NODE *pKSProperty,
     OUT GUID *pguidProperty)
 {
     UNIMPLEMENTED
diff --git a/reactos/drivers/storage/floppy/SOURCES b/reactos/drivers/storage/floppy/SOURCES
index 3c1e43ac684..d29f2b243af 100644
--- a/reactos/drivers/storage/floppy/SOURCES
+++ b/reactos/drivers/storage/floppy/SOURCES
@@ -1,30 +1,28 @@
-#  ReactOS Floppy Driver
-#  Copyright (C) 2004, Vizzini (vizzini@plasmic.com)
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# PROJECT:         ReactOS Floppy Driver
-# FILE:            SOURCES
-# PURPOSE:         SOURCES file for Microsoft DDK build system
-# PROGRAMMER:      Vizzini (vizzini@plasmic.com)
-# REVISIONS:
-#                  15-Feb-2004 vizzini - Created/
-
 TARGETNAME=floppy
 TARGETTYPE=DRIVER
-TARGETPATH=obj
-TARGETLIBS= $(DDK_LIB_PATH)\csq.lib
-SOURCES= floppy.c csqrtns.c hardware.c readwrite.c ioctl.c
+
 MSC_WARNING_LEVEL=/W3 /WX
+
+C_DEFINES=$(C_DEFINES) /DSTDCALL=__stdcall /DDDKAPI=__stdcall /wd4996
+INCLUDES=.; \
+	../../../.; \
+	../../../include; \
+	../../../include; \
+	../../../include/dxsdk; \
+	../../../include/dxsdk; \
+	../../../include/GL; \
+	../../../include/ndk; \
+	../../../include/reactos; \
+	../../../include/reactos; \
+	../../../include/reactos/mc; \
+	../../../include/reactos/libs 
+
+TARGETLIBS= $(DDK_LIB_PATH)\ntstrsafe.lib
+
+SOURCES=csqrtns.c \
+	floppy.c \
+	hardware.c \
+	ioctl.c \
+	readwrite.c \
+	floppy.rc 
+TARGET_DESTINATION=retail
diff --git a/reactos/include/ddk/bdasup.h b/reactos/include/ddk/bdasup.h
index 893bcde2b6c..0342ceaf696 100644
--- a/reactos/include/ddk/bdasup.h
+++ b/reactos/include/ddk/bdasup.h
@@ -96,21 +96,21 @@ STDMETHODIMP_(NTSTATUS) BdaPropertyGetPinControl(
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors(
     IN PIRP Irp,
     IN KSPROPERTY *pKSProperty,
-    OUT GUID *pguidProperty);
+    OUT BDANODE_DESCRIPTOR *pNodeDescriptorProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents(
     IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
+    IN KSP_NODE *pKSProperty,
     OUT GUID *pguidProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods(
     IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
+    IN KSP_NODE *pKSProperty,
     OUT GUID *pguidProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties(
     IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
+    IN KSP_NODE *pKSProperty,
     OUT GUID *pguidProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes(