Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [WS2_32_APITEST] Improve the existing PCH and make use of it.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b09a63709bc5f5ed4859e… commit b09a63709bc5f5ed4859ec84e84edd79109d3f6a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Dec 21 13:36:04 2017 +0100 [WS2_32_APITEST] Improve the existing PCH and make use of it. --- modules/rostests/apitests/ws2_32/CMakeLists.txt | 5 +++-- modules/rostests/apitests/ws2_32/WSAAsync.c | 6 +----- modules/rostests/apitests/ws2_32/WSAIoctl.c | 6 ++---- modules/rostests/apitests/ws2_32/WSARecv.c | 5 ----- modules/rostests/apitests/ws2_32/WSAStartup.c | 10 +--------- modules/rostests/apitests/ws2_32/bind.c | 11 +---------- modules/rostests/apitests/ws2_32/close.c | 5 ----- modules/rostests/apitests/ws2_32/getaddrinfo.c | 11 +---------- modules/rostests/apitests/ws2_32/getnameinfo.c | 11 +---------- modules/rostests/apitests/ws2_32/getservbyname.c | 10 +--------- modules/rostests/apitests/ws2_32/getservbyport.c | 10 +--------- modules/rostests/apitests/ws2_32/helpers.c | 3 --- modules/rostests/apitests/ws2_32/ioctlsocket.c | 3 --- modules/rostests/apitests/ws2_32/nonblocking.c | 6 +----- modules/rostests/apitests/ws2_32/nostartup.c | 11 +---------- modules/rostests/apitests/ws2_32/recv.c | 9 ++++----- modules/rostests/apitests/ws2_32/send.c | 7 +------ modules/rostests/apitests/ws2_32/ws2_32.h | 11 +++++++++-- 18 files changed, 28 insertions(+), 112 deletions(-) diff --git a/modules/rostests/apitests/ws2_32/CMakeLists.txt b/modules/rostests/apitests/ws2_32/CMakeLists.txt index 1538e291fb..cd63545a38 100644 --- a/modules/rostests/apitests/ws2_32/CMakeLists.txt +++ b/modules/rostests/apitests/ws2_32/CMakeLists.txt @@ -16,10 +16,11 @@ list(APPEND SOURCE WSAIoctl.c WSARecv.c WSAStartup.c - testlist.c) + ws2_32.h) -add_executable(ws2_32_apitest ${SOURCE}) +add_executable(ws2_32_apitest ${SOURCE} testlist.c) target_link_libraries(ws2_32_apitest wine ${PSEH_LIB}) set_module_type(ws2_32_apitest win32cui) add_importlibs(ws2_32_apitest ws2_32 msvcrt iphlpapi kernel32 ntdll) +add_pch(ws2_32_apitest ws2_32.h SOURCE) add_rostests_file(TARGET ws2_32_apitest) diff --git a/modules/rostests/apitests/ws2_32/WSAAsync.c b/modules/rostests/apitests/ws2_32/WSAAsync.c index 083d2cca3f..6d784f1e16 100644 --- a/modules/rostests/apitests/ws2_32/WSAAsync.c +++ b/modules/rostests/apitests/ws2_32/WSAAsync.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Miroslav Mastny */ -#include <apitest.h> - -#include <stdio.h> -#include <windows.h> -#include <winsock2.h> +#include "ws2_32.h" #define SVR_PORT 5000 #define WAIT_TIMEOUT_ 10000 diff --git a/modules/rostests/apitests/ws2_32/WSAIoctl.c b/modules/rostests/apitests/ws2_32/WSAIoctl.c index 2e1f72273f..5f98c017b1 100644 --- a/modules/rostests/apitests/ws2_32/WSAIoctl.c +++ b/modules/rostests/apitests/ws2_32/WSAIoctl.c @@ -6,11 +6,9 @@ * PROGRAMMERS: Andreas Maier */ -#include <apitest.h> +#include "ws2_32.h" -#include <stdio.h> -#include "ws2tcpip.h" -#include "iphlpapi.h" +#include <iphlpapi.h> void traceaddr(char* txt, sockaddr_gen a) { diff --git a/modules/rostests/apitests/ws2_32/WSARecv.c b/modules/rostests/apitests/ws2_32/WSARecv.c index 051a1ce9f9..4a076b2f96 100644 --- a/modules/rostests/apitests/ws2_32/WSARecv.c +++ b/modules/rostests/apitests/ws2_32/WSARecv.c @@ -5,11 +5,6 @@ * PROGRAMMERS: Peter Hater */ -#include <apitest.h> - -#include <stdio.h> -#include <ntstatus.h> -#include <wine/winternl.h> #include "ws2_32.h" #define RECV_BUF 4 diff --git a/modules/rostests/apitests/ws2_32/WSAStartup.c b/modules/rostests/apitests/ws2_32/WSAStartup.c index 92edb42bdc..11e731a805 100644 --- a/modules/rostests/apitests/ws2_32/WSAStartup.c +++ b/modules/rostests/apitests/ws2_32/WSAStartup.c @@ -5,15 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <windef.h> -#include <winsock2.h> -#include <ndk/rtlfuncs.h> -#include <ndk/mmfuncs.h> +#include "ws2_32.h" static PVOID diff --git a/modules/rostests/apitests/ws2_32/bind.c b/modules/rostests/apitests/ws2_32/bind.c index 1e8c393aa4..bf9069d169 100644 --- a/modules/rostests/apitests/ws2_32/bind.c +++ b/modules/rostests/apitests/ws2_32/bind.c @@ -5,16 +5,7 @@ * PROGRAMMER: Peter Hater */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <ws2tcpip.h> -#include <ndk/umtypes.h> +#include "ws2_32.h" CHAR LocalAddress[sizeof("255.255.255.255")]; #define PORT 58888 diff --git a/modules/rostests/apitests/ws2_32/close.c b/modules/rostests/apitests/ws2_32/close.c index 624571bd41..8701a3cb73 100644 --- a/modules/rostests/apitests/ws2_32/close.c +++ b/modules/rostests/apitests/ws2_32/close.c @@ -5,11 +5,6 @@ * PROGRAMMERS: Peter Hater */ -#include <apitest.h> - -#include <stdio.h> -#include <ntstatus.h> -#include <wine/winternl.h> #include "ws2_32.h" void Test_CloseDuplicatedSocket() diff --git a/modules/rostests/apitests/ws2_32/getaddrinfo.c b/modules/rostests/apitests/ws2_32/getaddrinfo.c index b9b3ab534a..369c5b3e69 100644 --- a/modules/rostests/apitests/ws2_32/getaddrinfo.c +++ b/modules/rostests/apitests/ws2_32/getaddrinfo.c @@ -5,16 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <ws2tcpip.h> -#include <ndk/umtypes.h> +#include "ws2_32.h" #define ok_addrinfo(ai, flags, family, socktype, protocol, addrlen) do \ { \ diff --git a/modules/rostests/apitests/ws2_32/getnameinfo.c b/modules/rostests/apitests/ws2_32/getnameinfo.c index 294259be08..f8dbafc4a2 100644 --- a/modules/rostests/apitests/ws2_32/getnameinfo.c +++ b/modules/rostests/apitests/ws2_32/getnameinfo.c @@ -5,16 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <ws2tcpip.h> -#include <ndk/umtypes.h> +#include "ws2_32.h" START_TEST(getnameinfo) { diff --git a/modules/rostests/apitests/ws2_32/getservbyname.c b/modules/rostests/apitests/ws2_32/getservbyname.c index bfb0f0f335..fcfef097d7 100644 --- a/modules/rostests/apitests/ws2_32/getservbyname.c +++ b/modules/rostests/apitests/ws2_32/getservbyname.c @@ -5,15 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <ws2tcpip.h> +#include "ws2_32.h" START_TEST(getservbyname) { diff --git a/modules/rostests/apitests/ws2_32/getservbyport.c b/modules/rostests/apitests/ws2_32/getservbyport.c index acf48de6f2..0e069044e6 100644 --- a/modules/rostests/apitests/ws2_32/getservbyport.c +++ b/modules/rostests/apitests/ws2_32/getservbyport.c @@ -5,15 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <ws2tcpip.h> +#include "ws2_32.h" START_TEST(getservbyport) { diff --git a/modules/rostests/apitests/ws2_32/helpers.c b/modules/rostests/apitests/ws2_32/helpers.c index 7048696133..702ac3654a 100644 --- a/modules/rostests/apitests/ws2_32/helpers.c +++ b/modules/rostests/apitests/ws2_32/helpers.c @@ -6,9 +6,6 @@ * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> */ -#include <apitest.h> - -#include <stdio.h> #include "ws2_32.h" int CreateSocket(SOCKET* psck) diff --git a/modules/rostests/apitests/ws2_32/ioctlsocket.c b/modules/rostests/apitests/ws2_32/ioctlsocket.c index 90398b3956..2667f6c3a3 100644 --- a/modules/rostests/apitests/ws2_32/ioctlsocket.c +++ b/modules/rostests/apitests/ws2_32/ioctlsocket.c @@ -5,9 +5,6 @@ * PROGRAMMERS: Colin Finck */ -#include <apitest.h> - -#include <stdio.h> #include "ws2_32.h" int Test_ioctlsocket() diff --git a/modules/rostests/apitests/ws2_32/nonblocking.c b/modules/rostests/apitests/ws2_32/nonblocking.c index 328f823d3a..29e6e38ac1 100644 --- a/modules/rostests/apitests/ws2_32/nonblocking.c +++ b/modules/rostests/apitests/ws2_32/nonblocking.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Peter Hater */ -#include <apitest.h> - -#include <stdio.h> -#include <windows.h> -#include <winsock2.h> +#include "ws2_32.h" #define SVR_PORT 5000 #define WAIT_TIMEOUT_ 10000 diff --git a/modules/rostests/apitests/ws2_32/nostartup.c b/modules/rostests/apitests/ws2_32/nostartup.c index 2449d8839b..28b0a9c175 100644 --- a/modules/rostests/apitests/ws2_32/nostartup.c +++ b/modules/rostests/apitests/ws2_32/nostartup.c @@ -5,16 +5,7 @@ * PROGRAMMER: Sylvain Petreolle <sylvain.petreolle(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <winsock2.h> -#include <ndk/rtlfuncs.h> -#include <ndk/mmfuncs.h> +#include "ws2_32.h" // This test depends on WSAStartup not having been called START_TEST(nostartup) diff --git a/modules/rostests/apitests/ws2_32/recv.c b/modules/rostests/apitests/ws2_32/recv.c index 55982ce622..9721280b7a 100644 --- a/modules/rostests/apitests/ws2_32/recv.c +++ b/modules/rostests/apitests/ws2_32/recv.c @@ -5,13 +5,12 @@ * PROGRAMMERS: Colin Finck */ -#include <apitest.h> - -#include <stdio.h> -#include <ntstatus.h> -#include <wine/winternl.h> #include "ws2_32.h" +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> + #define RECV_BUF 4 /* For valid test results, the ReactOS Website needs to return at least 8 bytes on a "GET / HTTP/1.0" request. diff --git a/modules/rostests/apitests/ws2_32/send.c b/modules/rostests/apitests/ws2_32/send.c index 5e702239e9..d8a149c1a6 100644 --- a/modules/rostests/apitests/ws2_32/send.c +++ b/modules/rostests/apitests/ws2_32/send.c @@ -5,12 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <winsock2.h> - -#define WIN32_NO_STATUS -#include <ndk/mmfuncs.h> -#include <ndk/rtlfuncs.h> +#include "ws2_32.h" static PVOID diff --git a/modules/rostests/apitests/ws2_32/ws2_32.h b/modules/rostests/apitests/ws2_32/ws2_32.h index b8415bf102..35a3d4e33e 100644 --- a/modules/rostests/apitests/ws2_32/ws2_32.h +++ b/modules/rostests/apitests/ws2_32/ws2_32.h @@ -9,10 +9,17 @@ #ifndef _WS2_32_APITESTS_H #define _WS2_32_APITESTS_H +#include <ntstatus.h> +#include <stdio.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <winsock2.h> + +#include <apitest.h> +#include <ws2tcpip.h> +#include <ndk/rtlfuncs.h> +#include <ndk/mmfuncs.h> /* Simple macro for executing a socket command and doing cleanup operations in case of a failure */ #define SCKTEST(_cmd_) \ @@ -34,4 +41,4 @@ int GetRequestAndWait(SOCKET sck); /* ws2_32.c */ extern HANDLE g_hHeap; -#endif +#endif /* !_WS2_32_APITESTS_H */

