[KMTestSuite]

- sync to rostests r52109 to fix CMake build with recent revisions

svn path=/branches/GSoC_2011/KMTestSuite/; revision=52123

apitests/dciman32/CMakeLists.txt

@@ -5,4 +5,4 @@ add_executable(dciman32_apitest DCICreatePrimary.c testlist.c)
 target_link_libraries(dciman32_apitest wine)
 set_module_type(dciman32_apitest win32cui)
 add_importlibs(dciman32_apitest msvcrt kernel32 ntdll)
-add_cab_target(dciman32_apitest 7)
+add_cd_file(TARGET dciman32_apitest DESTINATION reactos/bin FOR all)

apitests/gdi32/CMakeLists.txt

@@ -53,4 +53,4 @@ add_executable(gdi32_apitest ${SOURCE})
 target_link_libraries(gdi32_apitest wine ${PSEH_LIB})
 set_module_type(gdi32_apitest win32cui)
 add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll)
-add_cab_target(gdi32_apitest 7)
+add_cd_file(TARGET gdi32_apitest DESTINATION reactos/bin FOR all)

apitests/gdi32/Rectangle.c

@@ -15,6 +15,7 @@ void Test_Rectangle(void)
     HBITMAP hBmp;
     BOOL ret;
     HBRUSH hBrush;
+    HPEN hPen;
     COLORREF color;
     
     hdc = CreateCompatibleDC(NULL);
@@ -48,7 +49,7 @@ void Test_Rectangle(void)
     ok( color == RGB(0, 0, 0), "Expected 0, got 0x%08x\n", (UINT)color);
 
     ret = BitBlt(hdc, 0, 0, 4, 4, NULL, 0, 0, WHITENESS);
-    ok(ret, "BitBlt failed to blank the bitmap!\n");    
+    ok(ret, "BitBlt failed to blank the bitmap!\n");
     /* Try well ordered rectangle coordinates */
     ret = Rectangle(hdc, 0, 0, 2, 2);
     ok(ret, "Rectangle failed!");
@@ -63,6 +64,28 @@ void Test_Rectangle(void)
     color = GetPixel(hdc, 1, 1);
     ok( color == RGB(0, 0, 0), "Expected 0, got 0x%08x\n", (UINT)color);
     
+    /* tests with NULL pen */
+    hPen = SelectObject(hdc, GetStockObject(NULL_PEN));
+    
+    /* Blank the bitmap */
+    ret = BitBlt(hdc, 0, 0, 4, 4, NULL, 0, 0, WHITENESS);
+    ok(ret, "BitBlt failed to blank the bitmap!\n");
+    
+    ret = Rectangle(hdc, 0, 0, 3, 3);
+    ok(ret, "Rectangle failed!");
+    color = GetPixel(hdc, 0, 0);
+    ok( color == RGB(0, 0, 0), "Expected 0, got 0x%08x\n", (UINT)color);
+    color = GetPixel(hdc, 2, 2);
+    ok( color == RGB(255, 255, 255), "Expected 0x00FFFFFF, got 0x%08x\n", (UINT)color);
+    color = GetPixel(hdc, 0, 2);
+    ok( color == RGB(255, 255, 255), "Expected 0x00FFFFFF, got 0x%08x\n", (UINT)color);
+    color = GetPixel(hdc, 2, 0);
+    ok( color == RGB(255, 255, 255), "Expected 0x00FFFFFF, got 0x%08x\n", (UINT)color);
+    color = GetPixel(hdc, 1, 1);
+    ok( color == RGB(0, 0, 0), "Expected 0, got 0x%08x\n", (UINT)color);
+    
+    SelectObject(hdc, hPen);
+    
     /* Same tests with GM_ADVANCED */
     ok(SetGraphicsMode(hdc, GM_ADVANCED) == GM_COMPATIBLE, "Default mode for the DC is not GM_COMPATIBLE.\n");
     

apitests/kernel32/CMakeLists.txt

@@ -9,4 +9,4 @@ add_executable(kernel32_apitest ${SOURCE})
 target_link_libraries(kernel32_apitest wine ${PSEH_LIB})
 set_module_type(kernel32_apitest win32cui)
 add_importlibs(kernel32_apitest gdi32 user32 msvcrt kernel32 ntdll)
-add_cab_target(kernel32_apitest 7)
+add_cd_file(TARGET kernel32_apitest DESTINATION reactos/bin FOR all)

apitests/msvcrt/CMakeLists.txt

@@ -0,0 +1,12 @@
+
+add_definitions(-D_DLL -D__USE_CRTIMP)
+
+list(APPEND SOURCE
+    splitpath.c
+    testlist.c)
+
+add_executable(msvcrt_apitest ${SOURCE})
+target_link_libraries(msvcrt_apitest wine)
+set_module_type(msvcrt_apitest win32cui)
+add_importlibs(msvcrt_apitest msvcrt kernel32)
+add_cd_file(TARGET msvcrt_apitest DESTINATION reactos/bin FOR all)

apitests/msvcrt/msvcrt_apitest.rbuild

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+<module name="msvcrt_apitest" type="win32cui" installbase="bin" installname="msvcrt_apitest.exe">
+	<include base="msvcrt_apitest">.</include>
+	<library>wine</library>
+	<library>pseh</library>
+	<file>testlist.c</file>
+
+	<file>splitpath.c</file>
+
+</module>
+</group>

apitests/msvcrt/splitpath.c

@@ -0,0 +1,94 @@
+/*
+ * PROJECT:         ReactOS api tests
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * PURPOSE:         Test for _splitpath
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#include <wine/test.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <stdarg.h>
+
+#define ok_str(x, y) \
+    ok(strcmp(x, y) == 0, "got '%s', expected '%s'\n", x, y);
+
+#define ok_int(x, y) \
+    ok(x == y, "got %d, expected %d\n", x, y);
+
+START_TEST(splitpath)
+{
+    char drive[5];
+    char dir[64];
+    char fname[32];
+    char ext[10];
+
+    _splitpath("c:\\dir1\\dir2\\file.ext", drive, dir, fname, ext);
+    ok_str(drive, "c:");
+    ok_str(dir, "\\dir1\\dir2\\");
+    ok_str(fname, "file");
+    ok_str(ext, ".ext");
+
+    *_errno() = 0;
+    _splitpath("c:\\dir1\\dir2\\file.ext", 0, 0, 0, 0);
+    ok_int(*_errno(), 0);
+
+    *_errno() = 0;
+    _splitpath(0, drive, dir, fname, ext);
+    ok_int(*_errno(), EINVAL);
+    ok_str(drive, "");
+    ok_str(dir, "");
+    ok_str(fname, "");
+    ok_str(ext, "");
+
+    _splitpath("\\\\?\\c:\\dir1\\dir2\\file.ext", drive, dir, fname, ext);
+    ok_str(drive, "c:");
+    ok_str(dir, "\\dir1\\dir2\\");
+    ok_str(fname, "file");
+    ok_str(ext, ".ext");
+
+    _splitpath("ab:\\dir1\\..\\file", drive, dir, fname, ext);
+    ok_str(drive, "");
+    ok_str(dir, "ab:\\dir1\\..\\");
+    ok_str(fname, "file");
+    ok_str(ext, "");
+
+    _splitpath("//?/c:/dir1/dir2/file.ext", drive, dir, fname, ext);
+    ok_str(drive, "");
+    ok_str(dir, "//?/c:/dir1/dir2/");
+    ok_str(fname, "file");
+    ok_str(ext, ".ext");
+
+    _splitpath("\\\\?\\0:/dir1\\dir2/file.", drive, dir, fname, ext);
+    ok_str(drive, "0:");
+    ok_str(dir, "/dir1\\dir2/");
+    ok_str(fname, "file");
+    ok_str(ext, ".");
+
+    _splitpath("\\\\.\\c:\\dir1\\dir2\\.ext.ext2", drive, dir, fname, ext);
+    ok_str(drive, "");
+    ok_str(dir, "\\\\.\\c:\\dir1\\dir2\\");
+    ok_str(fname, ".ext");
+    ok_str(ext, ".ext2");
+
+    _splitpath("\\??\\c:\\dir1\\dir2\\file. ~ ", drive, dir, fname, ext);
+    ok_str(drive, "");
+    ok_str(dir, "\\??\\c:\\dir1\\dir2\\");
+    ok_str(fname, "file");
+    ok_str(ext, ". ~ ");
+
+    _splitpath("x: dir1\\/dir2 \\.blub", drive, dir, fname, ext);
+    ok_str(drive, "x:");
+    ok_str(dir, " dir1\\/dir2 \\");
+    ok_str(fname, "");
+    ok_str(ext, ".blub");
+
+    _splitpath("/:\\dir1\\dir2\\file.ext", drive, dir, fname, ext);
+    ok_str(drive, "/:");
+    ok_str(dir, "\\dir1\\dir2\\");
+    ok_str(fname, "file");
+    ok_str(ext, ".ext");
+
+}
+

apitests/msvcrt/testlist.c

@@ -0,0 +1,16 @@
+#define WIN32_LEAN_AND_MEAN
+#define __ROS_LONG64__
+#include <windows.h>
+
+#define STANDALONE
+#include "wine/test.h"
+
+extern void func_splitpath(void);
+
+const struct test winetest_testlist[] =
+{
+    { "splitpath", func_splitpath },
+
+    { 0, 0 }
+};
+

apitests/ntdll/CMakeLists.txt

@@ -14,4 +14,4 @@ add_executable(ntdll_apitest ${SOURCE})
 target_link_libraries(ntdll_apitest wine)
 set_module_type(ntdll_apitest win32cui)
 add_importlibs(ntdll_apitest msvcrt kernel32 ntdll)
-add_cab_target(ntdll_apitest 7)
+add_cd_file(TARGET ntdll_apitest DESTINATION reactos/bin FOR all)

apitests/user32/CMakeLists.txt

@@ -14,6 +14,7 @@ list(APPEND SOURCE
     ScrollDC.c
     ScrollWindowEx.c
     SetCursorPos.c
+    WndProc.c
     testlist.c
     user32_apitest.rc)
 
@@ -21,4 +22,4 @@ add_executable(user32_apitest ${SOURCE})
 target_link_libraries(user32_apitest wine)
 set_module_type(user32_apitest win32cui)
 add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll)
-add_cab_target(user32_apitest 7)
+add_cd_file(TARGET user32_apitest DESTINATION reactos/bin FOR all)

apitests/user32/ScrollDC.c

@@ -27,30 +27,35 @@ void Test_ScrollDC()
 	/* Test that no update region is there */
 	hrgn = CreateRectRgn(0,0,0,0);
 	iResult = GetUpdateRgn(hWnd, hrgn, FALSE);
