2004-01-15 Filip Navara <xnavara@volny.cz>

	* include/ddk/mcd.h: Don't care about value of DBG define.
	* include/ddk/srb.h: Ditto.
	* include/ddk/storport.h: Ditto.
	* include/ddk/video.h: Ditto.
	* include/nspapi.h (SetServiceW, GetAddressByNameA,
	GetAddressByNameW): Correct protoype.
	* include/ntsecapi.h (PCUNICODE_STRING): Define.

7 files changed, 20 insertions, 9 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c1f36cd09..43b39507d 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-15  Filip Navara  <xnavara@volny.cz>
+
+	* include/ddk/mcd.h: Don't care about value of DBG define.
+	* include/ddk/srb.h: Ditto.
+	* include/ddk/storport.h: Ditto.
+	* include/ddk/video.h: Ditto.
+	* include/nspapi.h (SetServiceW, GetAddressByNameA,
+	GetAddressByNameW): Correct protoype.
+	* include/ntsecapi.h (PCUNICODE_STRING): Define.
+
 2004-01-05  Filip Navara  <xnavara@volny.cz>
 
 	* include/prsht.h (LPCPROPSHEETPAGEW): Fix definition.
diff --git a/winsup/w32api/include/ddk/mcd.h b/winsup/w32api/include/ddk/mcd.h
index 44dd26d52..c5e2380cf 100644
--- a/winsup/w32api/include/ddk/mcd.h
+++ b/winsup/w32api/include/ddk/mcd.h
@@ -48,7 +48,7 @@ extern "C" {
 #undef DebugPrint
 #endif
 
-#if DBG
+#ifdef DBG
 #define DebugPrint(x) ChangerClassDebugPrint x
 #else
 #define DebugPrint(x)
diff --git a/winsup/w32api/include/ddk/srb.h b/winsup/w32api/include/ddk/srb.h
index 74ba51a04..93563f283 100644
--- a/winsup/w32api/include/ddk/srb.h
+++ b/winsup/w32api/include/ddk/srb.h
@@ -41,7 +41,7 @@ extern "C" {
   #define SCSIPORTAPI DECLSPEC_IMPORT
 #endif
 
-#if DBG
+#ifdef DBG
 #define DebugPrint(x) ScsiDebugPrint x
 #else
 #define DebugPrint(x)
@@ -64,7 +64,7 @@ typedef PHYSICAL_ADDRESS SCSI_PHYSICAL_ADDRESS, *PSCSI_PHYSICAL_ADDRESS;
 
 #define MAXIMUM_CDB_SIZE                  12
 
-#if DBG
+#ifdef DBG
 #define SCSI_PORT_SIGNATURE               0x54524f50
 #endif
 
diff --git a/winsup/w32api/include/ddk/storport.h b/winsup/w32api/include/ddk/storport.h
index 184a099c7..a97fc7a4e 100644
--- a/winsup/w32api/include/ddk/storport.h
+++ b/winsup/w32api/include/ddk/storport.h
@@ -411,7 +411,7 @@ StorPortSynchronizeAccess(
   IN PSTOR_SYNCHRONIZED_ACCESS  SynchronizedAccessRoutine,
   IN PVOID  Context);
 
-#if DBG
+#ifdef DBG
 #define DebugPrint(x) StorPortDebugPrint x
 #else
 #define DebugPrint(x)
diff --git a/winsup/w32api/include/ddk/video.h b/winsup/w32api/include/ddk/video.h
index 41e17127d..fd63f7dff 100644
--- a/winsup/w32api/include/ddk/video.h
+++ b/winsup/w32api/include/ddk/video.h
@@ -91,7 +91,7 @@ typedef HW_DMA_RETURN
     PDMA  pDma);
 
 
-#if DBG
+#ifdef DBG
 
 #define PAGED_CODE() \
   if (VideoPortGetCurrentIrql() > 1 /* APC_LEVEL */) \
@@ -1553,7 +1553,7 @@ VideoPortZeroMemory(
   IN PVOID  Destination,
   IN ULONG  Length);
 
-#if DBG
+#ifdef DBG
 #define VideoDebugPrint(x) VideoPortDebugPrint x
 #else
 #define VideoDebugPrint(x)
diff --git a/winsup/w32api/include/nspapi.h b/winsup/w32api/include/nspapi.h
index 54cb7cfaa..463b13902 100644
--- a/winsup/w32api/include/nspapi.h
+++ b/winsup/w32api/include/nspapi.h
@@ -102,9 +102,9 @@ typedef struct _SERVICE_INFOW {
 
 typedef void *LPSERVICE_ASYNC_INFO;
 INT WINAPI SetServiceA(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD);
-INT WINAPI SetServiceW(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD);
-INT WINAPI GetAddressByNameA(DWORD,LPGUID,LPSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPTSTR,LPDWORD);
-INT WINAPI GetAddressByNameW(DWORD,LPGUID,LPWSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPTSTR,LPDWORD);
+INT WINAPI SetServiceW(DWORD,DWORD,DWORD,LPSERVICE_INFOW,LPSERVICE_ASYNC_INFO,LPDWORD);
+INT WINAPI GetAddressByNameA(DWORD,LPGUID,LPSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPSTR,LPDWORD);
+INT WINAPI GetAddressByNameW(DWORD,LPGUID,LPWSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPWSTR,LPDWORD);
 
 #ifdef UNICODE
 typedef SERVICE_INFOW SERVICE_INFO, *LPSERVICE_INFO;
diff --git a/winsup/w32api/include/ntsecapi.h b/winsup/w32api/include/ntsecapi.h
index 71e4e5e74..559087292 100644
--- a/winsup/w32api/include/ntsecapi.h
+++ b/winsup/w32api/include/ntsecapi.h
@@ -129,6 +129,7 @@ typedef struct _UNICODE_STRING {
   USHORT MaximumLength;
   PWSTR Buffer;
 } UNICODE_STRING, *PUNICODE_STRING;
+typedef const UNICODE_STRING* PCUNICODE_STRING;
 typedef struct _STRING {
   USHORT Length;
   USHORT MaximumLength;