7 years

[reactos] 01/01: [ATL_APITEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=823270e608ab7a890341d… commit 823270e608ab7a890341d984297244cf0d50acaf Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Dec 21 13:31:24 2017 +0100 [ATL_APITEST] Add a PCH. --- modules/rostests/apitests/atl/CComBSTR.cpp | 2 +- modules/rostests/apitests/atl/CComHeapPtr.cpp | 1 - modules/rostests/apitests/atl/CComVariant.cpp | 1 - modules/rostests/apitests/atl/CMakeLists.txt | 9 +++++++-- modules/rostests/apitests/atl/precomp.h | 14 ++++++++++++++ 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/atl/CComBSTR.cpp b/modules/rostests/apitests/atl/CComBSTR.cpp index e0ad4ce861..0a10292c38 100644 --- a/modules/rostests/apitests/atl/CComBSTR.cpp +++ b/modules/rostests/apitests/atl/CComBSTR.cpp @@ -7,7 +7,7 @@ #include <apitest.h> #include <atlbase.h> -#include <atlcom.h> + #include "resource.h" #define verify_str (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_str_imp diff --git a/modules/rostests/apitests/atl/CComHeapPtr.cpp b/modules/rostests/apitests/atl/CComHeapPtr.cpp index d18a75fae2..30fb99abd0 100644 --- a/modules/rostests/apitests/atl/CComHeapPtr.cpp +++ b/modules/rostests/apitests/atl/CComHeapPtr.cpp @@ -7,7 +7,6 @@ #include <apitest.h> #include <atlbase.h> -#include <atlcom.h> static PDWORD test_Alloc(DWORD value) { diff --git a/modules/rostests/apitests/atl/CComVariant.cpp b/modules/rostests/apitests/atl/CComVariant.cpp index 8a24a00c4c..32df6f253b 100644 --- a/modules/rostests/apitests/atl/CComVariant.cpp +++ b/modules/rostests/apitests/atl/CComVariant.cpp @@ -11,7 +11,6 @@ #include <apitest.h> #include <atlbase.h> -#include <atlcom.h> void expect_bool_imp(const CComVariant& ccv, bool value) { diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index d5428d9fd2..9c9ed6ddec 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -4,20 +4,25 @@ set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) -add_executable(atl_apitest +list(APPEND SOURCE atltypes.cpp CComBSTR.cpp CComHeapPtr.cpp - CComVariant.cpp CImage.cpp CRegKey.cpp CSimpleArray.cpp CSimpleMap.cpp CString.cpp + precomp.h) + +add_executable(atl_apitest + ${SOURCE} + CComVariant.cpp testlist.c atl_apitest.rc) target_link_libraries(atl_apitest wine atlnew uuid) set_module_type(atl_apitest win32cui) add_importlibs(atl_apitest rpcrt4 ole32 oleaut32 msimg32 gdi32 advapi32 user32 msvcrt kernel32 ntdll) +add_pch(atl_apitest precomp.h SOURCE) add_rostests_file(TARGET atl_apitest) diff --git a/modules/rostests/apitests/atl/precomp.h b/modules/rostests/apitests/atl/precomp.h new file mode 100644 index 0000000000..7feb40d3a6 --- /dev/null +++ b/modules/rostests/apitests/atl/precomp.h @@ -0,0 +1,14 @@ +#ifndef _ATL_APITEST_PRECOMP_H_ +#define _ATL_APITEST_PRECOMP_H_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <apitest.h> +#include <atlbase.h> +#include <atlsimpcoll.h> + +#include "resource.h" + +#endif /* _ATL_APITEST_PRECOMP_H_ */

7 years

[reactos] 01/01: [NTOS] Remove forgotten assert, see CORE-14128.

by Samuel Serapion

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a59d4674dec116a951392… commit a59d4674dec116a951392bb6d136bd11f0e143f2 Author: Samuel Serapion <samcharly(a)hotmail.com> AuthorDate: Wed Dec 20 12:27:59 2017 -0500 [NTOS] Remove forgotten assert, see CORE-14128. --- ntoskrnl/io/iomgr/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ntoskrnl/io/iomgr/device.c b/ntoskrnl/io/iomgr/device.c index 9342d5a22d..04f7d5d2db 100644 --- a/ntoskrnl/io/iomgr/device.c +++ b/ntoskrnl/io/iomgr/device.c @@ -5,7 +5,7 @@ * PURPOSE: Device Object Management, including Notifications and Queues. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Filip Navara (navaraf(a)reactos.org) - * Herv� Poussineau (hpoussin(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -1349,7 +1349,6 @@ IoGetRelatedDeviceObject(IN PFILE_OBJECT FileObject) if (FileObject->FileObjectExtension) { PFILE_OBJECT_EXTENSION FileObjectExtension; - ASSERT(FALSE); /* Cast the buffer to something we understand */ FileObjectExtension = FileObject->FileObjectExtension;

7 years

[reactos] 01/01: [TRANSLATION] [NETCFGX] Fix russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a89c979fe07d3608cb12b… commit a89c979fe07d3608cb12b52deca1359cc8550d4d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Dec 20 21:16:27 2017 +0300 [TRANSLATION] [NETCFGX] Fix russian translation --- dll/win32/netcfgx/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index c7a5f078e4..590ad886b7 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -197,7 +197,7 @@ END STRINGTABLE BEGIN - IDS_NET_CONNECT "Сетевые подключения" + IDS_NET_CONNECT "Сетевое подключение" IDS_NO_IPADDR_SET "Этот адаптер требует ввода хотя бы одного IP-адреса. Введите адрес." IDS_NO_SUBMASK_SET "Введен адрес без указания маски подсети. Введите маску подсети." IDS_TCPFILTERDESC "Фильтрация TCP/IP позволяет контролировать сетевой трафик TCP/IP, поступающий на данный компьютер."

7 years

[reactos] 01/01: [WIN32K] avoid BSOD in Bochs 2.6.8 CORE-13629, patch by Mark Jansen We applied this patch also last second in 0.4.7rls, now in master.

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82caf5f82346013299337… commit 82caf5f82346013299337ce47303daf915128a42 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Dec 20 17:38:36 2017 +0100 [WIN32K] avoid BSOD in Bochs 2.6.8 CORE-13629, patch by Mark Jansen We applied this patch also last second in 0.4.7rls, now in master. IntTrackPopupMenuEx() caused the BSOD when called while window is in the process of being destroyed. --- win32ss/user/ntuser/menu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index dbb2fff625..965a72b81d 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -4392,7 +4392,10 @@ BOOL WINAPI IntTrackPopupMenuEx( PMENU menu, UINT wFlags, int x, int y, { PWND pwndM = ValidateHwndNoErr( menu->hWnd ); if (pwndM) // wine hack around this with their destroy function. - co_UserDestroyWindow( pwndM ); // Fix wrong error return. + { + if (!(pWnd->state & WNDS_DESTROYED)) + co_UserDestroyWindow( pwndM ); // Fix wrong error return. + } menu->hWnd = 0; if (!(wFlags & TPM_NONOTIFY))

7 years

[reactos] 01/01: [SHLWAPI_WINETEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9317220c0032ef62f07af… commit 9317220c0032ef62f07af6b6fbc671cab1133f5a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Dec 20 13:36:27 2017 +0100 [SHLWAPI_WINETEST] Add a PCH. --- modules/rostests/winetests/shlwapi/CMakeLists.txt | 5 +++-- modules/rostests/winetests/shlwapi/assoc.c | 11 +---------- modules/rostests/winetests/shlwapi/clist.c | 13 +------------ modules/rostests/winetests/shlwapi/clsid.c | 18 +++--------------- modules/rostests/winetests/shlwapi/generated.c | 21 +-------------------- modules/rostests/winetests/shlwapi/istream.c | 17 +---------------- modules/rostests/winetests/shlwapi/ordinal.c | 23 +---------------------- modules/rostests/winetests/shlwapi/path.c | 15 +-------------- modules/rostests/winetests/shlwapi/precomp.h | 22 ++++++++++++++++++++++ modules/rostests/winetests/shlwapi/shreg.c | 15 +-------------- modules/rostests/winetests/shlwapi/string.c | 18 +----------------- modules/rostests/winetests/shlwapi/thread.c | 19 +------------------ modules/rostests/winetests/shlwapi/url.c | 16 ++-------------- 13 files changed, 39 insertions(+), 174 deletions(-) diff --git a/modules/rostests/winetests/shlwapi/CMakeLists.txt b/modules/rostests/winetests/shlwapi/CMakeLists.txt index dfd73e607c..f46f22d70e 100644 --- a/modules/rostests/winetests/shlwapi/CMakeLists.txt +++ b/modules/rostests/winetests/shlwapi/CMakeLists.txt @@ -15,9 +15,9 @@ list(APPEND SOURCE string.c thread.c url.c - testlist.c) + precomp.h) -add_executable(shlwapi_winetest ${SOURCE}) +add_executable(shlwapi_winetest ${SOURCE} testlist.c) target_link_libraries(shlwapi_winetest uuid) set_module_type(shlwapi_winetest win32cui) add_importlibs(shlwapi_winetest shlwapi ole32 oleaut32 user32 advapi32 msvcrt kernel32) @@ -26,4 +26,5 @@ if(MSVC) add_importlibs(shlwapi_winetest ntdll) endif() +add_pch(shlwapi_winetest precomp.h SOURCE) add_rostests_file(TARGET shlwapi_winetest) diff --git a/modules/rostests/winetests/shlwapi/assoc.c b/modules/rostests/winetests/shlwapi/assoc.c index 5e37dd6123..8915b3a7aa 100644 --- a/modules/rostests/winetests/shlwapi/assoc.c +++ b/modules/rostests/winetests/shlwapi/assoc.c @@ -17,16 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#include <wine/test.h> -#include <winreg.h> -#include <shlwapi.h> -#include <shlguid.h> +#include "precomp.h" #define expect(expected, got) ok( (expected) == (got), "Expected %d, got %d\n", (expected), (got)) #define expect_hr(expected, got) ok( (expected) == (got), "Expected %08x, got %08x\n", (expected), (got)) diff --git a/modules/rostests/winetests/shlwapi/clist.c b/modules/rostests/winetests/shlwapi/clist.c index e7fc4f9f59..c621ffc912 100755 --- a/modules/rostests/winetests/shlwapi/clist.c +++ b/modules/rostests/winetests/shlwapi/clist.c @@ -17,18 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -//#include <stdarg.h> - -#include <wine/test.h> -//#include "windef.h" -//#include "winbase.h" -#include <objbase.h> +#include "precomp.h" typedef struct tagSHLWAPI_CLIST { diff --git a/modules/rostests/winetests/shlwapi/clsid.c b/modules/rostests/winetests/shlwapi/clsid.c index afad9aeb55..c86407cab1 100755 --- a/modules/rostests/winetests/shlwapi/clsid.c +++ b/modules/rostests/winetests/shlwapi/clsid.c @@ -17,22 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdio.h> - -#include <wine/test.h> -//#include "winbase.h" -//#include "winerror.h" -//#include "winnls.h" -//#include "winuser.h" -#include <objbase.h> -#include <initguid.h> -#include <shlguid.h> -#include <shobjidl.h> +#include "precomp.h" + #include <olectl.h> +#include <initguid.h> DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); diff --git a/modules/rostests/winetests/shlwapi/generated.c b/modules/rostests/winetests/shlwapi/generated.c index 44a449da8b..59fdd9fb26 100755 --- a/modules/rostests/winetests/shlwapi/generated.c +++ b/modules/rostests/winetests/shlwapi/generated.c @@ -5,26 +5,7 @@ * Unit tests for data structure packing */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - -#define WINE_NOWINSOCK - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -//#include "wtypes.h" -#include <winreg.h> -#include <shlwapi.h> - -#include <wine/test.h> +#include "precomp.h" /*********************************************************************** * Compatibility macros diff --git a/modules/rostests/winetests/shlwapi/istream.c b/modules/rostests/winetests/shlwapi/istream.c index 9aefb1f439..134a74c32e 100644 --- a/modules/rostests/winetests/shlwapi/istream.c +++ b/modules/rostests/winetests/shlwapi/istream.c @@ -17,22 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -//#include <stdarg.h> -//#include <stdio.h> - -#include <wine/test.h> -//#include "windef.h" -//#include "winbase.h" -#include <winnls.h> -#include <winreg.h> -#include <objbase.h> -#include <shlwapi.h> +#include "precomp.h" static void test_IStream_invalid_operations(IStream * stream, DWORD mode) { diff --git a/modules/rostests/winetests/shlwapi/ordinal.c b/modules/rostests/winetests/shlwapi/ordinal.c index c26a716af0..3cc8856e77 100755 --- a/modules/rostests/winetests/shlwapi/ordinal.c +++ b/modules/rostests/winetests/shlwapi/ordinal.c @@ -17,28 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdio.h> - -#define COBJMACROS -#define CONST_VTABLE -#include <wine/test.h> -//#include "winbase.h" -#include <winreg.h> -#include <winnls.h> -//#include "winerror.h" -//#include "winuser.h" -#include <ole2.h> -//#include "oaidl.h" -//#include "ocidl.h" -//#include "mlang.h" -#include <shlwapi.h> -//#include "docobj.h" -#include <shobjidl.h> -//#include "shlobj.h" +#include "precomp.h" /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; diff --git a/modules/rostests/winetests/shlwapi/path.c b/modules/rostests/winetests/shlwapi/path.c index 6456e81537..d025dbf6a2 100755 --- a/modules/rostests/winetests/shlwapi/path.c +++ b/modules/rostests/winetests/shlwapi/path.c @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -#include <stdio.h> - -#include <wine/test.h> -//#include "windef.h" -//#include "winbase.h" -#include <winreg.h> -#include <winnls.h> -#include <shlwapi.h> -#include <wininet.h> +#include "precomp.h" static BOOL (WINAPI *pPathIsValidCharA)(char,DWORD); static BOOL (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); diff --git a/modules/rostests/winetests/shlwapi/precomp.h b/modules/rostests/winetests/shlwapi/precomp.h new file mode 100644 index 0000000000..0d6f5ba1ca --- /dev/null +++ b/modules/rostests/winetests/shlwapi/precomp.h @@ -0,0 +1,22 @@ +#ifndef _SHLWAPI_WINETEST_PRECOMP_H_ +#define _SHLWAPI_WINETEST_PRECOMP_H_ + +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define COBJMACROS +#define CONST_VTABLE + +#include <wine/test.h> + +#include <winnls.h> +#include <winreg.h> +#include <shlwapi.h> +#include <shlguid.h> +#include <shobjidl.h> +#include <ole2.h> +#include <wininet.h> + +#endif /* !_SHLWAPI_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/shlwapi/shreg.c b/modules/rostests/winetests/shlwapi/shreg.c index a175e31eeb..50c62b64d9 100755 --- a/modules/rostests/winetests/shlwapi/shreg.c +++ b/modules/rostests/winetests/shlwapi/shreg.c @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -//#include <stdio.h> - -#include <wine/test.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <winreg.h> -//#include "winuser.h" -#include <shlwapi.h> +#include "precomp.h" /* Keys used for testing */ #define REG_TEST_KEY "Software\\Wine\\Test" diff --git a/modules/rostests/winetests/shlwapi/string.c b/modules/rostests/winetests/shlwapi/string.c index 1d8a6af1be..d12d82055b 100755 --- a/modules/rostests/winetests/shlwapi/string.c +++ b/modules/rostests/winetests/shlwapi/string.c @@ -17,23 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdio.h> - -#include <wine/test.h> -//#include "winbase.h" -//#include "winerror.h" -#include <winnls.h> -#include <ole2.h> -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_PATH -#define NO_SHLWAPI_GDI -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> -//#include "shtypes.h" +#include "precomp.h" #define expect_eq(expr, val, type, fmt) do { \ type ret = expr; \ diff --git a/modules/rostests/winetests/shlwapi/thread.c b/modules/rostests/winetests/shlwapi/thread.c index 28b4ccd59a..17ff7a73ed 100644 --- a/modules/rostests/winetests/shlwapi/thread.c +++ b/modules/rostests/winetests/shlwapi/thread.c @@ -17,24 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS -#define CONST_VTABLE - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -//#include "winerror.h" -#include <ole2.h> -//#include "shlwapi.h" - -#include <wine/test.h> +#include "precomp.h" static HRESULT (WINAPI *pSHCreateThreadRef)(LONG*, IUnknown**); static HRESULT (WINAPI *pSHGetThreadRef)(IUnknown**); diff --git a/modules/rostests/winetests/shlwapi/url.c b/modules/rostests/winetests/shlwapi/url.c index f3756e42df..1e7679f339 100644 --- a/modules/rostests/winetests/shlwapi/url.c +++ b/modules/rostests/winetests/shlwapi/url.c @@ -18,20 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -//#include <stdio.h> - -#include <wine/test.h> -//#include "windef.h" -//#include "winbase.h" -#include <winreg.h> -#include <winnls.h> -#include <shlwapi.h> -#include <wininet.h> +#include "precomp.h" + #include <intshcut.h> /* ################ */

7 years

[reactos] 01/01: [SHELL32_WINETEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e32018ba19bef687b25e4… commit e32018ba19bef687b25e48b1351214aed7a6329a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Dec 20 13:29:32 2017 +0100 [SHELL32_WINETEST] Add a PCH. --- modules/rostests/winetests/shell32/CMakeLists.txt | 6 ++++- modules/rostests/winetests/shell32/appbar.c | 7 +---- modules/rostests/winetests/shell32/assoc.c | 11 ++------ modules/rostests/winetests/shell32/autocomplete.c | 11 +------- modules/rostests/winetests/shell32/brsfolder.c | 9 +------ modules/rostests/winetests/shell32/ebrowser.c | 14 +++------- modules/rostests/winetests/shell32/generated.c | 17 +----------- modules/rostests/winetests/shell32/msg.h | 4 +-- modules/rostests/winetests/shell32/precomp.h | 30 ++++++++++++++++++++++ modules/rostests/winetests/shell32/progman_dde.c | 8 +----- modules/rostests/winetests/shell32/recyclebin.c | 7 +---- modules/rostests/winetests/shell32/shell32_test.h | 1 + modules/rostests/winetests/shell32/shelldispatch.c | 12 +++------ modules/rostests/winetests/shell32/shelllink.c | 15 +---------- modules/rostests/winetests/shell32/shellole.c | 25 +++++++----------- modules/rostests/winetests/shell32/shellpath.c | 17 +++--------- .../rostests/winetests/shell32/shfldr_special.c | 20 +++------------ modules/rostests/winetests/shell32/shlexec.c | 19 +------------- modules/rostests/winetests/shell32/shlfileop.c | 14 +--------- modules/rostests/winetests/shell32/shlfolder.c | 21 +-------------- modules/rostests/winetests/shell32/shlview.c | 22 +--------------- modules/rostests/winetests/shell32/string.c | 13 +--------- modules/rostests/winetests/shell32/systray.c | 7 +---- 23 files changed, 74 insertions(+), 236 deletions(-) diff --git a/modules/rostests/winetests/shell32/CMakeLists.txt b/modules/rostests/winetests/shell32/CMakeLists.txt index 7d33d85e3e..ded63d7065 100644 --- a/modules/rostests/winetests/shell32/CMakeLists.txt +++ b/modules/rostests/winetests/shell32/CMakeLists.txt @@ -23,10 +23,13 @@ list(APPEND SOURCE shlview.c string.c systray.c + precomp.h) + +add_executable(shell32_winetest + ${SOURCE} testlist.c rsrc.rc) -add_executable(shell32_winetest ${SOURCE}) target_link_libraries(shell32_winetest uuid) set_module_type(shell32_winetest win32cui) add_importlibs(shell32_winetest shell32 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32) @@ -35,4 +38,5 @@ if(MSVC) add_importlibs(shell32_winetest ntdll) endif() +add_pch(shell32_winetest precomp.h SOURCE) add_rostests_file(TARGET shell32_winetest) diff --git a/modules/rostests/winetests/shell32/appbar.c b/modules/rostests/winetests/shell32/appbar.c index 1505a40aeb..f25fed9159 100644 --- a/modules/rostests/winetests/shell32/appbar.c +++ b/modules/rostests/winetests/shell32/appbar.c @@ -17,12 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include <windows.h> -#include "shellapi.h" - -#include "wine/test.h" +#include "precomp.h" #define MSG_APPBAR WM_APP diff --git a/modules/rostests/winetests/shell32/assoc.c b/modules/rostests/winetests/shell32/assoc.c index 2cd06d2c08..ac6edef099 100644 --- a/modules/rostests/winetests/shell32/assoc.c +++ b/modules/rostests/winetests/shell32/assoc.c @@ -17,16 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <stdarg.h> - -#include "shlwapi.h" -#include "shlguid.h" -#include "shobjidl.h" - -#include "wine/test.h" +#include "precomp.h" +#include <shobjidl.h> static void test_IQueryAssociations_QueryInterface(void) { diff --git a/modules/rostests/winetests/shell32/autocomplete.c b/modules/rostests/winetests/shell32/autocomplete.c index 63a2eb2b11..c2c02e2ca9 100644 --- a/modules/rostests/winetests/shell32/autocomplete.c +++ b/modules/rostests/winetests/shell32/autocomplete.c @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <wine/test.h> -#include <stdarg.h> - -#include "windows.h" -#include "shobjidl.h" -#include "shlguid.h" -#include "initguid.h" -#include "shldisp.h" +#include "precomp.h" static HWND hMainWnd, hEdit; static HINSTANCE hinst; diff --git a/modules/rostests/winetests/shell32/brsfolder.c b/modules/rostests/winetests/shell32/brsfolder.c index bf29d1169f..d564ed5e61 100644 --- a/modules/rostests/winetests/shell32/brsfolder.c +++ b/modules/rostests/winetests/shell32/brsfolder.c @@ -19,15 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS +#include "precomp.h" -#include <windows.h> -#include <shlobj.h> -#include <shobjidl.h> -#include <string.h> -#include "shellapi.h" - -#include "wine/test.h" #define IDD_MAKENEWFOLDER 0x3746 /* From "../shresdef.h" */ #define TIMER_WAIT_MS 50 /* Should be long enough for slow systems */ diff --git a/modules/rostests/winetests/shell32/ebrowser.c b/modules/rostests/winetests/shell32/ebrowser.c index 7db584225e..27beff5ecc 100644 --- a/modules/rostests/winetests/shell32/ebrowser.c +++ b/modules/rostests/winetests/shell32/ebrowser.c @@ -18,18 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +#include "precomp.h" -#define COBJMACROS -#define CONST_VTABLE - -#include "shlobj.h" -#include "shlwapi.h" - -#include "wine/test.h" - -#include "initguid.h" -#include "mshtml.h" +#include <initguid.h> +#include <mshtml.h> /********************************************************************** * Some IIDs for test_SetSite. diff --git a/modules/rostests/winetests/shell32/generated.c b/modules/rostests/winetests/shell32/generated.c index ace877eb42..b18fdec02c 100755 --- a/modules/rostests/winetests/shell32/generated.c +++ b/modules/rostests/winetests/shell32/generated.c @@ -5,22 +5,7 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - -#define WINE_NOWINSOCK - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "shellapi.h" -#include "winuser.h" -#include "wingdi.h" -#include "shlobj.h" - -#include "wine/test.h" +#include "precomp.h" /*********************************************************************** * Compatibility macros diff --git a/modules/rostests/winetests/shell32/msg.h b/modules/rostests/winetests/shell32/msg.h index a457fd4fce..7afdc7af89 100644 --- a/modules/rostests/winetests/shell32/msg.h +++ b/modules/rostests/winetests/shell32/msg.h @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <windows.h> -#include "wine/test.h" +#pragma once /* undocumented SWP flags - from SDK 3.1 */ #define SWP_NOCLIENTSIZE 0x0800 diff --git a/modules/rostests/winetests/shell32/precomp.h b/modules/rostests/winetests/shell32/precomp.h new file mode 100644 index 0000000000..ffa1f861d5 --- /dev/null +++ b/modules/rostests/winetests/shell32/precomp.h @@ -0,0 +1,30 @@ +#ifndef _SHELL32_WINETEST_PRECOMP_H_ +#define _SHELL32_WINETEST_PRECOMP_H_ + +#include <assert.h> +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define CONST_VTABLE + +#include <wine/test.h> + +#include <winreg.h> +#include <winnls.h> +#include <winuser.h> +#include <wincon.h> +#include <shellapi.h> +#include <shlwapi.h> +#include <shlguid.h> +#include <shlobj.h> +#include <ddeml.h> +#include <commoncontrols.h> +#include <reactos/undocshell.h> + +#include "shell32_test.h" + +#endif /* !_SHELL32_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/shell32/progman_dde.c b/modules/rostests/winetests/shell32/progman_dde.c index 6e1378ff84..bb566ba125 100644 --- a/modules/rostests/winetests/shell32/progman_dde.c +++ b/modules/rostests/winetests/shell32/progman_dde.c @@ -26,13 +26,7 @@ * Tests for Invalid Characters in Names / Invalid Parameters */ -#include <stdio.h> -#include <wine/test.h> -#include <winbase.h> -#include "dde.h" -#include "ddeml.h" -#include "winuser.h" -#include "shlobj.h" +#include "precomp.h" /* Timeout on DdeClientTransaction Call */ #define MS_TIMEOUT_VAL 1000 diff --git a/modules/rostests/winetests/shell32/recyclebin.c b/modules/rostests/winetests/shell32/recyclebin.c index 50e262e918..7cb8f6e8ca 100644 --- a/modules/rostests/winetests/shell32/recyclebin.c +++ b/modules/rostests/winetests/shell32/recyclebin.c @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include "shellapi.h" - -#include <stdio.h> -#include "wine/test.h" +#include "precomp.h" static int (WINAPI *pSHQueryRecycleBinA)(LPCSTR,LPSHQUERYRBINFO); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); diff --git a/modules/rostests/winetests/shell32/shell32_test.h b/modules/rostests/winetests/shell32/shell32_test.h index 42a74fb2d5..906dcac033 100755 --- a/modules/rostests/winetests/shell32/shell32_test.h +++ b/modules/rostests/winetests/shell32/shell32_test.h @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once /* Helper function for creating .lnk files */ typedef struct diff --git a/modules/rostests/winetests/shell32/shelldispatch.c b/modules/rostests/winetests/shell32/shelldispatch.c index 04f664c1cf..30b3133547 100644 --- a/modules/rostests/winetests/shell32/shelldispatch.c +++ b/modules/rostests/winetests/shell32/shelldispatch.c @@ -18,16 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT +#include "precomp.h" -#include "shldisp.h" -#include "shlobj.h" -#include "shlwapi.h" -#include "wine/test.h" - -#include "initguid.h" +#include <winsvc.h> +#include <initguid.h> #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) diff --git a/modules/rostests/winetests/shell32/shelllink.c b/modules/rostests/winetests/shell32/shelllink.c index 050c0339ba..5e995db54e 100755 --- a/modules/rostests/winetests/shell32/shelllink.c +++ b/modules/rostests/winetests/shell32/shelllink.c @@ -19,20 +19,7 @@ * */ -#define COBJMACROS - -#include "initguid.h" -#include "windows.h" -#include "shlguid.h" -#include "shobjidl.h" -#include "shlobj.h" -#include "shellapi.h" -#include "commoncontrols.h" -#include "wine/test.h" - -#include "shell32_test.h" - -#include <reactos/undocshell.h> +#include "precomp.h" #ifndef SLDF_HAS_LOGO3ID # define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */ diff --git a/modules/rostests/winetests/shell32/shellole.c b/modules/rostests/winetests/shell32/shellole.c index eedbdf677c..f2485928e4 100644 --- a/modules/rostests/winetests/shell32/shellole.c +++ b/modules/rostests/winetests/shell32/shellole.c @@ -16,16 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE -#define NONAMELESSUNION +#include "precomp.h" -#include <stdio.h> -#include <wine/test.h> - -#include "winbase.h" -#include "shlobj.h" -#include "initguid.h" +#include <initguid.h> DEFINE_GUID(FMTID_Test,0x12345678,0x1234,0x1234,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12); DEFINE_GUID(FMTID_NotExisting, 0x12345678,0x1234,0x1234,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x13); @@ -116,10 +109,10 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG ok(rgpropvar != NULL, "rgpropvar = NULL\n"); ok(rgpspec[0].ulKind == PRSPEC_PROPID, "rgpspec[0].ulKind = %d\n", rgpspec[0].ulKind); - ok(rgpspec[0].u.propid == PID_CODEPAGE, "rgpspec[0].propid = %d\n", rgpspec[0].u.propid); + ok(rgpspec[0].propid == PID_CODEPAGE, "rgpspec[0].propid = %d\n", rgpspec[0].propid); rgpropvar[0].vt = VT_I2; - rgpropvar[0].u.iVal = 1234; + rgpropvar[0].iVal = 1234; } else { CHECK_EXPECT(ReadMultiple); @@ -130,13 +123,13 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG ok(rgpropvar[0].vt==0 || broken(rgpropvar[0].vt==VT_BSTR), "rgpropvar[0].vt = %d\n", rgpropvar[0].vt); rgpropvar[0].vt = VT_BSTR; - rgpropvar[0].u.bstrVal = (void*)0xdeadbeef; + rgpropvar[0].bstrVal = (void*)0xdeadbeef; rgpropvar[1].vt = VT_LPSTR; - rgpropvar[1].u.pszVal = (void*)0xdeadbeef; + rgpropvar[1].pszVal = (void*)0xdeadbeef; rgpropvar[2].vt = VT_BYREF|VT_I1; - rgpropvar[2].u.pcVal = (void*)0xdeadbeef; + rgpropvar[2].pcVal = (void*)0xdeadbeef; rgpropvar[3].vt = VT_BYREF|VT_VARIANT; - rgpropvar[3].u.pvarVal = (void*)0xdeadbeef; + rgpropvar[3].pvarVal = (void*)0xdeadbeef; } return S_OK; @@ -419,7 +412,7 @@ static void test_SHPropStg_functions(void) CHECK_CALLED(WriteMultiple); read[0].vt = VT_BSTR; - read[0].u.bstrVal = (void*)0xdeadbeef; + read[0].bstrVal = (void*)0xdeadbeef; SET_EXPECT(ReadMultiple); SET_EXPECT(ReadMultipleCodePage); SET_EXPECT(Stat); diff --git a/modules/rostests/winetests/shell32/shellpath.c b/modules/rostests/winetests/shell32/shellpath.c index 9fea876e8b..02eecb972a 100644 --- a/modules/rostests/winetests/shell32/shellpath.c +++ b/modules/rostests/winetests/shell32/shellpath.c @@ -21,20 +21,9 @@ * namespace) path for a given folder (CSIDL value). */ -#define COBJMACROS - -#include <stdarg.h> -#include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "shlguid.h" -#include "shlobj.h" -#include "shlwapi.h" -#include "knownfolders.h" -#include "shellapi.h" -#include "wine/test.h" - -#include "initguid.h" +#include "precomp.h" + +#include <initguid.h> /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want * here is its original value. diff --git a/modules/rostests/winetests/shell32/shfldr_special.c b/modules/rostests/winetests/shell32/shfldr_special.c index dd4cc04402..08efed9720 100644 --- a/modules/rostests/winetests/shell32/shfldr_special.c +++ b/modules/rostests/winetests/shell32/shfldr_special.c @@ -19,19 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include "shellapi.h" -#include "shlobj.h" - -#include "wine/test.h" +#include "precomp.h" static inline BOOL SHELL_OsIsUnicode(void) { @@ -164,10 +152,10 @@ if (0) hr = IShellFolder2_GetDefaultColumnState(folder, 6, &state); ok(broken(hr == E_NOTIMPL) || hr == E_INVALIDARG /* Win7 */, "got 0x%08x\n", hr); - details.str.u.pOleStr = NULL; + details.str.pOleStr = NULL; hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); ok(hr == S_OK || broken(hr == E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr); - if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); + if (SHELL_OsIsUnicode()) SHFree(details.str.pOleStr); /* test every column if method is implemented */ if (hr == S_OK) @@ -183,7 +171,7 @@ if (0) ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt); /* can't be on w9x at this point, IShellFolder2 unsupported there, check present for running Wine with w9x setup */ - if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); + if (SHELL_OsIsUnicode()) SHFree(details.str.pOleStr); hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); ok(hr == S_OK, "got 0x%08x\n", hr); diff --git a/modules/rostests/winetests/shell32/shlexec.c b/modules/rostests/winetests/shell32/shlexec.c index f0f51f5456..34f76e3e3b 100755 --- a/modules/rostests/winetests/shell32/shlexec.c +++ b/modules/rostests/winetests/shell32/shlexec.c @@ -30,24 +30,7 @@ * we could check */ -/* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ -#define NTDDI_WINXPSP1 0x05010100 -#define NTDDI_VERSION NTDDI_WINXPSP1 -#define _WIN32_WINNT 0x0501 - -#include <stdio.h> -#include <assert.h> - -#include "wtypes.h" -#include "winbase.h" -#include "windef.h" -#include "shellapi.h" -#include "shlwapi.h" -#include "ddeml.h" -#include "wine/test.h" - -#include "shell32_test.h" - +#include "precomp.h" static char argv0[MAX_PATH]; static int myARGC; diff --git a/modules/rostests/winetests/shell32/shlfileop.c b/modules/rostests/winetests/shell32/shlfileop.c index 0f44082e59..4e898586e3 100644 --- a/modules/rostests/winetests/shell32/shlfileop.c +++ b/modules/rostests/winetests/shell32/shlfileop.c @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS -#define WINE_NOWINSOCK -#include <windows.h> -#include "shellapi.h" -#include "shlobj.h" -#include "commoncontrols.h" - -#include "wine/test.h" - -#include <reactos/undocshell.h> +#include "precomp.h" #ifndef FOF_NORECURSION #define FOF_NORECURSION 0x1000 diff --git a/modules/rostests/winetests/shell32/shlfolder.c b/modules/rostests/winetests/shell32/shlfolder.c index 1e03978dbc..8d2481ffc4 100644 --- a/modules/rostests/winetests/shell32/shlfolder.c +++ b/modules/rostests/winetests/shell32/shlfolder.c @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS -#define CONST_VTABLE - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "shellapi.h" - - -#include "shlguid.h" -#include "shlobj.h" -#include "shobjidl.h" -#include "shlwapi.h" -#include "ocidl.h" -#include "oleauto.h" - -#include "wine/test.h" +#include "precomp.h" #include <initguid.h> DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99,0xD9, 0x5D,0xEA,0xD2,0x87,0x32,0x36); diff --git a/modules/rostests/winetests/shell32/shlview.c b/modules/rostests/winetests/shell32/shlview.c index 76855067c0..5b08473cfd 100644 --- a/modules/rostests/winetests/shell32/shlview.c +++ b/modules/rostests/winetests/shell32/shlview.c @@ -18,27 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS -#define CONST_VTABLE - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "shellapi.h" - -#include "shlguid.h" -#include "shlobj.h" -#include "shobjidl.h" -#include "shlwapi.h" -#include "ocidl.h" -#include "oleauto.h" - -#include "initguid.h" - -#include "wine/test.h" +#include "precomp.h" #include "msg.h" diff --git a/modules/rostests/winetests/shell32/string.c b/modules/rostests/winetests/shell32/string.c index 6cdb386eba..4d7096203c 100755 --- a/modules/rostests/winetests/shell32/string.c +++ b/modules/rostests/winetests/shell32/string.c @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define WINE_NOWINSOCK -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "shellapi.h" -#include "shtypes.h" -#include "objbase.h" - -#include "wine/test.h" +#include "precomp.h" static HMODULE hShell32; static BOOL (WINAPI *pStrRetToStrNAW)(LPVOID,DWORD,LPSTRRET,const ITEMIDLIST *); diff --git a/modules/rostests/winetests/shell32/systray.c b/modules/rostests/winetests/shell32/systray.c index 4af10f040d..5473868de3 100644 --- a/modules/rostests/winetests/shell32/systray.c +++ b/modules/rostests/winetests/shell32/systray.c @@ -16,13 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_IE 0x600 -#include <stdarg.h> - -#include <windows.h> - -#include "wine/test.h" +#include "precomp.h" static HWND hMainWnd; static BOOL (WINAPI *pShell_NotifyIconW)(DWORD,PNOTIFYICONDATAW);

7 years

[reactos] 01/01: [OLEAUT32_WINETEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de6d0f24bc768e476996a… commit de6d0f24bc768e476996a03e04928a4a864dd31c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Dec 20 13:21:11 2017 +0100 [OLEAUT32_WINETEST] Add a PCH. --- modules/rostests/winetests/oleaut32/CMakeLists.txt | 7 +-- modules/rostests/winetests/oleaut32/dispatch.c | 14 +---- modules/rostests/winetests/oleaut32/olefont.c | 25 +-------- modules/rostests/winetests/oleaut32/olepicture.c | 59 +++++++--------------- modules/rostests/winetests/oleaut32/precomp.h | 23 +++++++++ modules/rostests/winetests/oleaut32/safearray.c | 24 +-------- modules/rostests/winetests/oleaut32/tmarshal.c | 19 +------ .../rostests/winetests/oleaut32/tmarshal_dispids.h | 2 + modules/rostests/winetests/oleaut32/typelib.c | 22 +------- modules/rostests/winetests/oleaut32/usrmarshal.c | 17 +------ modules/rostests/winetests/oleaut32/varformat.c | 22 +------- modules/rostests/winetests/oleaut32/vartest.c | 23 +-------- modules/rostests/winetests/oleaut32/vartype.c | 14 +---- 13 files changed, 55 insertions(+), 216 deletions(-) diff --git a/modules/rostests/winetests/oleaut32/CMakeLists.txt b/modules/rostests/winetests/oleaut32/CMakeLists.txt index e1d61fee9b..bd9c0f47b6 100644 --- a/modules/rostests/winetests/oleaut32/CMakeLists.txt +++ b/modules/rostests/winetests/oleaut32/CMakeLists.txt @@ -10,7 +10,6 @@ list(APPEND SOURCE olefont.c olepicture.c safearray.c - testlist.c tmarshal.c typelib.c usrmarshal.c @@ -19,7 +18,8 @@ list(APPEND SOURCE vartype.c ${CMAKE_CURRENT_BINARY_DIR}/test_reg_i.c ${CMAKE_CURRENT_BINARY_DIR}/test_tlb_i.c - ${CMAKE_CURRENT_BINARY_DIR}/tmarshal_i.c) + ${CMAKE_CURRENT_BINARY_DIR}/tmarshal_i.c + precomp.h) set(tmarshal.rc_DEPS ${CMAKE_CURRENT_BINARY_DIR}/test_reg.tlb @@ -27,7 +27,7 @@ set(tmarshal.rc_DEPS ${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb) set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS "${tmarshal.rc_DEPS}") -add_executable(oleaut32_winetest ${SOURCE} tmarshal.rc) +add_executable(oleaut32_winetest ${SOURCE} testlist.c tmarshal.rc) target_link_libraries(oleaut32_winetest uuid) set_module_type(oleaut32_winetest win32cui) add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32) @@ -37,4 +37,5 @@ if(MSVC) endif() add_dependencies(oleaut32_winetest stdole2 oleaut32_idlheaders) +add_pch(oleaut32_winetest precomp.h SOURCE) add_rostests_file(TARGET oleaut32_winetest) diff --git a/modules/rostests/winetests/oleaut32/dispatch.c b/modules/rostests/winetests/oleaut32/dispatch.c index d5ac4f0383..722488da31 100644 --- a/modules/rostests/winetests/oleaut32/dispatch.c +++ b/modules/rostests/winetests/oleaut32/dispatch.c @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define CONST_VTABLE - -#include <wine/test.h> -//#include <windef.h> -//#include <winbase.h> -#include <winnls.h> -#include <ole2.h> -//#include <oaidl.h> +#include "precomp.h" static const WCHAR szSunshine[] = {'S','u','n','s','h','i','n','e',0}; diff --git a/modules/rostests/winetests/oleaut32/olefont.c b/modules/rostests/winetests/oleaut32/olefont.c index 5cf4987173..9763271208 100644 --- a/modules/rostests/winetests/oleaut32/olefont.c +++ b/modules/rostests/winetests/oleaut32/olefont.c @@ -20,30 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -//#include <stdio.h> -//#include <math.h> -//#include <float.h> - -#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 <initguid.h> -//#include <wtypes.h> -#include <ole2.h> -#include <olectl.h> -//#include <ocidl.h> +#include "precomp.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); diff --git a/modules/rostests/winetests/oleaut32/olepicture.c b/modules/rostests/winetests/oleaut32/olepicture.c index 1b8e3957cc..02d68a4171 100644 --- a/modules/rostests/winetests/oleaut32/olepicture.c +++ b/modules/rostests/winetests/oleaut32/olepicture.c @@ -19,32 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -#include <stdio.h> -//#include <math.h> -//#include <float.h> - -#define COBJMACROS -#define CONST_VTABLE -#define NONAMELESSUNION - -#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 <ole2.h> -//#include <urlmon.h> -//#include <wtypes.h> -#include <olectl.h> -//#include <objidl.h> +#include "precomp.h" #define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } @@ -761,8 +736,8 @@ static void test_Render(void) desc.cbSizeofstruct = sizeof(PICTDESC); desc.picType = PICTYPE_ICON; - desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); - if(!desc.u.icon.hicon){ + desc.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + if(!desc.icon.hicon){ win_skip("LoadIcon failed. Skipping...\n"); delete_render_dc(hdc); return; @@ -1065,14 +1040,14 @@ static void test_himetric(void) desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_BITMAP; - desc.u.bmp.hpal = NULL; + desc.bmp.hpal = NULL; hdc = CreateCompatibleDC(0); bmp = CreateBitmap(1.9 * GetDeviceCaps(hdc, LOGPIXELSX), 1.9 * GetDeviceCaps(hdc, LOGPIXELSY), 1, 1, NULL); - desc.u.bmp.hbitmap = bmp; + desc.bmp.hbitmap = bmp; /* size in himetric units reported rounded up to next integer value */ hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); @@ -1099,7 +1074,7 @@ static void test_himetric(void) ok(icon != NULL, "failed to create icon\n"); desc.picType = PICTYPE_ICON; - desc.u.icon.hicon = icon; + desc.icon.hicon = icon; hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1138,8 +1113,8 @@ static void test_load_save_bmp(void) desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_BITMAP; - desc.u.bmp.hpal = 0; - desc.u.bmp.hbitmap = CreateBitmap(1, 1, 1, 1, NULL); + desc.bmp.hpal = 0; + desc.bmp.hbitmap = CreateBitmap(1, 1, 1, 1, NULL); hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); @@ -1150,7 +1125,7 @@ static void test_load_save_bmp(void) hr = IPicture_get_Handle(pic, &handle); ok(hr == S_OK,"get_Handle error %#8x\n", hr); - ok(IntToPtr(handle) == desc.u.bmp.hbitmap, "get_Handle returned wrong handle %#x\n", handle); + ok(IntToPtr(handle) == desc.bmp.hbitmap, "get_Handle returned wrong handle %#x\n", handle); hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); @@ -1190,7 +1165,7 @@ static void test_load_save_bmp(void) GlobalUnlock(hmem); GlobalFree(hmem); - DeleteObject(desc.u.bmp.hbitmap); + DeleteObject(desc.bmp.hbitmap); IPicture_Release(pic); } @@ -1210,7 +1185,7 @@ static void test_load_save_icon(void) desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_ICON; - desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + desc.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); @@ -1221,7 +1196,7 @@ static void test_load_save_icon(void) hr = IPicture_get_Handle(pic, &handle); ok(hr == S_OK,"get_Handle error %#8x\n", hr); - ok(IntToPtr(handle) == desc.u.icon.hicon, "get_Handle returned wrong handle %#x\n", handle); + ok(IntToPtr(handle) == desc.icon.hicon, "get_Handle returned wrong handle %#x\n", handle); hmem = GlobalAlloc(GMEM_ZEROINIT, 8192); hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); @@ -1263,7 +1238,7 @@ todo_wine GlobalUnlock(hmem); GlobalFree(hmem); - DestroyIcon(desc.u.icon.hicon); + DestroyIcon(desc.icon.hicon); IPicture_Release(pic); } @@ -1397,8 +1372,8 @@ static void test_load_save_emf(void) desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_ENHMETAFILE; - desc.u.emf.hemf = CloseEnhMetaFile(hdc); - ok(desc.u.emf.hemf != 0, "CloseEnhMetaFile failed\n"); + desc.emf.hemf = CloseEnhMetaFile(hdc); + ok(desc.emf.hemf != 0, "CloseEnhMetaFile failed\n"); hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); @@ -1409,7 +1384,7 @@ static void test_load_save_emf(void) hr = IPicture_get_Handle(pic, &handle); ok(hr == S_OK,"get_Handle error %#8x\n", hr); - ok(IntToPtr(handle) == desc.u.emf.hemf, "get_Handle returned wrong handle %#x\n", handle); + ok(IntToPtr(handle) == desc.emf.hemf, "get_Handle returned wrong handle %#x\n", handle); hmem = GlobalAlloc(GMEM_MOVEABLE, 0); hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); @@ -1455,7 +1430,7 @@ if (size) GlobalUnlock(hmem); GlobalFree(hmem); - DeleteEnhMetaFile(desc.u.emf.hemf); + DeleteEnhMetaFile(desc.emf.hemf); IPicture_Release(pic); } diff --git a/modules/rostests/winetests/oleaut32/precomp.h b/modules/rostests/winetests/oleaut32/precomp.h new file mode 100644 index 0000000000..eb417ca71f --- /dev/null +++ b/modules/rostests/winetests/oleaut32/precomp.h @@ -0,0 +1,23 @@ +#ifndef _OLEAUT32_WINETEST_PRECOMP_H_ +#define _OLEAUT32_WINETEST_PRECOMP_H_ + +#include <stdio.h> +#include <math.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define CONST_VTABLE + +#include <wine/test.h> + +#include <winnls.h> +#include <wingdi.h> +#include <ole2.h> +#include <olectl.h> +#include <tmarshal.h> +#include <test_tlb.h> + +#endif /* !_OLEAUT32_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/oleaut32/safearray.c b/modules/rostests/winetests/oleaut32/safearray.c index a73829dead..06dbb269a6 100644 --- a/modules/rostests/winetests/oleaut32/safearray.c +++ b/modules/rostests/winetests/oleaut32/safearray.c @@ -19,29 +19,7 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -#include <stdio.h> -//#include <math.h> -//#include <float.h> - -#define COBJMACROS -#define CONST_VTABLE -#include <wine/test.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "wingdi.h" -//#include "winnls.h" -//#include "winsock.h" -//#include "winerror.h" -//#include "winnt.h" -#include <objbase.h> -//#include "wtypes.h" -#include <oleauto.h> +#include "precomp.h" #ifndef FADF_CREATEVECTOR const USHORT FADF_CREATEVECTOR = 0x2000; diff --git a/modules/rostests/winetests/oleaut32/tmarshal.c b/modules/rostests/winetests/oleaut32/tmarshal.c index 8ee2f808bf..c801494c49 100644 --- a/modules/rostests/winetests/oleaut32/tmarshal.c +++ b/modules/rostests/winetests/oleaut32/tmarshal.c @@ -17,25 +17,8 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -#define COBJMACROS -#define CONST_VTABLE - -//#include <windows.h> -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <ole2.h> -//#include <ocidl.h> -//#include <stdio.h> - -#include <wine/test.h> - -#include <tmarshal.h> #include "tmarshal_dispids.h" static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); diff --git a/modules/rostests/winetests/oleaut32/tmarshal_dispids.h b/modules/rostests/winetests/oleaut32/tmarshal_dispids.h index 26f40273bf..9cdc12a7b7 100644 --- a/modules/rostests/winetests/oleaut32/tmarshal_dispids.h +++ b/modules/rostests/winetests/oleaut32/tmarshal_dispids.h @@ -17,6 +17,8 @@ * */ +#pragma once + #define DISPID_TM_NAME 1 #define DISPID_TM_DOSOMETHING 2 #define DISPID_TM_STATE 3 diff --git a/modules/rostests/winetests/oleaut32/typelib.c b/modules/rostests/winetests/oleaut32/typelib.c index 8d5687f71e..c6626991c0 100644 --- a/modules/rostests/winetests/oleaut32/typelib.c +++ b/modules/rostests/winetests/oleaut32/typelib.c @@ -19,30 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -#define COBJMACROS -#define CONST_VTABLE - -#include <wine/test.h> -//#include <stdarg.h> -#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -#include <winnls.h> #include <winreg.h> -#include <objbase.h> -#include <oleauto.h> -//#include "ocidl.h" -//#include "shlwapi.h" -#include <tmarshal.h> -#include <olectl.h> - #include <test_reg.h> -#include <test_tlb.h> #define expect_eq(expr, value, type, format) { type _ret = (expr); ok((value) == _ret, #expr " expected " format " got " format "\n", value, _ret); } #define expect_int(expr, value) expect_eq(expr, (int)(value), int, "%d") diff --git a/modules/rostests/winetests/oleaut32/usrmarshal.c b/modules/rostests/winetests/oleaut32/usrmarshal.c index 924183e9aa..d570842a4e 100644 --- a/modules/rostests/winetests/oleaut32/usrmarshal.c +++ b/modules/rostests/winetests/oleaut32/usrmarshal.c @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define CONST_VTABLE - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <ole2.h> -//#include "objbase.h" -//#include "propidl.h" /* for LPSAFEARRAY_User* routines */ - -#include <wine/test.h> +#include "precomp.h" #if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) # define V_U2(A) ((A)->n1.n2) diff --git a/modules/rostests/winetests/oleaut32/varformat.c b/modules/rostests/winetests/oleaut32/varformat.c index cabab801b7..78faa277e4 100644 --- a/modules/rostests/winetests/oleaut32/varformat.c +++ b/modules/rostests/winetests/oleaut32/varformat.c @@ -19,27 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -//#include <stdio.h> -//#include <math.h> -//#include <float.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winsock.h" -#include <wine/test.h> -//#include "winuser.h" -//#include "wingdi.h" -#include <winnls.h> -//#include "winerror.h" -//#include "winnt.h" -#include <objbase.h> -//#include "wtypes.h" -#include <oleauto.h> +#include "precomp.h" static HMODULE hOleaut32; diff --git a/modules/rostests/winetests/oleaut32/vartest.c b/modules/rostests/winetests/oleaut32/vartest.c index 770ca82680..38eb1806a8 100644 --- a/modules/rostests/winetests/oleaut32/vartest.c +++ b/modules/rostests/winetests/oleaut32/vartest.c @@ -19,31 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -//#include <stdarg.h> -#include <stdio.h> -#include <math.h> #include <float.h> -#define COBJMACROS -#define CONST_VTABLE - -//#include "windef.h" -//#include "winbase.h" -//#include "winsock.h" -#include <wine/test.h> -//#include "winuser.h" -//#include "wingdi.h" -#include <winnls.h> -//#include "winerror.h" -//#include "winnt.h" -#include <objbase.h> -//#include "wtypes.h" -#include <oleauto.h> - static HMODULE hOleaut32; static HRESULT (WINAPI *pVarUdateFromDate)(DATE,ULONG,UDATE*); diff --git a/modules/rostests/winetests/oleaut32/vartype.c b/modules/rostests/winetests/oleaut32/vartype.c index e6a577c844..5086e4b500 100644 --- a/modules/rostests/winetests/oleaut32/vartype.c +++ b/modules/rostests/winetests/oleaut32/vartype.c @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define CONST_VTABLE -#define COBJMACROS - -#include <wine/test.h> -#include <winnls.h> -#include <objbase.h> -#include <oleauto.h> -#include <math.h> -#include <test_tlb.h> +#include "precomp.h" #include <initguid.h>

7 years

[reactos] 01/01: [OLE32_WINETEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cd1c84f7f27f5b218d27… commit 2cd1c84f7f27f5b218d273368891b712efb78ae3 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Dec 20 13:13:26 2017 +0100 [OLE32_WINETEST] Add a PCH. --- modules/rostests/winetests/ole32/CMakeLists.txt | 5 ++- modules/rostests/winetests/ole32/clipboard.c | 20 +--------- modules/rostests/winetests/ole32/compobj.c | 24 +----------- modules/rostests/winetests/ole32/defaulthandler.c | 17 +-------- modules/rostests/winetests/ole32/dragdrop.c | 19 +--------- modules/rostests/winetests/ole32/errorinfo.c | 16 +------- modules/rostests/winetests/ole32/hglobalstream.c | 15 +------- modules/rostests/winetests/ole32/marshal.c | 24 +----------- modules/rostests/winetests/ole32/moniker.c | 22 +---------- modules/rostests/winetests/ole32/ole2.c | 21 +---------- modules/rostests/winetests/ole32/ole_server.c | 10 +---- modules/rostests/winetests/ole32/precomp.h | 21 +++++++++++ modules/rostests/winetests/ole32/propvariant.c | 14 +------ modules/rostests/winetests/ole32/stg_prop.c | 14 +------ modules/rostests/winetests/ole32/storage32.c | 45 ++++++++--------------- modules/rostests/winetests/ole32/usrmarshal.c | 17 +-------- 16 files changed, 57 insertions(+), 247 deletions(-) diff --git a/modules/rostests/winetests/ole32/CMakeLists.txt b/modules/rostests/winetests/ole32/CMakeLists.txt index 78fe6dff66..0cb4ec3312 100644 --- a/modules/rostests/winetests/ole32/CMakeLists.txt +++ b/modules/rostests/winetests/ole32/CMakeLists.txt @@ -16,9 +16,9 @@ list(APPEND SOURCE stg_prop.c storage32.c usrmarshal.c - testlist.c) + precomp.h) -add_executable(ole32_winetest ${SOURCE}) +add_executable(ole32_winetest ${SOURCE} testlist.c) target_link_libraries(ole32_winetest uuid) set_module_type(ole32_winetest win32cui) add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32) @@ -27,4 +27,5 @@ if(MSVC) add_importlibs(ole32_winetest ntdll) endif() +add_pch(ole32_winetest precomp.h SOURCE) add_rostests_file(TARGET ole32_winetest) diff --git a/modules/rostests/winetests/ole32/clipboard.c b/modules/rostests/winetests/ole32/clipboard.c index ff3b03da0d..64fafaf1f2 100644 --- a/modules/rostests/winetests/ole32/clipboard.c +++ b/modules/rostests/winetests/ole32/clipboard.c @@ -18,24 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define CONST_VTABLE -#define NONAMELESSUNION - -//#include <stdarg.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <ole2.h> -//#include "objbase.h" - -#include <wine/test.h> +#include "precomp.h" #define InitFormatEtc(fe, cf, med) \ {\ @@ -1290,7 +1274,7 @@ static void test_flushed_getdata(void) ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); if(SUCCEEDED(hr)) { - hr = IStorage_Stat(med.u.pstg, &stat, STATFLAG_NONAME); + hr = IStorage_Stat(med.pstg, &stat, STATFLAG_NONAME); ok(hr == S_OK, "got %08x\n", hr); ok(stat.grfMode == (STGM_SHARE_EXCLUSIVE | STGM_READWRITE), "got %08x\n", stat.grfMode); ReleaseStgMedium(&med); diff --git a/modules/rostests/winetests/ole32/compobj.c b/modules/rostests/winetests/ole32/compobj.c index 6dd9e334cc..eeb4686f15 100644 --- a/modules/rostests/winetests/ole32/compobj.c +++ b/modules/rostests/winetests/ole32/compobj.c @@ -18,31 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -#define COBJMACROS -#define CONST_VTABLE - -#include <stdarg.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <winreg.h> -#define USE_COM_CONTEXT_DEF -#include <initguid.h> -//#include "objbase.h" -//#include "shlguid.h" -#include <ole2.h> -#include <urlmon.h> /* for CLSID_FileProtocol */ #include <dde.h> - #include <ctxtcall.h> - -#include <wine/test.h> +#include <initguid.h> extern const IID GUID_NULL; diff --git a/modules/rostests/winetests/ole32/defaulthandler.c b/modules/rostests/winetests/ole32/defaulthandler.c index d8119b1b67..c9e6af98b9 100644 --- a/modules/rostests/winetests/ole32/defaulthandler.c +++ b/modules/rostests/winetests/ole32/defaulthandler.c @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#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 <ole2.h> -//#include "objbase.h" - -#include <wine/test.h> +#include "precomp.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE diff --git a/modules/rostests/winetests/ole32/dragdrop.c b/modules/rostests/winetests/ole32/dragdrop.c index a2b2dbfe4c..e14e757287 100644 --- a/modules/rostests/winetests/ole32/dragdrop.c +++ b/modules/rostests/winetests/ole32/dragdrop.c @@ -18,24 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define _WIN32_DCOM -#define COBJMACROS -#define CONST_VTABLE - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <ole2.h> -//#include "objbase.h" - -#include <wine/test.h> - +#include "precomp.h" #define METHOD_LIST \ METHOD(DO_EnumFormatEtc), \ diff --git a/modules/rostests/winetests/ole32/errorinfo.c b/modules/rostests/winetests/ole32/errorinfo.c index 25a7cdb498..c3e99a7a7b 100644 --- a/modules/rostests/winetests/ole32/errorinfo.c +++ b/modules/rostests/winetests/ole32/errorinfo.c @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define CONST_VTABLE - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <ole2.h> -//#include "objbase.h" - -#include <wine/test.h> +#include "precomp.h" #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) diff --git a/modules/rostests/winetests/ole32/hglobalstream.c b/modules/rostests/winetests/ole32/hglobalstream.c index 52cf915cbb..8789623869 100644 --- a/modules/rostests/winetests/ole32/hglobalstream.c +++ b/modules/rostests/winetests/ole32/hglobalstream.c @@ -19,20 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <ole2.h> -//#include "objbase.h" - -#include <wine/test.h> +#include "precomp.h" #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) diff --git a/modules/rostests/winetests/ole32/marshal.c b/modules/rostests/winetests/ole32/marshal.c index 020b678778..10564cd536 100644 --- a/modules/rostests/winetests/ole32/marshal.c +++ b/modules/rostests/winetests/ole32/marshal.c @@ -18,29 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define _WIN32_DCOM -#define COBJMACROS -#define CONST_VTABLE - -//#include <stdarg.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winnls.h> -#include <ole2.h> -//#include "objbase.h" -//#include "olectl.h" -#include <shlguid.h> -//#include "shobjidl.h" -//#include "initguid.h" +#include "precomp.h" -#include <wine/test.h> +#include <shlguid.h> DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); diff --git a/modules/rostests/winetests/ole32/moniker.c b/modules/rostests/winetests/ole32/moniker.c index 464ba62dc1..ca94904696 100644 --- a/modules/rostests/winetests/ole32/moniker.c +++ b/modules/rostests/winetests/ole32/moniker.c @@ -18,29 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define _WIN32_DCOM -#define COBJMACROS -#define CONST_VTABLE - -//#include <stdarg.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <ole2.h> -//#include "objbase.h" -//#include "ocidl.h" -//#include "initguid.h" +#include "precomp.h" + #include <comcat.h> #include <olectl.h> -#include <wine/test.h> - #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) diff --git a/modules/rostests/winetests/ole32/ole2.c b/modules/rostests/winetests/ole32/ole2.c index 82ec820b62..288517c7d9 100644 --- a/modules/rostests/winetests/ole32/ole2.c +++ b/modules/rostests/winetests/ole32/ole2.c @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define CONST_VTABLE -#define WIN32_LEAN_AND_MEAN - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <wingdi.h> -#include <winreg.h> -#include <ole2.h> -//#include "objbase.h" -//#include "shlguid.h" - -#include <wine/test.h> +#include "precomp.h" #ifndef __REACTOS__ #include "initguid.h" diff --git a/modules/rostests/winetests/ole32/ole_server.c b/modules/rostests/winetests/ole32/ole_server.c index 77abda47aa..9ca8bdf122 100644 --- a/modules/rostests/winetests/ole32/ole_server.c +++ b/modules/rostests/winetests/ole32/ole_server.c @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE - -#include <windows.h> -#include <exdisp.h> -#include <tlhelp32.h> -#include <stdio.h> -#include <assert.h> -#include "wine/test.h" +#include "precomp.h" #include <initguid.h> DEFINE_GUID(CLSID_WineTestObject, 0xdeadbeef,0xdead,0xbeef,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef); diff --git a/modules/rostests/winetests/ole32/precomp.h b/modules/rostests/winetests/ole32/precomp.h new file mode 100644 index 0000000000..24b5295b71 --- /dev/null +++ b/modules/rostests/winetests/ole32/precomp.h @@ -0,0 +1,21 @@ +#ifndef _OLE32_WINETEST_PRECOMP_H_ +#define _OLE32_WINETEST_PRECOMP_H_ + +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define CONST_VTABLE + +#include <wine/test.h> + +#include <winnls.h> +#include <winreg.h> +#include <wingdi.h> +#define USE_COM_CONTEXT_DEF +#include <ole2.h> + +#endif /* !_OLE32_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/ole32/propvariant.c b/modules/rostests/winetests/ole32/propvariant.c index 26a5a91115..8c3256621e 100644 --- a/modules/rostests/winetests/ole32/propvariant.c +++ b/modules/rostests/winetests/ole32/propvariant.c @@ -18,21 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windows.h" +#include "precomp.h" -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> #include <ddeml.h> -#include <ole2.h> - -#include <wine/test.h> /* invalid in all versions */ #define PROP_INV 0x7f diff --git a/modules/rostests/winetests/ole32/stg_prop.c b/modules/rostests/winetests/ole32/stg_prop.c index 318159d9ac..9b189c64c9 100644 --- a/modules/rostests/winetests/ole32/stg_prop.c +++ b/modules/rostests/winetests/ole32/stg_prop.c @@ -16,19 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#define COBJMACROS -#include <objbase.h> -#include <wine/test.h> -//#include "initguid.h" +#include "precomp.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); diff --git a/modules/rostests/winetests/ole32/storage32.c b/modules/rostests/winetests/ole32/storage32.c index b7ed290954..756b7691df 100644 --- a/modules/rostests/winetests/ole32/storage32.c +++ b/modules/rostests/winetests/ole32/storage32.c @@ -18,21 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -//#include <stdio.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include <windows.h> -#include <wine/test.h> -#include <winnls.h> -#include <ole2.h> -//#include "objidl.h" #include <initguid.h> DEFINE_GUID( test_stg_cls, 0x88888888, 0x0425, 0x0000, 0,0,0,0,0,0,0,0); @@ -3540,10 +3527,10 @@ static void test_locking(void) hfile = CreateFileW(filename, open_mode, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(hfile != INVALID_HANDLE_VALUE, "couldn't open file with mode %x\n", current->stg_mode); - ol.u.s.OffsetHigh = 0; + ol.OffsetHigh = 0; ol.hEvent = NULL; - for (ol.u.s.Offset = 0x7ffffe00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) + for (ol.Offset = 0x7ffffe00; ol.Offset != 0x80000000; ol.Offset++) { if (LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK|LOCKFILE_FAIL_IMMEDIATELY, 0, 1, 0, &ol)) locked = FALSE; @@ -3555,7 +3542,7 @@ static void test_locking(void) UnlockFileEx(hfile, 0, 1, 0, &ol); - if ((ol.u.s.Offset&0x1ff) == *next_lock) + if ((ol.Offset&0x1ff) == *next_lock) { expect_locked = TRUE; next_lock++; @@ -3565,12 +3552,12 @@ static void test_locking(void) if (!current->todo || locked == expect_locked) ok(locked == expect_locked, "byte %x of file with mode %x is %slocked but should %sbe\n", - ol.u.s.Offset, current->stg_mode, locked?"":"not ", expect_locked?"":"not "); + ol.Offset, current->stg_mode, locked?"":"not ", expect_locked?"":"not "); else { any_failure = TRUE; todo_wine ok(locked == expect_locked, "byte %x of file with mode %x is %slocked but should %sbe\n", - ol.u.s.Offset, current->stg_mode, locked?"":"not ", expect_locked?"":"not "); + ol.Offset, current->stg_mode, locked?"":"not ", expect_locked?"":"not "); } } @@ -3589,17 +3576,17 @@ static void test_locking(void) hfile = CreateFileW(filename, open_mode, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(hfile != INVALID_HANDLE_VALUE, "couldn't open file with mode %x\n", current->stg_mode); - ol.u.s.OffsetHigh = 0; + ol.OffsetHigh = 0; ol.hEvent = NULL; - for (ol.u.s.Offset = 0x7ffffe00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) + for (ol.Offset = 0x7ffffe00; ol.Offset != 0x80000000; ol.Offset++) { - if (ol.u.s.Offset == 0x7fffff92 || - (ol.u.s.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READWRITE)) || - (ol.u.s.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READ))) + if (ol.Offset == 0x7fffff92 || + (ol.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READWRITE)) || + (ol.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READ))) continue; /* This makes opens hang */ - if (ol.u.s.Offset < 0x7fffff00) + if (ol.Offset < 0x7fffff00) LockFileEx(hfile, 0, 0, 1, 0, &ol); else LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &ol); @@ -3612,11 +3599,11 @@ static void test_locking(void) failed = FAILED(hr); - if (!expect_failed && (ol.u.s.Offset&0x1ff) == next_range[0]) + if (!expect_failed && (ol.Offset&0x1ff) == next_range[0]) { expect_failed = TRUE; } - else if (expect_failed && (ol.u.s.Offset&0x1ff) == next_range[1]) + else if (expect_failed && (ol.Offset&0x1ff) == next_range[1]) { expect_failed = FALSE; next_range += 2; @@ -3624,12 +3611,12 @@ static void test_locking(void) if (!current->todo || failed == expect_failed) ok(failed == expect_failed, "open with byte %x locked, mode %x %s but should %s\n", - ol.u.s.Offset, current->stg_mode, failed?"failed":"succeeded", expect_failed?"fail":"succeed"); + ol.Offset, current->stg_mode, failed?"failed":"succeeded", expect_failed?"fail":"succeed"); else { any_failure = TRUE; todo_wine ok(failed == expect_failed, "open with byte %x locked, mode %x %s but should %s\n", - ol.u.s.Offset, current->stg_mode, failed?"failed":"succeeded", expect_failed?"fail":"succeed"); + ol.Offset, current->stg_mode, failed?"failed":"succeeded", expect_failed?"fail":"succeed"); } } diff --git a/modules/rostests/winetests/ole32/usrmarshal.c b/modules/rostests/winetests/ole32/usrmarshal.c index 8cce648209..bc9525914e 100644 --- a/modules/rostests/winetests/ole32/usrmarshal.c +++ b/modules/rostests/winetests/ole32/usrmarshal.c @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define CONST_VTABLE -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <ole2.h> -//#include "objbase.h" -//#include "objidl.h" - -#include <wine/test.h> +#include "precomp.h" ULONG __RPC_USER HMETAFILE_UserSize(ULONG *, ULONG, HMETAFILE *); unsigned char * __RPC_USER HMETAFILE_UserMarshal(ULONG *, unsigned char *, HMETAFILE *);

7 years

[reactos] 01/01: [NTDLL_WINETEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a76e7d13e2b52f91a52a6… commit a76e7d13e2b52f91a52a62150906b84fed7d6a21 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Dec 20 13:07:06 2017 +0100 [NTDLL_WINETEST] Add a PCH. --- modules/rostests/winetests/ntdll/CMakeLists.txt | 9 ++++----- modules/rostests/winetests/ntdll/atom.c | 17 +---------------- modules/rostests/winetests/ntdll/change.c | 9 +-------- modules/rostests/winetests/ntdll/directory.c | 13 +------------ modules/rostests/winetests/ntdll/env.c | 2 -- modules/rostests/winetests/ntdll/error.c | 14 ++------------ modules/rostests/winetests/ntdll/exception.c | 19 ++----------------- modules/rostests/winetests/ntdll/file.c | 14 +------------- modules/rostests/winetests/ntdll/generated.c | 8 -------- modules/rostests/winetests/ntdll/info.c | 2 -- modules/rostests/winetests/ntdll/large_int.c | 3 --- modules/rostests/winetests/ntdll/ntdll_test.h | 22 ++++++++++++++-------- modules/rostests/winetests/ntdll/om.c | 4 ---- modules/rostests/winetests/ntdll/pipe.c | 14 +------------- modules/rostests/winetests/ntdll/port.c | 13 +------------ modules/rostests/winetests/ntdll/process.c | 5 ----- modules/rostests/winetests/ntdll/reg.c | 7 ++----- modules/rostests/winetests/ntdll/rtl.c | 12 ++++++------ modules/rostests/winetests/ntdll/rtlstr.c | 8 ++------ modules/rostests/winetests/ntdll/string.c | 3 --- modules/rostests/winetests/ntdll/time.c | 3 +-- 21 files changed, 39 insertions(+), 162 deletions(-) diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index 0bbc8d33a1..2e9a5ef2d2 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -24,15 +24,13 @@ list(APPEND SOURCE rtlstr.c string.c time.c - testlist.c) + ntdll_test.h) if(ARCH STREQUAL "i386") - list(APPEND SOURCE - generated.c - ) + list(APPEND SOURCE generated.c) endif() -add_executable(ntdll_winetest ${SOURCE}) +add_executable(ntdll_winetest ${SOURCE} testlist.c) if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(ntdll_winetest "-Wno-format") @@ -40,4 +38,5 @@ endif() set_module_type(ntdll_winetest win32cui) add_importlibs(ntdll_winetest user32 ole32 advapi32 msvcrt kernel32 ntdll) +add_pch(ntdll_winetest ntdll_test.h SOURCE) add_rostests_file(TARGET ntdll_winetest) diff --git a/modules/rostests/winetests/ntdll/atom.c b/modules/rostests/winetests/ntdll/atom.c index 6a16a8d0b6..e8ad049aa9 100755 --- a/modules/rostests/winetests/ntdll/atom.c +++ b/modules/rostests/winetests/ntdll/atom.c @@ -21,22 +21,7 @@ * windows. */ -#include <stdio.h> -#include <stdarg.h> - -#include "ntstatus.h" -/* Define WIN32_NO_STATUS so MSVC does not give us duplicate macro - * definition errors when we get to winnt.h - */ -#define WIN32_NO_STATUS - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "winuser.h" -#include "wine/test.h" -#include "wine/winternl.h" +#include "ntdll_test.h" #ifndef __WINE_WINTERNL_H typedef unsigned short RTL_ATOM, *PRTL_ATOM; diff --git a/modules/rostests/winetests/ntdll/change.c b/modules/rostests/winetests/ntdll/change.c index fc9a18185a..8dfc68d788 100644 --- a/modules/rostests/winetests/ntdll/change.c +++ b/modules/rostests/winetests/ntdll/change.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <ntstatus.h> -#define WIN32_NO_STATUS -#include <windows.h> -#include <winnt.h> -#include <wine/winternl.h> -#include <winerror.h> -#include <stdio.h> -#include "wine/test.h" +#include "ntdll_test.h" static NTSTATUS (WINAPI *pNtNotifyChangeDirectoryFile)( HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID, diff --git a/modules/rostests/winetests/ntdll/directory.c b/modules/rostests/winetests/ntdll/directory.c index 21f22ad043..75f371cfa3 100644 --- a/modules/rostests/winetests/ntdll/directory.c +++ b/modules/rostests/winetests/ntdll/directory.c @@ -24,18 +24,7 @@ * windows. */ -#include <stdio.h> -#include <stdarg.h> - -#include "ntstatus.h" -/* Define WIN32_NO_STATUS so MSVC does not give us duplicate macro - * definition errors when we get to winnt.h - */ -#define WIN32_NO_STATUS - -#include "wine/test.h" -#include "winnls.h" -#include "wine/winternl.h" +#include "ntdll_test.h" static NTSTATUS (WINAPI *pNtClose)( PHANDLE ); static NTSTATUS (WINAPI *pNtOpenFile) ( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG ); diff --git a/modules/rostests/winetests/ntdll/env.c b/modules/rostests/winetests/ntdll/env.c index 8989760f43..5d024ec319 100755 --- a/modules/rostests/winetests/ntdll/env.c +++ b/modules/rostests/winetests/ntdll/env.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - #include "ntdll_test.h" static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPDWORD reslen, diff --git a/modules/rostests/winetests/ntdll/error.c b/modules/rostests/winetests/ntdll/error.c index 8a7732bdba..5f725e647f 100755 --- a/modules/rostests/winetests/ntdll/error.c +++ b/modules/rostests/winetests/ntdll/error.c @@ -19,19 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#include "ntdll_test.h" -#include "ntstatus.h" -#define WIN32_NO_STATUS - -#include "wine/test.h" - -#include "windef.h" -#include "winbase.h" -#include "rpcnterr.h" -#include "winreg.h" -#include "wine/winternl.h" +#include <rpcnterr.h> /* FIXME!!! this test checks only mappings, defined by MSDN * It is necessary to add other mappings and to test them diff --git a/modules/rostests/winetests/ntdll/exception.c b/modules/rostests/winetests/ntdll/exception.c index 8dc2d90482..1fb7786f29 100644 --- a/modules/rostests/winetests/ntdll/exception.c +++ b/modules/rostests/winetests/ntdll/exception.c @@ -18,24 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#include "ntdll_test.h" -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x500 /* For NTSTATUS */ -#endif - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winreg.h" -#include "wine/winternl.h" -#include "wine/exception.h" -#include "wine/test.h" +#include <wine/exception.h> static void *code_mem; diff --git a/modules/rostests/winetests/ntdll/file.c b/modules/rostests/winetests/ntdll/file.c index 3316399c2f..36ca9fc0cf 100644 --- a/modules/rostests/winetests/ntdll/file.c +++ b/modules/rostests/winetests/ntdll/file.c @@ -24,19 +24,7 @@ * windows. */ -#include <stdio.h> -#include <stdarg.h> - -#include "ntstatus.h" -/* Define WIN32_NO_STATUS so MSVC does not give us duplicate macro - * definition errors when we get to winnt.h - */ -#define WIN32_NO_STATUS - -#include "wine/test.h" -#include "wine/winternl.h" -#include "winuser.h" -#include "wine/winioctl.h" +#include "ntdll_test.h" /* FIXME */ typedef struct _REPARSE_DATA_BUFFER { diff --git a/modules/rostests/winetests/ntdll/generated.c b/modules/rostests/winetests/ntdll/generated.c index b099a5c084..54b43a3374 100755 --- a/modules/rostests/winetests/ntdll/generated.c +++ b/modules/rostests/winetests/ntdll/generated.c @@ -5,16 +5,8 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - -#define WINE_NOWINSOCK - #include "ntdll_test.h" -#include "wine/test.h" - /*********************************************************************** * Compatibility macros */ diff --git a/modules/rostests/winetests/ntdll/info.c b/modules/rostests/winetests/ntdll/info.c index d03d26c0b9..f42619a820 100755 --- a/modules/rostests/winetests/ntdll/info.c +++ b/modules/rostests/winetests/ntdll/info.c @@ -19,8 +19,6 @@ */ #include "ntdll_test.h" -#include <winnls.h> -#include <stdio.h> static NTSTATUS (WINAPI * pRtlDowncaseUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *, BOOLEAN); static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); diff --git a/modules/rostests/winetests/ntdll/large_int.c b/modules/rostests/winetests/ntdll/large_int.c index 4562e6768e..2313f9eab8 100755 --- a/modules/rostests/winetests/ntdll/large_int.c +++ b/modules/rostests/winetests/ntdll/large_int.c @@ -21,11 +21,8 @@ * windows. */ -#include <stdlib.h> - #include "ntdll_test.h" - /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; static LONGLONG (WINAPI *pRtlExtendedMagicDivide)(LONGLONG, LONGLONG, INT); diff --git a/modules/rostests/winetests/ntdll/ntdll_test.h b/modules/rostests/winetests/ntdll/ntdll_test.h index 84ed6a4a71..d192e332dd 100755 --- a/modules/rostests/winetests/ntdll/ntdll_test.h +++ b/modules/rostests/winetests/ntdll/ntdll_test.h @@ -18,14 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#ifndef _NTDLL_TEST_H_ +#define _NTDLL_TEST_H_ + +#include <stdio.h> +#include <ntstatus.h> -#include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winreg.h" +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <wine/test.h> +#include <winuser.h> +#include <winnls.h> +#include <winioctl.h> +#include <wine/winternl.h> -#include "wine/winternl.h" -#include "wine/test.h" +#endif /* !_NTDLL_TEST_H_ */ diff --git a/modules/rostests/winetests/ntdll/om.c b/modules/rostests/winetests/ntdll/om.c index 651db0a1ee..49784e5964 100644 --- a/modules/rostests/winetests/ntdll/om.c +++ b/modules/rostests/winetests/ntdll/om.c @@ -20,10 +20,6 @@ */ #include "ntdll_test.h" -#include "wine/winternl.h" -#include "stdio.h" -#include "winnt.h" -#include "stdlib.h" static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*, BOOL, LPCSTR); static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); diff --git a/modules/rostests/winetests/ntdll/pipe.c b/modules/rostests/winetests/ntdll/pipe.c index a3984e1a9e..48cfad03b5 100644 --- a/modules/rostests/winetests/ntdll/pipe.c +++ b/modules/rostests/winetests/ntdll/pipe.c @@ -17,19 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winnls.h" -#include "wine/test.h" -#include "wine/winternl.h" -#include "winioctl.h" +#include "ntdll_test.h" #ifndef __WINE_WINTERNL_H diff --git a/modules/rostests/winetests/ntdll/port.c b/modules/rostests/winetests/ntdll/port.c index e5bb3edc28..1b47718049 100644 --- a/modules/rostests/winetests/ntdll/port.c +++ b/modules/rostests/winetests/ntdll/port.c @@ -17,18 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winnls.h" -#include "wine/test.h" -#include "wine/winternl.h" +#include "ntdll_test.h" #ifndef __WINE_WINTERNL_H diff --git a/modules/rostests/winetests/ntdll/process.c b/modules/rostests/winetests/ntdll/process.c index 41303b7e9a..8187f637e3 100644 --- a/modules/rostests/winetests/ntdll/process.c +++ b/modules/rostests/winetests/ntdll/process.c @@ -18,13 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - #include "ntdll_test.h" -#include "windef.h" -#include "winbase.h" - static NTSTATUS (WINAPI *pNtResumeProcess)(HANDLE); static NTSTATUS (WINAPI *pNtSuspendProcess)(HANDLE); static NTSTATUS (WINAPI *pNtSuspendThread)(HANDLE,PULONG); diff --git a/modules/rostests/winetests/ntdll/reg.c b/modules/rostests/winetests/ntdll/reg.c index 67833b18f5..1f3bd0acb4 100755 --- a/modules/rostests/winetests/ntdll/reg.c +++ b/modules/rostests/winetests/ntdll/reg.c @@ -23,11 +23,8 @@ */ #include "ntdll_test.h" -#include "wine/winternl.h" -#include "stdio.h" -#include "winnt.h" -#include "winnls.h" -#include "stdlib.h" + +#include <winreg.h> /* A test string */ static const WCHAR stringW[] = {'s', 't', 'r', 'i', 'n', 'g', 'W', 0}; diff --git a/modules/rostests/winetests/ntdll/rtl.c b/modules/rostests/winetests/ntdll/rtl.c index 5ba6b1159d..147fd2d116 100755 --- a/modules/rostests/winetests/ntdll/rtl.c +++ b/modules/rostests/winetests/ntdll/rtl.c @@ -21,14 +21,14 @@ * windows. */ -#include <stdlib.h> - #include "ntdll_test.h" -#include "inaddr.h" -#include "in6addr.h" -#include "initguid.h" + +#include <inaddr.h> +#include <in6addr.h> +#include <objbase.h> +#include <initguid.h> #define COBJMACROS -#include "shobjidl.h" +#include <shobjidl.h> #ifndef __WINE_WINTERNL_H diff --git a/modules/rostests/winetests/ntdll/rtlstr.c b/modules/rostests/winetests/ntdll/rtlstr.c index 7f889dfa0d..c113f76a89 100755 --- a/modules/rostests/winetests/ntdll/rtlstr.c +++ b/modules/rostests/winetests/ntdll/rtlstr.c @@ -22,13 +22,9 @@ * windows. */ -#include <stdlib.h> - -#define INITGUID - #include "ntdll_test.h" -#include "winnls.h" -#include "guiddef.h" + +#include <initguid.h> #define HASH_STRING_ALGORITHM_X65599 1 #define HASH_STRING_ALGORITHM_INVALID 0xffffffff diff --git a/modules/rostests/winetests/ntdll/string.c b/modules/rostests/winetests/ntdll/string.c index 9bbaddd415..9de0039fe9 100755 --- a/modules/rostests/winetests/ntdll/string.c +++ b/modules/rostests/winetests/ntdll/string.c @@ -21,11 +21,8 @@ * windows. */ -#include <stdlib.h> - #include "ntdll_test.h" - /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pRtlUnicodeStringToAnsiString)(STRING *, const UNICODE_STRING *, BOOLEAN); diff --git a/modules/rostests/winetests/ntdll/time.c b/modules/rostests/winetests/ntdll/time.c index dc570e14ce..7d9e65148e 100755 --- a/modules/rostests/winetests/ntdll/time.c +++ b/modules/rostests/winetests/ntdll/time.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #include "ntdll_test.h" /* FIXME: Inspect */ @@ -203,7 +202,7 @@ static void test_NtGetTickCount(void) for (i = 0; i < 5; ++i) { - diff = (user_shared_data->u.TickCountQuad * user_shared_data->TickCountMultiplier) >> 24; + diff = (user_shared_data->TickCountQuad * user_shared_data->TickCountMultiplier) >> 24; diff = pNtGetTickCount() - diff; ok(diff < 32, "NtGetTickCount - TickCountQuad too high, expected < 32 got %d\n", diff); Sleep(50);

7 years

← Newer
1
...
9
10
11
12
13
14
15
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017