-	ok (iResult == NULLREGION, "\n");
+	ok (iResult == NULLREGION, "Expected NULLREGION, got %d\n", iResult);
 
     /* Test normal scrolling */
-	ok(ScrollDC(hDC, 0, 0, NULL, NULL, hrgn, NULL) == TRUE, "\n");
+	ok(ScrollDC(hDC, 0, 0, NULL, NULL, hrgn, NULL) == TRUE, "ScrollDC failed\n");
 
     /* Scroll with invalid update region */
 	DeleteObject(hrgn);
-	ok(ScrollDC(hDC, 50, 0, NULL, NULL, hrgn, NULL) == FALSE, "\n");
+	ok(ScrollDC(hDC, 50, 0, NULL, NULL, (HRGN)0x12345678, NULL) == FALSE, "ScrollDC successed\n");
+	ok(ScrollDC(hDC, 50, 0, NULL, NULL, hrgn, NULL) == FALSE, "ScrollDC successed\n");
 	hrgn = CreateRectRgn(0,0,0,0);
-	ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n");
+	iResult = GetUpdateRgn(hWnd, hrgn, FALSE);
+	ok(iResult == NULLREGION, "Expected NULLREGION, got %d\n", iResult);
 
     /* Scroll with invalid update rect pointer */
-	ok(ScrollDC(hDC, 50, 0, NULL, NULL, NULL, (PRECT)1) == 0, "\n");
-	ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n");
+	ok(ScrollDC(hDC, 50, 0, NULL, NULL, NULL, (PRECT)1) == FALSE, "ScrollDC failed\n");
+	iResult = GetUpdateRgn(hWnd, hrgn, FALSE);
+	ok(iResult == NULLREGION, "Expected NULLREGION, got %d\n", iResult);
 
     /* Scroll with a clip rect */
     rcClip.left = 50; rcClip.top = 0; rcClip.right = 100; rcClip.bottom = 100;
-	ok(ScrollDC(hDC, 50, 0, NULL, &rcClip, hrgn, NULL) == TRUE, "\n");
-	ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n");
+	ok(ScrollDC(hDC, 50, 0, NULL, &rcClip, hrgn, NULL) == TRUE, "ScrollDC failed\n");
+	iResult = GetUpdateRgn(hWnd, hrgn, FALSE);
+	ok(iResult == NULLREGION, "Expected NULLREGION, got %d\n", iResult);
 
     /* Scroll with a clip rect */
     rcClip.left = 50; rcClip.top = 0; rcClip.right = 100; rcClip.bottom = 100;
-	ok(ScrollDC(hDC, 50, 50, NULL, &rcClip, hrgn, NULL) == TRUE, "\n");
-	ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n");
+	ok(ScrollDC(hDC, 50, 50, NULL, &rcClip, hrgn, NULL) == TRUE, "ScrollDC failed\n");
+	iResult = GetUpdateRgn(hWnd, hrgn, FALSE);
+	ok(iResult == NULLREGION, "Expected NULLREGION, got %d\n", iResult);
 
 	/* Overlap with another window */
 	hWnd2 = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE,

apitests/user32/WndProc.c

@@ -0,0 +1,100 @@
+/*
+ * PROJECT:         ReactOS api tests
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * PURPOSE:         Test for mismatch with function prototype in window procedure callback.
+ * PROGRAMMERS:
+ */
+
+#include <stdio.h>
+#include <wine/test.h>
+#include <windows.h>
+
+/* Used wine Redraw test for proof in principle. */
+
+/* Global variables to trigger exit from loop */
+static int redrawComplete, WMPAINT_count;
+
+/*
+   Force stack corruption when calling from assumed window procedure callback.
+   Adding (6 and) more will force exception faults and terminate the test program.
+   The test is with five and this is safe for windows.
+
+   But,,,, ReactOS compiled with GCC can handle this,,,,,,
+ */
+static LRESULT WINAPI redraw_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD ExtraData,DWORD ExtraData1,DWORD ExtraData2,DWORD ExtraData3)
+{
+    switch (msg)
+    {
+    case WM_PAINT:
+        trace("doing WM_PAINT %d\n", WMPAINT_count);
+        WMPAINT_count++;
+        if (WMPAINT_count > 10 && redrawComplete == 0)
+        {
+            PAINTSTRUCT ps;
+            BeginPaint(hwnd, &ps);
+            EndPaint(hwnd, &ps);  
+            return 1;
+        }
+   /*
+       This will force one stack corruption "ret" fault with normal window
+       procedure callback.
+    */
+#ifdef __MINGW32__
+        asm ("movl $0, %eax\n\t"
+             "leave\n\t"
+             "ret");
+#else
+//#ifdef _MSC_VER
+        __asm
+          {
+             mov eax, 0
+             leave
+             ret
+          }
+#endif
+    }
+    return DefWindowProc(hwnd, msg, wparam, lparam);
+}
+
+static void test_wndproc(void)
+{
+   WNDCLASSA cls;
+   HWND hwndMain;
+
+   cls.style = CS_DBLCLKS;
+   cls.lpfnWndProc = (WNDPROC)redraw_window_procA;
+   cls.cbClsExtra = 0;
+   cls.cbWndExtra = 0;  
+   cls.hInstance = GetModuleHandleA(0);
+   cls.hIcon = 0;
+   cls.hCursor = LoadCursorA(0, IDC_ARROW);
+   cls.hbrBackground = GetStockObject(WHITE_BRUSH);
+   cls.lpszMenuName = NULL;
+   cls.lpszClassName = "RedrawWindowClass";
+
+   if (!RegisterClassA(&cls))
+   {
+       trace("Register failed %d\n", (int)GetLastError());
+       return;
+   }
+
+   hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW,
+                            CW_USEDEFAULT, 0, 100, 100, NULL, NULL, 0, NULL);
+
+   ok( WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count);
+   ShowWindow(hwndMain, SW_SHOW);
+   ok( WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count);
+   RedrawWindow(hwndMain, NULL,NULL,RDW_UPDATENOW | RDW_ALLCHILDREN);
+   ok( WMPAINT_count == 1 || broken(WMPAINT_count == 0), /* sometimes on win9x */
+       "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count);
+   redrawComplete = TRUE;
+   ok( WMPAINT_count < 10, "RedrawWindow (RDW_UPDATENOW) never completed (%d)\n", WMPAINT_count);
+
+   /* clean up */
+   DestroyWindow( hwndMain);
+}
+
+START_TEST(WndProc)
+{
+   test_wndproc();
+}

apitests/user32/testlist.c

@@ -15,6 +15,7 @@ extern void func_GetPeekMessage(void);
 extern void func_DeferWindowPos(void);
 extern void func_GetKeyState(void);
 extern void func_SetCursorPos(void);
