Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cfc324cd1bf5e236f809… commit 4cfc324cd1bf5e236f809039fb2a46216e2c653b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 18 13:48:13 2017 +0100 [MSI_WINETEST] Add a PCH. --- modules/rostests/winetests/msi/CMakeLists.txt | 5 +++-- modules/rostests/winetests/msi/action.c | 16 +--------------- modules/rostests/winetests/msi/automation.c | 13 ++----------- modules/rostests/winetests/msi/db.c | 12 +----------- modules/rostests/winetests/msi/format.c | 8 +------- modules/rostests/winetests/msi/install.c | 16 +--------------- modules/rostests/winetests/msi/msi.c | 13 +------------ modules/rostests/winetests/msi/package.c | 10 +--------- modules/rostests/winetests/msi/patch.c | 12 +----------- modules/rostests/winetests/msi/precomp.h | 27 +++++++++++++++++++++++++++ modules/rostests/winetests/msi/record.c | 6 +----- modules/rostests/winetests/msi/source.c | 11 +---------- modules/rostests/winetests/msi/suminfo.c | 10 +--------- 13 files changed, 42 insertions(+), 117 deletions(-) diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 01498466d0..3a3a03d77f 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -15,10 +15,11 @@ list(APPEND SOURCE record.c source.c suminfo.c - testlist.c) + precomp.h) -add_executable(msi_winetest ${SOURCE}) +add_executable(msi_winetest ${SOURCE} testlist.c) target_link_libraries(msi_winetest uuid) set_module_type(msi_winetest win32cui) add_importlibs(msi_winetest cabinet msi shell32 ole32 oleaut32 user32 advapi32 version msvcrt kernel32) +add_pch(msi_winetest precomp.h SOURCE) add_rostests_file(TARGET msi_winetest) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 11e244c6e2..7d8eaa2ebf 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -19,21 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_MSI 300 -#include <stdio.h> -#include <stdlib.h> - -#include <windows.h> -#include <msiquery.h> -#include <msidefs.h> -#include <msi.h> -#include <fci.h> -#include <srrestoreptapi.h> -#include <wtypes.h> -#include <shellapi.h> -#include <winsvc.h> - -#include "wine/test.h" +#include "precomp.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); diff --git a/modules/rostests/winetests/msi/automation.c b/modules/rostests/winetests/msi/automation.c index e4d2faad5c..1cb4959bc3 100644 --- a/modules/rostests/winetests/msi/automation.c +++ b/modules/rostests/winetests/msi/automation.c @@ -19,19 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#include <stdio.h> +#include "precomp.h" -#include <initguid.h> -#include <windows.h> -#include <msiquery.h> -#include <msidefs.h> -#include <msi.h> -#include <fci.h> -#include <oaidl.h> - -#include "wine/test.h" +#include <ole2.h> static BOOL is_wow64; diff --git a/modules/rostests/winetests/msi/db.c b/modules/rostests/winetests/msi/db.c index 4ea1f10024..5f0738d845 100644 --- a/modules/rostests/winetests/msi/db.c +++ b/modules/rostests/winetests/msi/db.c @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <stdio.h> - -#include <windows.h> -#include <objidl.h> -#include <msi.h> -#include <msidefs.h> -#include <msiquery.h> - -#include "wine/test.h" +#include "precomp.h" static const char *msifile = "winetest-db.msi"; static const char *msifile2 = "winetst2-db.msi"; diff --git a/modules/rostests/winetests/msi/format.c b/modules/rostests/winetests/msi/format.c index b476c6b290..a8bd290069 100644 --- a/modules/rostests/winetests/msi/format.c +++ b/modules/rostests/winetests/msi/format.c @@ -19,13 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <windows.h> -#include <shlwapi.h> -#include <msi.h> -#include <msiquery.h> - -#include "wine/test.h" +#include "precomp.h" static const char msifile[] = "winetest-format.msi"; static const WCHAR msifileW[] = diff --git a/modules/rostests/winetests/msi/install.c b/modules/rostests/winetests/msi/install.c index 47a8ad9eff..21ef1b2e79 100644 --- a/modules/rostests/winetests/msi/install.c +++ b/modules/rostests/winetests/msi/install.c @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_MSI 300 -#define COBJMACROS - -#include <stdio.h> - -#include <windows.h> -#include <msiquery.h> -#include <msidefs.h> -#include <msi.h> -#include <fci.h> -#include <objidl.h> -#include <srrestoreptapi.h> -#include <shlobj.h> - -#include "wine/test.h" +#include "precomp.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE*); diff --git a/modules/rostests/winetests/msi/msi.c b/modules/rostests/winetests/msi/msi.c index 6ae7753870..25d9dad459 100644 --- a/modules/rostests/winetests/msi/msi.c +++ b/modules/rostests/winetests/msi/msi.c @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_MSI 300 -#define COBJMACROS - -#include <stdio.h> -#include <windows.h> -#include <msi.h> -#include <msiquery.h> -#include <msidefs.h> -#include <sddl.h> -#include <fci.h> - -#include "wine/test.h" +#include "precomp.h" static BOOL is_wow64; static const char msifile[] = "winetest.msi"; diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index c00ed61c18..6834bec6af 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -19,19 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS +#include "precomp.h" #include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <msidefs.h> -#include <msi.h> -#include <msiquery.h> -#include <srrestoreptapi.h> #include <shlobj.h> -#include "wine/test.h" - static BOOL is_wow64; static const char msifile[] = "winetest-package.msi"; static const WCHAR msifileW[] = diff --git a/modules/rostests/winetests/msi/patch.c b/modules/rostests/winetests/msi/patch.c index 6aeb4b1615..bb2276ee58 100644 --- a/modules/rostests/winetests/msi/patch.c +++ b/modules/rostests/winetests/msi/patch.c @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_MSI 300 -#define COBJMACROS - -#include <stdio.h> - -#include <windows.h> -#include <msiquery.h> -#include <msidefs.h> -#include <msi.h> - -#include "wine/test.h" +#include "precomp.h" static UINT (WINAPI *pMsiApplyPatchA)( LPCSTR, LPCSTR, INSTALLTYPE, LPCSTR ); static UINT (WINAPI *pMsiGetPatchInfoExA)( LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, diff --git a/modules/rostests/winetests/msi/precomp.h b/modules/rostests/winetests/msi/precomp.h new file mode 100644 index 0000000000..67839b12f0 --- /dev/null +++ b/modules/rostests/winetests/msi/precomp.h @@ -0,0 +1,27 @@ +#ifndef _MSI_WINETEST_PRECOMP_H_ +#define _MSI_WINETEST_PRECOMP_H_ + +#define _WIN32_MSI 300 + +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define COBJMACROS + +#include <wine/test.h> + +#include <winuser.h> +#include <winreg.h> +#include <winnls.h> +#include <winsvc.h> +#include <winver.h> +#include <objbase.h> +#include <msiquery.h> +#include <msidefs.h> +#include <fci.h> +#include <srrestoreptapi.h> +#include <shellapi.h> + +#endif /* !_MSI_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/msi/record.c b/modules/rostests/winetests/msi/record.c index 5caaefc72d..1106e25376 100644 --- a/modules/rostests/winetests/msi/record.c +++ b/modules/rostests/winetests/msi/record.c @@ -18,11 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> -#include <msi.h> -#include <msiquery.h> - -#include "wine/test.h" +#include "precomp.h" static const char *msifile = "winetest-record.msi"; static const WCHAR msifileW[] = diff --git a/modules/rostests/winetests/msi/source.c b/modules/rostests/winetests/msi/source.c index 1d94695609..daf2979bbb 100644 --- a/modules/rostests/winetests/msi/source.c +++ b/modules/rostests/winetests/msi/source.c @@ -18,19 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_MSI 300 +#include "precomp.h" -#include <stdio.h> - -#include <windows.h> -#include <msiquery.h> -#include <msidefs.h> -#include <msi.h> -#include <sddl.h> #include <secext.h> -#include "wine/test.h" - static BOOL is_wow64; static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); diff --git a/modules/rostests/winetests/msi/suminfo.c b/modules/rostests/winetests/msi/suminfo.c index 8c2e292ab8..40fcef4488 100644 --- a/modules/rostests/winetests/msi/suminfo.c +++ b/modules/rostests/winetests/msi/suminfo.c @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <stdio.h> -#include <windows.h> -#include <msi.h> -#include <msiquery.h> -#include <objidl.h> - -#include "wine/test.h" +#include "precomp.h" /* * The following are defined in Windows SDK's msidefs.h

