Ros-diffs February 2013

ros-diffs@reactos.org

11 participants
125 discussions

[akhaldi] 58292: [CMAKE] * Rely on CMAKE_HOST_WIN32 instead of CMAKE_HOST_SYSTEM_NAME which, sometimes, isn't set for some reason. Should fix the incorrect MINGW_TOOLCHAIN_PREFIX value issue.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 6 22:10:51 2013 New Revision: 58292 URL: http://svn.reactos.org/svn/reactos?rev=58292&view=rev Log: [CMAKE] * Rely on CMAKE_HOST_WIN32 instead of CMAKE_HOST_SYSTEM_NAME which, sometimes, isn't set for some reason. Should fix the incorrect MINGW_TOOLCHAIN_PREFIX value issue. Modified: trunk/reactos/toolchain-gcc.cmake Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=58… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Wed Feb 6 22:10:51 2013 @@ -7,7 +7,7 @@ if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX) if(ARCH STREQUAL "i386") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_HOST_WIN32) set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") else() if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1)

11 years, 8 months

[akhaldi] 58291: [WIN32SS] * Fix a corner case when the start segments overlaps the end segment in Chord(), Pie(), Arc() and ArcTo() functions. * This should fix the Pie chart in "Disk Properties" ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 5 23:02:36 2013 New Revision: 58291 URL: http://svn.reactos.org/svn/reactos?rev=58291&view=rev Log: [WIN32SS] * Fix a corner case when the start segments overlaps the end segment in Chord(), Pie(), Arc() and ArcTo() functions. * This should fix the Pie chart in "Disk Properties" when all the space is used. * Brought to you by Victor Martinez Calvo. CORE-6848 #resolve #comment Committed in r58291. Thanks ! Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Tue Feb 5 23:02:36 2013 @@ -131,6 +131,12 @@ AngleEnd = atan2((RectSEpts.bottom - CenterY), RectSEpts.right - CenterX)*(360.0/(M_PI*2)); AngleStart = atan2((RectSEpts.top - CenterY), RectSEpts.left - CenterX)*(360.0/(M_PI*2)); + /* Edge Case: Check if the start segments overlaps(is equal) the end segment */ + if (AngleEnd == AngleStart) + { + AngleStart = AngleEnd + 360.0; // Arc(), ArcTo(), Pie() and Chord() are counterclockwise APIs. + } + SfCx = (LONG)(Rcos(AngleStart) * RadiusX); SfCy = (LONG)(Rsin(AngleStart) * RadiusY); EfCx = (LONG)(Rcos(AngleEnd) * RadiusX);

11 years, 8 months

[akhaldi] 58290: * Addendum to r58214.

by akhaldi＠svn.reactos.org

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>

11 years, 8 months

[akhaldi] 58289: [MSI] * Account for the fact that PID_SECURITY is defined in propidl.h with a different value. Spotted by Sylvain. CORE-6930 #resolve #comment Fixed in r58289.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 5 17:51:43 2013 New Revision: 58289 URL: http://svn.reactos.org/svn/reactos?rev=58289&view=rev Log: [MSI] * Account for the fact that PID_SECURITY is defined in propidl.h with a different value. Spotted by Sylvain. CORE-6930 #resolve #comment Fixed in r58289. Modified: trunk/reactos/dll/win32/msi/suminfo.c Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] Tue Feb 5 17:51:43 2013 @@ -34,12 +34,14 @@ //#include "shlwapi.h" #include <wine/debug.h> #include <wine/unicode.h> +#include <objbase.h> +//#include "objidl.h" +#include <propvarutil.h> //#include "msi.h" //#include "msiquery.h" -//#include "msidefs.h" +#include <msidefs.h> #include "msipriv.h" -//#include "objidl.h" -#include <propvarutil.h> + #include <msiserver.h> WINE_DEFAULT_DEBUG_CHANNEL(msi);

11 years, 8 months

[tfaber] 58288: [HAL] - Fix missing dependency on asm in GCC object library build CORE-6941 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Feb 5 12:03:56 2013 New Revision: 58288 URL: http://svn.reactos.org/svn/reactos?rev=58288&view=rev Log: [HAL] - Fix missing dependency on asm in GCC object library build CORE-6941 #resolve Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Tue Feb 5 12:03:56 2013 @@ -30,9 +30,9 @@ add_library(lib_hal_generic OBJECT ${HAL_GENERIC_SOURCE}) else() add_library(lib_hal_generic ${HAL_GENERIC_SOURCE}) - add_dependencies(lib_hal_generic asm) -endif() - +endif() + +add_dependencies(lib_hal_generic asm) add_pch(lib_hal_generic include/hal.h) if(ARCH STREQUAL "i386")