+extern void func_WndProc(void);
 
 const struct test winetest_testlist[] =
 {
@@ -28,6 +29,7 @@ const struct test winetest_testlist[] =
     { "DeferWindowPos", func_DeferWindowPos },
     { "GetKeyState", func_GetKeyState },
     { "SetCursorPos", func_SetCursorPos },
+    { "WndProc", func_WndProc },
     { 0, 0 }
 };
 

apitests/user32/user32_apitest.rbuild

@@ -20,6 +20,7 @@
 	<file>GetPeekMessage.c</file>
 	<file>DeferWindowPos.c</file>
 	<file>SetCursorPos.c</file>
+	<file>WndProc.c</file>
 
 </module>
 </group>

apitests/w32knapi/w32knapi.h

@@ -40,7 +40,7 @@ extern PGDI_TABLE_ENTRY GdiHandleTable;
 BOOL IsHandleValid(HGDIOBJ hobj);
 PVOID GetHandleUserData(HGDIOBJ hobj);
 DWORD Syscall(LPWSTR lpszFunction, int cParams, void* pParams);
-BOOL InitOsVersion();
+BOOL InitOsVersion(VOID);
 extern UINT g_OsIdx;
 
 typedef UINT ASPI[5];

apitests/ws2_32/CMakeLists.txt

@@ -11,4 +11,4 @@ add_executable(ws2_32_apitest ${SOURCE})
 target_link_libraries(ws2_32_apitest wine)
 set_module_type(ws2_32_apitest win32cui)
 add_importlibs(ws2_32_apitest ws2_32 msvcrt kernel32 ntdll)
-add_cab_target(ws2_32_apitest 7)
+add_cd_file(TARGET ws2_32_apitest DESTINATION reactos/bin FOR all)

drivers/kmtest/kmtest.h

@@ -29,7 +29,7 @@ typedef struct
 
 extern tls_data glob_data;
 
-VOID StartTest();
+VOID StartTest(VOID);
 VOID FinishTest(HANDLE KeyHandle, LPWSTR TestName);
 void kmtest_set_location(const char* file, int line);
 

dxtest/win32kdxtest/test.h

@@ -1,8 +1,8 @@
 
 
-HANDLE test_NtGdiDdCreateDirectDrawObject();
+HANDLE test_NtGdiDdCreateDirectDrawObject(void);
 void test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal);
-void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal);
+void test_NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal);
 void test_NtGdiDdGetScanLine(HANDLE hDirectDrawLocal);
 void test_NtGdiDdWaitForVerticalBlank(HANDLE hDirectDrawLocal);
 void test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal);

rosautotest/CMakeLists.txt

@@ -27,4 +27,4 @@ ${SOURCE})
 set_module_type(rosautotest win32cui)
 add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll)
 
-add_cab_target(rosautotest 1)
+add_cd_file(TARGET rosautotest DESTINATION reactos/system32 FOR all)

tests/DxHalTest/main.h

@@ -3,7 +3,7 @@
 #include <d3dhal.h>
 
 
-int StartupHAL ();
+int StartupHAL (VOID);
 extern HDC hdc;
 extern   DDRAWI_DIRECTDRAW_GBL mDDrawGlobal;
   extern DDRAWI_DIRECTDRAW_LCL mDDrawLocal;

tests/mmixer_test/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(mmixer_test test.c)
 set_module_type(mmixer_test win32cui)
 
 target_link_libraries(mmixer_test mmixer)
-add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 kernel32 msvcrt)
+add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 msvcrt kernel32)

tests/pseh2/CMakeLists.txt

@@ -5,4 +5,4 @@ add_executable(pseh2_test psehtest.c psehtest2.c)
 target_link_libraries(pseh2_test wine ${PSEH_LIB})
 set_module_type(pseh2_test win32cui)
 add_importlibs(pseh2_test msvcrt kernel32 ntdll)
-add_cab_target(pseh2_test 7)
+add_cd_file(TARGET pseh2_test DESTINATION reactos/bin FOR all)

winetests/CMakeLists.txt

@@ -22,6 +22,7 @@ add_subdirectory(gdi32)
 add_subdirectory(gdiplus)
 add_subdirectory(hlink)
 add_subdirectory(icmp)
+add_subdirectory(imagehlp)
 add_subdirectory(imm32)
 add_subdirectory(inetcomm)
 add_subdirectory(inetmib1)

winetests/advapi32/CMakeLists.txt

@@ -23,4 +23,4 @@ target_link_libraries(advapi32_winetest uuid)
 
 set_module_type(advapi32_winetest win32cui)
 add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32 ntdll)
-add_cab_target(advapi32_winetest 7)
+add_cd_file(TARGET advapi32_winetest DESTINATION reactos/bin FOR all)

winetests/advpack/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries(advpack_winetest wine)
 
 set_module_type(advpack_winetest win32cui)
 add_importlibs(advpack_winetest cabinet advapi32 msvcrt kernel32 ntdll)
-add_cab_target(advpack_winetest 7)
+add_cd_file(TARGET advpack_winetest DESTINATION reactos/bin FOR all)

winetests/amstream/CMakeLists.txt

@@ -5,4 +5,4 @@ target_link_libraries(amstream_winetest wine uuid)
 set_module_type(amstream_winetest win32cui)
 add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32 ntdll)
 add_dependencies(amstream_winetest dxsdk)
-add_cab_target(amstream_winetest 7)
+add_cd_file(TARGET amstream_winetest DESTINATION reactos/bin FOR all)

winetests/atl/CMakeLists.txt

@@ -12,4 +12,4 @@ target_link_libraries(atl_winetest wine uuid)
 
 set_module_type(atl_winetest win32cui)
 add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll)
-add_cab_target(atl_winetest 7)
+add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all)

winetests/avifil32/CMakeLists.txt

@@ -4,4 +4,4 @@ add_executable(avifil32_winetest api.c testlist.c)
 target_link_libraries(avifil32_winetest wine)
 set_module_type(avifil32_winetest win32cui)
 add_importlibs(avifil32_winetest avifil32 msvcrt kernel32)
-add_cab_target(avifil32_winetest 7)
+add_cd_file(TARGET avifil32_winetest DESTINATION reactos/bin FOR all)

winetests/browseui/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(browseui_winetest autocomplete.c testlist.c)
 target_link_libraries(browseui_winetest wine uuid)
 set_module_type(browseui_winetest win32cui)
 add_importlibs(browseui_winetest user32 ole32 msvcrt kernel32 ntdll)
-add_cab_target(browseui_winetest 7)
+add_cd_file(TARGET browseui_winetest DESTINATION reactos/bin FOR all)

winetests/cabinet/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(cabinet_winetest extract.c fdi.c testlist.c)
 target_link_libraries(cabinet_winetest wine)
 set_module_type(cabinet_winetest win32cui)
 add_importlibs(cabinet_winetest cabinet msvcrt kernel32 ntdll)
-add_cab_target(cabinet_winetest 7)
+add_cd_file(TARGET cabinet_winetest DESTINATION reactos/bin FOR all)

winetests/comcat/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(comcat_winetest comcat.c testlist.c)
 target_link_libraries(comcat_winetest wine uuid)
 set_module_type(comcat_winetest win32cui)
 add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(comcat_winetest 7)
+add_cd_file(TARGET comcat_winetest DESTINATION reactos/bin FOR all)

winetests/comctl32/CMakeLists.txt

@@ -40,4 +40,4 @@ add_executable(comctl32_winetest ${SOURCE})
 target_link_libraries(comctl32_winetest wine)
 set_module_type(comctl32_winetest win32cui)
 add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(comctl32_winetest 7)
+add_cd_file(TARGET comctl32_winetest DESTINATION reactos/bin FOR all)

winetests/comdlg32/CMakeLists.txt

@@ -14,4 +14,4 @@ add_executable(comdlg32_winetest ${SOURCE})
 target_link_libraries(comdlg32_winetest wine)
 set_module_type(comdlg32_winetest win32cui)
 add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 msvcrt kernel32 ntdll)
-add_cab_target(comdlg32_winetest 7)
+add_cd_file(TARGET comdlg32_winetest DESTINATION reactos/bin FOR all)

winetests/credui/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(credui_winetest credui.c testlist.c)
 target_link_libraries(credui_winetest wine)
 set_module_type(credui_winetest win32cui)
 add_importlibs(credui_winetest credui msvcrt kernel32 ntdll)
-add_cab_target(credui_winetest 7)
+add_cd_file(TARGET credui_winetest DESTINATION reactos/bin FOR all)

winetests/crypt32/CMakeLists.txt

@@ -25,4 +25,4 @@ add_executable(crypt32_winetest ${SOURCE})
 target_link_libraries(crypt32_winetest wine)
 set_module_type(crypt32_winetest win32cui)
 add_importlibs(crypt32_winetest crypt32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(crypt32_winetest 7)
+add_cd_file(TARGET crypt32_winetest DESTINATION reactos/bin FOR all)

winetests/cryptnet/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(cryptnet_winetest cryptnet.c testlist.c)
 target_link_libraries(cryptnet_winetest wine)
 set_module_type(cryptnet_winetest win32cui)
 add_importlibs(cryptnet_winetest cryptnet crypt32 msvcrt kernel32 ntdll)
-add_cab_target(cryptnet_winetest 7)
+add_cd_file(TARGET cryptnet_winetest DESTINATION reactos/bin FOR all)

winetests/cryptui/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(cryptui_winetest cryptui.c testlist.c)
 target_link_libraries(cryptui_winetest wine)
 set_module_type(cryptui_winetest win32cui)
 add_importlibs(cryptui_winetest cryptui crypt32 user32 msvcrt kernel32 ntdll)
-add_cab_target(cryptui_winetest 7)
+add_cd_file(TARGET cryptui_winetest DESTINATION reactos/bin FOR all)

winetests/dnsapi/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(dnsapi_winetest name.c record.c testlist.c)
 target_link_libraries(dnsapi_winetest wine)
 set_module_type(dnsapi_winetest win32cui)
 add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32 ntdll)
-add_cab_target(dnsapi_winetest 7)
+add_cd_file(TARGET dnsapi_winetest DESTINATION reactos/bin FOR all)

winetests/dsound/CMakeLists.txt

@@ -17,4 +17,4 @@ add_executable(dsound_winetest ${SOURCE})
 target_link_libraries(dsound_winetest wine uuid dxguid)
 set_module_type(dsound_winetest win32cui)
 add_importlibs(dsound_winetest dsound ole32 user32 msvcrt kernel32 ntdll)
-add_cab_target(dsound_winetest 7)
+add_cd_file(TARGET dsound_winetest DESTINATION reactos/bin FOR all)

winetests/fusion/CMakeLists.txt

@@ -14,4 +14,4 @@ add_executable(fusion_winetest ${SOURCE})
 target_link_libraries(fusion_winetest wine)
 set_module_type(fusion_winetest win32cui)
 add_importlibs(fusion_winetest user32 msvcrt kernel32 ntdll)
-add_cab_target(fusion_winetest 7)
+add_cd_file(TARGET fusion_winetest DESTINATION reactos/bin FOR all)

winetests/gdi32/CMakeLists.txt

@@ -22,4 +22,4 @@ list(APPEND SOURCE
 add_executable(gdi32_winetest ${SOURCE})
 set_module_type(gdi32_winetest win32cui)
 add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(gdi32_winetest 7)
+add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin FOR all)

winetests/gdiplus/CMakeLists.txt

@@ -21,4 +21,4 @@ add_executable(gdiplus_winetest ${SOURCE})
 target_link_libraries(gdiplus_winetest wine)
 set_module_type(gdiplus_winetest win32cui)
 add_importlibs(gdiplus_winetest gdiplus user32 gdi32 ole32 msvcrt kernel32 ntdll)
-add_cab_target(gdiplus_winetest 7)
+add_cd_file(TARGET gdiplus_winetest DESTINATION reactos/bin FOR all)

winetests/hlink/CMakeLists.txt

@@ -12,4 +12,4 @@ add_executable(hlink_winetest ${SOURCE})
 target_link_libraries(hlink_winetest wine uuid)
 set_module_type(hlink_winetest win32cui)
 add_importlibs(hlink_winetest hlink ole32 msvcrt kernel32 ntdll)
-add_cab_target(hlink_winetest 7)
+add_cd_file(TARGET hlink_winetest DESTINATION reactos/bin FOR all)

winetests/icmp/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(icmp_winetest icmp.c testlist.c)
 target_link_libraries(icmp_winetest wine uuid)
 set_module_type(icmp_winetest win32cui)
 add_importlibs(icmp_winetest icmp msvcrt kernel32 ntdll)
-add_cab_target(icmp_winetest 7)
+add_cd_file(TARGET icmp_winetest DESTINATION reactos/bin FOR all)

winetests/imagehlp/CMakeLists.txt

@@ -0,0 +1,15 @@
+
+add_definitions(
+    -D__ROS_LONG64__
+    -D_DLL -D__USE_CRTIMP)
+
+list(APPEND SOURCE
+    image.c
+    integrity.c
+    testlist.c)
+
+add_executable(imagehlp_winetest ${SOURCE})
+target_link_libraries(imagehlp_winetest wine uuid)
+set_module_type(imagehlp_winetest win32cui)
+add_importlibs(imagehlp_winetest advapi32 msvcrt kernel32 ntdll)
+add_cd_file(TARGET imagehlp_winetest DESTINATION reactos/bin FOR all)

winetests/imm32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(imm32_winetest imm32.c testlist.c)
 target_link_libraries(imm32_winetest wine)
 set_module_type(imm32_winetest win32cui)
 add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32 ntdll)
-add_cab_target(imm32_winetest 7)
+add_cd_file(TARGET imm32_winetest DESTINATION reactos/bin FOR all)

winetests/inetcomm/CMakeLists.txt

@@ -12,4 +12,4 @@ add_executable(inetcomm_winetest ${SOURCE})
 target_link_libraries(inetcomm_winetest wine)
 set_module_type(inetcomm_winetest win32cui)
 add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32 ntdll)
-add_cab_target(inetcomm_winetest 7)
+add_cd_file(TARGET inetcomm_winetest DESTINATION reactos/bin FOR all)

winetests/inetmib1/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(inetmib1_winetest main.c testlist.c)
 target_link_libraries(inetmib1_winetest wine)
 set_module_type(inetmib1_winetest win32cui)
 add_importlibs(inetmib1_winetest snmpapi msvcrt kernel32 ntdll)
-add_cab_target(inetmib1_winetest 7)
+add_cd_file(TARGET inetmib1_winetest DESTINATION reactos/bin FOR all)

winetests/iphlpapi/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(iphlpapi_winetest iphlpapi.c testlist.c)
 target_link_libraries(iphlpapi_winetest wine)
 set_module_type(iphlpapi_winetest win32cui)
 add_importlibs(iphlpapi_winetest msvcrt kernel32 ntdll)
-add_cab_target(iphlpapi_winetest 7)
+add_cd_file(TARGET iphlpapi_winetest DESTINATION reactos/bin FOR all)

winetests/itss/CMakeLists.txt

@@ -9,4 +9,4 @@ add_executable(itss_winetest protocol.c testlist.c rsrc.rc)
 target_link_libraries(itss_winetest wine)
 set_module_type(itss_winetest win32cui)
 add_importlibs(itss_winetest ole32 msvcrt kernel32 ntdll)
-add_cab_target(itss_winetest 7)
+add_cd_file(TARGET itss_winetest DESTINATION reactos/bin FOR all)

winetests/jscript/CMakeLists.txt

@@ -16,4 +16,4 @@ add_executable(jscript_winetest ${SOURCE})
 target_link_libraries(jscript_winetest wine)
 set_module_type(jscript_winetest win32cui)
 add_importlibs(jscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(jscript_winetest 7)
+add_cd_file(TARGET jscript_winetest DESTINATION reactos/bin FOR all)

winetests/kernel32/CMakeLists.txt

@@ -49,4 +49,4 @@ target_link_libraries(kernel32_winetest wine)
 set_module_type(kernel32_winetest win32cui)
 add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll)
 
-add_cab_target(kernel32_winetest 7)
+add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)

winetests/localspl/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(localspl_winetest localmon.c testlist.c)
 target_link_libraries(localspl_winetest wine)
 set_module_type(localspl_winetest win32cui)
 add_importlibs(localspl_winetest advapi32 msvcrt kernel32 ntdll)
-add_cab_target(localspl_winetest 7)
+add_cd_file(TARGET localspl_winetest DESTINATION reactos/bin FOR all)

winetests/localui/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(localui_winetest localui.c testlist.c)
 target_link_libraries(localui_winetest wine)
 set_module_type(localui_winetest win32cui)
 add_importlibs(localui_winetest winspool msvcrt kernel32 ntdll)
-add_cab_target(localui_winetest 7)
+add_cd_file(TARGET localui_winetest DESTINATION reactos/bin FOR all)

winetests/lz32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(lz32_winetest lzexpand_main.c testlist.c)
 target_link_libraries(lz32_winetest wine)
 set_module_type(lz32_winetest win32cui)
 add_importlibs(lz32_winetest lz32 msvcrt kernel32 ntdll)
-add_cab_target(lz32_winetest 7)
+add_cd_file(TARGET lz32_winetest DESTINATION reactos/bin FOR all)

winetests/mapi32/CMakeLists.txt

@@ -13,4 +13,4 @@ add_executable(mapi32_winetest ${SOURCE})
 target_link_libraries(mapi32_winetest wine uuid)
 set_module_type(mapi32_winetest win32cui)
 add_importlibs(mapi32_winetest advapi32 msvcrt kernel32 ntdll)
