Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61411: [MSCOREE] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in...
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 15:31:19 2013 New Revision: 61411 URL: http://svn.reactos.org/svn/reactos?rev=61411&view=rev Log: [MSCOREE] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/mscoree/guid.c (with props) Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt trunk/reactos/dll/win32/mscoree/assembly.c trunk/reactos/dll/win32/mscoree/config.c trunk/reactos/dll/win32/mscoree/cordebug.c trunk/reactos/dll/win32/mscoree/corruntimehost.c trunk/reactos/dll/win32/mscoree/metadata.c trunk/reactos/dll/win32/mscoree/metahost.c trunk/reactos/dll/win32/mscoree/mscoree_main.c trunk/reactos/dll/win32/mscoree/mscoree_private.h Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -15,12 +15,13 @@ metadata.c metahost.c mscoree_main.c + guid.c mscoree.rc ${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) add_library(mscoree SHARED ${SOURCE}) set_module_type(mscoree win32dll) -target_link_libraries(mscoree wine uuid) +target_link_libraries(mscoree uuid wine) add_importlibs(mscoree dbghelp advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mscoree/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/assembly… ============================================================================== --- trunk/reactos/dll/win32/mscoree/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/assembly.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -18,28 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" +#include "mscoree_private.h" + #include <winver.h> #include <dbghelp.h> -#include <ole2.h> -//#include "mscoree.h" -#include <corhdr.h> -#include <metahost.h> -#include <cordebug.h> -#include <wine/list.h> -#include "mscoree_private.h" - -//#include "wine/debug.h" -//#include "wine/unicode.h" typedef struct { Modified: trunk/reactos/dll/win32/mscoree/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/config.c… ============================================================================== --- trunk/reactos/dll/win32/mscoree/config.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/config.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -18,30 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include "mscoree_private.h" + #include <ole2.h> +#include <shlwapi.h> +#include <initguid.h> #include <msxml2.h> -//#include "mscoree.h" -#include <corhdr.h> -#include <metahost.h> -#include <cordebug.h> -#include <wine/list.h> -#include "mscoree_private.h" -#include <shlwapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); enum parse_state { Modified: trunk/reactos/dll/win32/mscoree/cordebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/cordebug… ============================================================================== --- trunk/reactos/dll/win32/mscoree/cordebug.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/cordebug.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -17,32 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> - -//#include "winuser.h" -//#include "winnls.h" -//#include "winreg.h" -#include <ole2.h> -//#include "shellapi.h" -//#include "mscoree.h" -#include <corhdr.h> -#include <metahost.h> -#include <cordebug.h> -#include <wine/list.h> #include "mscoree_private.h" -#include <wine/debug.h> - - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); typedef struct DebugProcess { Modified: trunk/reactos/dll/win32/mscoree/corruntimehost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/corrunti… ============================================================================== --- trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -17,37 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS +#include "mscoree_private.h" #include <assert.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <winreg.h> -#include <ole2.h> #include <shellapi.h> - -#include <cor.h> -//#include "mscoree.h" -#include <metahost.h> -//#include "corhdr.h" -#include <cordebug.h> -#include <wine/list.h> -#include "mscoree_private.h" - -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); - #include <initguid.h> DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0xf2,0xa7,0x13); Added: trunk/reactos/dll/win32/mscoree/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/guid.c?r… ============================================================================== --- trunk/reactos/dll/win32/mscoree/guid.c (added) +++ trunk/reactos/dll/win32/mscoree/guid.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -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 <objbase.h> +#include <initguid.h> +#include <cor.h> +#include <cordebug.h> +#include <metahost.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/mscoree/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mscoree/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/metadata… ============================================================================== --- trunk/reactos/dll/win32/mscoree/metadata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/metadata.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -18,32 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdio.h> -#include <stdarg.h> -//#include <assert.h> - -#define COBJMACROS - -//#include "wine/library.h" -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -#include <ole2.h> -#include <cor.h> -//#include "mscoree.h" -//#include "corhdr.h" -//#include "cordebug.h" -//#include "metahost.h" -//#include "wine/list.h" -//#include "mscoree_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +#include "mscoree_private.h" typedef struct MetaDataDispenser { Modified: trunk/reactos/dll/win32/mscoree/metahost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/metahost… ============================================================================== --- trunk/reactos/dll/win32/mscoree/metahost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/metahost.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -18,36 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "mscoree_private.h" #include <stdio.h> -//#include <stdarg.h> #include <assert.h> -#define COBJMACROS - -#include <wine/unicode.h> #include <wine/library.h> -//#include "windef.h" -//#include "winbase.h" -#include <winreg.h> -#include <ole2.h> - -//#include "corerror.h" -#include <cor.h> -//#include "mscoree.h" -//#include "corhdr.h" -#include <cordebug.h> -#include <metahost.h> + #include <fusion.h> -#include <wine/list.h> -#include "mscoree_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); static const WCHAR net_11_subdir[] = {'1','.','0',0}; static const WCHAR net_20_subdir[] = {'2','.','0',0}; Modified: trunk/reactos/dll/win32/mscoree/mscoree_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -19,40 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS -#include <wine/unicode.h> -//#include "wine/library.h" -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" -#include <winreg.h> -#include <ole2.h> -#include <ocidl.h> -//#include "shellapi.h" - -#include <initguid.h> -#include <msxml2.h> -//#include "corerror.h" -#include <cor.h> -//#include "mscoree.h" -//#include "corhdr.h" -#include <cordebug.h> -#include <metahost.h> -//#include "fusion.h" -#include <wine/list.h> #include "mscoree_private.h" + #include <rpcproxy.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); static HINSTANCE MSCOREE_hInstance; Modified: trunk/reactos/dll/win32/mscoree/mscoree_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -19,6 +19,29 @@ #ifndef __MSCOREE_PRIVATE__ #define __MSCOREE_PRIVATE__ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <cor.h> +#include <corhdr.h> +#include <cordebug.h> +#include <metahost.h> + +#include <wine/list.h> +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); extern char *WtoA(LPCWSTR wstr) DECLSPEC_HIDDEN;

1 0

[akhaldi] 61410: [MMDEVAPI] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 15:19:53 2013 New Revision: 61410 URL: http://svn.reactos.org/svn/reactos?rev=61410&view=rev Log: [MMDEVAPI] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/mmdevapi/guid.c (with props) Modified: trunk/reactos/dll/win32/mmdevapi/CMakeLists.txt trunk/reactos/dll/win32/mmdevapi/devenum.c trunk/reactos/dll/win32/mmdevapi/mmdevapi.h Modified: trunk/reactos/dll/win32/mmdevapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/CMakeLists.txt [iso-8859-1] Wed Dec 25 15:19:53 2013 @@ -10,6 +10,7 @@ audiovolume.c devenum.c main.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi.def) Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/devenum… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] Wed Dec 25 15:19:53 2013 @@ -18,12 +18,13 @@ #include "mmdevapi.h" +#include <wine/list.h> + +#include <ole2.h> +#include <initguid.h> #define _WINDOWS_H -#include <ole2.h> #include <dshow.h> #include <devpkey.h> - -#include <wine/list.h> static const WCHAR software_mmdevapi[] = { 'S','o','f','t','w','a','r','e','\\', Added: trunk/reactos/dll/win32/mmdevapi/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/guid.c (added) +++ trunk/reactos/dll/win32/mmdevapi/guid.c [iso-8859-1] Wed Dec 25 15:19:53 2013 @@ -0,0 +1,18 @@ +/* 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 <audiopolicy.h> +#include <endpointvolume.h> +#include <mmdeviceapi.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/mmdevapi/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] Wed Dec 25 15:19:53 2013 @@ -32,7 +32,6 @@ #include <winbase.h> #include <wingdi.h> #include <winreg.h> -#include <initguid.h> #include <objbase.h> #include <audiopolicy.h> #include <endpointvolume.h>

1 0

[akhaldi] 61409: [MAPI32] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 15:03:21 2013 New Revision: 61409 URL: http://svn.reactos.org/svn/reactos?rev=61409&view=rev Log: [MAPI32] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/mapi32/guid.c (with props) Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt trunk/reactos/dll/win32/mapi32/precomp.h Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Wed Dec 25 15:03:21 2013 @@ -10,11 +10,12 @@ sendmail.c util.c stubs.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/mapi32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) add_library(mapi32 SHARED ${SOURCE} version.rc) set_module_type(mapi32 win32dll) -target_link_libraries(mapi32 wine) +target_link_libraries(mapi32 uuid wine) add_importlibs(mapi32 shlwapi user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET mapi32 DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/mapi32/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/guid.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/guid.c (added) +++ trunk/reactos/dll/win32/mapi32/guid.c [iso-8859-1] Wed Dec 25 15:03:21 2013 @@ -0,0 +1,15 @@ +/* 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 <objbase.h> +#include <initguid.h> +#include <mapiguid.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/mapi32/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mapi32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/mapi32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/precomp.h [iso-8859-1] Wed Dec 25 15:03:21 2013 @@ -16,7 +16,6 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> -#include <initguid.h> #include <mapival.h> #include <mapiutil.h>

1 0

[akhaldi] 61408: * Remove incorrect headers.
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 14:56:05 2013 New Revision: 61408 URL: http://svn.reactos.org/svn/reactos?rev=61408&view=rev Log: * Remove incorrect headers. Modified: trunk/reactos/dll/win32/hhctrl.ocx/guid.c trunk/reactos/dll/win32/inetcomm/guid.c trunk/reactos/dll/win32/itss/guid.c Modified: trunk/reactos/dll/win32/hhctrl.ocx/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/guid.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/guid.c [iso-8859-1] Wed Dec 25 14:56:05 2013 @@ -1,22 +1,3 @@ -/* - * ReactOS Access Control List Editor - * Copyright (C) 2004-2005 ReactOS Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ #include <stdarg.h> Modified: trunk/reactos/dll/win32/inetcomm/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/guid.c [iso-8859-1] Wed Dec 25 14:56:05 2013 @@ -1,22 +1,3 @@ -/* - * ReactOS Access Control List Editor - * Copyright (C) 2004-2005 ReactOS Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ #include <stdarg.h> Modified: trunk/reactos/dll/win32/itss/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/guid.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/itss/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/guid.c [iso-8859-1] Wed Dec 25 14:56:05 2013 @@ -1,22 +1,3 @@ -/* - * ReactOS Access Control List Editor - * Copyright (C) 2004-2005 ReactOS Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ #include <stdarg.h>

1 0

[akhaldi] 61407: [ITSS] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 14:53:25 2013 New Revision: 61407 URL: http://svn.reactos.org/svn/reactos?rev=61407&view=rev Log: [ITSS] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/itss/guid.c (with props) Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt trunk/reactos/dll/win32/itss/precomp.h Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Wed Dec 25 14:53:25 2013 @@ -11,6 +11,7 @@ moniker.c protocol.c storage.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/itss.def) Added: trunk/reactos/dll/win32/itss/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/guid.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/itss/guid.c (added) +++ trunk/reactos/dll/win32/itss/guid.c [iso-8859-1] Wed Dec 25 14:53:25 2013 @@ -0,0 +1,34 @@ +/* + * ReactOS Access Control List Editor + * Copyright (C) 2004-2005 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* 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 <objbase.h> +#include <initguid.h> +#include <wine/itss.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/itss/guid.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed Dec 25 14:53:25 2013 @@ -15,7 +15,6 @@ #include <windef.h> #include <winbase.h> #include <ole2.h> -#include <initguid.h> #include <wine/itss.h> #include <wine/unicode.h>

1 0

[akhaldi] 61406: [INETCOMM] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 14:46:47 2013 New Revision: 61406 URL: http://svn.reactos.org/svn/reactos?rev=61406&view=rev Log: [INETCOMM] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/inetcomm/guid.c (with props) Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt trunk/reactos/dll/win32/inetcomm/inetcomm_private.h Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] Wed Dec 25 14:46:47 2013 @@ -11,6 +11,7 @@ mimeole.c pop3transport.c smtptransport.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/inetcomm_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def) Added: trunk/reactos/dll/win32/inetcomm/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/guid.c (added) +++ trunk/reactos/dll/win32/inetcomm/guid.c [iso-8859-1] Wed Dec 25 14:46:47 2013 @@ -0,0 +1,35 @@ +/* + * ReactOS Access Control List Editor + * Copyright (C) 2004-2005 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* 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 <objbase.h> +#include <initguid.h> +#include <imnxport.h> +#include <mimeole.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/inetcomm/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] Wed Dec 25 14:46:47 2013 @@ -31,7 +31,6 @@ #include <windef.h> #include <winbase.h> #include <ole2.h> -#include <initguid.h> #include <mimeole.h> #include <winsock2.h> #include <imnxport.h>