7 years

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba54c5644e6947f9c6d6a… commit ba54c5644e6947f9c6d6a7e15a6bd770bb077498 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 18 13:43:24 2017 +0100 [MSHTML_WINETEST] Add a PCH. --- modules/rostests/winetests/mshtml/CMakeLists.txt | 11 ++++++--- modules/rostests/winetests/mshtml/activex.c | 23 ++---------------- modules/rostests/winetests/mshtml/dom.c | 19 +-------------- modules/rostests/winetests/mshtml/events.c | 16 ++----------- modules/rostests/winetests/mshtml/guid.c | 15 ++++++++++++ modules/rostests/winetests/mshtml/htmldoc.c | 27 ++++----------------- modules/rostests/winetests/mshtml/htmllocation.c | 8 +------ modules/rostests/winetests/mshtml/misc.c | 9 +------ modules/rostests/winetests/mshtml/mshtml_test.h | 4 +++- modules/rostests/winetests/mshtml/precomp.h | 28 ++++++++++++++++++++++ modules/rostests/winetests/mshtml/protocol.c | 11 +-------- modules/rostests/winetests/mshtml/script.c | 23 ++---------------- modules/rostests/winetests/mshtml/style.c | 14 +---------- modules/rostests/winetests/mshtml/xmlhttprequest.c | 10 +------- 14 files changed, 70 insertions(+), 148 deletions(-) diff --git a/modules/rostests/winetests/mshtml/CMakeLists.txt b/modules/rostests/winetests/mshtml/CMakeLists.txt index 5384512e52..f744975c2f 100644 --- a/modules/rostests/winetests/mshtml/CMakeLists.txt +++ b/modules/rostests/winetests/mshtml/CMakeLists.txt @@ -13,10 +13,14 @@ list(APPEND SOURCE protocol.c script.c style.c - testlist.c - xmlhttprequest.c) + xmlhttprequest.c + precomp.h) -add_executable(mshtml_winetest ${SOURCE} rsrc.rc) +add_executable(mshtml_winetest + ${SOURCE} + guid.c + testlist.c + rsrc.rc) list(APPEND mshtml_winetest_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/test_tlb.tlb @@ -33,4 +37,5 @@ target_link_libraries(mshtml_winetest uuid strmiids) set_module_type(mshtml_winetest win32cui) add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32) add_dependencies(mshtml_winetest test_tlb_header stdole2) +add_pch(mshtml_winetest precomp.h SOURCE) add_rostests_file(TARGET mshtml_winetest) diff --git a/modules/rostests/winetests/mshtml/activex.c b/modules/rostests/winetests/mshtml/activex.c index c145b4ab54..117becd79a 100644 --- a/modules/rostests/winetests/mshtml/activex.c +++ b/modules/rostests/winetests/mshtml/activex.c @@ -16,27 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE - -#include <wine/test.h> -//#include <stdarg.h> -#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "ole2.h" -#include <mshtml.h> -//#include "docobj.h" -#include <hlink.h> -//#include "dispex.h" -#include <mshtmhst.h> -//#include "activscp.h" -//#include "objsafe.h" -#include <mshtmdid.h> -#include "mshtml_test.h" - -#include <initguid.h> +#include "precomp.h" + #include <test_tlb.h> #define DEFINE_EXPECT(func) \ diff --git a/modules/rostests/winetests/mshtml/dom.c b/modules/rostests/winetests/mshtml/dom.c index 1874ead8b5..09d0c7fda2 100644 --- a/modules/rostests/winetests/mshtml/dom.c +++ b/modules/rostests/winetests/mshtml/dom.c @@ -16,27 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE +#include "precomp.h" -#include <wine/test.h> -//#include <stdarg.h> #include <stdio.h> -//#include "windef.h" -//#include "winbase.h" -//#include "ole2.h" -#include <mshtml.h> -#include <mshtmcid.h> -#include <mshtmhst.h> -//#include "docobj.h" -#include <hlink.h> -//#include "dispex.h" -#include "mshtml_test.h" -#include <objsafe.h> -#include <htiface.h> -#include <tlogstg.h> - static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); diff --git a/modules/rostests/winetests/mshtml/events.c b/modules/rostests/winetests/mshtml/events.c index b5f14b8445..e3218509f1 100644 --- a/modules/rostests/winetests/mshtml/events.c +++ b/modules/rostests/winetests/mshtml/events.c @@ -16,21 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE - -#include <wine/test.h> -//#include <stdarg.h> -#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "ole2.h" -#include <mshtml.h> -#include <mshtmdid.h> +#include "precomp.h" + #include <docobj.h> -#include <hlink.h> -//#include "dispex.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE diff --git a/modules/rostests/winetests/mshtml/guid.c b/modules/rostests/winetests/mshtml/guid.c new file mode 100644 index 0000000000..49ddc82961 --- /dev/null +++ b/modules/rostests/winetests/mshtml/guid.c @@ -0,0 +1,15 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <dispex.h> +#include <test_tlb.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/modules/rostests/winetests/mshtml/htmldoc.c b/modules/rostests/winetests/mshtml/htmldoc.c index 1ca1878b58..78583894f0 100644 --- a/modules/rostests/winetests/mshtml/htmldoc.c +++ b/modules/rostests/winetests/mshtml/htmldoc.c @@ -16,35 +16,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE +#include "precomp.h" -#include <wine/test.h> -//#include <stdarg.h> -#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -#include <initguid.h> -//#include "ole2.h" -#include <mshtml.h> -//#include "docobj.h" -#include <docobjectservice.h> -#include <wininet.h> -#include <mshtmhst.h> -#include <mshtmdid.h> -#include <mshtmcid.h> -//#include "hlink.h" -//#include "dispex.h" #include <idispids.h> #include <shlguid.h> #include <shdeprecated.h> #include <perhist.h> -//#include "shobjidl.h" -#include <htiface.h> -#include <tlogstg.h> #include <exdispid.h> -#include "mshtml_test.h" + +#include <initguid.h> +#include <docobjectservice.h> DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); diff --git a/modules/rostests/winetests/mshtml/htmllocation.c b/modules/rostests/winetests/mshtml/htmllocation.c index 8bf5517dd5..e28e126db9 100644 --- a/modules/rostests/winetests/mshtml/htmllocation.c +++ b/modules/rostests/winetests/mshtml/htmllocation.c @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE - -#include <wine/test.h> - -#include "mshtml.h" -#include "wininet.h" +#include "precomp.h" struct location_test { const char *name; diff --git a/modules/rostests/winetests/mshtml/misc.c b/modules/rostests/winetests/mshtml/misc.c index d57aabc354..b33b88db89 100644 --- a/modules/rostests/winetests/mshtml/misc.c +++ b/modules/rostests/winetests/mshtml/misc.c @@ -16,15 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS +#include "precomp.h" -#include <wine/test.h> -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "ole2.h" -//#include "initguid.h" #include <optary.h> static void test_HTMLLoadOptions(void) diff --git a/modules/rostests/winetests/mshtml/mshtml_test.h b/modules/rostests/winetests/mshtml/mshtml_test.h index c0844958dc..b6d896ad33 100644 --- a/modules/rostests/winetests/mshtml/mshtml_test.h +++ b/modules/rostests/winetests/mshtml/mshtml_test.h @@ -16,9 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + /* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ /* Note: this code is duplicated in dlls/mshtml/tests/mshtml_test.h and dlls/urlmon/tests/sec_mgr.c */ -static BOOL is_ie_hardened(void) +static inline BOOL is_ie_hardened(void) { HKEY zone_map; DWORD ie_harden, type, size; diff --git a/modules/rostests/winetests/mshtml/precomp.h b/modules/rostests/winetests/mshtml/precomp.h new file mode 100644 index 0000000000..acb5807b69 --- /dev/null +++ b/modules/rostests/winetests/mshtml/precomp.h @@ -0,0 +1,28 @@ +#ifndef _MSHTML_WINETEST_PRECOMP_H_ +#define _MSHTML_WINETEST_PRECOMP_H_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define COBJMACROS +#define CONST_VTABLE + +#include <wine/test.h> + +#include <wingdi.h> +#include <winnls.h> +#include <ole2.h> +#include <mshtml.h> +#include <hlink.h> +#include <mshtmhst.h> +#include <mshtmdid.h> +#include <mshtmcid.h> +#include <objsafe.h> +#include <htiface.h> +#include <tlogstg.h> +#include <winreg.h> +#include <wininet.h> + +#include "mshtml_test.h" + +#endif /* !_MSHTML_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/mshtml/protocol.c b/modules/rostests/winetests/mshtml/protocol.c index b90451e4fd..bda617c7ab 100644 --- a/modules/rostests/winetests/mshtml/protocol.c +++ b/modules/rostests/winetests/mshtml/protocol.c @@ -16,18 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS +#include "precomp.h" -#include <wine/test.h> -//#include <stdarg.h> -#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "ole2.h" -#include <urlmon.h> #include <shlwapi.h> -#include <wininet.h> #include <initguid.h> diff --git a/modules/rostests/winetests/mshtml/script.c b/modules/rostests/winetests/mshtml/script.c index 1c5171bffc..102f994946 100644 --- a/modules/rostests/winetests/mshtml/script.c +++ b/modules/rostests/winetests/mshtml/script.c @@ -16,28 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE - -#include <wine/test.h> -//#include <stdarg.h> -#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "ole2.h" -#include <wininet.h> -//#include "docobj.h" -//#include "dispex.h" -#include <hlink.h> -#include <mshtml.h> -#include <mshtmhst.h> -//#include "initguid.h" -//#include "activscp.h" +#include "precomp.h" + #include <activdbg.h> -#include <objsafe.h> -#include <mshtmdid.h> -#include "mshtml_test.h" DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); diff --git a/modules/rostests/winetests/mshtml/style.c b/modules/rostests/winetests/mshtml/style.c index 974ec2baae..71c432dd02 100644 --- a/modules/rostests/winetests/mshtml/style.c +++ b/modules/rostests/winetests/mshtml/style.c @@ -16,19 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define CONST_VTABLE - -#include <wine/test.h> -//#include <stdarg.h> -//#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "ole2.h" -#include <mshtml.h> -//#include "mshtmhst.h" -//#include "docobj.h" +#include "precomp.h" static int strcmp_wa(LPCWSTR strw, const char *stra) { diff --git a/modules/rostests/winetests/mshtml/xmlhttprequest.c b/modules/rostests/winetests/mshtml/xmlhttprequest.c index 09972068bb..8a4bd1793b 100644 --- a/modules/rostests/winetests/mshtml/xmlhttprequest.c +++ b/modules/rostests/winetests/mshtml/xmlhttprequest.c @@ -16,15 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <wine/test.h> -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "mshtml.h" +#include "precomp.h" static BSTR a2bstr(const char *str) {