-add_cab_target(mapi32_winetest 7)
+add_cd_file(TARGET mapi32_winetest DESTINATION reactos/bin FOR all)

winetests/mlang/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(mlang_winetest mlang.c testlist.c)
 target_link_libraries(mlang_winetest wine uuid)
 set_module_type(mlang_winetest win32cui)
 add_importlibs(mlang_winetest oleaut32 ole32 gdi32 msvcrt kernel32 ntdll)
-add_cab_target(mlang_winetest 7)
+add_cd_file(TARGET mlang_winetest DESTINATION reactos/bin FOR all)

winetests/msacm32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(msacm32_winetest msacm.c testlist.c)
 target_link_libraries(msacm32_winetest wine)
 set_module_type(msacm32_winetest win32cui)
 add_importlibs(msacm32_winetest msacm32 msvcrt kernel32 ntdll)
-add_cab_target(msacm32_winetest 7)
+add_cd_file(TARGET msacm32_winetest DESTINATION reactos/bin FOR all)

winetests/mscms/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(mscms_winetest profile.c testlist.c)
 target_link_libraries(mscms_winetest wine)
 set_module_type(mscms_winetest win32cui)
 add_importlibs(mscms_winetest advapi32 msvcrt kernel32 ntdll)
-add_cab_target(mscms_winetest 7)
+add_cd_file(TARGET mscms_winetest DESTINATION reactos/bin FOR all)

winetests/msctf/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(msctf_winetest inputprocessor.c testlist.c)
 target_link_libraries(msctf_winetest wine)
 set_module_type(msctf_winetest win32cui)
 add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll)
-add_cab_target(msctf_winetest 7)
+add_cd_file(TARGET msctf_winetest DESTINATION reactos/bin FOR all)

winetests/mshtml/CMakeLists.txt

@@ -20,4 +20,4 @@ add_executable(mshtml_winetest ${SOURCE})
 target_link_libraries(mshtml_winetest wine uuid strmiids)
 set_module_type(mshtml_winetest win32cui)
 add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32 ntdll)
-add_cab_target(mshtml_winetest 7)
+add_cd_file(TARGET mshtml_winetest DESTINATION reactos/bin FOR all)

winetests/msi/CMakeLists.txt

@@ -20,4 +20,4 @@ add_executable(msi_winetest ${SOURCE})
 target_link_libraries(msi_winetest wine uuid)
 set_module_type(msi_winetest win32cui)
 add_importlibs(msi_winetest cabinet msi shell32 ole32 oleaut32 user32 advapi32 version msvcrt kernel32 ntdll)
-add_cab_target(msi_winetest 7)
+add_cd_file(TARGET msi_winetest DESTINATION reactos/bin FOR all)

winetests/mstask/CMakeLists.txt

@@ -13,4 +13,4 @@ add_executable(mstask_winetest ${SOURCE})
 target_link_libraries(mstask_winetest wine)
 set_module_type(mstask_winetest win32cui)
 add_importlibs(mstask_winetest ole32 msvcrt kernel32 ntdll)
-add_cab_target(mstask_winetest 7)
+add_cd_file(TARGET mstask_winetest DESTINATION reactos/bin FOR all)

winetests/msvcrt/CMakeLists.txt

@@ -24,4 +24,4 @@ list(APPEND SOURCE
 add_executable(msvcrt_winetest ${SOURCE})
 set_module_type(msvcrt_winetest win32cui)
 add_importlibs(msvcrt_winetest msvcrt kernel32 ntdll)
-add_cab_target(msvcrt_winetest 7)
+add_cd_file(TARGET msvcrt_winetest DESTINATION reactos/bin FOR all)

winetests/msvcrtd/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(msvcrtd_winetest debug.c testlist.c)
 target_link_libraries(msvcrtd_winetest wine)
 set_module_type(msvcrtd_winetest win32cui)
 add_importlibs(msvcrtd_winetest msvcrt kernel32 ntdll)
-add_cab_target(msvcrtd_winetest 7)
+add_cd_file(TARGET msvcrtd_winetest DESTINATION reactos/bin FOR all)

winetests/msvfw32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(msvfw32_winetest msvfw.c testlist.c)
 target_link_libraries(msvfw32_winetest wine)
 set_module_type(msvfw32_winetest win32cui)
 add_importlibs(msvfw32_winetest msvfw32 msvcrt kernel32 ntdll)
-add_cab_target(msvfw32_winetest 7)
+add_cd_file(TARGET msvfw32_winetest DESTINATION reactos/bin FOR all)

winetests/msxml3/CMakeLists.txt

@@ -15,4 +15,4 @@ add_executable(msxml3_winetest ${SOURCE})
 target_link_libraries(msxml3_winetest wine)
 set_module_type(msxml3_winetest win32cui)
 add_importlibs(msxml3_winetest user32 ole32 oleaut32 msvcrt kernel32 ntdll)
-add_cab_target(msxml3_winetest 7)
+add_cd_file(TARGET msxml3_winetest DESTINATION reactos/bin FOR all)

winetests/netapi32/CMakeLists.txt

@@ -14,4 +14,4 @@ add_executable(netapi32_winetest ${SOURCE})
 target_link_libraries(netapi32_winetest wine)
 set_module_type(netapi32_winetest win32cui)
 add_importlibs(netapi32_winetest advapi32 msvcrt kernel32 ntdll)
-add_cab_target(netapi32_winetest 7)
+add_cd_file(TARGET netapi32_winetest DESTINATION reactos/bin FOR all)

winetests/ntdll/CMakeLists.txt

@@ -28,4 +28,4 @@ list(APPEND SOURCE
 add_executable(ntdll_winetest ${SOURCE})
 set_module_type(ntdll_winetest win32cui)
 add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll)
-add_cab_target(ntdll_winetest 7)
+add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all)

winetests/ntdsapi/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(ntdsapi_winetest ntdsapi.c testlist.c)
 target_link_libraries(ntdsapi_winetest wine)
 set_module_type(ntdsapi_winetest win32cui)
 add_importlibs(ntdsapi_winetest ntdsapi msvcrt kernel32 ntdll)
-add_cab_target(ntdsapi_winetest 7)
+add_cd_file(TARGET ntdsapi_winetest DESTINATION reactos/bin FOR all)

winetests/ntprint/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(ntprint_winetest ntprint.c testlist.c)
 target_link_libraries(ntprint_winetest wine)
 set_module_type(ntprint_winetest win32cui)
 add_importlibs(ntprint_winetest msvcrt kernel32 ntdll)
-add_cab_target(ntprint_winetest 7)
+add_cd_file(TARGET ntprint_winetest DESTINATION reactos/bin FOR all)

winetests/odbccp32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(odbccp32_winetest misc.c testlist.c)
 target_link_libraries(odbccp32_winetest wine)
 set_module_type(odbccp32_winetest win32cui)
 add_importlibs(odbccp32_winetest odbccp32 msvcrt kernel32 ntdll)
-add_cab_target(odbccp32_winetest 7)
+add_cd_file(TARGET odbccp32_winetest DESTINATION reactos/bin FOR all)

winetests/ole32/CMakeLists.txt

@@ -23,4 +23,4 @@ add_executable(ole32_winetest ${SOURCE})
 target_link_libraries(ole32_winetest wine uuid)
 set_module_type(ole32_winetest win32cui)
 add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(ole32_winetest 7)
+add_cd_file(TARGET ole32_winetest DESTINATION reactos/bin FOR all)

winetests/oleacc/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(oleacc_winetest main.c testlist.c)
 target_link_libraries(oleacc_winetest wine)
 set_module_type(oleacc_winetest win32cui)
 add_importlibs(oleacc_winetest oleacc msvcrt kernel32 ntdll)
-add_cab_target(oleacc_winetest 7)
+add_cd_file(TARGET oleacc_winetest DESTINATION reactos/bin FOR all)

winetests/oleaut32/CMakeLists.txt

@@ -31,4 +31,4 @@ target_link_libraries(oleaut32_winetest uuid wine)
 set_module_type(oleaut32_winetest win32cui)
 add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
 add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders)
-add_cab_target(oleaut32_winetest 7)
+add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all)

winetests/opengl32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(opengl32_winetest opengl.c testlist.c)
 target_link_libraries(opengl32_winetest wine)
 set_module_type(opengl32_winetest win32cui)
 add_importlibs(opengl32_winetest opengl32 gdi32 user32 msvcrt kernel32 ntdll)
-add_cab_target(opengl32_winetest 7)
+add_cd_file(TARGET opengl32_winetest DESTINATION reactos/bin FOR all)

winetests/pdh/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(pdh_winetest pdh.c testlist.c)
 target_link_libraries(pdh_winetest wine)
 set_module_type(pdh_winetest win32cui)
 add_importlibs(pdh_winetest pdh msvcrt kernel32 ntdll)
