Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61771: [JSCRIPT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 17:45:05 2014 New Revision: 61771 URL: http://svn.reactos.org/svn/reactos?rev=61771&view=rev Log: [JSCRIPT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 Modified: trunk/reactos/dll/win32/jscript/activex.c trunk/reactos/dll/win32/jscript/engine.h trunk/reactos/dll/win32/jscript/jscript.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/jscript_main.c trunk/reactos/dll/win32/jscript/jsstr.h trunk/reactos/dll/win32/jscript/jsval.h trunk/reactos/dll/win32/jscript/regexp.h Modified: trunk/reactos/dll/win32/jscript/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/activex.… ============================================================================== --- trunk/reactos/dll/win32/jscript/activex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/activex.c [iso-8859-1] Thu Jan 23 17:45:05 2014 @@ -18,7 +18,6 @@ #include "jscript.h" -#include <objsafe.h> #include <mshtmhst.h> /* Defined as extern in urlmon.idl, but not exported by uuid.lib */ Modified: trunk/reactos/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h… ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.h [iso-8859-1] Thu Jan 23 17:45:05 2014 @@ -15,6 +15,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 */ + +#pragma once typedef struct _source_elements_t source_elements_t; typedef struct _expression_t expression_t; Modified: trunk/reactos/dll/win32/jscript/jscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.c [iso-8859-1] Thu Jan 23 17:45:05 2014 @@ -17,8 +17,6 @@ */ #include "jscript.h" - -#include <objsafe.h> #ifdef _WIN64 Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] Thu Jan 23 17:45:05 2014 @@ -20,9 +20,7 @@ #include <wine/port.h> #include <assert.h> -#include <math.h> #include <stdarg.h> -#include <stdio.h> #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -32,15 +30,16 @@ #include <windef.h> #include <winbase.h> -#include <winuser.h> -#include <ole2.h> +#include <objbase.h> +#include <oleauto.h> #include <dispex.h> #include <activscp.h> - +#include <objsafe.h> + +#include <wine/debug.h> +#include <wine/list.h> #include <wine/unicode.h> -#include <wine/list.h> - -#include <wine/debug.h> + WINE_DEFAULT_DEBUG_CHANNEL(jscript); #include "resource.h" Modified: trunk/reactos/dll/win32/jscript/jscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript_main.c [iso-8859-1] Thu Jan 23 17:45:05 2014 @@ -18,13 +18,11 @@ #include "jscript.h" +#include <rpcproxy.h> #include <initguid.h> -#include <rpcproxy.h> #include <jscript_classes.h> LONG module_ref = 0; - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); HINSTANCE jscript_hinstance; Modified: trunk/reactos/dll/win32/jscript/jsstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsstr.h?… ============================================================================== --- trunk/reactos/dll/win32/jscript/jsstr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsstr.h [iso-8859-1] Thu Jan 23 17:45:05 2014 @@ -33,6 +33,9 @@ * * In the future more layouts and transformations may be added. */ + +#pragma once + struct _jsstr_t { unsigned length_flags; unsigned ref; Modified: trunk/reactos/dll/win32/jscript/jsval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsval.h?… ============================================================================== --- trunk/reactos/dll/win32/jscript/jsval.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsval.h [iso-8859-1] Thu Jan 23 17:45:05 2014 @@ -246,4 +246,4 @@ void jsval_release(jsval_t) DECLSPEC_HIDDEN; HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN; -#endif +#endif /* JSVAL_H */ Modified: trunk/reactos/dll/win32/jscript/regexp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.h… ============================================================================== --- trunk/reactos/dll/win32/jscript/regexp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/regexp.h [iso-8859-1] Thu Jan 23 17:45:05 2014 @@ -15,6 +15,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 */ + +#pragma once /* * Code in this file is based on files:

1 0

[akhaldi] 61770: [ITSS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 17:43:25 2014 New Revision: 61770 URL: http://svn.reactos.org/svn/reactos?rev=61770&view=rev Log: [ITSS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/itss/moniker.c trunk/reactos/dll/win32/itss/precomp.h Modified: trunk/reactos/dll/win32/itss/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/moniker.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/moniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/moniker.c [iso-8859-1] Thu Jan 23 17:43:25 2014 @@ -21,6 +21,8 @@ */ #include "precomp.h" + +#include <oleidl.h> /*****************************************************************************/ Modified: trunk/reactos/dll/win32/itss/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/precomp.h?r… ============================================================================== --- trunk/reactos/dll/win32/itss/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/precomp.h [iso-8859-1] Thu Jan 23 17:43:25 2014 @@ -1,7 +1,7 @@ #ifndef _ITSS_PCH_ #define _ITSS_PCH_ -#include <config.h> +#include <wine/config.h> #include <wine/port.h> #include <stdarg.h> @@ -14,7 +14,7 @@ #include <windef.h> #include <winbase.h> -#include <ole2.h> +#include <objbase.h> #include <wine/itss.h> #include <wine/unicode.h>

1 0

[akhaldi] 61769: [IMAGEHLP] * Remove one time winternl.h inclusion from the main header and put it back where it belongs. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 17:42:15 2014 New Revision: 61769 URL: http://svn.reactos.org/svn/reactos?rev=61769&view=rev Log: [IMAGEHLP] * Remove one time winternl.h inclusion from the main header and put it back where it belongs. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/imagehlp/access.c trunk/reactos/dll/win32/imagehlp/modify.c trunk/reactos/dll/win32/imagehlp/precomp.h Modified: trunk/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/access.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] Thu Jan 23 17:42:15 2014 @@ -19,6 +19,8 @@ */ #include "precomp.h" + +#include <winternl.h> /*********************************************************************** * Data Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Thu Jan 23 17:42:15 2014 @@ -22,7 +22,6 @@ static WORD CalcCheckSum(DWORD StartValue, LPVOID BaseAddress, DWORD WordCount); - /*********************************************************************** * BindImage (IMAGEHLP.@) */ Modified: trunk/reactos/dll/win32/imagehlp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/precomp… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/precomp.h [iso-8859-1] Thu Jan 23 17:42:15 2014 @@ -4,10 +4,11 @@ #include <stdarg.h> #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include <windef.h> #include <winbase.h> -#include <winternl.h> #include <imagehlp.h> #include <wine/debug.h>

1 0

[akhaldi] 61768: [IEFRAME] * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 11:30:37 2014 New Revision: 61768 URL: http://svn.reactos.org/svn/reactos?rev=61768&view=rev Log: [IEFRAME] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/ieframe/ieframe.h Modified: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] Thu Jan 23 11:30:37 2014 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> #include <stdio.h> #define WIN32_NO_STATUS @@ -26,7 +25,6 @@ #define COM_NO_WINDOWS_H #define COBJMACROS - #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -39,7 +37,6 @@ #include <mshtmhst.h> #include <mshtmdid.h> #include <exdispid.h> -#include <hlink.h> #include <htiface.h> #include <idispids.h> #include <intshcut.h>

1 0

[akhaldi] 61767: [HID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 11:28:58 2014 New Revision: 61767 URL: http://svn.reactos.org/svn/reactos?rev=61767&view=rev Log: [HID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/hid/hid.c trunk/reactos/dll/win32/hid/precomp.h Modified: trunk/reactos/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.c?rev=61… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] Thu Jan 23 11:28:58 2014 @@ -27,6 +27,8 @@ */ #include "precomp.h" + +#include <winbase.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] Thu Jan 23 11:28:58 2014 @@ -1,7 +1,6 @@ #include <stdarg.h> + #define WIN32_NO_STATUS -#include <windef.h> -#include <winbase.h> #define NTOS_MODE_USER #include <ndk/umtypes.h> @@ -14,9 +13,7 @@ (WINAPI *PINTERFACE_DEREFERENCE)( PVOID Context); -//#include <hidusage.h> #include <hidclass.h> -//#include <hidpi.h> extern HINSTANCE hDllInstance; extern const GUID HidClassGuid;

1 0

[akhaldi] 61766: [HHCTRL.OCX] * Remove one time mshtmhst.h inclusion from the main header and put it back where it belongs. * Move resource.h inclusion to the main header. * Remove redundant winnls...
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 11:27:43 2014 New Revision: 61766 URL: http://svn.reactos.org/svn/reactos?rev=61766&view=rev Log: [HHCTRL.OCX] * Remove one time mshtmhst.h inclusion from the main header and put it back where it belongs. * Move resource.h inclusion to the main header. * Remove redundant winnls.h inclusion. CORE-7716 Modified: trunk/reactos/dll/win32/hhctrl.ocx/content.c trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h trunk/reactos/dll/win32/hhctrl.ocx/stream.h trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c Modified: trunk/reactos/dll/win32/hhctrl.ocx/content.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/conte… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/content.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/content.c [iso-8859-1] Thu Jan 23 11:27:43 2014 @@ -19,8 +19,6 @@ #include "hhctrl.h" -#include "resource.h" - typedef enum { INSERT_NEXT, INSERT_CHILD Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] Thu Jan 23 11:27:43 2014 @@ -24,8 +24,6 @@ #include <wingdi.h> #include <wininet.h> - -#include "resource.h" static LRESULT Help_OnSize(HWND hWnd); static void ExpandContract(HHInfo *pHHInfo); Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] Thu Jan 23 11:27:43 2014 @@ -26,19 +26,16 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT - -#define COBJMACROS #include <windef.h> #include <winbase.h> #include <winuser.h> -#include <winnls.h> #include <htmlhelp.h> #include <ole2.h> #include <exdisp.h> -#include <mshtmhst.h> #include <commctrl.h> #include <wine/itss.h> @@ -48,6 +45,7 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); +#include "resource.h" #include "stream.h" #define WB_GOBACK 0 @@ -326,4 +324,4 @@ extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN; extern BOOL hh_process DECLSPEC_HIDDEN; -#endif +#endif /* HHCTRL_H */ Modified: trunk/reactos/dll/win32/hhctrl.ocx/stream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/strea… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/stream.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/stream.h [iso-8859-1] Thu Jan 23 11:27:43 2014 @@ -45,4 +45,4 @@ BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN; -#endif +#endif /* HHCTRL_STREAM_H */ Modified: trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/webbr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c [iso-8859-1] Thu Jan 23 11:27:43 2014 @@ -19,6 +19,8 @@ */ #include "hhctrl.h" + +#include <mshtmhst.h> typedef struct IOleClientSiteImpl {

1 0

[akhaldi] 61765: [GDIPLUS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 11:25:09 2014 New Revision: 61765 URL: http://svn.reactos.org/svn/reactos?rev=61765&view=rev Log: [GDIPLUS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/gdiplus/guid.c (with props) Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/image.c Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Thu Jan 23 11:25:09 2014 @@ -22,12 +22,13 @@ pen.c region.c stringformat.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def) add_library(gdiplus SHARED ${SOURCE} gdiplus.rc) set_module_type(gdiplus win32dll) -target_link_libraries(gdiplus uuid wine) +target_link_libraries(gdiplus wine) add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Thu Jan 23 11:25:09 2014 @@ -29,12 +29,10 @@ #define NONAMELESSUNION #define COBJMACROS -#define INITGUID - #include <windef.h> #include <winbase.h> #include <wingdi.h> -#include <ole2.h> +#include <objbase.h> #include <wincodecsdk.h> #include <gdiplus.h> @@ -457,4 +455,4 @@ void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; -#endif +#endif /* __WINE_GP_PRIVATE_H_ */ Added: trunk/reactos/dll/win32/gdiplus/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/guid.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/guid.c (added) +++ trunk/reactos/dll/win32/gdiplus/guid.c [iso-8859-1] Thu Jan 23 11:25:09 2014 @@ -0,0 +1,17 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <initguid.h> +#include <wincodecsdk.h> +#include <gdiplus.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/gdiplus/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Thu Jan 23 11:25:09 2014 @@ -20,6 +20,7 @@ #include "gdiplus_private.h" #include <assert.h> +#include <ole2.h> #include <olectl.h> #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24)

1 0

[akhaldi] 61764: [FUSION] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 11:22:13 2014 New Revision: 61764 URL: http://svn.reactos.org/svn/reactos?rev=61764&view=rev Log: [FUSION] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt trunk/reactos/dll/win32/fusion/asmcache.c trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/dll/win32/fusion/fusionpriv.h Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Thu Jan 23 11:22:13 2014 @@ -15,7 +15,7 @@ add_library(fusion SHARED ${SOURCE} version.rc) set_module_type(fusion win32dll) -target_link_libraries(fusion wine) +target_link_libraries(fusion uuid wine) add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) Modified: trunk/reactos/dll/win32/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] Thu Jan 23 11:22:13 2014 @@ -20,8 +20,6 @@ #include "fusionpriv.h" -#include <corerror.h> - static const WCHAR cache_mutex_nameW[] = {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Thu Jan 23 11:22:13 2014 @@ -21,7 +21,7 @@ #include "fusionpriv.h" #include <assert.h> -#include <corerror.h> +#include <winuser.h> typedef struct { IAssemblyName IAssemblyName_iface; Modified: trunk/reactos/dll/win32/fusion/fusionpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusionpri… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] Thu Jan 23 11:22:13 2014 @@ -31,13 +31,12 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define INITGUID - #include <windef.h> #include <winbase.h> #include <winver.h> -#include <ole2.h> +#include <objbase.h> #include <fusion.h> +#include <corerror.h> #include <wine/unicode.h>

1 0

[akhaldi] 61763: [FMIFS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 11:19:27 2014 New Revision: 61763 URL: http://svn.reactos.org/svn/reactos?rev=61763&view=rev Log: [FMIFS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/fmifs/init.c trunk/reactos/dll/win32/fmifs/precomp.h Modified: trunk/reactos/dll/win32/fmifs/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/init.c?rev… ============================================================================== --- trunk/reactos/dll/win32/fmifs/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/init.c [iso-8859-1] Thu Jan 23 11:19:27 2014 @@ -9,6 +9,10 @@ */ #include "precomp.h" + +#include <winreg.h> +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> static BOOLEAN FmIfsInitialized = FALSE; LIST_ENTRY ProviderListHead; Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Thu Jan 23 11:19:27 2014 @@ -20,16 +20,10 @@ /* PSDK/NDK Headers */ #include <windef.h> #include <winbase.h> -#include <winreg.h> -#include <ndk/cmfuncs.h> -#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> /* FMIFS Public Header */ #include <fmifs/fmifs.h> - -/* VFATLIB Public Header */ -//#include <fslib/vfatlib.h> extern LIST_ENTRY ProviderListHead;

1 0

[akhaldi] 61762: [DNSAPI] * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 23 Jan '14

23 Jan '14

Author: akhaldi Date: Thu Jan 23 11:16:46 2014 New Revision: 61762 URL: http://svn.reactos.org/svn/reactos?rev=61762&view=rev Log: [DNSAPI] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h trunk/reactos/dll/win32/dnsapi/dnsapi/record.c trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c trunk/reactos/dll/win32/dnsapi/include/internal/windns.h Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/pr… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h [iso-8859-1] Thu Jan 23 11:16:46 2014 @@ -8,14 +8,17 @@ /* INCLUDES ******************************************************************/ -#define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN -#define NTOS_MODE_USER +#include <stdarg.h> /* PSDK/NDK Headers */ -#include <windows.h> -//#include <winerror.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <winbase.h> +#include <winnls.h> #include <windns.h> +#define NTOS_MODE_USER #include <ndk/rtlfuncs.h> /* Internal DNSAPI Headers */ Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/re… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/record.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/record.c [iso-8859-1] Thu Jan 23 11:16:46 2014 @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "precomp.h" #define NDEBUG Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/st… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] Thu Jan 23 11:16:46 2014 @@ -1,4 +1,5 @@ #include "precomp.h" + #include <debug.h> DNS_STATUS WINAPI Modified: trunk/reactos/dll/win32/dnsapi/include/internal/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/include/i… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/include/internal/windns.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/include/internal/windns.h [iso-8859-1] Thu Jan 23 11:16:46 2014 @@ -11,4 +11,4 @@ DNS_STATUS DnsIntTranslateAdnsToDNS_STATUS(int Status); void DnsIntFreeRecordList(PDNS_RECORD ToFree); -#endif//WINDNS_INTERNAL_H +#endif /* WINDNS_INTERNAL_H */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs