Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32_WINETEST] Add a PCH.

Browse source
This commit is contained in:
Amine Khaldi 2017-12-17 13:40:43 +01:00
parent 8ed8eec17c
commit 284a839dbd
30 changed files with 72 additions and 284 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/rostests/winetests/comctl32/CMakeLists.txt
View file

@ -5,7 +5,6 @@ add_definitions(-DUSE_WINE_TODOS)
list(APPEND SOURCE list(APPEND SOURCE
animate.c animate.c
button.c
comboex.c comboex.c
datetime.c datetime.c
dpa.c dpa.c
@ -21,7 +20,6 @@ list(APPEND SOURCE
propsheet.c propsheet.c
rebar.c rebar.c
status.c status.c
subclass.c
syslink.c syslink.c
tab.c tab.c
taskdialog.c taskdialog.c
@ -30,9 +28,14 @@ list(APPEND SOURCE
trackbar.c trackbar.c
treeview.c treeview.c
updown.c updown.c
testlist.c) precomp.h)
add_executable(comctl32_winetest ${SOURCE} rsrc.rc) add_executable(comctl32_winetest
${SOURCE}
button.c
subclass.c
testlist.c
rsrc.rc)
if(USE_CLANG_CL OR (NOT MSVC)) if(USE_CLANG_CL OR (NOT MSVC))
add_target_compile_flags(comctl32_winetest "-Wno-format") add_target_compile_flags(comctl32_winetest "-Wno-format")
@ -40,4 +43,5 @@ endif()
set_module_type(comctl32_winetest win32cui) set_module_type(comctl32_winetest win32cui)
add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32)
add_pch(comctl32_winetest precomp.h SOURCE)
add_rostests_file(TARGET comctl32_winetest) add_rostests_file(TARGET comctl32_winetest)

10
modules/rostests/winetests/comctl32/animate.c
View file

@ -17,15 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h> #include "precomp.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "commctrl.h"
#include "wine/test.h"
#define SEARCHING_AVI_INDEX 151 /* From shell32 resource library */ #define SEARCHING_AVI_INDEX 151 /* From shell32 resource library */
#define INVALID_AVI_INDEX 0xffff #define INVALID_AVI_INDEX 0xffff

8
modules/rostests/winetests/comctl32/button.c
View file

@ -22,15 +22,13 @@
#undef USE_WINE_TODOS #undef USE_WINE_TODOS
//#include <windows.h> #include "wine/test.h"
#include <stdarg.h>
#include <windef.h> #include <assert.h>
#include <winbase.h>
#include <wingdi.h> #include <wingdi.h>
#include <winuser.h> #include <winuser.h>
#include <commctrl.h> #include <commctrl.h>
#include "wine/test.h"
#include "v6util.h" #include "v6util.h"
#include "msg.h" #include "msg.h"

11
modules/rostests/winetests/comctl32/comboex.c
View file

@ -17,16 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <assert.h> #include "precomp.h"
//#include <windows.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
#include <commctrl.h>
//#include "wine/test.h"
#include "msg.h"
#define EDITBOX_SEQ_INDEX 0 #define EDITBOX_SEQ_INDEX 0
#define NUM_MSG_SEQUENCES 1 #define NUM_MSG_SEQUENCES 1

11
modules/rostests/winetests/comctl32/datetime.c
View file

@ -17,16 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include <windows.h> #include "precomp.h"
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
#include <winnls.h>
#include <commctrl.h>
//#include "wine/test.h"
#include "msg.h"
#define expect(EXPECTED, GOT) ok((GOT)==(EXPECTED), "Expected %d, got %ld\n", (EXPECTED), (GOT)) #define expect(EXPECTED, GOT) ok((GOT)==(EXPECTED), "Expected %d, got %ld\n", (EXPECTED), (GOT))

17
modules/rostests/winetests/comctl32/dpa.c
View file

@ -19,22 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
#include <commctrl.h>
#include <objbase.h>
//#include "objidl.h"
#include <wine/test.h>
#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)

19
modules/rostests/winetests/comctl32/header.c
View file

@ -18,24 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
//#include <windows.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
#include <winnls.h>
#include <objbase.h>
#include <commctrl.h>
#include <assert.h>
#include <wine/test.h>
#include "v6util.h"
#include "msg.h"
typedef struct tagEXPECTEDNOTIFY typedef struct tagEXPECTEDNOTIFY
{ {

21
modules/rostests/winetests/comctl32/imagelist.c
View file

@ -21,28 +21,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define CONST_VTABLE
//#include <stdarg.h>
#include <stdio.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <objbase.h>
#include <commctrl.h> /* must be included after objbase.h to get ImageList_Write */
#include <ole2.h> #include <ole2.h>
#include <initguid.h>
#include <commoncontrols.h>
#include <shellapi.h> #include <shellapi.h>
#include <wine/test.h> #include <initguid.h>
#include "v6util.h" #include <commoncontrols.h>
#define IMAGELIST_MAGIC (('L' << 8) | 'I') #define IMAGELIST_MAGIC (('L' << 8) | 'I')

6
modules/rostests/winetests/comctl32/ipaddress.c
View file

@ -17,11 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <windows.h>
#include <winuser.h>
#include <commctrl.h>
#define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got)

11
modules/rostests/winetests/comctl32/listview.c
View file

@ -20,16 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <stdio.h>
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#include "v6util.h"
#include "msg.h"
enum seq_index { enum seq_index {
PARENT_SEQ_INDEX, PARENT_SEQ_INDEX,

9
modules/rostests/winetests/comctl32/misc.c
View file

@ -18,14 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include <stdio.h> #include "precomp.h"
//#include <windows.h>
#include <wine/test.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#include "v6util.h"
static PVOID (WINAPI * pAlloc)(LONG); static PVOID (WINAPI * pAlloc)(LONG);
static PVOID (WINAPI * pReAlloc)(PVOID, LONG); static PVOID (WINAPI * pReAlloc)(PVOID, LONG);

16
modules/rostests/winetests/comctl32/monthcal.c
View file

@ -19,21 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <stdarg.h>
//#include "windef.h"
//#include "winbase.h"
#include <winuser.h>
#include <wingdi.h>
#include <winnls.h>
#include <commctrl.h>
#include "v6util.h"
//#include <assert.h>
//#include <windows.h>
#include "msg.h"
#define expect(expected, got) ok(expected == got, "Expected %d, got %d\n", expected, got); #define expect(expected, got) ok(expected == got, "Expected %d, got %d\n", expected, got);
#define expect_hex(expected, got) ok(expected == got, "Expected %x, got %x\n", expected, got); #define expect_hex(expected, got) ok(expected == got, "Expected %x, got %x\n", expected, got);

12
modules/rostests/winetests/comctl32/mru.c
View file

@ -17,18 +17,8 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h>
#include <windef.h> #include "precomp.h"
#include <winbase.h>
//#include "wingdi.h"
#include <winuser.h>
//#include "winnls.h"
#include <winreg.h>
#include <commctrl.h>
//#include "shlwapi.h"
#include <wine/test.h>
/* Keys for testing MRU functions */ /* Keys for testing MRU functions */
#define REG_TEST_BASEKEYA "Software\\Wine" #define REG_TEST_BASEKEYA "Software\\Wine"

8
modules/rostests/winetests/comctl32/msg.h
View file

@ -18,9 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <assert.h> #pragma once
//#include <windows.h>
#include <wine/test.h>
/* undocumented SWP flags - from SDK 3.1 */ /* undocumented SWP flags - from SDK 3.1 */
#define SWP_NOCLIENTSIZE 0x0800 #define SWP_NOCLIENTSIZE 0x0800
@ -164,7 +162,7 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index,
} }
} }
static void ok_sequence_(struct msg_sequence **seq, int sequence_index, static inline void ok_sequence_(struct msg_sequence **seq, int sequence_index,
const struct message *expected, const char *context, BOOL todo, const struct message *expected, const char *context, BOOL todo,
const char *file, int line) const char *file, int line)
{ {
@ -387,7 +385,7 @@ done:
ok_sequence_(seq, index, (exp), (contx), (todo), __FILE__, __LINE__) ok_sequence_(seq, index, (exp), (contx), (todo), __FILE__, __LINE__)
static void init_msg_sequences(struct msg_sequence **seq, int n) static inline void init_msg_sequences(struct msg_sequence **seq, int n)
{ {
int i; int i;

9
modules/rostests/winetests/comctl32/pager.c
View file

@ -18,14 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#include "msg.h"
#define NUM_MSG_SEQUENCES 1 #define NUM_MSG_SEQUENCES 1
#define PAGER_SEQ_INDEX 0 #define PAGER_SEQ_INDEX 0

25
modules/rostests/winetests/comctl32/precomp.h Normal file
View file

@ -0,0 +1,25 @@
#ifndef _COMCTL32_WINETEST_PRECOMP_H_
#define _COMCTL32_WINETEST_PRECOMP_H_
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define CONST_VTABLE
#include <stdio.h>
#include <wine/test.h>
#include <assert.h>
#include <wingdi.h>
#include <winuser.h>
#include <winnls.h>
#include <winreg.h>
#include <objbase.h>
#include <wine/commctrl.h>
#include "msg.h"
#include "resources.h"
#include "v6util.h"
#endif /* !_COMCTL32_WINETEST_PRECOMP_H_ */

11
modules/rostests/winetests/comctl32/progress.c
View file

@ -17,16 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h> #include "precomp.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "commctrl.h"
#include "wine/test.h"
static HWND hProgressParentWnd, hProgressWnd; static HWND hProgressParentWnd, hProgressWnd;
static const char progressTestClass[] = "ProgressBarTestClass"; static const char progressTestClass[] = "ProgressBarTestClass";

9
modules/rostests/winetests/comctl32/propsheet.c
View file

@ -18,16 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#include <reactos/undocuser.h> #include <reactos/undocuser.h>
#include "msg.h"
#include "resources.h"
static HWND parenthwnd; static HWND parenthwnd;
static HWND sheethwnd; static HWND sheethwnd;

15
modules/rostests/winetests/comctl32/rebar.c
View file

@ -17,20 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/* make sure the structures work with a comctl32 v5.x */ #include "precomp.h"
#define _WIN32_WINNT 0x500
#define _WIN32_IE 0x500
#include <wine/test.h>
#include <assert.h>
//#include <stdarg.h>
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
//#include <uxtheme.h>
static RECT height_change_notify_rect; static RECT height_change_notify_rect;
static HWND hMainWnd; static HWND hMainWnd;

7
modules/rostests/winetests/comctl32/status.c
View file

@ -18,12 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#define SUBCLASS_NAME "MyStatusBar" #define SUBCLASS_NAME "MyStatusBar"

10
modules/rostests/winetests/comctl32/subclass.c
View file

@ -19,17 +19,13 @@
#define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */ #define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */
#include <assert.h> #include "wine/test.h"
#include <stdarg.h>
#include <assert.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "commctrl.h" #include "commctrl.h"
#include "wine/test.h"
static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR);
static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM);

10
modules/rostests/winetests/comctl32/syslink.c
View file

@ -17,15 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#include "v6util.h"
#include "msg.h"
#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
#define NUM_MSG_SEQUENCE 2 #define NUM_MSG_SEQUENCE 2

11
modules/rostests/winetests/comctl32/tab.c
View file

@ -18,16 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
#include <assert.h>
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#include <stdio.h>
#include "msg.h"
#define DEFAULT_MIN_TAB_WIDTH 54 #define DEFAULT_MIN_TAB_WIDTH 54
#define TAB_PADDING_X 6 #define TAB_PADDING_X 6

10
modules/rostests/winetests/comctl32/taskdialog.c
View file

@ -17,15 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h> #include "precomp.h"
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "commctrl.h"
#include "wine/test.h"
#include "v6util.h"
static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *);
static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *,

16
modules/rostests/winetests/comctl32/toolbar.c
View file

@ -18,21 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h> #include "precomp.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winreg.h"
#include "commctrl.h"
#include "resources.h"
#include "wine/test.h"
#include "msg.h"
#define PARENT_SEQ_INDEX 0 #define PARENT_SEQ_INDEX 0
#define NUM_MSG_SEQUENCES 1 #define NUM_MSG_SEQUENCES 1

11
modules/rostests/winetests/comctl32/tooltips.c
View file

@ -17,16 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
#include <assert.h>
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <winnls.h>
#include <commctrl.h>
#include "resources.h"
#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)

10
modules/rostests/winetests/comctl32/trackbar.c
View file

@ -17,15 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#include <stdio.h>
#include "msg.h"
#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
#define NUM_MSG_SEQUENCE 2 #define NUM_MSG_SEQUENCE 2

15
modules/rostests/winetests/comctl32/treeview.c
View file

@ -18,20 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h> #include "precomp.h"
#include <stdio.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winreg.h"
#include "wine/commctrl.h"
#include "wine/test.h"
#include "v6util.h"
#include "msg.h"
static const char *TEST_CALLBACK_TEXT = "callback_text"; static const char *TEST_CALLBACK_TEXT = "callback_text";

10
modules/rostests/winetests/comctl32/updown.c
View file

@ -44,15 +44,7 @@
* - more stuff to test * - more stuff to test
*/ */
#include <wine/test.h> #include "precomp.h"
//#include <windows.h>
#include <wingdi.h>
#include <winuser.h>
#include <commctrl.h>
#include <stdio.h>
#include "msg.h"
#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT))

6
modules/rostests/winetests/comctl32/v6util.h
View file

@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once
#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
#ifdef __i386__ #ifdef __i386__
@ -60,7 +62,7 @@ static const CHAR manifest[] =
"</dependency>\n" "</dependency>\n"
"</assembly>\n"; "</assembly>\n";
static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) static inline void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx)
{ {
HANDLE hKernel32; HANDLE hKernel32;
BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR);
@ -81,7 +83,7 @@ static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx)
DeleteFileA(manifest_name); DeleteFileA(manifest_name);
} }
static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) static inline BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx)
{ {
HANDLE hKernel32; HANDLE hKernel32;
HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*);