7 years

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98ca8ad114d3aa5f5b10e… commit 98ca8ad114d3aa5f5b10e5686c6f0712c532092f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 18 13:28:00 2017 +0100 [KERNEL32_WINETEST] Add a PCH. --- modules/rostests/winetests/kernel32/CMakeLists.txt | 9 +++++++-- modules/rostests/winetests/kernel32/actctx.c | 11 ++--------- modules/rostests/winetests/kernel32/atom.c | 9 +-------- modules/rostests/winetests/kernel32/change.c | 10 +--------- modules/rostests/winetests/kernel32/codepage.c | 9 +-------- modules/rostests/winetests/kernel32/comm.c | 9 +-------- modules/rostests/winetests/kernel32/console.c | 4 +--- modules/rostests/winetests/kernel32/cpu.c | 4 +--- modules/rostests/winetests/kernel32/debugger.c | 8 +------- modules/rostests/winetests/kernel32/directory.c | 8 +------- modules/rostests/winetests/kernel32/drive.c | 7 +------ modules/rostests/winetests/kernel32/environ.c | 8 +------- modules/rostests/winetests/kernel32/fiber.c | 2 +- modules/rostests/winetests/kernel32/file.c | 15 +-------------- modules/rostests/winetests/kernel32/format_msg.c | 7 +------ modules/rostests/winetests/kernel32/heap.c | 10 +--------- modules/rostests/winetests/kernel32/loader.c | 18 ++++-------------- modules/rostests/winetests/kernel32/locale.c | 14 +------------- modules/rostests/winetests/kernel32/mailslot.c | 9 +-------- modules/rostests/winetests/kernel32/module.c | 5 ++--- modules/rostests/winetests/kernel32/path.c | 10 +--------- modules/rostests/winetests/kernel32/pipe.c | 11 +---------- modules/rostests/winetests/kernel32/precomp.h | 22 ++++++++++++++++++++++ modules/rostests/winetests/kernel32/process.c | 17 +---------------- modules/rostests/winetests/kernel32/profile.c | 8 +------- modules/rostests/winetests/kernel32/resource.c | 5 +---- modules/rostests/winetests/kernel32/sync.c | 10 +--------- modules/rostests/winetests/kernel32/testlist.c | 5 +---- modules/rostests/winetests/kernel32/thread.c | 20 +------------------- modules/rostests/winetests/kernel32/time.c | 5 +---- modules/rostests/winetests/kernel32/timer.c | 6 +----- modules/rostests/winetests/kernel32/toolhelp.c | 10 +--------- modules/rostests/winetests/kernel32/version.c | 7 +------ modules/rostests/winetests/kernel32/virtual.c | 16 +++------------- modules/rostests/winetests/kernel32/volume.c | 8 +++----- 35 files changed, 71 insertions(+), 265 deletions(-) diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt index af63b39d94..063ff85193 100644 --- a/modules/rostests/winetests/kernel32/CMakeLists.txt +++ b/modules/rostests/winetests/kernel32/CMakeLists.txt @@ -1,6 +1,7 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) +add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x601) list(APPEND SOURCE actctx.c @@ -36,9 +37,12 @@ list(APPEND SOURCE version.c virtual.c volume.c - testlist.c) + precomp.h) -add_executable(kernel32_winetest ${SOURCE} resource.rc) +add_executable(kernel32_winetest + ${SOURCE} + testlist.c + resource.rc) if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(kernel32_winetest "-Wno-format") @@ -46,4 +50,5 @@ endif() set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) +add_pch(kernel32_winetest precomp.h SOURCE) add_rostests_file(TARGET kernel32_winetest) diff --git a/modules/rostests/winetests/kernel32/actctx.c b/modules/rostests/winetests/kernel32/actctx.c index e8a2cdfdc0..5a41c40218 100644 --- a/modules/rostests/winetests/kernel32/actctx.c +++ b/modules/rostests/winetests/kernel32/actctx.c @@ -16,16 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <ntstatus.h> -#define WIN32_NO_STATUS -#include <wine/test.h> -#include <winbase.h> -#include <windef.h> -#include <winnt.h> -#include <wine/winternl.h> -#include <winnls.h> -#include <stdio.h> +#include "precomp.h" +#include <objbase.h> #include <oaidl.h> #include <initguid.h> diff --git a/modules/rostests/winetests/kernel32/atom.c b/modules/rostests/winetests/kernel32/atom.c index 0c1740869a..a276e966dd 100755 --- a/modules/rostests/winetests/kernel32/atom.c +++ b/modules/rostests/winetests/kernel32/atom.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" +#include "precomp.h" #define DOUBLE(x) (WCHAR)((x<<8)|(x)) diff --git a/modules/rostests/winetests/kernel32/change.c b/modules/rostests/winetests/kernel32/change.c index 3779e69278..997b025461 100755 --- a/modules/rostests/winetests/kernel32/change.c +++ b/modules/rostests/winetests/kernel32/change.c @@ -26,15 +26,7 @@ * FILE_NOTIFY_CHANGE_CREATION */ -#include <stdarg.h> -#include <stdio.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "wine/test.h" -#include <windef.h> -#include <winbase.h> -#include <wine/winternl.h> +#include "precomp.h" static DWORD CALLBACK NotificationThread(LPVOID arg) { diff --git a/modules/rostests/winetests/kernel32/codepage.c b/modules/rostests/winetests/kernel32/codepage.c index ac8b90298b..4acc0cb510 100755 --- a/modules/rostests/winetests/kernel32/codepage.c +++ b/modules/rostests/winetests/kernel32/codepage.c @@ -19,14 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> -#include <limits.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +#include "precomp.h" static const char foobarA[] = "foobar"; static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; diff --git a/modules/rostests/winetests/kernel32/comm.c b/modules/rostests/winetests/kernel32/comm.c index 9230850d3c..cb7648205b 100755 --- a/modules/rostests/winetests/kernel32/comm.c +++ b/modules/rostests/winetests/kernel32/comm.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "wine/test.h" -#include "wine/winternl.h" -#include "winbase.h" -#include "winnls.h" +#include "precomp.h" #define TIMEOUT 1000 /* one second for Timeouts*/ #define SLOWBAUD 150 diff --git a/modules/rostests/winetests/kernel32/console.c b/modules/rostests/winetests/kernel32/console.c index a14bc45034..51f2162f35 100755 --- a/modules/rostests/winetests/kernel32/console.c +++ b/modules/rostests/winetests/kernel32/console.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" -#include <windows.h> -#include <stdio.h> +#include "precomp.h" static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); static DWORD (WINAPI *pGetConsoleProcessList)(LPDWORD, DWORD); diff --git a/modules/rostests/winetests/kernel32/cpu.c b/modules/rostests/winetests/kernel32/cpu.c index 405d990a06..ff5a6c1a64 100644 --- a/modules/rostests/winetests/kernel32/cpu.c +++ b/modules/rostests/winetests/kernel32/cpu.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" -#include "winbase.h" -#include "winnls.h" +#include "precomp.h" static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); diff --git a/modules/rostests/winetests/kernel32/debugger.c b/modules/rostests/winetests/kernel32/debugger.c index 58f1f3c5db..2236046432 100644 --- a/modules/rostests/winetests/kernel32/debugger.c +++ b/modules/rostests/winetests/kernel32/debugger.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <assert.h> - -#include <windows.h> -#include <wine/winternl.h> -#include <winreg.h> -#include "wine/test.h" +#include "precomp.h" #ifndef STATUS_DEBUGGER_INACTIVE #define STATUS_DEBUGGER_INACTIVE ((NTSTATUS) 0xC0000354) diff --git a/modules/rostests/winetests/kernel32/directory.c b/modules/rostests/winetests/kernel32/directory.c index f57618e32f..233fba7427 100755 --- a/modules/rostests/winetests/kernel32/directory.c +++ b/modules/rostests/winetests/kernel32/directory.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/winternl.h" +#include "precomp.h" static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); diff --git a/modules/rostests/winetests/kernel32/drive.c b/modules/rostests/winetests/kernel32/drive.c index 98dc454f34..e787276273 100755 --- a/modules/rostests/winetests/kernel32/drive.c +++ b/modules/rostests/winetests/kernel32/drive.c @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" static DWORD (WINAPI *pGetDiskFreeSpaceExA)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER); diff --git a/modules/rostests/winetests/kernel32/environ.c b/modules/rostests/winetests/kernel32/environ.c index f8452be2ee..50d331582e 100755 --- a/modules/rostests/winetests/kernel32/environ.c +++ b/modules/rostests/winetests/kernel32/environ.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" +#include "precomp.h" static CHAR string[MAX_PATH]; #define ok_w(res, format, szString) \ diff --git a/modules/rostests/winetests/kernel32/fiber.c b/modules/rostests/winetests/kernel32/fiber.c index 7501165dc8..0e0051bf7d 100644 --- a/modules/rostests/winetests/kernel32/fiber.c +++ b/modules/rostests/winetests/kernel32/fiber.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" +#include "precomp.h" static LPVOID (WINAPI *pCreateFiber)(SIZE_T,LPFIBER_START_ROUTINE,LPVOID); static LPVOID (WINAPI *pConvertThreadToFiber)(LPVOID); diff --git a/modules/rostests/winetests/kernel32/file.c b/modules/rostests/winetests/kernel32/file.c index 940e2fc27b..ee91e62e41 100755 --- a/modules/rostests/winetests/kernel32/file.c +++ b/modules/rostests/winetests/kernel32/file.c @@ -20,22 +20,9 @@ * */ -/* ReplaceFile requires Windows 2000 or newer */ -#define _WIN32_WINNT 0x0601 +#include "precomp.h" -#include <stdarg.h> -#include <stdlib.h> #include <time.h> -#include <stdio.h> - -#include <ntstatus.h> -#define WIN32_NO_STATUS -#include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winerror.h> -#include <wine/winternl.h> -#include <winnls.h> #include <fileapi.h> #undef DeleteFile /* needed for FILE_DISPOSITION_INFO */ diff --git a/modules/rostests/winetests/kernel32/format_msg.c b/modules/rostests/winetests/kernel32/format_msg.c index 1f88e2465b..3966b2aa6c 100755 --- a/modules/rostests/winetests/kernel32/format_msg.c +++ b/modules/rostests/winetests/kernel32/format_msg.c @@ -17,12 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +#include "precomp.h" #define ULL(a,b) (((ULONG64)(a) << 32) | (b)) diff --git a/modules/rostests/winetests/kernel32/heap.c b/modules/rostests/winetests/kernel32/heap.c index 7c1c89dd5a..0c82d7bac9 100755 --- a/modules/rostests/winetests/kernel32/heap.c +++ b/modules/rostests/winetests/kernel32/heap.c @@ -20,15 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wine/winternl.h" -#include "wine/test.h" +#include "precomp.h" #define MAGIC_DEAD 0xdeadbeef diff --git a/modules/rostests/winetests/kernel32/loader.c b/modules/rostests/winetests/kernel32/loader.c index 90e790f5c6..73ca0134b8 100644 --- a/modules/rostests/winetests/kernel32/loader.c +++ b/modules/rostests/winetests/kernel32/loader.c @@ -18,19 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#include <stdarg.h> -#include <stdio.h> -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wine/winternl.h" -#include "winuser.h" -#include "wine/test.h" -#include "delayloadhandler.h" +#include "precomp.h" + +#include <delayloadhandler.h> /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) @@ -1546,7 +1536,7 @@ static void test_import_resolution(void) nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress = DATA_RVA(&data.tls); memset( &data, 0, sizeof(data) ); - data.descr[0].u.OriginalFirstThunk = DATA_RVA( data.original_thunks ); + data.descr[0].OriginalFirstThunk = DATA_RVA( data.original_thunks ); data.descr[0].FirstThunk = DATA_RVA( data.thunks ); data.descr[0].Name = DATA_RVA( data.module ); strcpy( data.module, "kernel32.dll" ); diff --git a/modules/rostests/winetests/kernel32/locale.c b/modules/rostests/winetests/kernel32/locale.c index 5f0a83666c..5b68563f71 100755 --- a/modules/rostests/winetests/kernel32/locale.c +++ b/modules/rostests/winetests/kernel32/locale.c @@ -25,19 +25,7 @@ * the control panel i8n page), we will still get the expected results. */ -#include <assert.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> - -#undef WINVER -#define WINVER 0x0600 - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" +#include "precomp.h" static const WCHAR upper_case[] = {'\t','J','U','S','T','!',' ','A',',',' ','T','E','S','T',';',' ','S','T','R','I','N','G',' ','1','/','*','+','-','.','\r','\n',0}; static const WCHAR lower_case[] = {'\t','j','u','s','t','!',' ','a',',',' ','t','e','s','t',';',' ','s','t','r','i','n','g',' ','1','/','*','+','-','.','\r','\n',0}; diff --git a/modules/rostests/winetests/kernel32/mailslot.c b/modules/rostests/winetests/kernel32/mailslot.c index da595e9714..0e6c5b17fe 100755 --- a/modules/rostests/winetests/kernel32/mailslot.c +++ b/modules/rostests/winetests/kernel32/mailslot.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> - -#include "wine/test.h" +#include "precomp.h" static const char szmspath[] = "\\\\.\\mailslot\\wine_mailslot_test"; diff --git a/modules/rostests/winetests/kernel32/module.c b/modules/rostests/winetests/kernel32/module.c index 108d0cb999..829a6587dc 100755 --- a/modules/rostests/winetests/kernel32/module.c +++ b/modules/rostests/winetests/kernel32/module.c @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" -#include <windows.h> -#include <stdio.h> +#include "precomp.h" + #include <psapi.h> static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); diff --git a/modules/rostests/winetests/kernel32/path.c b/modules/rostests/winetests/kernel32/path.c index c9afb1bee5..526c872f7c 100755 --- a/modules/rostests/winetests/kernel32/path.c +++ b/modules/rostests/winetests/kernel32/path.c @@ -19,15 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> -#include <assert.h> -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "winnls.h" +#include "precomp.h" #define HAS_TRAIL_SLASH_A(string) (string[lstrlenA(string)-1]=='\\') diff --git a/modules/rostests/winetests/kernel32/pipe.c b/modules/rostests/winetests/kernel32/pipe.c index 49c06436ef..3e4cf97ae6 100755 --- a/modules/rostests/winetests/kernel32/pipe.c +++ b/modules/rostests/winetests/kernel32/pipe.c @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wine/winternl.h" -#include "winioctl.h" -#include "wine/test.h" +#include "precomp.h" #define PIPENAME "\\\\.\\PiPe\\tests_pipe.c" #define PIPENAME_SPECIAL "\\\\.\\PiPe\\tests->pipe.c" diff --git a/modules/rostests/winetests/kernel32/precomp.h b/modules/rostests/winetests/kernel32/precomp.h new file mode 100644 index 0000000000..958ccf5ae0 --- /dev/null +++ b/modules/rostests/winetests/kernel32/precomp.h @@ -0,0 +1,22 @@ +#ifndef _KERNEL32_WINETEST_PRECOMP_H_ +#define _KERNEL32_WINETEST_PRECOMP_H_ + +#include <assert.h> +#include <stdio.h> +#include <ntstatus.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define COBJMACROS + +#include <wine/test.h> +#include <wine/winternl.h> +#include <winuser.h> +#include <winreg.h> +#include <wincon.h> +#include <winnls.h> +#include <winioctl.h> +#include <tlhelp32.h> + +#endif /* !_KERNEL32_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/kernel32/process.c b/modules/rostests/winetests/kernel32/process.c index 63536465df..1c710a8470 100755 --- a/modules/rostests/winetests/kernel32/process.c +++ b/modules/rostests/winetests/kernel32/process.c @@ -20,22 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wincon.h" -#include "winnls.h" -#include "wine/winternl.h" -#include "tlhelp32.h" - -#include "wine/test.h" +#include "precomp.h" /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) diff --git a/modules/rostests/winetests/kernel32/profile.c b/modules/rostests/winetests/kernel32/profile.c index 990aa1441d..277d018579 100755 --- a/modules/rostests/winetests/kernel32/profile.c +++ b/modules/rostests/winetests/kernel32/profile.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "windows.h" +#include "precomp.h" #define KEY "ProfileInt" #define SECTION "Test" diff --git a/modules/rostests/winetests/kernel32/resource.c b/modules/rostests/winetests/kernel32/resource.c index 74066cfba3..b0014a38af 100644 --- a/modules/rostests/winetests/kernel32/resource.c +++ b/modules/rostests/winetests/kernel32/resource.c @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> -#include <stdio.h> - -#include "wine/test.h" +#include "precomp.h" static const char filename[] = "test_.exe"; static DWORD GLE; diff --git a/modules/rostests/winetests/kernel32/sync.c b/modules/rostests/winetests/kernel32/sync.c index dfb462cea0..6cbff90059 100755 --- a/modules/rostests/winetests/kernel32/sync.c +++ b/modules/rostests/winetests/kernel32/sync.c @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#define _WIN32_WINNT 0x500 -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <wine/winternl.h> - -#include <wine/test.h> +#include "precomp.h" #define QueryDepthSList(x) RtlQueryDepthSList(x) #define InterlockedPushEntrySList(x,y) RtlInterlockedPushEntrySList(x,y) diff --git a/modules/rostests/winetests/kernel32/testlist.c b/modules/rostests/winetests/kernel32/testlist.c index 05f63de152..8e47dcc2bd 100755 --- a/modules/rostests/winetests/kernel32/testlist.c +++ b/modules/rostests/winetests/kernel32/testlist.c @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_actctx(void); extern void func_atom(void); diff --git a/modules/rostests/winetests/kernel32/thread.c b/modules/rostests/winetests/kernel32/thread.c index 28e35d4d81..9e9e968c46 100755 --- a/modules/rostests/winetests/kernel32/thread.c +++ b/modules/rostests/winetests/kernel32/thread.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */ -#define _WIN32_WINNT 0x0600 - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -/* the tests intentionally pass invalid pointers and need an exception handler */ -#define WINE_NO_INLINE_STRING - -#include <ntstatus.h> -#define WIN32_NO_STATUS -#include <windef.h> -#include <winbase.h> -#include <winnt.h> -#include <winerror.h> -#include <winnls.h> -#include <wine/winternl.h> -#include <wine/test.h> +#include "precomp.h" /* THREAD_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) diff --git a/modules/rostests/winetests/kernel32/time.c b/modules/rostests/winetests/kernel32/time.c index bc505e99b3..e37434fc4c 100755 --- a/modules/rostests/winetests/kernel32/time.c +++ b/modules/rostests/winetests/kernel32/time.c @@ -19,10 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" -#include "winbase.h" -#include "winnls.h" -#include "wine/winternl.h" +#include "precomp.h" static BOOL (WINAPI *pTzSpecificLocalTimeToSystemTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); static BOOL (WINAPI *pSystemTimeToTzSpecificLocalTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); diff --git a/modules/rostests/winetests/kernel32/timer.c b/modules/rostests/winetests/kernel32/timer.c index bcc800c494..b8d0892ff8 100755 --- a/modules/rostests/winetests/kernel32/timer.c +++ b/modules/rostests/winetests/kernel32/timer.c @@ -18,11 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 - -#include "wine/test.h" -#include "winbase.h" - +#include "precomp.h" static void test_timer(void) { diff --git a/modules/rostests/winetests/kernel32/toolhelp.c b/modules/rostests/winetests/kernel32/toolhelp.c index c40dbc4f8f..b90c3caa6b 100644 --- a/modules/rostests/winetests/kernel32/toolhelp.c +++ b/modules/rostests/winetests/kernel32/toolhelp.c @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "tlhelp32.h" -#include "wine/test.h" -#include "winuser.h" +#include "precomp.h" static char selfname[MAX_PATH]; diff --git a/modules/rostests/winetests/kernel32/version.c b/modules/rostests/winetests/kernel32/version.c index 6e3c751516..8891c9d14b 100644 --- a/modules/rostests/winetests/kernel32/version.c +++ b/modules/rostests/winetests/kernel32/version.c @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Needed for PRODUCT_* defines and GetProductInfo() */ -#define _WIN32_WINNT 0x0600 - -#include "wine/test.h" -#include "winbase.h" -#include "wine/winternl.h" +#include "precomp.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); static BOOL (WINAPI * pVerifyVersionInfoA)(LPOSVERSIONINFOEXA, DWORD, DWORDLONG); diff --git a/modules/rostests/winetests/kernel32/virtual.c b/modules/rostests/winetests/kernel32/virtual.c index 018b7e9ae0..f2c504eac9 100755 --- a/modules/rostests/winetests/kernel32/virtual.c +++ b/modules/rostests/winetests/kernel32/virtual.c @@ -18,19 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "wine/winternl.h" -#include "winerror.h" -#include "winuser.h" -#include "wine/exception.h" -#include "wine/test.h" +#include "precomp.h" + +#include <wine/exception.h> #define NUM_THREADS 4 #define MAPPING_SIZE 0x100000 diff --git a/modules/rostests/winetests/kernel32/volume.c b/modules/rostests/winetests/kernel32/volume.c index 1915836d16..f0a0d3be05 100644 --- a/modules/rostests/winetests/kernel32/volume.c +++ b/modules/rostests/winetests/kernel32/volume.c @@ -18,11 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" -#include "winbase.h" -#include "winioctl.h" -#include <stdio.h> -#include "wine/ddk/ntddcdvd.h" +#include "precomp.h" + +#include <wine/ddk/ntddcdvd.h> #include <pshpack1.h> struct COMPLETE_DVD_LAYER_DESCRIPTOR