-add_cab_target(pdh_winetest 7)
+add_cd_file(TARGET pdh_winetest DESTINATION reactos/bin FOR all)

winetests/powrprof/CMakeLists.txt

@@ -7,4 +7,4 @@ add_definitions(
 add_executable(powrprof_winetest pwrprof.c testlist.c)
 set_module_type(powrprof_winetest win32cui)
 add_importlibs(powrprof_winetest advapi32 powrprof msvcrt kernel32 ntdll)
-add_cab_target(powrprof_winetest 7)
+add_cd_file(TARGET powrprof_winetest DESTINATION reactos/bin FOR all)

winetests/psapi/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(psapi_winetest psapi_main.c testlist.c)
 target_link_libraries(psapi_winetest wine)
 set_module_type(psapi_winetest win32cui)
 add_importlibs(psapi_winetest psapi msvcrt kernel32 ntdll)
-add_cab_target(psapi_winetest 7)
+add_cd_file(TARGET psapi_winetest DESTINATION reactos/bin FOR all)

winetests/qmgr/CMakeLists.txt

@@ -15,4 +15,4 @@ add_executable(qmgr_winetest ${SOURCE})
 target_link_libraries(qmgr_winetest wine)
 set_module_type(qmgr_winetest win32cui)
 add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32 ntdll)
-add_cab_target(qmgr_winetest 7)
+add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin FOR all)

winetests/quartz/CMakeLists.txt

@@ -18,4 +18,4 @@ add_executable(quartz_winetest ${SOURCE})
 target_link_libraries(quartz_winetest wine)
 set_module_type(quartz_winetest win32cui)
 add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(quartz_winetest 7)
+add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all)

winetests/rasapi32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(rasapi32_winetest rasapi.c testlist.c)
 target_link_libraries(rasapi32_winetest wine)
 set_module_type(rasapi32_winetest win32cui)
 add_importlibs(rasapi32_winetest msvcrt kernel32 ntdll)
-add_cab_target(rasapi32_winetest 7)
+add_cd_file(TARGET rasapi32_winetest DESTINATION reactos/bin FOR all)

winetests/riched20/CMakeLists.txt

@@ -13,4 +13,4 @@ add_executable(riched20_winetest ${SOURCE})
 target_link_libraries(riched20_winetest wine uuid)
 set_module_type(riched20_winetest win32cui)
 add_importlibs(riched20_winetest ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll)
-add_cab_target(riched20_winetest 7)
+add_cd_file(TARGET riched20_winetest DESTINATION reactos/bin FOR all)

winetests/riched32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(riched32_winetest editor.c testlist.c)
 target_link_libraries(riched32_winetest wine)
 set_module_type(riched32_winetest win32cui)
 add_importlibs(riched32_winetest ole32 user32 msvcrt kernel32 ntdll)
-add_cab_target(riched32_winetest 7)
+add_cd_file(TARGET riched32_winetest DESTINATION reactos/bin FOR all)

winetests/rpcrt4/CMakeLists.txt

@@ -27,4 +27,4 @@ target_link_libraries(rpcrt4_winetest
 
 set_module_type(rpcrt4_winetest win32cui)
 add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll)
-add_cab_target(rpcrt4_winetest 7)
+add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all)

winetests/rsabase/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(rsabase_winetest rsabase.c testlist.c)
 target_link_libraries(rsabase_winetest wine)
 set_module_type(rsabase_winetest win32cui)
 add_importlibs(rsabase_winetest advapi32 msvcrt kernel32 ntdll)
-add_cab_target(rsabase_winetest 7)
+add_cd_file(TARGET rsabase_winetest DESTINATION reactos/bin FOR all)

winetests/rsaenh/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(rsaenh_winetest rsaenh.c testlist.c)
 target_link_libraries(rsaenh_winetest wine)
 set_module_type(rsaenh_winetest win32cui)
 add_importlibs(rsaenh_winetest advapi32 msvcrt kernel32 ntdll)
-add_cab_target(rsaenh_winetest 7)
+add_cd_file(TARGET rsaenh_winetest DESTINATION reactos/bin FOR all)

winetests/schannel/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(schannel_winetest main.c testlist.c)
 target_link_libraries(schannel_winetest wine)
 set_module_type(schannel_winetest win32cui)
 add_importlibs(schannel_winetest msvcrt kernel32 ntdll)
-add_cab_target(schannel_winetest 7)
+add_cd_file(TARGET schannel_winetest DESTINATION reactos/bin FOR all)

winetests/secur32/CMakeLists.txt

@@ -14,4 +14,4 @@ add_executable(secur32_winetest ${SOURCE})
 target_link_libraries(secur32_winetest wine)
 set_module_type(secur32_winetest win32cui)
 add_importlibs(secur32_winetest advapi32 msvcrt kernel32 ntdll)
-add_cab_target(secur32_winetest 7)
+add_cd_file(TARGET secur32_winetest DESTINATION reactos/bin FOR all)

winetests/serialui/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(serialui_winetest confdlg.c testlist.c)
 target_link_libraries(serialui_winetest wine)
 set_module_type(serialui_winetest win32cui)
 add_importlibs(serialui_winetest msvcrt kernel32 ntdll)
-add_cab_target(serialui_winetest 7)
+add_cd_file(TARGET serialui_winetest DESTINATION reactos/bin FOR all)

winetests/setupapi/CMakeLists.txt

@@ -18,4 +18,4 @@ add_executable(setupapi_winetest ${SOURCE})
 target_link_libraries(setupapi_winetest wine)
 set_module_type(setupapi_winetest win32cui)
 add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll)
-add_cab_target(setupapi_winetest 7)
+add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all)

winetests/shdocvw/CMakeLists.txt

@@ -14,4 +14,4 @@ add_executable(shdocvw_winetest ${SOURCE})
 target_link_libraries(shdocvw_winetest wine)
 set_module_type(shdocvw_winetest win32cui)
 add_importlibs(shdocvw_winetest gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(shdocvw_winetest 7)
+add_cd_file(TARGET shdocvw_winetest DESTINATION reactos/bin FOR all)

winetests/shell32/CMakeLists.txt

@@ -27,4 +27,4 @@ add_executable(shell32_winetest ${SOURCE})
 target_link_libraries(shell32_winetest wine uuid)
 set_module_type(shell32_winetest win32cui)
 add_importlibs(shell32_winetest shlwapi gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(shell32_winetest 7)
+add_cd_file(TARGET shell32_winetest DESTINATION reactos/bin FOR all)

winetests/shlwapi/CMakeLists.txt

@@ -21,4 +21,4 @@ add_executable(shlwapi_winetest ${SOURCE})
 target_link_libraries(shlwapi_winetest wine uuid)
 set_module_type(shlwapi_winetest win32cui)
 add_importlibs(shlwapi_winetest shlwapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(shlwapi_winetest 7)
+add_cd_file(TARGET shlwapi_winetest DESTINATION reactos/bin FOR all)

winetests/snmpapi/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(snmpapi_winetest util.c testlist.c)
 target_link_libraries(snmpapi_winetest wine)
 set_module_type(snmpapi_winetest win32cui)
 add_importlibs(snmpapi_winetest snmpapi msvcrt kernel32 ntdll)
-add_cab_target(snmpapi_winetest 7)
+add_cd_file(TARGET snmpapi_winetest DESTINATION reactos/bin FOR all)

winetests/spoolss/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(spoolss_winetest spoolss.c testlist.c)
 target_link_libraries(spoolss_winetest wine)
 set_module_type(spoolss_winetest win32cui)
 add_importlibs(spoolss_winetest msvcrt kernel32 ntdll)
-add_cab_target(spoolss_winetest 7)
+add_cd_file(TARGET spoolss_winetest DESTINATION reactos/bin FOR all)

winetests/twain_32/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(twain_32_winetest dsm.c testlist.c)
 target_link_libraries(twain_32_winetest wine)
 set_module_type(twain_32_winetest win32cui)
 add_importlibs(twain_32_winetest user32 gdi32 msvcrt kernel32 ntdll)
-add_cab_target(twain_32_winetest 7)
+add_cd_file(TARGET twain_32_winetest DESTINATION reactos/bin FOR all)

winetests/urlmon/CMakeLists.txt

@@ -17,4 +17,4 @@ add_executable(urlmon_winetest ${SOURCE})
 target_link_libraries(urlmon_winetest wine uuid)
 set_module_type(urlmon_winetest win32cui)
 add_importlibs(urlmon_winetest urlmon ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
-add_cab_target(urlmon_winetest 7)
+add_cd_file(TARGET urlmon_winetest DESTINATION reactos/bin FOR all)

winetests/urlmon/misc.c

@@ -74,7 +74,10 @@ static HRESULT (WINAPI *pFindMimeFromData)(LPBC, LPCWSTR, LPVOID, DWORD, LPCWSTR
 static HRESULT (WINAPI *pObtainUserAgentString)(DWORD, LPSTR, DWORD*);
 static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*);
 static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, DWORD);
-
+static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD);
+static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD);
+static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL);
+static HRESULT (WINAPI *pIEInstallScope)(DWORD*);
 
 static void test_CreateFormatEnum(void)
 {
@@ -270,7 +273,8 @@ static const WCHAR url9[] =
      '/','s','i','t','e','/','a','b','o','u','t',0};
 static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e',
         '.','j','p','g',0};
