From fcad5d27737b92a958dedff5742bb4c5004cc225 Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Sat, 12 Nov 2005 06:37:36 +0000 Subject: [PATCH] build fixes svn path=/trunk/; revision=19170 --- rosapps/tests/accelerator/accelerator.c | 4 ++++ rosapps/tests/alphablend/alphablend.c | 4 ++++ rosapps/tests/apc/apc.c | 9 ++++----- rosapps/tests/apc/apc.xml | 1 + rosapps/tests/atomtest/atomtest.c | 3 ++- rosapps/tests/atomtest/atomtest.xml | 2 +- rosapps/tests/carets/carets.c | 2 ++ rosapps/tests/carets/carets.rc | 4 +--- rosapps/tests/carets/carets.xml | 2 ++ rosapps/tests/combotst/combotst.xml | 1 + rosapps/tests/create-links/create-links.xml | 4 ++++ rosapps/tests/diskspeed/diskspeed.c | 12 ++++++++---- 12 files changed, 34 insertions(+), 14 deletions(-) diff --git a/rosapps/tests/accelerator/accelerator.c b/rosapps/tests/accelerator/accelerator.c index 116d4f17f58..590cfe81880 100644 --- a/rosapps/tests/accelerator/accelerator.c +++ b/rosapps/tests/accelerator/accelerator.c @@ -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 diff --git a/rosapps/tests/alphablend/alphablend.c b/rosapps/tests/alphablend/alphablend.c index 8fa434b4cf2..0c3e96a0b53 100644 --- a/rosapps/tests/alphablend/alphablend.c +++ b/rosapps/tests/alphablend/alphablend.c @@ -1,6 +1,10 @@ #include #include +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 diff --git a/rosapps/tests/apc/apc.c b/rosapps/tests/apc/apc.c index 51eaf6ab454..99244dd997c 100644 --- a/rosapps/tests/apc/apc.c +++ b/rosapps/tests/apc/apc.c @@ -1,9 +1,8 @@ -#include -#include #include +#include #include -#include -#include +#define NTOS_MODE_USER +#include HANDLE OutputHandle; HANDLE InputHandle; @@ -22,7 +21,7 @@ int main(int argc, char* argv[]) 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; diff --git a/rosapps/tests/apc/apc.xml b/rosapps/tests/apc/apc.xml index 11c41b4a1d8..3be2b97219b 100644 --- a/rosapps/tests/apc/apc.xml +++ b/rosapps/tests/apc/apc.xml @@ -3,5 +3,6 @@ 0x0501 kernel32 + ntdll apc.c diff --git a/rosapps/tests/atomtest/atomtest.c b/rosapps/tests/atomtest/atomtest.c index f71253dde7c..c482c3965a4 100644 --- a/rosapps/tests/atomtest/atomtest.c +++ b/rosapps/tests/atomtest/atomtest.c @@ -1,7 +1,8 @@ #include #include #include -#include +#define NTOS_MODE_USER +#include #define BUFFER_SIZE 256 diff --git a/rosapps/tests/atomtest/atomtest.xml b/rosapps/tests/atomtest/atomtest.xml index d107f6eeaf0..2fa679b3f50 100644 --- a/rosapps/tests/atomtest/atomtest.xml +++ b/rosapps/tests/atomtest/atomtest.xml @@ -3,6 +3,6 @@ 0x0501 kernel32 - gdi32 + ntdll atomtest.c diff --git a/rosapps/tests/carets/carets.c b/rosapps/tests/carets/carets.c index e8eeaec2a40..e18a2b1fa93 100644 --- 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; +ULONG __cdecl DbgPrint(IN PCH Format, IN ...); + LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM); int WINAPI diff --git a/rosapps/tests/carets/carets.rc b/rosapps/tests/carets/carets.rc index ac12cac514c..b269d709790 100644 --- a/rosapps/tests/carets/carets.rc +++ b/rosapps/tests/carets/carets.rc @@ -1,5 +1,3 @@ #include -#include -#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 e2c9ab74739..196529f6bc2 100644 --- a/rosapps/tests/carets/carets.xml +++ b/rosapps/tests/carets/carets.xml @@ -4,5 +4,7 @@ kernel32 gdi32 + ntdll carets.c + carets.rc diff --git a/rosapps/tests/combotst/combotst.xml b/rosapps/tests/combotst/combotst.xml index cbcbbf045c0..c7c7fb21582 100644 --- a/rosapps/tests/combotst/combotst.xml +++ b/rosapps/tests/combotst/combotst.xml @@ -5,4 +5,5 @@ kernel32 gdi32 combotst.c + utils.c diff --git a/rosapps/tests/create-links/create-links.xml b/rosapps/tests/create-links/create-links.xml index bf760838c10..4d090093759 100644 --- a/rosapps/tests/create-links/create-links.xml +++ b/rosapps/tests/create-links/create-links.xml @@ -4,5 +4,9 @@ kernel32 gdi32 + ole32 + uuid + shell32 + shlwapi create-links.c diff --git a/rosapps/tests/diskspeed/diskspeed.c b/rosapps/tests/diskspeed/diskspeed.c index c007de6e072..dca9d1724ba 100644 --- a/rosapps/tests/diskspeed/diskspeed.c +++ b/rosapps/tests/diskspeed/diskspeed.c @@ -8,12 +8,16 @@ * PROGRAMMER: Hartmut Birr */ -#include #include #include -#include -#include -#include + +#include +#define NTOS_MODE_USER +#include + +#define _NTSCSI_USER_MODE_ +#include +#include BOOL GetInquiryData(HANDLE hDevice, PINQUIRYDATA InquiryData) { -- 2.17.1