7 years

[reactos] 01/01: [APITESTS][WINETESTS] Addendum to the recent PCH work.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e36cf4acaf403964f9205… commit e36cf4acaf403964f92053dedbf68ca4bb299682 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 18 13:21:47 2017 +0100 [APITESTS][WINETESTS] Addendum to the recent PCH work. --- modules/rostests/apitests/advapi32/precomp.h | 4 ++++ modules/rostests/apitests/com/com_apitest.c | 1 + modules/rostests/apitests/com/com_apitest.h | 7 ++++++- modules/rostests/apitests/gdi32/precomp.h | 4 ++++ modules/rostests/apitests/kernel32/precomp.h | 4 ++++ modules/rostests/apitests/ntdll/NtSetValueKey.c | 2 ++ modules/rostests/apitests/ntdll/precomp.h | 7 +++++-- modules/rostests/apitests/user32/precomp.h | 6 +++++- modules/rostests/winetests/crypt32/precomp.h | 5 +++++ modules/rostests/winetests/gdi32/precomp.h | 2 ++ 10 files changed, 38 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/advapi32/precomp.h b/modules/rostests/apitests/advapi32/precomp.h index 503d956465..a009b9676d 100644 --- a/modules/rostests/apitests/advapi32/precomp.h +++ b/modules/rostests/apitests/advapi32/precomp.h @@ -1,6 +1,10 @@ #ifndef _ADVAPI32_APITEST_PRECOMP_H_ #define _ADVAPI32_APITEST_PRECOMP_H_ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <apitest.h> #include <winreg.h> #include <winsvc.h> diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 7f72b0b835..1add9839b0 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -7,6 +7,7 @@ #include "com_apitest.h" +#include <winreg.h> #include <mshtmhst.h> #include <shlwapi.h> #include <commoncontrols.h> diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h index f841e58121..8820da294d 100644 --- a/modules/rostests/apitests/com/com_apitest.h +++ b/modules/rostests/apitests/com/com_apitest.h @@ -16,11 +16,16 @@ * we usually don't want to be that strict */ //#define FAIL_WRONG_OFFSET -#define COBJMACROS #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define COBJMACROS #include <wine/test.h> +#include <wingdi.h> +#include <winuser.h> +#include <prsht.h> #include <objbase.h> #include <objsafe.h> #include <oleacc.h> diff --git a/modules/rostests/apitests/gdi32/precomp.h b/modules/rostests/apitests/gdi32/precomp.h index a0331e74a7..ad6ebda215 100644 --- a/modules/rostests/apitests/gdi32/precomp.h +++ b/modules/rostests/apitests/gdi32/precomp.h @@ -1,6 +1,10 @@ #ifndef _GDI32_APITEST_PRECOMP_H_ #define _GDI32_APITEST_PRECOMP_H_ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <apitest.h> #include <wingdi.h> #include <winuser.h> diff --git a/modules/rostests/apitests/kernel32/precomp.h b/modules/rostests/apitests/kernel32/precomp.h index cbc24c78ae..ffbf218a93 100644 --- a/modules/rostests/apitests/kernel32/precomp.h +++ b/modules/rostests/apitests/kernel32/precomp.h @@ -1,6 +1,10 @@ #ifndef _KERNEL32_APITEST_PRECOMP_H_ #define _KERNEL32_APITEST_PRECOMP_H_ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <apitest.h> #include <wincon.h> #include <winnls.h> diff --git a/modules/rostests/apitests/ntdll/NtSetValueKey.c b/modules/rostests/apitests/ntdll/NtSetValueKey.c index 7a77839a19..caa2e34ef4 100644 --- a/modules/rostests/apitests/ntdll/NtSetValueKey.c +++ b/modules/rostests/apitests/ntdll/NtSetValueKey.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <winreg.h> + START_TEST(NtSetValueKey) { NTSTATUS Status; diff --git a/modules/rostests/apitests/ntdll/precomp.h b/modules/rostests/apitests/ntdll/precomp.h index 1552223a0b..39ff188224 100644 --- a/modules/rostests/apitests/ntdll/precomp.h +++ b/modules/rostests/apitests/ntdll/precomp.h @@ -2,10 +2,13 @@ #define _NTDLL_APITEST_PRECOMP_H_ #include <stdio.h> -#include <apitest.h> + #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <apitest.h> #include <ndk/ntndk.h> -#include <winreg.h> #include <strsafe.h> #endif /* _NTDLL_APITEST_PRECOMP_H_ */ diff --git a/modules/rostests/apitests/user32/precomp.h b/modules/rostests/apitests/user32/precomp.h index 8cb2810b59..9159e4bd58 100644 --- a/modules/rostests/apitests/user32/precomp.h +++ b/modules/rostests/apitests/user32/precomp.h @@ -1,9 +1,13 @@ #ifndef _USER32_APITEST_PRECOMP_H_ #define _USER32_APITEST_PRECOMP_H_ -#define WIN32_NO_STATUS #include <assert.h> #include <stdio.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define WIN32_NO_STATUS + #include <apitest.h> #include <wingdi.h> #include <winuser.h> diff --git a/modules/rostests/winetests/crypt32/precomp.h b/modules/rostests/winetests/crypt32/precomp.h index 1d2fc3b4e8..81c3376acc 100644 --- a/modules/rostests/winetests/crypt32/precomp.h +++ b/modules/rostests/winetests/crypt32/precomp.h @@ -2,6 +2,11 @@ #define _CRYPT32_WINETEST_PRECOMP_H_ #include <stdio.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <wine/test.h> #include <winreg.h> #define CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS diff --git a/modules/rostests/winetests/gdi32/precomp.h b/modules/rostests/winetests/gdi32/precomp.h index 11e9e70e51..bf8aea3a12 100644 --- a/modules/rostests/winetests/gdi32/precomp.h +++ b/modules/rostests/winetests/gdi32/precomp.h @@ -2,6 +2,8 @@ #define _GDI32_WINETEST_PRECOMP_H_ #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define NONAMELESSUNION #include <assert.h>

