build fixes Modified: trunk/rosapps/tests/accelerator/accelerator.c Modified: trunk/rosapps/tests/alphablend/alphablend.c Modified: trunk/rosapps/tests/apc/apc.c Modified: trunk/rosapps/tests/apc/apc.xml Modified: trunk/rosapps/tests/atomtest/atomtest.c Modified: trunk/rosapps/tests/atomtest/atomtest.xml Modified: trunk/rosapps/tests/carets/carets.c Modified: trunk/rosapps/tests/carets/carets.rc Modified: trunk/rosapps/tests/carets/carets.xml Modified: trunk/rosapps/tests/combotst/combotst.xml Modified: trunk/rosapps/tests/create-links/create-links.xml Modified: trunk/rosapps/tests/diskspeed/diskspeed.c _____
Modified: trunk/rosapps/tests/accelerator/accelerator.c --- trunk/rosapps/tests/accelerator/accelerator.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/accelerator/accelerator.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -7,6 +7,10 @@
#define ID_ACCEL3 0x102 #define ID_ACCEL4 0x103
+#ifndef VK_A +#define VK_A 0x41 +#endif + /* * {fVirt, key, cmd} * fVirt |= FVIRTKEY | FCONTROL | FALT | FSHIFT _____
Modified: trunk/rosapps/tests/alphablend/alphablend.c --- trunk/rosapps/tests/alphablend/alphablend.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/alphablend/alphablend.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -1,6 +1,10 @@
#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 _____
Modified: trunk/rosapps/tests/apc/apc.c --- trunk/rosapps/tests/apc/apc.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/apc/apc.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -1,9 +1,8 @@
-#include <stdarg.h> -#include <string.h> #include <stdio.h> +#include <string.h> #include <windows.h> -#include <ddk/ntddk.h> -#include <rosrtl/string.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h>
HANDLE OutputHandle; HANDLE InputHandle; @@ -22,7 +21,7 @@ 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; _____
Modified: trunk/rosapps/tests/apc/apc.xml --- trunk/rosapps/tests/apc/apc.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/apc/apc.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -3,5 +3,6 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> + <library>ntdll</library> <file>apc.c</file> </module> _____
Modified: trunk/rosapps/tests/atomtest/atomtest.c --- trunk/rosapps/tests/atomtest/atomtest.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/atomtest/atomtest.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -1,7 +1,8 @@
#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
_____
Modified: trunk/rosapps/tests/atomtest/atomtest.xml --- trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -3,6 +3,6 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>ntdll</library> <file>atomtest.c</file> </module> _____
Modified: trunk/rosapps/tests/carets/carets.c --- trunk/rosapps/tests/carets/carets.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/carets/carets.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -8,6 +8,8 @@
static int CharHeight = 16; static HBITMAP CaretBitmap;
+ULONG __cdecl DbgPrint(IN PCH Format, IN ...); + LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM);
int WINAPI _____
Modified: trunk/rosapps/tests/carets/carets.rc --- trunk/rosapps/tests/carets/carets.rc 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/carets/carets.rc 2005-11-12 06:37:36 UTC (rev 19170) @@ -1,5 +1,3 @@
#include <windows.h> -#include <reactos/resource.h> -#include "resource.h"
-IDB_CARET BITMAP DISCARDABLE "caret.bmp" +1 BITMAP DISCARDABLE "caret.bmp" _____
Modified: trunk/rosapps/tests/carets/carets.xml --- trunk/rosapps/tests/carets/carets.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/carets/carets.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -4,5 +4,7 @@
<define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> + <library>ntdll</library> <file>carets.c</file> + <efile>carets.rc</efile> </module> _____
Modified: trunk/rosapps/tests/combotst/combotst.xml --- trunk/rosapps/tests/combotst/combotst.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/combotst/combotst.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -5,4 +5,5 @@
<library>kernel32</library> <library>gdi32</library> <file>combotst.c</file> + <file>utils.c</file> </module> _____
Modified: trunk/rosapps/tests/create-links/create-links.xml --- trunk/rosapps/tests/create-links/create-links.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/create-links/create-links.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -4,5 +4,9 @@
<define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> + <library>ole32</library> + <library>uuid</library> + <library>shell32</library> + <library>shlwapi</library> <file>create-links.c</file> </module> _____
Modified: trunk/rosapps/tests/diskspeed/diskspeed.c --- trunk/rosapps/tests/diskspeed/diskspeed.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/diskspeed/diskspeed.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -8,13 +8,17 @@
* PROGRAMMER: Hartmut Birr */
-#include <windows.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 Result;
-
sedwards＠svn.reactos.com