1 0

[akhaldi] 61405: [HNETCFG] * Remove unneeded inclusion. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 14:36:37 2013 New Revision: 61405 URL: http://svn.reactos.org/svn/reactos?rev=61405&view=rev Log: [HNETCFG] * Remove unneeded inclusion. CORE-7716 Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Wed Dec 25 14:36:37 2013 @@ -26,8 +26,6 @@ #define COBJMACROS -#include <initguid.h> - #include <windef.h> #include <winbase.h> #include <objbase.h>

1 0

[akhaldi] 61404: [ITSS_GUID] * We no longer need this library.
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 14:26:18 2013 New Revision: 61404 URL: http://svn.reactos.org/svn/reactos?rev=61404&view=rev Log: [ITSS_GUID] * We no longer need this library. Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/CMake… ============================================================================== --- trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] Wed Dec 25 14:26:18 2013 @@ -1,3 +1,2 @@ add_idl_headers(wineheaders itss.idl winedxgi.idl) -add_iid_library(itss_guid itss.idl)

1 0

[akhaldi] 61403: [HHCTRL.OCX] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 14:23:09 2013 New Revision: 61403 URL: http://svn.reactos.org/svn/reactos?rev=61403&view=rev Log: [HHCTRL.OCX] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/hhctrl.ocx/guid.c (with props) Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/CMake… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Wed Dec 25 14:23:09 2013 @@ -15,6 +15,7 @@ search.c stream.c webbrowser.c + guid.c hhctrl.rc ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) @@ -30,7 +31,7 @@ add_dependencies(hhctrl stdole2) set_module_type(hhctrl win32ocx) -target_link_libraries(hhctrl uuid wine itss_guid) +target_link_libraries(hhctrl uuid wine) add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) add_dependencies(hhctrl wineheaders) add_pch(hhctrl hhctrl.h) Added: trunk/reactos/dll/win32/hhctrl.ocx/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/guid.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/guid.c (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/guid.c [iso-8859-1] Wed Dec 25 14:23:09 2013 @@ -0,0 +1,34 @@ +/* + * ReactOS Access Control List Editor + * Copyright (C) 2004-2005 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* 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 <objbase.h> +#include <initguid.h> +#include <wine/itss.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/hhctrl.ocx/guid.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed Dec 25 14:23:09 2013 @@ -31,8 +31,6 @@ #define COBJMACROS -#include <initguid.h> - #include <windef.h> #include <winbase.h> #include <winuser.h>

1 0

[akhaldi] 61402: [AVIFIL32] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 13:27:32 2013 New Revision: 61402 URL: http://svn.reactos.org/svn/reactos?rev=61402&view=rev Log: [AVIFIL32] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/avifil32/guid.c (with props) Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/editstream.c Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Wed Dec 25 13:27:32 2013 @@ -17,10 +17,11 @@ icmstream.c tmpfile.c wavfile.c + guid.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) -target_link_libraries(avifil32 uuid wine) +target_link_libraries(avifil32 wine) add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] Wed Dec 25 13:27:32 2013 @@ -27,8 +27,6 @@ #define COM_NO_WINDOWS_H #define COBJMACROS - -#include <initguid.h> #include <windef.h> #include <winbase.h> Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] Wed Dec 25 13:27:32 2013 @@ -17,6 +17,8 @@ */ #include "avifile_private.h" + +#include <initguid.h> /***********************************************************************/ Added: trunk/reactos/dll/win32/avifil32/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/avifil32/guid.c (added) +++ trunk/reactos/dll/win32/avifil32/guid.c [iso-8859-1] Wed Dec 25 13:27:32 2013 @@ -0,0 +1,19 @@ +/* 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 <initguid.h> +#include <vfw.h> + +DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); +DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); +DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/avifil32/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

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