7 years

[reactos] 01/01: [UUID] Add SID_SHTMLEditServices.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a4e5911fc1ea895018d3… commit 0a4e5911fc1ea895018d3b2c559335871043d0df Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 18 13:18:07 2017 +0100 [UUID] Add SID_SHTMLEditServices. --- dll/win32/mshtml/guid.c | 1 - sdk/lib/uuid/ieguids.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/mshtml/guid.c b/dll/win32/mshtml/guid.c index 199fdcbb7e..ffd2d5ca94 100644 --- a/dll/win32/mshtml/guid.c +++ b/dll/win32/mshtml/guid.c @@ -32,6 +32,5 @@ DEFINE_GUID(IID_IDispatchJS,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9); DEFINE_GUID(IID_HTMLPluginContainer, 0xbd7a6050,0xb373,0x4f6f,0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a); -DEFINE_GUID(SID_SHTMLEditServices, 0x3050f7f9,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/sdk/lib/uuid/ieguids.c b/sdk/lib/uuid/ieguids.c index 661368c193..b63a604014 100644 --- a/sdk/lib/uuid/ieguids.c +++ b/sdk/lib/uuid/ieguids.c @@ -36,7 +36,7 @@ DEFINE_GUID(CATID_SafeForInitializing, 0x7dd95802,0x9882,0x11cf,0x9f,0xa9,0x00,0 //BFID_RGB_8 //BFID_RGB_4 //BFID_MONOCHROME -//SID_SHTMLEditServices +DEFINE_GUID(SID_SHTMLEditServices, 0x3050f7f9,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); //CLSID_HTMLPluginDocument //CLSID_HTMLApplication //CLSID_HTADocument

7 years

[reactos] 01/01: [FS] During 1st stage, disable any FS we don't support install to in order to let RawFS these volumes. This avoids bloated setup and avoids potential bugs in 3rd party drivers.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a650f6ba50a270faf37c… commit 5a650f6ba50a270faf37c36f8054b931dd9b4272 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Dec 18 08:44:24 2017 +0100 [FS] During 1st stage, disable any FS we don't support install to in order to let RawFS these volumes. This avoids bloated setup and avoids potential bugs in 3rd party drivers. This is following 806cd1. --- boot/bootdata/txtsetup.sif | 4 ---- drivers/filesystems/ext2/CMakeLists.txt | 2 +- drivers/filesystems/ffs/CMakeLists.txt | 2 +- drivers/filesystems/reiserfs/CMakeLists.txt | 2 +- drivers/filesystems/udfs/CMakeLists.txt | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 822c19c8c8..7a86befd28 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -57,7 +57,6 @@ scsiport.sys=,,,,,,x,,,,,,4 storport.sys=,,,,,,x,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 -ext2fs.sys=,,,,,,x,,,,,,4 classpnp.sys=,,,,,,,,,,,,4 pciide.sys=,,,,,,,,,,,,4 pciidex.sys=,,,,,,,,,,,,4 @@ -68,9 +67,6 @@ ntdll.dll=,,,,,,,,,,,,2 wmilib.sys=,,,,,,,,,,,,4 ksecdd.sys=,,,,,,,,,,,,4 mountmgr.sys=,,,,,,x,,,,,,4 -reiserfs.sys=,,,,,,x,,,,,,4 -ffs.sys=,,,,,,x,,,,,,4 -udfs.sys=,,,,,,x,,,,,,4 [SystemPartitionFiles] diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index 6d0bdb7d01..94b077b0c4 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -118,4 +118,4 @@ if(NOT USE_CLANG_CL) add_pch(ext2fs inc/ext2fs.h SOURCE) endif() -add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/ffs/CMakeLists.txt b/drivers/filesystems/ffs/CMakeLists.txt index 8138a15a5a..6f371875b2 100644 --- a/drivers/filesystems/ffs/CMakeLists.txt +++ b/drivers/filesystems/ffs/CMakeLists.txt @@ -45,5 +45,5 @@ set_module_type(ffs kernelmodedriver) target_link_libraries(ffs memcmp ${PSEH_LIB}) add_importlibs(ffs ntoskrnl hal) add_pch(ffs inc/ffsdrv.h SOURCE) -add_cd_file(TARGET ffs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET ffs DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/reiserfs/CMakeLists.txt b/drivers/filesystems/reiserfs/CMakeLists.txt index 7990886489..95d70eaf01 100644 --- a/drivers/filesystems/reiserfs/CMakeLists.txt +++ b/drivers/filesystems/reiserfs/CMakeLists.txt @@ -95,4 +95,4 @@ add_definitions(-D__KERNEL__) set_module_type(reiserfs kernelmodedriver) add_importlibs(reiserfs ntoskrnl hal) add_pch(reiserfs inc/rfsd.h SOURCE) -add_cd_file(TARGET reiserfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET reiserfs DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index 8b5df85fcf..8bb85aa627 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -60,5 +60,5 @@ set_module_type(udfs kernelmodedriver) target_link_libraries(udfs ${PSEH_LIB}) add_importlibs(udfs ntoskrnl hal) add_pch(udfs udffs.h SOURCE) -add_cd_file(TARGET udfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET udfs DESTINATION reactos/system32/drivers FOR all) add_registry_inf(udfs_reg.inf)

7 years

[reactos] 03/03: [NTOSKRNL] Make again an attempt at killing the IopParseDevice() hack.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ef08871ee67cafc1b356… commit 4ef08871ee67cafc1b3566f408bd4f7a86df9a80 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 23:30:58 2017 +0100 [NTOSKRNL] Make again an attempt at killing the IopParseDevice() hack. For the record, the only place it was remaining was 1st stage, notably because FSD (FastAT <3) was missing a few features. As this features weren't triggered in 3rd stage (unless forced), it was not needed there any longer. Now that they are implemented, and seem working out of the box, this hack might not be longer anymore. This is my ... ?! pfff attempt at killing it. It might not be the last, so just disabling the hack for now. If there are no regressions (who can really believe that?) we'll be clear for dropping it once for all. --- ntoskrnl/io/iomgr/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 71863ccb42..11ad0529b3 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -533,7 +533,7 @@ IopParseDevice(IN PVOID ParseObject, /* Check if we can simply use a dummy file */ UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); -#if 1 +#if 0 /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. */

7 years

[reactos] 02/03: [FASFAT] Enable FAT volume dismount using VPB swapout

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd1e7bf85e01ccaece3c3… commit bd1e7bf85e01ccaece3c3da4a701f7911f63cd7e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 23:29:33 2017 +0100 [FASFAT] Enable FAT volume dismount using VPB swapout --- drivers/filesystems/fastfat/vfat.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index b84b320573..50b83b1afb 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -13,11 +13,7 @@ #endif #define USE_ROS_CC_AND_FS -#if 0 -#ifndef _MSC_VER #define ENABLE_SWAPOUT -#endif -#endif #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l))

7 years

[reactos] 01/03: [USETUP] Our current FAT ChkDsk being a bit slow when using the right path make it only perform a full check if dirty bit is set (which should never happen *cough*).

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8f2befb5ff1465123d0b… commit c8f2befb5ff1465123d0bceb4595a00add62326f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 23:26:38 2017 +0100 [USETUP] Our current FAT ChkDsk being a bit slow when using the right path make it only perform a full check if dirty bit is set (which should never happen *cough*). This is needed because otherwise, ReactOS installation takes forever when IopParseDevice is gone due to slow ChkDsk. --- base/setup/usetup/chkdsk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/chkdsk.c b/base/setup/usetup/chkdsk.c index 1ad582a4be..6d8df5d214 100644 --- a/base/setup/usetup/chkdsk.c +++ b/base/setup/usetup/chkdsk.c @@ -77,7 +77,7 @@ ChkdskPartition( Status = FileSystem->ChkdskFunc(DriveRoot, TRUE, /* FixErrors */ FALSE, /* Verbose */ - FALSE, /* CheckOnlyIfDirty */ + TRUE, /* CheckOnlyIfDirty */ FALSE, /* ScanDrive */ ChkdskCallback); /* Callback */

7 years

[reactos] 01/01: [SETUP] Remove FSDs which have broken dismount implementation. This avoids issues when these partitions are formatted to FAT for setup.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=806cd16328799771b8939… commit 806cd16328799771b89397f5c51a3d46884bce0a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 23:13:56 2017 +0100 [SETUP] Remove FSDs which have broken dismount implementation. This avoids issues when these partitions are formatted to FAT for setup. For now, this commit doesn't change anything, but once IopParseDevice hack gets removed, this will make a difference! CORE-6305 --- boot/bootdata/txtsetup.sif | 2 -- drivers/filesystems/btrfs/CMakeLists.txt | 2 +- drivers/filesystems/ntfs/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 3ea62974b5..822c19c8c8 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -52,7 +52,6 @@ usbstor.sys=,,,,,,x,,,,,,4 kbdhid.sys=,,,,,,,,,,,,4 kbdclass.sys=,,,,,,x,,,,,,4 l_intl.nls=,,,,,,,,,,,,2 -ntfs.sys=,,,,,,,,,,,,4 pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 storport.sys=,,,,,,x,,,,,,4 @@ -69,7 +68,6 @@ ntdll.dll=,,,,,,,,,,,,2 wmilib.sys=,,,,,,,,,,,,4 ksecdd.sys=,,,,,,,,,,,,4 mountmgr.sys=,,,,,,x,,,,,,4 -btrfs.sys=,,,,,,x,,,,,,4 reiserfs.sys=,,,,,,x,,,,,,4 ffs.sys=,,,,,,x,,,,,,4 udfs.sys=,,,,,,x,,,,,,4 diff --git a/drivers/filesystems/btrfs/CMakeLists.txt b/drivers/filesystems/btrfs/CMakeLists.txt index 65e61d255a..123c9f0522 100644 --- a/drivers/filesystems/btrfs/CMakeLists.txt +++ b/drivers/filesystems/btrfs/CMakeLists.txt @@ -41,4 +41,4 @@ add_definitions(-D__KERNEL__) set_module_type(btrfs kernelmodedriver) target_link_libraries(btrfs rtlver ntoskrnl_vista zlib_solo wdmguid ${PSEH_LIB}) add_importlibs(btrfs ntoskrnl hal) -add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/ntfs/CMakeLists.txt b/drivers/filesystems/ntfs/CMakeLists.txt index 0b1af78947..5a193b449d 100644 --- a/drivers/filesystems/ntfs/CMakeLists.txt +++ b/drivers/filesystems/ntfs/CMakeLists.txt @@ -25,4 +25,4 @@ set_module_type(ntfs kernelmodedriver) target_link_libraries(ntfs ${PSEH_LIB}) add_importlibs(ntfs ntoskrnl hal) add_pch(ntfs ntfs.h SOURCE) -add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers FOR all)

7 years

← Newer
1
...
12
13
14
15
16
17
18
...
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