11 years, 8 months

[janderwald] 58287: - Disable assert CORE-6866

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 4 12:39:40 2013 New Revision: 58287 URL: http://svn.reactos.org/svn/reactos?rev=58287&view=rev Log: - Disable assert CORE-6866 Modified: trunk/reactos/win32ss/gdi/eng/mouse.c Modified: trunk/reactos/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mouse.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] Mon Feb 4 12:39:40 2013 @@ -661,7 +661,7 @@ psurfMask = SURFACE_ShareLockSurface(hbmMask); else { - ASSERT(fl & SPS_ALPHA); + //ASSERT(fl & SPS_ALPHA); psurfMask = NULL; }

11 years, 8 months

[janderwald] 58286: [EXPLORER] - Fix taskbar icons

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 4 12:09:35 2013 New Revision: 58286 URL: http://svn.reactos.org/svn/reactos?rev=58286&view=rev Log: [EXPLORER] - Fix taskbar icons Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Mon Feb 4 12:09:35 2013 @@ -516,33 +516,39 @@ for(set<int>::reverse_iterator it=btn_idx_to_delete.rbegin(); it!=btn_idx_to_delete.rend(); ++it) { int idx = *it; - SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0); - - for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it) { - TaskBarEntry& entry = it->second; + if (!SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0)) + MessageBoxW(NULL, L"failed to delete button", NULL, MB_OK); + + + for(TaskBarMap::iterator it2=_map.begin(); it2!=_map.end(); ++it2) { + TaskBarEntry& entry = it2->second; // adjust button indexes if (entry._btn_idx > idx) { --entry._btn_idx; +#if 0 --entry._bmp_idx; - + TBBUTTONINFO info; info.cbSize = sizeof(TBBUTTONINFO); info.dwMask = TBIF_IMAGE; info.iImage = entry._bmp_idx; - SendMessage(_htoolbar, TB_SETBUTTONINFO, entry._id, (LPARAM)&info); + if (!SendMessage(_htoolbar, TB_SETBUTTONINFO, entry._id, (LPARAM)&info)) + MessageBoxW(NULL, L"failed to set button info", NULL, MB_OK); +#endif } } + } for(set<HBITMAP>::iterator it=hbmp_to_delete.begin(); it!=hbmp_to_delete.end(); ++it) { HBITMAP hbmp = *it; - +#if 0 TBREPLACEBITMAP tbrepl = {0, (UINT_PTR)hbmp, 0, 0}; SendMessage(_htoolbar, TB_REPLACEBITMAP, 0, (LPARAM)&tbrepl); - +#endif DeleteObject(hbmp); for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it)

11 years, 8 months

