build fixes

svn path=/trunk/; revision=19170

diff --git a/rosapps/tests/accelerator/accelerator.c b/rosapps/tests/accelerator/accelerator.c
index 116d4f1..590cfe8 100644 (file)
--- a/rosapps/tests/accelerator/accelerator.c
+++ b/rosapps/tests/accelerator/accelerator.c
@@ -7,6 +7,10 @@
 #define ID_ACCEL3 0x102
 #define ID_ACCEL4 0x103
 
 #define ID_ACCEL3 0x102
 #define ID_ACCEL4 0x103
 

+#ifndef VK_A
+#define VK_A 0x41
+#endif
+

 /*
  * {fVirt, key, cmd}
  * fVirt |= FVIRTKEY | FCONTROL | FALT | FSHIFT
 /*
  * {fVirt, key, cmd}
  * fVirt |= FVIRTKEY | FCONTROL | FALT | FSHIFT

diff --git a/rosapps/tests/alphablend/alphablend.c b/rosapps/tests/alphablend/alphablend.c
index 8fa434b..0c3e96a 100644 (file)
--- a/rosapps/tests/alphablend/alphablend.c
+++ b/rosapps/tests/alphablend/alphablend.c
@@ -1,6 +1,10 @@
 #include <windows.h>
 #include <string.h>
 
 #include <windows.h>
 #include <string.h>
 

+BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heightDst,
+                          HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc,
+                           BLENDFUNCTION blendFunction);
+

 #ifndef AC_SRC_ALPHA
 #define AC_SRC_ALPHA   (0x1)
 #endif
 #ifndef AC_SRC_ALPHA
 #define AC_SRC_ALPHA   (0x1)
 #endif

diff --git a/rosapps/tests/apc/apc.c b/rosapps/tests/apc/apc.c
index 51eaf6a..99244dd 100644 (file)
--- a/rosapps/tests/apc/apc.c
+++ b/rosapps/tests/apc/apc.c
@@ -1,9 +1,8 @@
-#include <stdarg.h>
-#include <string.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <string.h>

 #include <windows.h>
 #include <windows.h>

-#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>

 
 HANDLE OutputHandle;
 HANDLE InputHandle;
 
 HANDLE OutputHandle;
 HANDLE InputHandle;


@@ -22,7 +21,7 @@ int main(int argc, char* argv[])
    NTSTATUS Status;
    HANDLE FileHandle;
    OBJECT_ATTRIBUTES ObjectAttributes;
    NTSTATUS Status;
    HANDLE FileHandle;
    OBJECT_ATTRIBUTES ObjectAttributes;

-   UNICODE_STRING FileName = ROS_STRING_INITIALIZER(L"\\C:\\a.txt");
+   UNICODE_STRING FileName = RTL_CONSTANT_STRING(L"\\C:\\a.txt");

    IO_STATUS_BLOCK IoStatus;
    CHAR Buffer[256];
    HANDLE EventHandle;
    IO_STATUS_BLOCK IoStatus;
    CHAR Buffer[256];
    HANDLE EventHandle;

diff --git a/rosapps/tests/apc/apc.xml b/rosapps/tests/apc/apc.xml
index 11c41b4..3be2b97 100644 (file)
--- a/rosapps/tests/apc/apc.xml
+++ b/rosapps/tests/apc/apc.xml
@@ -3,5 +3,6 @@
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r

+       <library>ntdll</library>\r

        <file>apc.c</file>\r
 </module>\r
        <file>apc.c</file>\r
 </module>\r

diff --git a/rosapps/tests/atomtest/atomtest.c b/rosapps/tests/atomtest/atomtest.c
index f71253d..c482c39 100644 (file)
--- a/rosapps/tests/atomtest/atomtest.c
+++ b/rosapps/tests/atomtest/atomtest.c
@@ -1,7 +1,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>

-#include <ddk/ntddk.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>

 
 #define BUFFER_SIZE 256
 
 
 #define BUFFER_SIZE 256
 

diff --git a/rosapps/tests/atomtest/atomtest.xml b/rosapps/tests/atomtest/atomtest.xml
index d107f6e..2fa679b 100644 (file)
--- a/rosapps/tests/atomtest/atomtest.xml
+++ b/rosapps/tests/atomtest/atomtest.xml
@@ -3,6 +3,6 @@
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r

-       <library>gdi32</library>\r
+       <library>ntdll</library>\r

        <file>atomtest.c</file>\r
 </module>\r
        <file>atomtest.c</file>\r
 </module>\r

diff --git a/rosapps/tests/carets/carets.c b/rosapps/tests/carets/carets.c
index e8eeaec..e18a2b1 100644 (file)
--- a/rosapps/tests/carets/carets.c
+++ b/rosapps/tests/carets/carets.c
@@ -8,6 +8,8 @@ static int CharWidth = 10;
 static int CharHeight = 16;
 static HBITMAP CaretBitmap;
 
 static int CharHeight = 16;
 static HBITMAP CaretBitmap;
 

+ULONG __cdecl DbgPrint(IN PCH  Format, IN ...);
+

 LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM);
 
 int WINAPI
 LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM);
 
 int WINAPI

diff --git a/rosapps/tests/carets/carets.rc b/rosapps/tests/carets/carets.rc
index ac12cac..b269d70 100644 (file)
--- a/rosapps/tests/carets/carets.rc
+++ b/rosapps/tests/carets/carets.rc
@@ -1,5 +1,3 @@
 #include <windows.h>
 #include <windows.h>

-#include <reactos/resource.h>
-#include "resource.h"

 
 

-IDB_CARET                BITMAP    DISCARDABLE     "caret.bmp"
+1 BITMAP  DISCARDABLE "caret.bmp"

diff --git a/rosapps/tests/carets/carets.xml b/rosapps/tests/carets/carets.xml
index e2c9ab7..196529f 100644 (file)
--- a/rosapps/tests/carets/carets.xml
+++ b/rosapps/tests/carets/carets.xml
@@ -4,5 +4,7 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

+       <library>ntdll</library>\r

        <file>carets.c</file>\r
        <file>carets.c</file>\r

+       <efile>carets.rc</efile>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/combotst/combotst.xml b/rosapps/tests/combotst/combotst.xml
index cbcbbf0..c7c7fb2 100644 (file)
--- a/rosapps/tests/combotst/combotst.xml
+++ b/rosapps/tests/combotst/combotst.xml
@@ -5,4 +5,5 @@
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <file>combotst.c</file>\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <file>combotst.c</file>\r

+       <file>utils.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/create-links/create-links.xml b/rosapps/tests/create-links/create-links.xml
index bf76083..4d09009 100644 (file)
--- a/rosapps/tests/create-links/create-links.xml
+++ b/rosapps/tests/create-links/create-links.xml
@@ -4,5 +4,9 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

+       <library>ole32</library>\r
+       <library>uuid</library>\r
+       <library>shell32</library>\r
+       <library>shlwapi</library>\r

        <file>create-links.c</file>\r
 </module>\r
        <file>create-links.c</file>\r
 </module>\r

diff --git a/rosapps/tests/diskspeed/diskspeed.c b/rosapps/tests/diskspeed/diskspeed.c
index c007de6..dca9d17 100644 (file)
--- a/rosapps/tests/diskspeed/diskspeed.c
+++ b/rosapps/tests/diskspeed/diskspeed.c
@@ -8,12 +8,16 @@
  * PROGRAMMER:      Hartmut Birr
  */
 
  * PROGRAMMER:      Hartmut Birr
  */
 

-#include <windows.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <ddk/ntddk.h>
-#include <ddk/ntddscsi.h>
-#include <ddk/scsi.h>
+
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
+#define _NTSCSI_USER_MODE_
+#include <ntddscsi.h>
+#include <scsi.h>

 
 BOOL GetInquiryData(HANDLE hDevice, PINQUIRYDATA InquiryData)
 {
 
 BOOL GetInquiryData(HANDLE hDevice, PINQUIRYDATA InquiryData)
 {