-
+static const WCHAR url11[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','*','.',
+        'c','o','m',0};
 static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e',
         '.','j','p','g',0};
 
@@ -282,10 +286,13 @@ static const WCHAR wszFile[] = {'f','i','l','e',0};
 static const WCHAR wszHttp[] = {'h','t','t','p',0};
 static const WCHAR wszAbout[] = {'a','b','o','u','t',0};
 static const WCHAR wszEmpty[] = {0};
+static const WCHAR wszGoogle[] = {'g','o','o','g','l','e','.','*','.','c','o','m',0};
 
 static const WCHAR wszWineHQ[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0};
 static const WCHAR wszHttpWineHQ[] = {'h','t','t','p',':','/','/','w','w','w','.',
     'w','i','n','e','h','q','.','o','r','g',0};
+static const WCHAR wszHttpGoogle[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e',
+    '.','*','.','c','o','m',0};
 
 struct parse_test {
     LPCWSTR url;
@@ -307,6 +314,7 @@ static const struct parse_test parse_tests[] = {
     {url4, E_FAIL, url4e, S_OK, path4,        wszFile, wszEmpty, S_OK, NULL, E_FAIL},
     {url5, E_FAIL, url5,  E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK, wszHttpWineHQ, S_OK},
     {url6, S_OK,   url6,  E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL, NULL, E_FAIL},
+    {url11, E_FAIL, url11, E_INVALIDARG,        NULL, wszHttp, wszGoogle, S_OK, wszHttpGoogle, S_OK}
 };
 
 static void test_CoInternetParseUrl(void)
@@ -317,10 +325,6 @@ static void test_CoInternetParseUrl(void)
 
     static WCHAR buf[4096];
 
-    if (!pCoInternetParseUrl) {
-        return;
-    }
-
     memset(buf, 0xf0, sizeof(buf));
     hres = pCoInternetParseUrl(parse_tests[0].url, PARSE_SCHEMA, 0, buf,
             3, &size, 0);
@@ -380,10 +384,6 @@ static void test_CoInternetCompareUrl(void)
 {
     HRESULT hres;
 
-    if (!pCoInternetCompareUrl) {
-        return;
-    }
-
     hres = pCoInternetCompareUrl(url1, url1, 0);
     ok(hres == S_OK, "CoInternetCompareUrl failed: %08x\n", hres);
 
@@ -414,10 +414,6 @@ static void test_CoInternetQueryInfo(void)
     DWORD cb, i;
     HRESULT hres;
 
-    if (!pCoInternetQueryInfo) {
-        return;
-    }
-
     for(i=0; i < sizeof(query_info_tests)/sizeof(query_info_tests[0]); i++) {
         cb = 0xdeadbeef;
         memset(buf, '?', sizeof(buf));
@@ -665,10 +661,6 @@ static void test_FindMimeFromData(void)
     LPWSTR mime;
     int i;
 
-    if (!pFindMimeFromData) {
-        return;
-    }
-
     for(i=0; i<sizeof(mime_tests)/sizeof(mime_tests[0]); i++) {
         mime = (LPWSTR)0xf0f0f0f0;
         hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0);
@@ -770,10 +762,6 @@ static void register_protocols(void)
 
     static const WCHAR wszAbout[] = {'a','b','o','u','t',0};
 
-    if (!pCoInternetGetSession) {
-        return;
-    }
-
     hres = pCoInternetGetSession(0, &session, 0);
     ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres);
     if(FAILED(hres))
@@ -947,10 +935,6 @@ static void test_NameSpace(void)
 
     static const WCHAR wszTest[] = {'t','e','s','t',0};
 
-    if (!pCoInternetGetSession || !pCoInternetParseUrl) {
-        return;
-    }
-
     hres = pCoInternetGetSession(0, &session, 0);
     ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres);
     if(FAILED(hres))
@@ -1105,10 +1089,6 @@ static void test_MimeFilter(void)
 
     static const WCHAR mimeW[] = {'t','e','s','t','/','m','i','m','e',0};
 
-    if (!pCoInternetGetSession) {
-        return;
-    }
-
     hres = pCoInternetGetSession(0, &session, 0);
     ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres);
     if(FAILED(hres))
@@ -1146,10 +1126,6 @@ static void test_ReleaseBindInfo(void)
     BINDINFO bi;
     IUnknown unk = { &unk_vtbl };
 
-    if (!pReleaseBindInfo) {
-        return;
-    }
-
     pReleaseBindInfo(NULL); /* shouldn't crash */
 
     memset(&bi, 0, sizeof(bi));
@@ -1183,11 +1159,6 @@ static void test_CopyStgMedium(void)
 
     static WCHAR fileW[] = {'f','i','l','e',0};
 
-    if (!pCopyStgMedium) {
-        return;
-    }
-
-
     memset(&src, 0xf0, sizeof(src));
     memset(&dst, 0xe0, sizeof(dst));
     memset(&empty, 0xf0, sizeof(empty));
@@ -1219,6 +1190,7 @@ static void test_CopyStgMedium(void)
     ok(dst.u.lpszFileName && dst.u.lpszFileName != fileW, "lpszFileName=%p\n", dst.u.lpszFileName);
     ok(!lstrcmpW(dst.u.lpszFileName, fileW), "wrong file name\n");
     ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease);
+    ReleaseStgMedium(&dst);
 
     hres = pCopyStgMedium(&src, NULL);
     ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres);
@@ -1231,11 +1203,6 @@ static void test_UrlMkGetSessionOption(void)
     DWORD encoding, size;
     HRESULT hres;
 
-
-    if (!pUrlMkGetSessionOption) {
-        return;
-    }
-
     size = encoding = 0xdeadbeef;
     hres = pUrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
                                  sizeof(encoding), &size, 0);
@@ -1281,10 +1248,6 @@ static void test_user_agent(void)
     HRESULT hres;
     DWORD size, saved;
 
-    if (!pObtainUserAgentString || !pUrlMkGetSessionOption) {
-        return;
-    }
-
     hres = pObtainUserAgentString(0, NULL, NULL);
     ok(hres == E_INVALIDARG, "ObtainUserAgentString failed: %08x\n", hres);
 
