Jacek Caban : atl: Use atlbase.h in tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 65493cf137183635cecdb966800593a004c7a32c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=65493cf137183635cecdb966800593a004c7a32c

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Dec 26 13:49:50 2012 +0100

atl: Use atlbase.h in tests.

---

 dlls/atl/tests/module.c |   87 ++++++++++++-----------------------------------
 1 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c
index 2a97ef9..ffa62ad 100644
--- a/dlls/atl/tests/module.c
+++ b/dlls/atl/tests/module.c
@@ -24,84 +24,41 @@
 
 #define COBJMACROS
 
-#include <wine/test.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <winerror.h>
-#include <winnt.h>
-#include <wtypes.h>
-#include <olectl.h>
-#include <ocidl.h>
-
-struct _ATL_OBJMAP_ENTRYW;
-struct _AtlCreateWndData;
-struct _ATL_TERMFUNC_ELEM;
-
-struct _ATL_MODULEW
-{
-    UINT cbSize;
-    HINSTANCE m_hInst;
-    HINSTANCE m_hInstResource;
-    HINSTANCE m_hInstTypeLib;
-    struct _ATL_OBJMAP_ENTRYW* m_pObjMap;
-    LONG m_nLockCnt;
-    HANDLE m_hHeap;
-    union
-    {
-        CRITICAL_SECTION m_csTypeInfoHolder;
-        CRITICAL_SECTION m_csStaticDataInit;
-    } u;
-    CRITICAL_SECTION m_csWindowCreate;
-    CRITICAL_SECTION m_csObjMap;
-
-    DWORD dwAtlBuildVer;
-    struct _AtlCreateWndData* m_pCreateWndList;
-    BOOL m_bDestroyHeap;
-    GUID* pguidVer;
-    DWORD m_dwHeaps;
-    HANDLE* m_phHeaps;
-    int m_nHeap;
-    struct _ATL_TERMFUNC_ELEM* m_pTermFuncs;
-};
+#include <atlbase.h>
 
-HRESULT WINAPI AtlModuleInit(struct _ATL_MODULEW* pM, struct _ATL_OBJMAP_ENTRYW* p, HINSTANCE h);
+#include <wine/test.h>
 
 #define MAXSIZE 512
 static void test_StructSize(void)
 {
-        struct _ATL_MODULEW  *tst;
-        HRESULT              hres;
-	int i;
+    _ATL_MODULEW *tst;
+    HRESULT hres;
+    int i;
 
-        tst = HeapAlloc (GetProcessHeap(),HEAP_ZERO_MEMORY,MAXSIZE);
+    tst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAXSIZE);
 
-	for (i=0;i<MAXSIZE;i++) {
-		tst->cbSize = i;
-		hres = AtlModuleInit(tst, NULL, NULL);
+    for (i=0;i<MAXSIZE;i++) {
+        tst->cbSize = i;
+        hres = AtlModuleInit(tst, NULL, NULL);
 
-		switch (i)  {
-                case FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer ):
-		case sizeof(struct _ATL_MODULEW):
+        switch (i)  {
+        case FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer):
+        case sizeof(_ATL_MODULEW):
 #ifdef _WIN64
-		case sizeof(struct _ATL_MODULEW) + sizeof(void *):
+        case sizeof(_ATL_MODULEW) + sizeof(void *):
 #endif
-			ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres);
-			break;
-		default:
-			ok (FAILED(hres) ||
-                            broken((i > FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer )) && (hres == S_OK)), /* Win95 */
-                            "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres);
-			break;
-		}
-	}
+            ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres);
+            break;
+        default:
+            ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres);
+            break;
+        }
+    }
 
-        HeapFree (GetProcessHeap(), 0, tst);
+    HeapFree (GetProcessHeap(), 0, tst);
 }
 
 START_TEST(module)
 {
-        test_StructSize();
+    test_StructSize();
 }