[akhaldi] 58285: [IMM32_WINETEST] * Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 3 20:58:19 2013 New Revision: 58285 URL: http://svn.reactos.org/svn/reactos?rev=58285&view=rev Log: [IMM32_WINETEST] * Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/imm32/imm32.c Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… ============================================================================== --- trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] Sun Feb 3 20:58:19 2013 @@ -33,11 +33,16 @@ /* * msgspy - record and analyse message traces sent to a certain window */ +typedef struct _msgs { + CWPSTRUCT msg; + BOOL post; +} imm_msgs; + static struct _msg_spy { HWND hwnd; HHOOK get_msg_hook; HHOOK call_wnd_proc_hook; - CWPSTRUCT msgs[32]; + imm_msgs msgs[32]; unsigned int i_msg; } msg_spy; @@ -46,13 +51,14 @@ if (HC_ACTION == nCode) { MSG *msg = (MSG*)lParam; - if ((msg->hwnd == msg_spy.hwnd) && + if ((msg->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL) && (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) { - msg_spy.msgs[msg_spy.i_msg].hwnd = msg->hwnd; - msg_spy.msgs[msg_spy.i_msg].message = msg->message; - msg_spy.msgs[msg_spy.i_msg].wParam = msg->wParam; - msg_spy.msgs[msg_spy.i_msg].lParam = msg->lParam; + msg_spy.msgs[msg_spy.i_msg].msg.hwnd = msg->hwnd; + msg_spy.msgs[msg_spy.i_msg].msg.message = msg->message; + msg_spy.msgs[msg_spy.i_msg].msg.wParam = msg->wParam; + msg_spy.msgs[msg_spy.i_msg].msg.lParam = msg->lParam; + msg_spy.msgs[msg_spy.i_msg].post = TRUE; msg_spy.i_msg++; } } @@ -66,10 +72,11 @@ if (HC_ACTION == nCode) { CWPSTRUCT *cwp = (CWPSTRUCT*)lParam; - if ((cwp->hwnd == msg_spy.hwnd) && + if (((cwp->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL)) && (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) { - memcpy(&msg_spy.msgs[msg_spy.i_msg], cwp, sizeof(msg_spy.msgs[0])); + memcpy(&msg_spy.msgs[msg_spy.i_msg].msg, cwp, sizeof(msg_spy.msgs[0].msg)); + msg_spy.msgs[msg_spy.i_msg].post = FALSE; msg_spy.i_msg++; } } @@ -93,7 +100,7 @@ msg_spy.i_msg = 0; } -static CWPSTRUCT* msg_spy_find_msg(UINT message) { +static imm_msgs* msg_spy_find_next_msg(UINT message, UINT *start) { UINT i; msg_spy_pump_msg_queue(); @@ -102,11 +109,20 @@ fprintf(stdout, "%s:%d: msg_spy: message buffer overflow!\n", __FILE__, __LINE__); - for (i = 0; i < msg_spy.i_msg; i++) - if (msg_spy.msgs[i].message == message) + for (i = *start; i < msg_spy.i_msg; i++) + if (msg_spy.msgs[i].msg.message == message) + { + *start = i+1; return &msg_spy.msgs[i]; + } return NULL; +} + +static imm_msgs* msg_spy_find_msg(UINT message) { + UINT i = 0; + + return msg_spy_find_next_msg(message, &i); } static void msg_spy_init(HWND hwnd) { @@ -618,6 +634,73 @@ UnloadKeyboardLayout(hkl); } +static void test_ImmDefaultHwnd(void) +{ + HIMC imc1, imc2, imc3; + HWND def1, def3; + HWND hwnd; + + hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + + ShowWindow(hwnd, SW_SHOWNORMAL); + + imc1 = ImmGetContext(hwnd); + if (!imc1) + { + win_skip("IME support not implemented\n"); + return; + } + + def1 = ImmGetDefaultIMEWnd(hwnd); + + imc2 = ImmCreateContext(); + ImmSetOpenStatus(imc2, TRUE); + + imc3 = ImmGetContext(hwnd); + def3 = ImmGetDefaultIMEWnd(hwnd); + + ok(def3 == def1, "Default IME window should not change\n"); + ok(imc1 == imc3, "IME context should not change\n"); + ImmSetOpenStatus(imc2, FALSE); + + ImmReleaseContext(hwnd, imc1); + ImmReleaseContext(hwnd, imc3); + ImmDestroyContext(imc2); + DestroyWindow(hwnd); +} + +static void test_ImmMessages(void) +{ + CANDIDATEFORM cf; + imm_msgs *msg; + HWND defwnd; + HIMC imc; + UINT idx = 0; + + HWND hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + + ShowWindow(hwnd, SW_SHOWNORMAL); + defwnd = ImmGetDefaultIMEWnd(hwnd); + imc = ImmGetContext(hwnd); + + ImmSetOpenStatus(imc, TRUE); + msg_spy_flush_msgs(); + SendMessage(defwnd, WM_IME_CONTROL, IMC_GETCANDIDATEPOS, (LPARAM)&cf ); + do + { + msg = msg_spy_find_next_msg(WM_IME_CONTROL,&idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + ImmSetOpenStatus(imc, FALSE); + ImmReleaseContext(hwnd, imc); + DestroyWindow(hwnd); +} + START_TEST(imm32) { if (init()) { @@ -630,6 +713,12 @@ test_ImmIsUIMessage(); test_ImmGetContext(); test_ImmGetDescription(); + test_ImmDefaultHwnd(); + msg_spy_cleanup(); + /* Reinitialize the hooks to capture all windows */ + msg_spy_init(NULL); + test_ImmMessages(); + msg_spy_cleanup(); } cleanup(); }

11 years, 8 months