@@ -1498,17 +1461,247 @@ static void test_MkParseDisplayNameEx(void)
 static void test_IsValidURL(void)
 {
     HRESULT hr;
+    IBindCtx *bctx = NULL;
 
     hr = IsValidURL(NULL, 0, 0);
     ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
+
+    hr = IsValidURL(NULL, wszHttpWineHQ, 0);
+    ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+
+    CreateBindCtx(0, &bctx);
+
+    hr = IsValidURL(bctx, wszHttpWineHQ, 0);
+    ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+
+    IBindCtx_Release(bctx);
+}
+
+static const struct {
+    INTERNETFEATURELIST feature;
+    DWORD               get_flags;
+    HRESULT             expected;
+    BOOL                todo;
+} default_feature_tests[] = {
+    {FEATURE_OBJECT_CACHING,GET_FEATURE_FROM_PROCESS,S_OK},
+    {FEATURE_ZONE_ELEVATION,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_MIME_HANDLING,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_MIME_SNIFFING,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_WINDOW_RESTRICTIONS,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_WEBOC_POPUPMANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_BEHAVIORS,GET_FEATURE_FROM_PROCESS,S_OK},
+    {FEATURE_DISABLE_MK_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_OK},
+    {FEATURE_LOCALMACHINE_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_SECURITYBAND,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_RESTRICT_ACTIVEXINSTALL,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_VALIDATE_NAVIGATE_URL,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_RESTRICT_FILEDOWNLOAD,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_ADDON_MANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_PROTOCOL_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_HTTP_USERNAME_PASSWORD_DISABLE,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_SAFE_BINDTOOBJECT,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_UNC_SAVEDFILECHECK,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_GET_URL_DOM_FILEPATH_UNENCODED,GET_FEATURE_FROM_PROCESS,S_OK},
+    {FEATURE_TABBED_BROWSING,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_SSLUX,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_DISABLE_NAVIGATION_SOUNDS,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_DISABLE_LEGACY_COMPRESSION,GET_FEATURE_FROM_PROCESS,S_OK},
+    {FEATURE_FORCE_ADDR_AND_STATUS,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_XMLHTTP,GET_FEATURE_FROM_PROCESS,S_OK},
+    {FEATURE_DISABLE_TELNET_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_FEEDS,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_BLOCK_INPUT_PROMPTS,GET_FEATURE_FROM_PROCESS,S_FALSE}
+};
+
+static void test_internet_feature_defaults(void) {
+    HRESULT hres;
+    DWORD i;
+
+    for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) {
+        hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags);
+        if(default_feature_tests[i].todo) {
+            todo_wine
+            ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
+                hres, default_feature_tests[i].expected, i);
+        } else {
+            ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
+                hres, default_feature_tests[i].expected, i);
+        }
+    }
+}
+
+/* With older versions of IE (IE 7 and earlier), urlmon caches
+ * the FeatureControl values from the registry when it's loaded
+ * into memory. Newer versions of IE conditionally cache the
+ * the FeatureControl registry values (i.e. When a call to
+ * CoInternetIsFeatureEnabled and a corresponding CoInternetSetFeatureEnabled
+ * call hasn't already been made for the specified Feature). Because of
+ * this we skip these tests on IE 7 and earlier.
+ */
+static void test_internet_features_registry(void) {
+    HRESULT hres;
+    DWORD res;
+    char module[MAX_PATH];
+    char *name;
+    HKEY feature_control;
+    HKEY feature;
+    DWORD value;
+    BOOL delete_feature_key = TRUE;
+    BOOL delete_feature_control_key = FALSE;
+
+    static const char* szFeatureControlKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl";
+    static const char* szFeatureBehaviorsKey = "FEATURE_BEHAVIORS";
+    static const char* szFeatureZoneElevationKey = "FEATURE_ZONE_ELEVATION";
+
+    if(!pIEInstallScope) {
+        win_skip("Skipping internet feature registry tests, IE is too old...\n");
+        return;
+    }
+
+    res = GetModuleFileNameA(NULL, module, sizeof(module));
+    ok(res, "GetModuleFileName failed: %d\n", GetLastError());
+
+    name = strrchr(module, '\\')+1;
+
+    /* Some Windows machines don't have a FeatureControl key in HKCU. */
+    res = RegOpenKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control);
+    if(res != ERROR_SUCCESS) {
+        res = RegCreateKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control);
+        ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res);
+        delete_feature_control_key = TRUE;
+    }
+
+    res = RegOpenKeyA(feature_control, szFeatureBehaviorsKey, &feature);
+    if(res == ERROR_SUCCESS)
+        /* FEATURE_BEHAVIORS already existed, so don't delete it when we're done. */
+        delete_feature_key = FALSE;
+    else {
+        res = RegCreateKeyA(feature_control, szFeatureBehaviorsKey, &feature);
+        ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res);
+    }
+
+    value = 0;
+    res = RegSetValueExA(feature, name, 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD));
+    ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res);
+
+    hres = pCoInternetIsFeatureEnabled(FEATURE_BEHAVIORS, GET_FEATURE_FROM_PROCESS);
+    ok(hres == S_FALSE, "CoInternetIsFeatureEnabled returned %08x, expected S_FALSE\n", hres);
+
+    if(delete_feature_key) {
+        RegCloseKey(feature);
+        RegDeleteKeyA(feature_control, szFeatureBehaviorsKey);
+    } else {
+        RegDeleteValue(feature, name);
+        RegCloseKey(feature);
+    }
+
+    /* IE's feature control cached the value it got from the registry earlier. */
+    hres = pCoInternetIsFeatureEnabled(FEATURE_BEHAVIORS, GET_FEATURE_FROM_PROCESS);
+    ok(hres == S_FALSE, "CoInternetIsFeatureEnabled returned %08x, expected S_FALSE\n", hres);
+
+    /* Restore this feature back to its default value. */
+    hres = pCoInternetSetFeatureEnabled(FEATURE_BEHAVIORS, SET_FEATURE_ON_PROCESS, TRUE);
+    ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres);
+
+    RegCloseKey(feature_control);
+    if(delete_feature_control_key)
+        RegDeleteKeyA(HKEY_CURRENT_USER, szFeatureControlKey);
+
+    res = RegOpenKeyA(HKEY_LOCAL_MACHINE, szFeatureControlKey, &feature_control);
+    ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res);
+
+    res = RegOpenKeyA(feature_control, szFeatureZoneElevationKey, &feature);
+    ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res);
+
+    value = 1;
+    res = RegSetValueExA(feature, "*", 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD));
+    ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res);
+
+    hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS);
+    ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres);
+
+    RegDeleteValueA(feature, "*");
+    RegCloseKey(feature);
+    RegCloseKey(feature_control);
+
+    /* Value is still cached from last time. */
+    hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS);
+    ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres);
+
+    hres = pCoInternetSetFeatureEnabled(FEATURE_ZONE_ELEVATION, SET_FEATURE_ON_PROCESS, FALSE);
+    ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres);
+
+    test_internet_feature_defaults();
+}
+
+static void test_CoInternetIsFeatureEnabled(void) {
+    HRESULT hres;
+
+    hres = pCoInternetIsFeatureEnabled(FEATURE_ENTRY_COUNT, GET_FEATURE_FROM_PROCESS);
+    ok(hres == E_FAIL, "CoInternetIsFeatureEnabled returned %08x, expected E_FAIL\n", hres);
+}
+
+static const struct {
+    INTERNETFEATURELIST feature;
+    DWORD               set_flags;
+    BOOL                enable;
+    HRESULT             set_expected;
+    BOOL                set_todo;
+    DWORD               get_flags;
+    HRESULT             get_expected;
+    BOOL                get_todo;
+} internet_feature_tests[] = {
+    {FEATURE_OBJECT_CACHING,SET_FEATURE_ON_PROCESS,FALSE,S_OK,FALSE,GET_FEATURE_FROM_PROCESS,S_FALSE},
+    {FEATURE_WEBOC_POPUPMANAGEMENT,SET_FEATURE_ON_PROCESS,TRUE,S_OK,FALSE,GET_FEATURE_FROM_PROCESS,S_OK},
+    {FEATURE_LOCALMACHINE_LOCKDOWN,SET_FEATURE_ON_PROCESS,TRUE,S_OK,FALSE,GET_FEATURE_FROM_PROCESS,S_OK}
+};
+
+static void test_CoInternetSetFeatureEnabled(void) {
+    HRESULT hres;
+    DWORD i;
+
+    hres = pCoInternetSetFeatureEnabled(FEATURE_ENTRY_COUNT,SET_FEATURE_ON_PROCESS,TRUE);
+    ok(hres == E_FAIL, "CoInternetSetFeatureEnabled returned %08x, expected E_FAIL\n", hres);
+
+    for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) {
+        hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags,
+                                            internet_feature_tests[i].enable);
+        if(internet_feature_tests[i].set_todo) {
+            todo_wine
+            ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n",
+                hres, internet_feature_tests[i].set_expected, i);
+        } else {
+            ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n",
+                hres, internet_feature_tests[i].set_expected, i);
+        }
+
+        hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags);
+        if(internet_feature_tests[i].get_todo) {
+            todo_wine
+            ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
+                hres, internet_feature_tests[i].get_expected, i);
+        } else {
+            ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
+                hres, internet_feature_tests[i].get_expected, i);
+        }
+    }
+}
+
+static void test_internet_features(void) {
+    if(!pCoInternetIsFeatureEnabled || !pCoInternetSetFeatureEnabled) {
+        win_skip("Skipping internet feature tests, IE is too old\n");
+        return;
+    }
+
+    test_internet_features_registry();
+    test_CoInternetIsFeatureEnabled();
+    test_CoInternetSetFeatureEnabled();
 }
 
 START_TEST(misc)
 {
     HMODULE hurlmon;
 
-    OleInitialize(NULL);
-
     hurlmon = GetModuleHandle("urlmon.dll");
     pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl");
     pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl");
@@ -1520,12 +1713,19 @@ START_TEST(misc)
     pObtainUserAgentString = (void*) GetProcAddress(hurlmon, "ObtainUserAgentString");
     pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo");
     pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption");
+    pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds");
+    pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled");
+    pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled");
+    pIEInstallScope = (void*) GetProcAddress(hurlmon, "IEInstallScope");
 
     if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl ||
-        !pCoInternetGetSession || !pCoInternetParseUrl) {
-        win_skip("Various needed functions not present in IE 4.0\n");
+        !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) {
+        win_skip("Various needed functions not present, too old IE\n");
+        return;
     }
 
+    OleInitialize(NULL);
+
     register_protocols();
 
     test_CreateFormatEnum();
@@ -1542,6 +1742,7 @@ START_TEST(misc)
     test_user_agent();
     test_MkParseDisplayNameEx();
     test_IsValidURL();
+    test_internet_features();
 
     OleUninitialize();
 }