5 Feb
2013
5 Feb
'13
5:54 p.m.
Author: akhaldi
Date: Tue Feb 5 17:54:22 2013
New Revision: 58290
URL: http://svn.reactos.org/svn/reactos?rev=58290&view=rev
Log:
* Addendum to r58214.
Modified:
trunk/rostests/apitests/advapi32/CreateService.c
trunk/rostests/apitests/advapi32/LockDatabase.c
trunk/rostests/apitests/advapi32/QueryServiceConfig2.c
trunk/rostests/apitests/advapi32/testlist.c
trunk/rostests/apitests/apitest.h
trunk/rostests/apitests/crt/testlist.c
trunk/rostests/apitests/dciman32/DCICreatePrimary.c
trunk/rostests/apitests/dciman32/testlist.c
trunk/rostests/apitests/gdi32/AddFontResource.c
trunk/rostests/apitests/gdi32/AddFontResourceEx.c
trunk/rostests/apitests/gdi32/BeginPath.c
trunk/rostests/apitests/gdi32/CombineRgn.c
trunk/rostests/apitests/gdi32/CombineTransform.c
trunk/rostests/apitests/gdi32/CreateBitmap.c
trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c
trunk/rostests/apitests/gdi32/CreateCompatibleDC.c
trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c
trunk/rostests/apitests/gdi32/CreateDIBitmap.c
trunk/rostests/apitests/gdi32/CreateFont.c
trunk/rostests/apitests/gdi32/CreateFontIndirect.c
trunk/rostests/apitests/gdi32/CreateIconIndirect.c
trunk/rostests/apitests/gdi32/CreatePen.c
trunk/rostests/apitests/gdi32/CreateRectRgn.c
trunk/rostests/apitests/gdi32/DPtoLP.c
trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c
trunk/rostests/apitests/gdi32/EngCreateSemaphore.c
trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c
trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c
trunk/rostests/apitests/gdi32/ExtCreatePen.c
trunk/rostests/apitests/gdi32/GdiConvertBitmap.c
trunk/rostests/apitests/gdi32/GdiConvertBrush.c
trunk/rostests/apitests/gdi32/GdiConvertDC.c
trunk/rostests/apitests/gdi32/GdiConvertFont.c
trunk/rostests/apitests/gdi32/GdiConvertPalette.c
trunk/rostests/apitests/gdi32/GdiConvertRegion.c
trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c
trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c
trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c
trunk/rostests/apitests/gdi32/GdiGetLocalDC.c
trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c
trunk/rostests/apitests/gdi32/GdiSetAttrs.c
trunk/rostests/apitests/gdi32/GetClipRgn.c
trunk/rostests/apitests/gdi32/GetCurrentObject.c
trunk/rostests/apitests/gdi32/GetDIBColorTable.c
trunk/rostests/apitests/gdi32/GetDIBits.c
trunk/rostests/apitests/gdi32/GetObject.c
trunk/rostests/apitests/gdi32/GetPixel.c
trunk/rostests/apitests/gdi32/GetRandomRgn.c
trunk/rostests/apitests/gdi32/GetStockObject.c
trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c
trunk/rostests/apitests/gdi32/GetTextFace.c
trunk/rostests/apitests/gdi32/MaskBlt.c
trunk/rostests/apitests/gdi32/PatBlt.c
trunk/rostests/apitests/gdi32/Rectangle.c
trunk/rostests/apitests/gdi32/SelectObject.c
trunk/rostests/apitests/gdi32/SetBrushOrgEx.c
trunk/rostests/apitests/gdi32/SetDCPenColor.c
trunk/rostests/apitests/gdi32/SetDIBits.c
trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c
trunk/rostests/apitests/gdi32/SetMapMode.c
trunk/rostests/apitests/gdi32/SetPixel.c
trunk/rostests/apitests/gdi32/SetSysColors.c
trunk/rostests/apitests/gdi32/SetWindowExtEx.c
trunk/rostests/apitests/gdi32/SetWorldTransform.c
trunk/rostests/apitests/gdi32/init.c
trunk/rostests/apitests/gdi32/testlist.c
trunk/rostests/apitests/kernel32/GetDriveType.c
trunk/rostests/apitests/kernel32/GetModuleFileName.c
trunk/rostests/apitests/kernel32/MultiByteToWideChar.c
trunk/rostests/apitests/kernel32/lstrcpynW.c
trunk/rostests/apitests/kernel32/testlist.c
trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c
trunk/rostests/apitests/msvcrt/CommandLine.c
trunk/rostests/apitests/msvcrt/testlist.c
trunk/rostests/apitests/ntdll/LdrEnumResources.c
trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c
trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c
trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c
trunk/rostests/apitests/ntdll/RtlBitmap.c
trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c
trunk/rostests/apitests/ntdll/SystemInfo.c
trunk/rostests/apitests/ntdll/ZwContinue.c
trunk/rostests/apitests/ntdll/testlist.c
trunk/rostests/apitests/powrprof/power.c
trunk/rostests/apitests/powrprof/testlist.c
trunk/rostests/apitests/user32/AttachThreadInput.c
trunk/rostests/apitests/user32/CreateIconFromResourceEx.c
trunk/rostests/apitests/user32/DeferWindowPos.c
trunk/rostests/apitests/user32/DestroyCursorIcon.c
trunk/rostests/apitests/user32/DrawIconEx.c
trunk/rostests/apitests/user32/GetIconInfo.c
trunk/rostests/apitests/user32/GetKeyState.c
trunk/rostests/apitests/user32/GetPeekMessage.c
trunk/rostests/apitests/user32/GetSystemMetrics.c
trunk/rostests/apitests/user32/InitializeLpkHooks.c
trunk/rostests/apitests/user32/LoadImage.c
trunk/rostests/apitests/user32/RealGetWindowClass.c
trunk/rostests/apitests/user32/ScrollDC.c
trunk/rostests/apitests/user32/ScrollWindowEx.c
trunk/rostests/apitests/user32/SetActiveWindow.c
trunk/rostests/apitests/user32/SetCursorPos.c
trunk/rostests/apitests/user32/SystemParametersInfo.c
trunk/rostests/apitests/user32/TrackMouseEvent.c
trunk/rostests/apitests/user32/WndProc.c
trunk/rostests/apitests/user32/desktop.c
trunk/rostests/apitests/user32/helper.c
trunk/rostests/apitests/user32/testlist.c
trunk/rostests/apitests/user32/user32_apitest.rc
trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c
trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c
trunk/rostests/apitests/w32kdll/w32kdll_ros/main.c
trunk/rostests/apitests/w32kdll/w32kdll_vista/main.c
trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c
trunk/rostests/apitests/w32knapi/w32knapi.h
trunk/rostests/apitests/w32knapi/w32knapi.rc
trunk/rostests/apitests/winhttp/WinHttpOpen.c
trunk/rostests/apitests/winhttp/testlist.c
trunk/rostests/apitests/wininet/InternetOpen.c
trunk/rostests/apitests/wininet/testlist.c
trunk/rostests/apitests/ws2_32/WSAStartup.c
trunk/rostests/apitests/ws2_32/getaddrinfo.c
trunk/rostests/apitests/ws2_32/helpers.c
trunk/rostests/apitests/ws2_32/ioctlsocket.c
trunk/rostests/apitests/ws2_32/recv.c
trunk/rostests/apitests/ws2_32/testlist.c
trunk/rostests/apitests/ws2_32/ws2_32.h
trunk/rostests/kmtests/include/kmt_platform.h
trunk/rostests/kmtests/kmtest/kmtest.rc
trunk/rostests/kmtests/kmtest_drv/kmtest_drv.rc
trunk/rostests/rosautotest/precomp.h
trunk/rostests/tests/pseh2/psehtest.c
Modified: trunk/rostests/apitests/advapi32/CreateService.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CreateS…
==============================================================================
--- trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -6,7 +6,8 @@
*/
#include <wine/test.h>
-#include <windows.h>
+#include <winreg.h>
+#include <winsvc.h>
#include <strsafe.h>
static int MakeService(SC_HANDLE hScm, const wchar_t *serviceName, SC_HANDLE *hService,
DWORD *tag)
Modified: trunk/rostests/apitests/advapi32/LockDatabase.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/LockDat…
==============================================================================
--- trunk/rostests/apitests/advapi32/LockDatabase.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/LockDatabase.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -6,7 +6,7 @@
*/
#include <wine/test.h>
-#include <windows.h>
+#include <winsvc.h>
#include <strsafe.h>
#define TESTING_SERVICE L"Spooler"
Modified: trunk/rostests/apitests/advapi32/QueryServiceConfig2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/QuerySe…
==============================================================================
--- trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] Tue Feb 5
17:54:22 2013
@@ -6,7 +6,8 @@
*/
#include <wine/test.h>
-#include <windows.h>
+#include <winreg.h>
+#include <winsvc.h>
#include <strsafe.h>
#define TESTING_SERVICEW L"Spooler"
Modified: trunk/rostests/apitests/advapi32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis…
==============================================================================
--- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_CreateService(void);
extern void func_LockDatabase(void);
Modified: trunk/rostests/apitests/apitest.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=58…
==============================================================================
--- trunk/rostests/apitests/apitest.h [iso-8859-1] (original)
+++ trunk/rostests/apitests/apitest.h [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -2,9 +2,11 @@
#define _APITEST_H
#include <stdlib.h>
-#include <stdarg.h>
#include <stdio.h>
-#include <windows.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <shellapi.h>
#define APISTATUS_NORMAL 0
#define APISTATUS_NOT_FOUND 1
Modified: trunk/rostests/apitests/crt/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r…
==============================================================================
--- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
#if defined(TEST_MSVCRT)
extern void func_mbstowcs_s(void);
Modified: trunk/rostests/apitests/dciman32/DCICreatePrimary.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/DCICrea…
==============================================================================
--- trunk/rostests/apitests/dciman32/DCICreatePrimary.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/dciman32/DCICreatePrimary.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,7 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
void Test_DCICreatePrimary()
{
Modified: trunk/rostests/apitests/dciman32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/testlis…
==============================================================================
--- trunk/rostests/apitests/dciman32/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/dciman32/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_DCICreatePrimary(void);
Modified: trunk/rostests/apitests/gdi32/AddFontResource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes…
==============================================================================
--- trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#define COUNT 26
Modified: trunk/rostests/apitests/gdi32/AddFontResourceEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes…
==============================================================================
--- trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <libs/pseh/pseh2.h>
void Test_AddFontResourceExW()
Modified: trunk/rostests/apitests/gdi32/BeginPath.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/BeginPath.…
==============================================================================
--- trunk/rostests/apitests/gdi32/BeginPath.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/BeginPath.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
void Test_BeginPath()
{
Modified: trunk/rostests/apitests/gdi32/CombineRgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineRgn…
==============================================================================
--- trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
void Test_CombineRgn_Params()
{
Modified: trunk/rostests/apitests/gdi32/CombineTransform.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra…
==============================================================================
--- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
typedef union
Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#define DEFAULT_BITMAP 21
Modified: trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Magnus Olsen
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
void Test_CreateBitmapIndirect()
{
Modified: trunk/rostests/apitests/gdi32/CreateCompatibleDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateComp…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateCompatibleDC.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateCompatibleDC.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_CreateCompatibleDC()
{
Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+
#include "init.h"
Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,11 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <pseh/pseh2.h>
+
#include "init.h"
#define CBM_CREATDIB 2
Modified: trunk/rostests/apitests/gdi32/CreateFont.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateFont.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateFont.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#define INVALIDFONT "ThisFontDoesNotExist"
Modified: trunk/rostests/apitests/gdi32/CreateFontIndirect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateFontIndirect.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateFontIndirect.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
void
Modified: trunk/rostests/apitests/gdi32/CreateIconIndirect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateIcon…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,7 +1,7 @@
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
// FIXME user32
Modified: trunk/rostests/apitests/gdi32/CreatePen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreatePen.…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
#include <include/ntgdityp.h>
#include <include/ntgdihdl.h>
Modified: trunk/rostests/apitests/gdi32/CreateRectRgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateRect…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateRectRgn.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateRectRgn.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,7 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
void Test_CreateRectRgn()
{
Modified: trunk/rostests/apitests/gdi32/DPtoLP.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/DPtoLP.c?r…
==============================================================================
--- trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_DPtoLP_Params()
{
Modified: trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngAcquire…
==============================================================================
--- trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Magnus Olsen
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
void Test_EngAcquireSemaphore()
Modified: trunk/rostests/apitests/gdi32/EngCreateSemaphore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngCreateS…
==============================================================================
--- trunk/rostests/apitests/gdi32/EngCreateSemaphore.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/EngCreateSemaphore.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Magnus Olsen
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
void Test_EngCreateSemaphore()
Modified: trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngDeleteS…
==============================================================================
--- trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Magnus Olsen
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
void Test_EngDeleteSemaphore()
Modified: trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngRelease…
==============================================================================
--- trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Magnus Olsen
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
void Test_EngReleaseSemaphore()
Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP…
==============================================================================
--- trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
#include <include/ntgdityp.h>
#include <include/ntgdihdl.h>
Modified: trunk/rostests/apitests/gdi32/GdiConvertBitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertBitmap.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertBitmap.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm);
Modified: trunk/rostests/apitests/gdi32/GdiConvertBrush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertBrush.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertBrush.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr);
Modified: trunk/rostests/apitests/gdi32/GdiConvertDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertDC.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertDC.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HDC WINAPI GdiConvertDC(HDC hdc);
Modified: trunk/rostests/apitests/gdi32/GdiConvertFont.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertFont.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertFont.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HFONT WINAPI GdiConvertFont(HFONT);
Modified: trunk/rostests/apitests/gdi32/GdiConvertPalette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertPalette.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertPalette.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HPALETTE WINAPI GdiConvertPalette(HPALETTE);
Modified: trunk/rostests/apitests/gdi32/GdiConvertRegion.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertRegion.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertRegion.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HRGN WINAPI GdiConvertRegion(HRGN);
Modified: trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiDeleteL…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
BOOL WINAPI GdiDeleteLocalDC(HDC);
Modified: trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetChar…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
void Test_GdiGetCharDimensions()
{
Modified: trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr);
Modified: trunk/rostests/apitests/gdi32/GdiGetLocalDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiGetLocalDC.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiGetLocalDC.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HDC WINAPI GdiGetLocalDC(HDC);
Modified: trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiRelease…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
BOOL WINAPI GdiReleaseLocalDC(HDC);
Modified: trunk/rostests/apitests/gdi32/GdiSetAttrs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiSetAttr…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiSetAttrs.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiSetAttrs.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
BOOL WINAPI GdiSetAttrs(HDC);
Modified: trunk/rostests/apitests/gdi32/GetClipRgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipRgn…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetClipRgn.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetClipRgn.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_GetClipRgn()
{
Modified: trunk/rostests/apitests/gdi32/GetCurrentObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetCurrent…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,10 +5,10 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
+#include <winuser.h>
#include <include/ntgdityp.h>
#include <include/ntgdihdl.h>
Modified: trunk/rostests/apitests/gdi32/GetDIBColorTable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBColo…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
void Test_GetDIBColorTable()
{
Modified: trunk/rostests/apitests/gdi32/GetDIBits.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,10 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
+
#include "init.h"
void
Modified: trunk/rostests/apitests/gdi32/GetObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,10 +5,11 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
+#include <winuser.h>
+#include <pseh/pseh2.h>
#include <include/ntgdityp.h>
#include <include/ntgdihdl.h>
Modified: trunk/rostests/apitests/gdi32/GetPixel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetPixel.c…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,10 +5,8 @@
* PROGRAMMERS: Jérôme Gardou
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
-
+#include <wingdi.h>
void Test_GetPixel_1bpp()
{
Modified: trunk/rostests/apitests/gdi32/GetRandomRgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetRandomR…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -7,7 +7,8 @@
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#define CLIPRGN 1
#define METARGN 2
Modified: trunk/rostests/apitests/gdi32/GetStockObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
#include <include/ntgdityp.h>
#include <include/ntgdihdl.h>
Modified: trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextExt…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#define TEST(x) ok(x, #x"\n")
#define RTEST(x) ok(x, #x"\n")
Modified: trunk/rostests/apitests/gdi32/GetTextFace.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextFac…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#define TEST(x) ok(x, #x"\n")
#define RTEST(x) ok(x, #x"\n")
Modified: trunk/rostests/apitests/gdi32/MaskBlt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/MaskBlt.c?…
==============================================================================
--- trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_MaskBlt_1bpp()
{
Modified: trunk/rostests/apitests/gdi32/PatBlt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/PatBlt.c?r…
==============================================================================
--- trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
HBITMAP ghbmpTarget;
PULONG gpulTargetBits;
Modified: trunk/rostests/apitests/gdi32/Rectangle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/Rectangle.…
==============================================================================
--- trunk/rostests/apitests/gdi32/Rectangle.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/Rectangle.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Jérôme Gardou
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
void Test_Rectangle(void)
{
Modified: trunk/rostests/apitests/gdi32/SelectObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje…
==============================================================================
--- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -7,8 +7,10 @@
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
#include <winddi.h>
+#include <winuser.h>
+#include <pseh/pseh2.h>
#include <include/ntgdityp.h>
#include <include/ntgdihdl.h>
Modified: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBrushOr…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <pseh/pseh2.h>
void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD
dwErrExp)
{
Modified: trunk/rostests/apitests/gdi32/SetDCPenColor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDCPenCo…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_SetDCPenColor()
{
Modified: trunk/rostests/apitests/gdi32/SetDIBits.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBits.…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetDIBits.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetDIBits.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,10 +5,8 @@
* PROGRAMMERS: Jérôme Gardou
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
-
+#include <wingdi.h>
void Test_SetDIBits()
{
Modified: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBitsT…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+
#include "init.h"
static void
Modified: trunk/rostests/apitests/gdi32/SetMapMode.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetMapMode…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#define TEST(x) ok(x, #x"\n")
#define RTEST(x) ok(x, #x"\n")
Modified: trunk/rostests/apitests/gdi32/SetPixel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetPixel.c…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <mmsystem.h>
static struct
{
Modified: trunk/rostests/apitests/gdi32/SetSysColors.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#define TEST(x) ok(x, #x"\n")
Modified: trunk/rostests/apitests/gdi32/SetWindowExtEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWindowE…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#define TEST(x) ok(x, #x"\n")
#define RTEST(x) ok(x, #x"\n")
Modified: trunk/rostests/apitests/gdi32/SetWorldTransform.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWorldTr…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetWorldTransform.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetWorldTransform.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_SetWorldTransform()
{
Modified: trunk/rostests/apitests/gdi32/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.c?rev…
==============================================================================
--- trunk/rostests/apitests/gdi32/init.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/init.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,6 +1,7 @@
#include <stdio.h>
-#include <windows.h>
+#include <windef.h>
+#include <wingdi.h>
HBITMAP ghbmpDIB32;
HDC ghdcDIB32;
Modified: trunk/rostests/apitests/gdi32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c…
==============================================================================
--- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_AddFontResource(void);
extern void func_AddFontResourceEx(void);
Modified: trunk/rostests/apitests/kernel32/GetDriveType.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetDriv…
==============================================================================
--- trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,6 +1,4 @@
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
#define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) !=
DRIVE_NO_ROOT_DIR)
Modified: trunk/rostests/apitests/kernel32/GetModuleFileName.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetModu…
==============================================================================
--- trunk/rostests/apitests/kernel32/GetModuleFileName.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/GetModuleFileName.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -6,10 +6,13 @@
*/
#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
#define UNICODE
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <winreg.h>
+#include <winnls.h>
#include <shlwapi.h>
static
Modified: trunk/rostests/apitests/kernel32/MultiByteToWideChar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/MultiBy…
==============================================================================
--- trunk/rostests/apitests/kernel32/MultiByteToWideChar.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/MultiByteToWideChar.c [iso-8859-1] Tue Feb 5
17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMER: Mike "tamlin" Nordell
*/
-#include <windows.h>
-#include <stdio.h>
#include <wine/test.h>
+#include <winnls.h>
START_TEST(MultiByteToWideChar)
Modified: trunk/rostests/apitests/kernel32/lstrcpynW.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/lstrcpy…
==============================================================================
--- trunk/rostests/apitests/kernel32/lstrcpynW.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/lstrcpynW.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -7,7 +7,6 @@
#define WIN32_NO_STATUS
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
START_TEST(lstrcpynW)
{
Modified: trunk/rostests/apitests/kernel32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis…
==============================================================================
--- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_GetCurrentDirectory(void);
extern void func_GetDriveType(void);
Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUt…
==============================================================================
--- trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c [iso-8859-1] Tue Feb 5
17:54:22 2013
@@ -7,8 +7,9 @@
#define WIN32_NO_STATUS
#include <stdio.h>
-#include <windows.h>
-#include <ndk/ntndk.h>
+#include <windef.h>
+#include <winbase.h>
+#include <ndk/rtlfuncs.h>
#include "CmdLineUtil.h"
Modified: trunk/rostests/apitests/msvcrt/CommandLine.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi…
==============================================================================
--- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -9,7 +9,7 @@
#define UNICODE
#include <stdio.h>
#include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/umtypes.h>
#include "./CmdLineUtil/CmdLineUtil.h"
Modified: trunk/rostests/apitests/msvcrt/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/testlist.…
==============================================================================
--- trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_CommandLine(void);
extern void func_ieee(void);
Modified: trunk/rostests/apitests/ntdll/LdrEnumResources.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/LdrEnumRes…
==============================================================================
--- trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -7,7 +7,6 @@
#define WIN32_NO_STATUS
#define UNICODE
-#include <stdio.h>
#include <wine/test.h>
#include <pseh/pseh2.h>
#include <ndk/ldrfuncs.h>
Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate…
==============================================================================
--- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Tue Feb 5
17:54:22 2013
@@ -6,7 +6,6 @@
*/
#define WIN32_NO_STATUS
-#include <stdio.h>
#include <wine/test.h>
#include <ndk/rtlfuncs.h>
#include <ndk/mmfuncs.h>
Modified: trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtFreeVirt…
==============================================================================
--- trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,7 +1,7 @@
#define WIN32_NO_STATUS
-#include <stdio.h>
#include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/pstypes.h>
+#include <ndk/mmfuncs.h>
static void Test_NtFreeVirtualMemory(void)
{
Modified: trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQuerySys…
==============================================================================
--- trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1] Tue Feb 5
17:54:22 2013
@@ -6,9 +6,10 @@
*/
#define WIN32_NO_STATUS
-#include <stdio.h>
#include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/setypes.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/exfuncs.h>
// Arbitrary-defined constants
#define MIN_BUFFER_LENGTH 4L
Modified: trunk/rostests/apitests/ntdll/RtlBitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlBitmap.…
==============================================================================
--- trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,6 +1,5 @@
#define WIN32_NO_STATUS
-#include <stdio.h>
#include <wine/test.h>
#include <ndk/rtlfuncs.h>
#include <pseh/pseh2.h>
Modified: trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlInitial…
==============================================================================
--- trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -6,9 +6,8 @@
*/
#define WIN32_NO_STATUS
-#include <stdio.h>
#include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
void Test_RtlInitializeBitmap()
{
Modified: trunk/rostests/apitests/ntdll/SystemInfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/SystemInfo…
==============================================================================
--- trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -6,9 +6,8 @@
*/
#define WIN32_NO_STATUS
-#include <stdio.h>
#include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/exfuncs.h>
void
GetPrivilege()
Modified: trunk/rostests/apitests/ntdll/ZwContinue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ZwContinue…
==============================================================================
--- trunk/rostests/apitests/ntdll/ZwContinue.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/ZwContinue.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -6,7 +6,6 @@
*/
#include <setjmp.h>
-#include <stdio.h>
#include <time.h>
#include <wine/test.h>
Modified: trunk/rostests/apitests/ntdll/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c…
==============================================================================
--- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_LdrEnumResources(void);
extern void func_NtAllocateVirtualMemory(void);
Modified: trunk/rostests/apitests/powrprof/power.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c…
==============================================================================
--- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -8,17 +8,12 @@
*/
#include <stdarg.h>
-#include "ntstatus.h"
+#include <ntstatus.h>
#define WIN32_NO_STATUS
#define STANDALONE
-#include "wine/test.h"
-#include "winternl.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "powrprof.h"
-#include "assert.h"
-#include "winnt.h"
+#include <wine/test.h>
+#include <winreg.h>
+#include <powrprof.h>
/*
LONG WINAPI RegOpenCurrentUser(REGSAM a,PHKEY b)
Modified: trunk/rostests/apitests/powrprof/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/testlis…
==============================================================================
--- trunk/rostests/apitests/powrprof/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/powrprof/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,11 +1,11 @@
/* Automatically generated file; DO NOT EDIT!! */
/* stdarg.h is needed for Winelib */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "windef.h"
-#include "winbase.h"
+//#include <stdarg.h>
+//#include <stdio.h>
+//#include <stdlib.h>
+//#include "windef.h"
+//#include "winbase.h"
struct test
{
@@ -22,4 +22,4 @@
};
#define WINETEST_WANT_MAIN
-#include "wine/test.h"
+#include <wine/test.h>
Modified: trunk/rostests/apitests/user32/AttachThreadInput.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr…
==============================================================================
--- trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,11 +5,10 @@
* PROGRAMMERS: Giannis Adamopoulos
*/
-#include <windows.h>
-#include <stdio.h>
#include <wine/test.h>
+#include <wingdi.h>
+#include <winuser.h>
#include "helper.h"
-#include <undocuser.h>
#define DESKTOP_ALL_ACCESS 0x01ff
Modified: trunk/rostests/apitests/user32/CreateIconFromResourceEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateIco…
==============================================================================
--- trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] Tue Feb 5
17:54:22 2013
@@ -1,7 +1,5 @@
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
-#include "resource.h"
+#include <winuser.h>
START_TEST(CreateIconFromResourceEx)
{
Modified: trunk/rostests/apitests/user32/DeferWindowPos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind…
==============================================================================
--- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Thomas Faber
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
#include "helper.h"
#include <undocuser.h>
Modified: trunk/rostests/apitests/user32/DestroyCursorIcon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DestroyCu…
==============================================================================
--- trunk/rostests/apitests/user32/DestroyCursorIcon.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/DestroyCursorIcon.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,7 +1,6 @@
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
-#include "resource.h"
+#include <wingdi.h>
+#include <winuser.h>
START_TEST(DestroyCursorIcon)
{
Modified: trunk/rostests/apitests/user32/DrawIconEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DrawIconE…
==============================================================================
--- trunk/rostests/apitests/user32/DrawIconEx.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/DrawIconEx.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,7 +1,6 @@
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
-#include "resource.h"
+#include <wingdi.h>
+#include <winuser.h>
START_TEST(DrawIconEx)
{
Modified: trunk/rostests/apitests/user32/GetIconInfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetIconIn…
==============================================================================
--- trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,7 +1,7 @@
-
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
+
#include "resource.h"
// FIXME user32
Modified: trunk/rostests/apitests/user32/GetKeyState.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetKeySta…
==============================================================================
--- trunk/rostests/apitests/user32/GetKeyState.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/GetKeyState.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,13 +5,11 @@
* PROGRAMMERS: Giannis Adamopoulos
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
#include <assert.h>
HHOOK hKbdHook, hKbdLLHook;
-
LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam)
{
Modified: trunk/rostests/apitests/user32/GetPeekMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetPeekMe…
==============================================================================
--- trunk/rostests/apitests/user32/GetPeekMessage.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/GetPeekMessage.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,8 @@
* PROGRAMMERS: Thomas Faber
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
void Test_GetMessage(HWND hWnd)
{
Modified: trunk/rostests/apitests/user32/GetSystemMetrics.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetSystem…
==============================================================================
--- trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_GetSystemMetrics()
{
Modified: trunk/rostests/apitests/user32/InitializeLpkHooks.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/Initializ…
==============================================================================
--- trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,10 +5,8 @@
* PROGRAMMERS: Magnus Olsen
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
-
+#include <winuser.h>
typedef struct _LPK_LPEDITCONTROL_LIST
{
Modified: trunk/rostests/apitests/user32/LoadImage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LoadImage…
==============================================================================
--- trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,8 +1,7 @@
-
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
-#include "resource.h"
+#include <wingdi.h>
+#include <winuser.h>
START_TEST(LoadImage)
{
Modified: trunk/rostests/apitests/user32/RealGetWindowClass.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RealGetWi…
==============================================================================
--- trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
Modified: trunk/rostests/apitests/user32/ScrollDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollDC.…
==============================================================================
--- trunk/rostests/apitests/user32/ScrollDC.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/ScrollDC.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_ScrollDC()
{
Modified: trunk/rostests/apitests/user32/ScrollWindowEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollWin…
==============================================================================
--- trunk/rostests/apitests/user32/ScrollWindowEx.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/ScrollWindowEx.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
void Test_ScrollWindowEx()
{
Modified: trunk/rostests/apitests/user32/SetActiveWindow.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive…
==============================================================================
--- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Giannis Adamopoulos
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#include "helper.h"
#include <undocuser.h>
Modified: trunk/rostests/apitests/user32/SetCursorPos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetCursor…
==============================================================================
--- trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Giannis Adamopoulos
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#include <assert.h>
HHOOK hMouseHookLL, hMouseHook;
Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar…
==============================================================================
--- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Giannis Adamopoulos
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#include "helper.h"
#include <undocuser.h>
Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous…
==============================================================================
--- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -5,9 +5,9 @@
* PROGRAMMERS: Giannis Adamopoulos
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#include "helper.h"
#include <undocuser.h>
Modified: trunk/rostests/apitests/user32/WndProc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/WndProc.c…
==============================================================================
--- trunk/rostests/apitests/user32/WndProc.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/WndProc.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,9 +5,9 @@
* PROGRAMMERS:
*/
-#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
/* Used wine Redraw test for proof in principle. */
Modified: trunk/rostests/apitests/user32/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/desktop.c…
==============================================================================
--- trunk/rostests/apitests/user32/desktop.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -7,9 +7,9 @@
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
#include "helper.h"
-#include <undocuser.h>
#define STATUS_DLL_INIT_FAILED (0xC0000142)
#define DESKTOP_ALL_ACCESS 0x01ff
Modified: trunk/rostests/apitests/user32/helper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?…
==============================================================================
--- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
#include "helper.h"
#include <undocuser.h>
Modified: trunk/rostests/apitests/user32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.…
==============================================================================
--- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_AttachThreadInput(void);
extern void func_CreateIconFromResourceEx(void);
Modified: trunk/rostests/apitests/user32/user32_apitest.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap…
==============================================================================
--- trunk/rostests/apitests/user32/user32_apitest.rc [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32/user32_apitest.rc [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windef.h>
#include "resource.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windef.h>
#ifdef BUILD_DLL
#define DLL_EXPORT __declspec(dllexport)
Modified: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windef.h>
#ifdef BUILD_DLL
#define DLL_EXPORT __declspec(dllexport)
Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_ros/main.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_ros/main.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windef.h>
#ifdef BUILD_DLL
#define DLL_EXPORT __declspec(dllexport)
Modified: trunk/rostests/apitests/w32kdll/w32kdll_vista/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_vista/main.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_vista/main.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windef.h>
#ifdef BUILD_DLL
#define DLL_EXPORT __declspec(dllexport)
Modified: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c [iso-8859-1] Tue Feb 5 17:54:22
2013
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windef.h>
#ifdef BUILD_DLL
#define DLL_EXPORT __declspec(dllexport)
Modified: trunk/rostests/apitests/w32knapi/w32knapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap…
==============================================================================
--- trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] (original)
+++ trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -4,15 +4,17 @@
/* SDK/NDK Headers */
#define NTOS_MODE_USER
#define WIN32_NO_STATUS
-#include <windows.h>
-#include <winuser.h>
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <objbase.h>
#include <windowsx.h>
-#include <winnls32.h>
#include <ndk/ntndk.h>
-#include <wingdi.h>
#include <winddi.h>
#include <ddrawi.h>
-#include <d3dnthal.h>
#include <prntfont.h>
/* Public Win32K Headers */
Modified: trunk/rostests/apitests/w32knapi/w32knapi.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap…
==============================================================================
--- trunk/rostests/apitests/w32knapi/w32knapi.rc [iso-8859-1] (original)
+++ trunk/rostests/apitests/w32knapi/w32knapi.rc [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,5 +1,4 @@
-#include <windows.h>
+#include <windef.h>
#include "resource.h"
IDI_ICON ICON "resource/system.ico"
-
Modified: trunk/rostests/apitests/winhttp/WinHttpOpen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/WinHttpO…
==============================================================================
--- trunk/rostests/apitests/winhttp/WinHttpOpen.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/winhttp/WinHttpOpen.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -6,6 +6,11 @@
*/
#define UNICODE
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <windef.h>
#include <winsock2.h>
#include <wine/test.h>
#include <winhttp.h>
Modified: trunk/rostests/apitests/winhttp/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/testlist…
==============================================================================
--- trunk/rostests/apitests/winhttp/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/winhttp/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_WinHttpOpen(void);
Modified: trunk/rostests/apitests/wininet/InternetOpen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/Internet…
==============================================================================
--- trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -6,6 +6,11 @@
*/
#define UNICODE
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <windef.h>
#include <winsock2.h>
#include <wine/test.h>
#include <wininet.h>
Modified: trunk/rostests/apitests/wininet/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/testlist…
==============================================================================
--- trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_InternetOpen(void);
Modified: trunk/rostests/apitests/ws2_32/WSAStartup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSAStartu…
==============================================================================
--- trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -6,6 +6,9 @@
*/
#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <windef.h>
#include <winsock2.h>
#include <wine/test.h>
#include <pseh/pseh2.h>
Modified: trunk/rostests/apitests/ws2_32/getaddrinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/getaddrin…
==============================================================================
--- trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -6,7 +6,11 @@
*/
#define WIN32_NO_STATUS
-#include <winsock2.h>
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
#include <ws2tcpip.h>
#include <wine/test.h>
#include <pseh/pseh2.h>
Modified: trunk/rostests/apitests/ws2_32/helpers.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c…
==============================================================================
--- trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -8,6 +8,7 @@
#include <stdio.h>
#include <wine/test.h>
+
#include "ws2_32.h"
int CreateSocket(SOCKET* psck)
Modified: trunk/rostests/apitests/ws2_32/ioctlsocket.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ioctlsock…
==============================================================================
--- trunk/rostests/apitests/ws2_32/ioctlsocket.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ws2_32/ioctlsocket.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <wine/test.h>
-#include <windows.h>
+
#include "ws2_32.h"
int Test_ioctlsocket()
Modified: trunk/rostests/apitests/ws2_32/recv.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/recv.c?re…
==============================================================================
--- trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -8,7 +8,6 @@
#include <stdio.h>
#include <wine/test.h>
#include <winternl.h>
-#include <windows.h>
#include "ws2_32.h"
#define RECV_BUF 4
Modified: trunk/rostests/apitests/ws2_32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.…
==============================================================================
--- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
#define __ROS_LONG64__
-#include <windows.h>
#define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
extern void func_getaddrinfo(void);
extern void func_ioctlsocket(void);
Modified: trunk/rostests/apitests/ws2_32/ws2_32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.h?…
==============================================================================
--- trunk/rostests/apitests/ws2_32/ws2_32.h [iso-8859-1] (original)
+++ trunk/rostests/apitests/ws2_32/ws2_32.h [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -9,6 +9,9 @@
#ifndef _WS2_32_APITESTS_H
#define _WS2_32_APITESTS_H
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
#include <winsock2.h>
/* Simple macro for executing a socket command and doing cleanup operations in case of a
failure */
Modified: trunk/rostests/kmtests/include/kmt_platform.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_platf…
==============================================================================
--- trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] (original)
+++ trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -12,20 +12,28 @@
#error include kmt_test.h instead of including kmt_platform.h!
#endif /* !defined _KMTEST_TEST_H_ */
+#include <limits.h>
+#include <malloc.h>
+#include <stdarg.h>
+
#if defined KMT_KERNEL_MODE || defined KMT_STANDALONE_DRIVER
#include <ntddk.h>
#include <ntifs.h>
-#include <ndk/ntndk.h>
+#include <ndk/exfuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/mmfuncs.h>
#include <ntstrsafe.h>
#elif defined KMT_USER_MODE
-#define WIN32_LEAN_AND_MEAN
#define WIN32_NO_STATUS
#define UNICODE
-#include <windows.h>
-#include <ndk/ntndk.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winsvc.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/mmfuncs.h>
#include <strsafe.h>
-#include <winioctl.h>
#ifdef KMT_EMULATE_KERNEL
#define ok_irql(i)
@@ -48,8 +56,5 @@
#endif /* defined KMT_USER_MODE */
#include <pseh/pseh2.h>
-#include <limits.h>
-#include <malloc.h>
-#include <stdarg.h>
#endif /* !defined _KMTEST_PLATFORM_H_ */
Modified: trunk/rostests/kmtests/kmtest/kmtest.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/kmtest.rc?…
==============================================================================
--- trunk/rostests/kmtests/kmtest/kmtest.rc [iso-8859-1] (original)
+++ trunk/rostests/kmtests/kmtest/kmtest.rc [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,7 +5,7 @@
* PROGRAMMER: Thomas Faber <thfabba(a)gmx.de>
*/
-#include <windows.h>
+#include <windef.h>
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kernel-Mode Test Suite Loader
Application\0"
#define REACTOS_STR_INTERNAL_NAME "kmtest.exe\0"
Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_drv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/kmtest…
==============================================================================
--- trunk/rostests/kmtests/kmtest_drv/kmtest_drv.rc [iso-8859-1] (original)
+++ trunk/rostests/kmtests/kmtest_drv/kmtest_drv.rc [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -5,7 +5,7 @@
* PROGRAMMER: Thomas Faber <thfabba(a)gmx.de>
*/
-#include <windows.h>
+#include <windef.h>
#define REACTOS_FILETYPE VFT_DRV
#define REACTOS_FILESUBTYPE VFT2_DRV_SYSTEM
Modified: trunk/rostests/rosautotest/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev…
==============================================================================
--- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original)
+++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -2,15 +2,17 @@
#include <iostream>
#include <memory>
#include <sstream>
-#include <string>
#include <vector>
#include <iomanip>
using namespace std;
#define WIN32_NO_STATUS
-#include <windows.h>
-#include <ndk/rtlfuncs.h>
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <windef.h>
+#include <winbase.h>
+#include <winnls.h>
#include <reason.h>
#include <shlobj.h>
#include <wininet.h>
Modified: trunk/rostests/tests/pseh2/psehtest.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re…
==============================================================================
--- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original)
+++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Tue Feb 5 17:54:22 2013
@@ -20,15 +20,7 @@
DEALINGS IN THE SOFTWARE.
*/
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include <pseh/pseh2.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
#define STANDALONE
#include <wine/test.h>