[akhaldi] 58284: [IMM32] * Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 3 20:58:12 2013 New Revision: 58284 URL: http://svn.reactos.org/svn/reactos?rev=58284&view=rev Log: [IMM32] * Sync with Wine 1.5.19. Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] Sun Feb 3 20:58:12 2013 @@ -52,6 +52,7 @@ IMEINFO imeInfo; WCHAR imeClassName[17]; /* 16 character max */ ULONG uSelected; + HWND UIWnd; /* Function Pointers */ MAKE_FUNCPTR(ImeInquire); @@ -79,7 +80,6 @@ INPUTCONTEXT IMC; ImmHkl *immKbd; - HWND imeWnd; UINT lastVK; } InputContextData; @@ -112,6 +112,10 @@ static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; +static const WCHAR szwIME[] = {'I','M','E',0}; + +static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam); #define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) @@ -359,6 +363,8 @@ ptr->pImeDestroy(1); FreeLibrary(ptr->hIME); } + if (ptr->UIWnd) + DestroyWindow(ptr->UIWnd); HeapFree(GetProcessHeap(),0,ptr); } } @@ -374,6 +380,21 @@ WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); } +static void IMM_RegisterIMEClass(void) +{ + WNDCLASSW wndClass; + + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); + + wndClass.style = CS_GLOBALCLASS; + wndClass.lpfnWndProc = (WNDPROC) DefIME_WindowProc; + wndClass.cbWndExtra = 2 * sizeof(LONG_PTR); + wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); + wndClass.lpszClassName = szwIME; + + RegisterClassW(&wndClass); +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); @@ -384,6 +405,7 @@ tlsIndex = TlsAlloc(); if (tlsIndex == TLS_OUT_OF_INDEXES) return FALSE; + IMM_RegisterIMEClass(); break; case DLL_THREAD_ATTACH: break; @@ -394,6 +416,7 @@ IMM_FreeThreadData(); IMM_FreeAllImmHkl(); TlsFree(tlsIndex); + UnregisterClassW(szwIME, NULL); break; } return TRUE; @@ -679,10 +702,6 @@ data->immKbd->uSelected --; data->immKbd->pImeSelect(hIMC, FALSE); SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); - - if (IMM_GetThreadData()->hwndDefault == data->imeWnd) - IMM_GetThreadData()->hwndDefault = NULL; - DestroyWindow(data->imeWnd); ImmDestroyIMCC(data->IMC.hCompStr); ImmDestroyIMCC(data->IMC.hCandInfo); @@ -1492,6 +1511,9 @@ */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { + if (IMM_GetThreadData()->hwndDefault == NULL) + IMM_GetThreadData()->hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, + szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); TRACE("Default is %p\n",IMM_GetThreadData()->hwndDefault); return IMM_GetThreadData()->hwndDefault; } @@ -2264,16 +2286,16 @@ data->IMC.cfCompForm = *lpCompForm; - if (IsWindowVisible(IMM_GetThreadData()->hwndDefault)) + if (IsWindowVisible(data->immKbd->UIWnd)) { reshow = TRUE; - ShowWindow(IMM_GetThreadData()->hwndDefault,SW_HIDE); + ShowWindow(data->immKbd->UIWnd,SW_HIDE); } /* FIXME: this is a partial stub */ if (reshow) - ShowWindow(IMM_GetThreadData()->hwndDefault,SW_SHOWNOACTIVATE); + ShowWindow(data->immKbd->UIWnd,SW_SHOWNOACTIVATE); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; @@ -2323,15 +2345,16 @@ if (!data) return FALSE; - if (data->imeWnd == NULL) + if (data->immKbd->UIWnd == NULL) { /* create the ime window */ - data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, + data->immKbd->UIWnd = CreateWindowExW( WS_EX_TOOLWINDOW, data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, data->immKbd->hIME, 0); - SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); - IMM_GetThreadData()->hwndDefault = data->imeWnd; - } + SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); + } + else if (fOpen) + SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); if (!fOpen != !data->IMC.fOpen) { @@ -2857,3 +2880,53 @@ FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } + + +/* + * Window Proc for the Default IME window class + */ +static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + case WM_NCCREATE: + return TRUE; + case WM_IME_STARTCOMPOSITION: + case WM_IME_ENDCOMPOSITION: + case WM_IME_COMPOSITION: + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY: + case WM_IME_CONTROL: + case WM_IME_COMPOSITIONFULL: + case WM_IME_SELECT: + case WM_IME_CHAR: + case WM_IME_REQUEST: + case WM_IME_KEYDOWN: + case WM_IME_KEYUP: + { + ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); + if (immHkl->UIWnd) + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; + } + default: + if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || + (uMsg == WM_MSIME_SERVICE) || + (uMsg == WM_MSIME_MOUSE) || + (uMsg == WM_MSIME_RECONVERTREQUEST) || + (uMsg == WM_MSIME_RECONVERT) || + (uMsg == WM_MSIME_QUERYPOSITION) || + (uMsg == WM_MSIME_DOCUMENTFEED)) + { + ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); + if (immHkl->UIWnd) + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; + } + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 3 20:58:12 2013 @@ -71,7 +71,7 @@ reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.5.4 reactos/dll/win32/imagehlp # Synced to Wine-1.5.4 -reactos/dll/win32/imm32 # Synced to Wine-1.5.4 +reactos/dll/win32/imm32 # Synced to Wine-1.5.19 reactos/dll/win32/inetcomm # Synced to Wine-1.5.4 reactos/dll/win32/inetmib1 # Synced to Wine-1.5.4 reactos/dll/win32/initpki # Synced to Wine-1.5.19

11 years, 8 months

[akhaldi] 58283: [USP10_WINETEST] * Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 3 20:49:58 2013 New Revision: 58283 URL: http://svn.reactos.org/svn/reactos?rev=58283&view=rev Log: [USP10_WINETEST] * Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Sun Feb 3 20:49:58 2013 @@ -1804,11 +1804,64 @@ ok (!psc, "psc is not null after ScriptFreeCache\n"); } +#define MAX_ENUM_FONTS 4096 + +struct enum_font_data +{ + int total; + ENUMLOGFONT elf[MAX_ENUM_FONTS]; +}; + +static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE)) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + +static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (!(type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE))) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + static void test_ScriptGetFontProperties(HDC hdc) { HRESULT hr; SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; + HFONT font, oldfont; + LOGFONT lf; + struct enum_font_data efnd; + TEXTMETRICA tmA; + WORD gi[3]; + WCHAR str[3]; + DWORD i, ret; + WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); + static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; + /* U+0020: numeric space + U+200B: zero width space + U+F71B: unkown, found by black box testing */ + BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ @@ -1866,6 +1919,109 @@ ok( psc == old_psc, "Expected psc not to be changed, was %p is now %p\n", old_psc, psc); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); + if (!pGetGlyphIndicesW) + { + win_skip("Skip on WINNT4\n"); + return; + } + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_bitmap_font_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("bitmap font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + ret = GetTextMetricsA(hdc, &tmA); + ok(ret != 0, "GetTextMetricsA failed!\n"); + + is_terminal = !(lstrcmpA(lf.lfFaceName, "Terminal") && lstrcmpA(lf.lfFaceName, "@Terminal")); + ok(sfp.wgBlank == tmA.tmBreakChar || broken(is_terminal) || broken(is_arabic), "bitmap font %s wgBlank %04x tmBreakChar %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar); + + ok(sfp.wgDefault == tmA.tmDefaultChar || broken(is_arabic), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); + + ok(sfp.wgInvalid == sfp.wgBlank || broken(is_arabic), "bitmap font %s wgInvalid %02x wgBlank %02x\n", lf.lfFaceName, sfp.wgInvalid, sfp.wgBlank); + + ok(sfp.wgKashida == 0xFFFF || broken(is_arabic), "bitmap font %s wgKashida %02x\n", lf.lfFaceName, sfp.wgKashida); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } + + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_truetype_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("truetype font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + str[0] = 0x0020; /* U+0020: numeric space */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + ok(sfp.wgBlank == gi[0], "truetype font %s wgBlank %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgBlank, gi[0]); + + ok(sfp.wgDefault == 0 || broken(is_arabic), "truetype font %s wgDefault %04x\n", lf.lfFaceName, sfp.wgDefault); + + ret = pGetGlyphIndicesW(hdc, invalids, 3, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + if (gi[2] != 0xFFFF) /* index of default non exist char */ + ok(sfp.wgInvalid == gi[2], "truetype font %s wgInvalid %04x gi[2] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[2]); + else if (gi[1] != 0xFFFF) + ok(sfp.wgInvalid == gi[1], "truetype font %s wgInvalid %04x gi[1] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[1]); + else if (gi[0] != 0xFFFF) + ok(sfp.wgInvalid == gi[0], "truetype font %s wgInvalid %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[0]); + else + ok(sfp.wgInvalid == 0, "truetype font %s wgInvalid %04x expect 0\n", lf.lfFaceName, sfp.wgInvalid); + + str[0] = 0x0640; /* U+0640: kashida */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + is_arial = !lstrcmpA(lf.lfFaceName, "Arial"); + is_times_new_roman= !lstrcmpA(lf.lfFaceName, "Times New Roman"); + ok(sfp.wgKashida == gi[0] || broken(is_arial || is_times_new_roman) || broken(is_arabic), "truetype font %s wgKashida %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgKashida, gi[0]); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } } static void test_ScriptTextOut(HDC hdc) @@ -2433,7 +2589,7 @@ else ok(lead < trail, "Trailing values should be after leading for ltr characters(%i)\n",Cp); - /* move by 1 pixel so that we are not inbetween 2 characters. That could result in being the lead of a rtl and + /* move by 1 pixel so that we are not between 2 characters. That could result in being the lead of a rtl and at the same time the trail of an ltr */ /* inside the leading edge */

11 years, 8 months

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2013