Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[pschweitzer] 61449: [MOUNTMGR] Fix a typo. Spotted by Thomas
by pschweitzer＠svn.reactos.org 27 Dec '13

27 Dec '13

Author: pschweitzer Date: Fri Dec 27 16:19:03 2013 New Revision: 61449 URL: http://svn.reactos.org/svn/reactos?rev=61449&view=rev Log: [MOUNTMGR] Fix a typo. Spotted by Thomas Modified: trunk/reactos/drivers/filters/mountmgr/device.c Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Fri Dec 27 16:19:03 2013 @@ -981,7 +981,7 @@ TryWithVolumeName: /* If we didn't find anything, try differently */ - if (DeviceLength < 2 * sizeof(WCHAR) || DeviceString[2] != L':') + if (DeviceLength < 2 * sizeof(WCHAR) || DeviceString[1] != L':') { if (DeviceString) {

1 0

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

27 Dec '13

Author: akhaldi Date: Fri Dec 27 14:08:56 2013 New Revision: 61448 URL: http://svn.reactos.org/svn/reactos?rev=61448&view=rev Log: [TWAIN_32] * 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. CORE-7716 Modified: trunk/reactos/dll/win32/twain_32/dsm_ctrl.c trunk/reactos/dll/win32/twain_32/twain32_main.c trunk/reactos/dll/win32/twain_32/twain_i.h Modified: trunk/reactos/dll/win32/twain_32/dsm_ctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/dsm_ctr… ============================================================================== --- trunk/reactos/dll/win32/twain_32/dsm_ctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/dsm_ctrl.c [iso-8859-1] Fri Dec 27 14:08:56 2013 @@ -19,21 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include <stdlib.h> -//#include <stdarg.h> -//#include <stdio.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -//#include "twain.h" #include "twain_i.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(twain); static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */ static TW_UINT32 DSM_sourceId; /* source id generator */ Modified: trunk/reactos/dll/win32/twain_32/twain32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain32… ============================================================================== --- trunk/reactos/dll/win32/twain_32/twain32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/twain32_main.c [iso-8859-1] Fri Dec 27 14:08:56 2013 @@ -19,17 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "twain.h" #include "twain_i.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(twain); /* A helper function that looks up a destination identity in the active source list */ Modified: trunk/reactos/dll/win32/twain_32/twain_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain_i… ============================================================================== --- trunk/reactos/dll/win32/twain_32/twain_i.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/twain_i.h [iso-8859-1] Fri Dec 27 14:08:56 2013 @@ -20,15 +20,19 @@ #ifndef _TWAIN32_H #define _TWAIN32_H -#ifndef __WINE_CONFIG_H -# error You must include config.h first -#endif +#include <config.h> #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <twain.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(twain); /* internal information about an active data source */ typedef struct tagActiveDS

1 0

[akhaldi] 61447: [TAPI32] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that alrea...
by akhaldi＠svn.reactos.org 27 Dec '13

27 Dec '13

Author: akhaldi Date: Fri Dec 27 14:01:01 2013 New Revision: 61447 URL: http://svn.reactos.org/svn/reactos?rev=61447&view=rev Log: [TAPI32] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Added: trunk/reactos/dll/win32/tapi32/precomp.h (with props) Modified: trunk/reactos/dll/win32/tapi32/assisted.c trunk/reactos/dll/win32/tapi32/internal.c trunk/reactos/dll/win32/tapi32/line.c trunk/reactos/dll/win32/tapi32/phone.c Modified: trunk/reactos/dll/win32/tapi32/assisted.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/assisted.… ============================================================================== --- trunk/reactos/dll/win32/tapi32/assisted.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/assisted.c [iso-8859-1] Fri Dec 27 14:01:01 2013 @@ -19,25 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -#include <stdio.h> -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -#include <winreg.h> -#include <objbase.h> -#include <tapi.h> -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(tapi); +#include "precomp.h" /*********************************************************************** * tapiGetLocationInfoW (TAPI32.@) Modified: trunk/reactos/dll/win32/tapi32/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/internal.… ============================================================================== --- trunk/reactos/dll/win32/tapi32/internal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/internal.c [iso-8859-1] Fri Dec 27 14:01:01 2013 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <string.h> -//#include <stdlib.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winreg.h" -//#include "winnls.h" -//#include "winerror.h" -//#include "objbase.h" -//#include "tapi.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(tapi); +#include "precomp.h" /*********************************************************************** * internalConfig (TAPI32.@) Modified: trunk/reactos/dll/win32/tapi32/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/line.c?re… ============================================================================== --- trunk/reactos/dll/win32/tapi32/line.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/line.c [iso-8859-1] Fri Dec 27 14:01:01 2013 @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <string.h> -//#include <stdlib.h> -#include <stdarg.h> -//#include <stdio.h> -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -#include <winreg.h> -#include <winnls.h> -//#include "winerror.h" -#include <objbase.h> -#include <tapi.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(tapi); +#include "precomp.h" /* registry keys */ static const char szCountrylistKey[] = Modified: trunk/reactos/dll/win32/tapi32/phone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/phone.c?r… ============================================================================== --- trunk/reactos/dll/win32/tapi32/phone.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/phone.c [iso-8859-1] Fri Dec 27 14:01:01 2013 @@ -18,17 +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 <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <tapi.h> -#include <wine/debug.h> +#include "precomp.h" /* * Additional TSPI functions: @@ -38,7 +28,6 @@ * - TSPI_ProviderEnumDevices * - TSPI_ProviderConfig */ -WINE_DEFAULT_DEBUG_CHANNEL(tapi); /*********************************************************************** * phoneClose (TAPI32.@) Added: trunk/reactos/dll/win32/tapi32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/tapi32/precomp.h (added) +++ trunk/reactos/dll/win32/tapi32/precomp.h [iso-8859-1] Fri Dec 27 14:01:01 2013 @@ -0,0 +1,23 @@ +#ifndef _TAPI32_PCH_ +#define _TAPI32_PCH_ + +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <tapi.h> + +#include <wine/unicode.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(tapi); + +#endif /* _TAPI32_PCH_ */ Propchange: trunk/reactos/dll/win32/tapi32/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61446: [SPOOLSS] * 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 27 Dec '13

27 Dec '13

Author: akhaldi Date: Fri Dec 27 13:42:21 2013 New Revision: 61446 URL: http://svn.reactos.org/svn/reactos?rev=61446&view=rev Log: [SPOOLSS] * 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. CORE-7716 Modified: trunk/reactos/dll/win32/spoolss/router.c trunk/reactos/dll/win32/spoolss/spoolss.h trunk/reactos/dll/win32/spoolss/spoolss_main.c Modified: trunk/reactos/dll/win32/spoolss/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/router.c… ============================================================================== --- trunk/reactos/dll/win32/spoolss/router.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/router.c [iso-8859-1] Fri Dec 27 13:42:21 2013 @@ -18,23 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" +#include "spoolss.h" + #include <winreg.h> - #include <wingdi.h> #include <winspool.h> + #include <ddk/winsplp.h> -#include "spoolss.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(spoolss); /* ################################ */ Modified: trunk/reactos/dll/win32/spoolss/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss.h [iso-8859-1] Fri Dec 27 13:42:21 2013 @@ -16,8 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(spoolss); /* ################################ */ Modified: trunk/reactos/dll/win32/spoolss/spoolss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss_… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] Fri Dec 27 13:42:21 2013 @@ -18,23 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "winreg.h" - -//#include "wingdi.h" -//#include "winspool.h" -//#include "ddk/winsplp.h" #include "spoolss.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(spoolss); /* ################################ */

1 0

[akhaldi] 61445: [SHLWAPI] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that alre...
by akhaldi＠svn.reactos.org 27 Dec '13

27 Dec '13

Author: akhaldi Date: Fri Dec 27 13:34:32 2013 New Revision: 61445 URL: http://svn.reactos.org/svn/reactos?rev=61445&view=rev Log: [SHLWAPI] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Added: trunk/reactos/dll/win32/shlwapi/precomp.h (with props) Modified: trunk/reactos/dll/win32/shlwapi/assoc.c trunk/reactos/dll/win32/shlwapi/clist.c trunk/reactos/dll/win32/shlwapi/istream.c trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc trunk/reactos/dll/win32/shlwapi/msgbox.c trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/path.c trunk/reactos/dll/win32/shlwapi/reg.c trunk/reactos/dll/win32/shlwapi/regstream.c trunk/reactos/dll/win32/shlwapi/resource.h trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/shlwapi/shlwapi_main.c trunk/reactos/dll/win32/shlwapi/stopwatch.c trunk/reactos/dll/win32/shlwapi/string.c trunk/reactos/dll/win32/shlwapi/thread.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/dll/win32/shlwapi/wsprintf.c Modified: trunk/reactos/dll/win32/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/assoc.c?… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/assoc.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,25 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <assert.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <winreg.h> -//#include "objbase.h" -//#include "shlguid.h" -#include <shlobj.h> -#include <shlwapi.h> -//#include "wine/unicode.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); + +#include "precomp.h" /* Default IQueryAssociations::Init() flags */ #define SHLWAPI_DEF_ASSOCF (ASSOCF_INIT_BYEXENAME|ASSOCF_INIT_DEFAULTTOSTAR| \ Modified: trunk/reactos/dll/win32/shlwapi/clist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/clist.c?… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/clist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/clist.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,23 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "objbase.h" -#include <shlobj.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); + +#include "precomp.h" /* dwSignature for contained DATABLOCK_HEADER items */ #define CLIST_ID_CONTAINER (~0U) Modified: trunk/reactos/dll/win32/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/istream.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/istream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/istream.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,27 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <winnls.h> -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_PATH -#include <shlwapi.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); + +#include "precomp.h" #define STGM_ACCESS_MODE(stgm) ((stgm)&0x0000f) #define STGM_SHARE_MODE(stgm) ((stgm)&0x000f0) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -19,8 +19,6 @@ * 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 "resource.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -19,8 +19,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -16,8 +16,6 @@ * 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 "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/shlwapi/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/msgbox.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/msgbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/msgbox.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -18,30 +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 <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <string.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <winreg.h> -#include <shlwapi.h> -#include <wine/unicode.h> -#include <wine/debug.h> - -#include "resource.h" - - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" extern HINSTANCE shlwapi_hInstance; /* in shlwapi_main.c */ Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -20,45 +20,18 @@ * 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 <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> +#include "precomp.h" + #include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -#include <winreg.h> -#include <wingdi.h> -//#include "winuser.h" + #include <winver.h> #include <winnetwk.h> -#include <wincon.h> #include <mmsystem.h> -#include "objbase.h" -//#include "exdisp.h" -#include "shdeprecated.h" -#include <shlobj.h> -#include <shlwapi.h> +#include <shdeprecated.h> #include <shellapi.h> #include <commdlg.h> #include <mlang.h> #include <mshtmhst.h> -#include <wine/unicode.h> -#include <wine/debug.h> - - -WINE_DEFAULT_DEBUG_CHANNEL(shell); /* DLL handles for late bound calls */ extern HINSTANCE shlwapi_hInstance; Modified: trunk/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -19,29 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <wine/unicode.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winreg.h> -#include <winternl.h> -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /* Get a function pointer from a DLL handle */ #define GET_FUNC(func, module, name, fail) \ Added: trunk/reactos/dll/win32/shlwapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/precomp.h (added) +++ trunk/reactos/dll/win32/shlwapi/precomp.h [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -0,0 +1,34 @@ +#ifndef _SHLWAPI_PCH_ +#define _SHLWAPI_PCH_ + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <wingdi.h> +#include <wincon.h> +#include <winternl.h> +#define NO_SHLWAPI_STREAM +#define NO_SHLWAPI_USER +#include <shlwapi.h> +#include <shlobj.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +#include "resource.h" + +#endif /* _SHLWAPI_PCH_ */ Propchange: trunk/reactos/dll/win32/shlwapi/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/reg.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -19,22 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> -#include <wine/debug.h> -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /* Key/Value names for MIME content types */ static const char lpszContentTypeA[] = "Content Type"; Modified: trunk/reactos/dll/win32/shlwapi/regstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/regstrea… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/regstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/regstream.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -19,25 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <winreg.h> -//#include "shlwapi.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" typedef struct { Modified: trunk/reactos/dll/win32/shlwapi/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/resource… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/resource.h [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -17,11 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef WINE_SHLWAPI_RESOURCE_H #define WINE_SHLWAPI_RESOURCE_H - -//#include <windef.h> -#include <winuser.h> #define IDS_BYTES_FORMAT 64 #define IDS_TIME_INTERVAL_HOURS 65 Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.rc [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "resource.h" +#include <winuser.h> + +#include "resource.h" #include "version.rc" Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_main.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -19,20 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0; DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; Modified: trunk/reactos/dll/win32/shlwapi/stopwatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/stopwatc… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/stopwatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/stopwatch.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -23,24 +23,7 @@ * B) Want to use a substandard API to tune its performance. */ -#define WIN32_NO_STATUS - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -#include <winternl.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /************************************************************************* * @ [SHLWAPI.241] Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -19,36 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" +#include "precomp.h" #include <math.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> -//#include "wingdi.h" -//#include "winuser.h" -#include <shlobj.h> #include <mlang.h> #include <ddeml.h> -#include <wine/unicode.h> -#include <wine/debug.h> - -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); extern HINSTANCE shlwapi_hInstance; Modified: trunk/reactos/dll/win32/shlwapi/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/thread.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/thread.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -18,29 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -//#include "winuser.h" -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_PATH -#define NO_SHLWAPI_GDI -#define NO_SHLWAPI_STREAM -#define NO_SHLWAPI_USER -#include <shlwapi.h> -#include <shlobj.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shell); + +#include "precomp.h" extern DWORD SHLWAPI_ThreadRef_index; /* Initialised in shlwapi_main.c */ Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -18,33 +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 <config.h> -//#include "wine/port.h" -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> -#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -//#include "winerror.h" -#include <wine/unicode.h> +#include "precomp.h" + #include <wininet.h> -#include <winreg.h> -#include <winternl.h> -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> #include <intshcut.h> -#include <wine/debug.h> HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD); BOOL WINAPI MLFreeLibrary(HMODULE); HRESULT WINAPI MLBuildResURLW(LPCWSTR,HMODULE,DWORD,LPCWSTR,LPWSTR,DWORD); - -WINE_DEFAULT_DEBUG_CHANNEL(shell); static inline WCHAR *heap_strdupAtoW(const char *str) { Modified: trunk/reactos/dll/win32/shlwapi/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/wsprintf… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/wsprintf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/wsprintf.c [iso-8859-1] Fri Dec 27 13:34:32 2013 @@ -23,20 +23,9 @@ */ #define WIN32_NO_STATUS - -//#include <stdarg.h> -//#include <string.h> -//#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -#define NO_SHLWAPI_REG -//#include "shlwapi.h" - #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(string); - #define WPRINTF_LEFTALIGN 0x0001 /* Align output on the left ('-' prefix) */ #define WPRINTF_PREFIX_HEX 0x0002 /* Prefix hex with 0x ('#' prefix) */

1 0

[akhaldi] 61444: [SFC] * We don't need a PCH for one source file. CORE-7716
by akhaldi＠svn.reactos.org 27 Dec '13

27 Dec '13

Author: akhaldi Date: Fri Dec 27 11:34:31 2013 New Revision: 61444 URL: http://svn.reactos.org/svn/reactos?rev=61444&view=rev Log: [SFC] * We don't need a PCH for one source file. CORE-7716 Modified: trunk/reactos/dll/win32/sfc/CMakeLists.txt Modified: trunk/reactos/dll/win32/sfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sfc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc/CMakeLists.txt [iso-8859-1] Fri Dec 27 11:34:31 2013 @@ -11,6 +11,5 @@ set_module_type(sfc win32dll) add_importlibs(sfc sfc_os msvcrt kernel32 ntdll) -add_pch(sfc precomp.h) add_cd_file(TARGET sfc DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 61443: [SETUPAPI] * Set the default debugging channel globally through the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi＠svn.reactos.org 27 Dec '13

27 Dec '13

Author: akhaldi Date: Fri Dec 27 11:32:40 2013 New Revision: 61443 URL: http://svn.reactos.org/svn/reactos?rev=61443&view=rev Log: [SETUPAPI] * Set the default debugging channel globally through the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/dirid.c trunk/reactos/dll/win32/setupapi/diskspace.c trunk/reactos/dll/win32/setupapi/driver.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/interface.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/query.c trunk/reactos/dll/win32/setupapi/queue.c trunk/reactos/dll/win32/setupapi/rpc.c trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/setupcab.c trunk/reactos/dll/win32/setupapi/stringtable.c trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -21,7 +21,9 @@ #include "setupapi_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#include <pnp_c.h> + +#include "rpc_private.h" /* Registry key and value names */ static const WCHAR Backslash[] = {'\\', 0}; Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -21,7 +21,7 @@ #include "setupapi_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#include <wingdi.h> /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -20,8 +20,6 @@ */ #include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; Modified: trunk/reactos/dll/win32/setupapi/dirid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/dirid.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/dirid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/dirid.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -19,8 +19,6 @@ */ #include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #define MAX_SYSTEM_DIRID DIRID_PRINTPROCESSOR #define MIN_CSIDL_DIRID 0x4000 Modified: trunk/reactos/dll/win32/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/diskspa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -19,8 +19,6 @@ */ #include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); typedef struct { WCHAR lpzName[20]; Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/driver.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -19,8 +19,6 @@ */ #include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -21,7 +21,8 @@ #include "setupapi_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#include <winsvc.h> +#include <ndk/cmfuncs.h> /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -20,8 +20,6 @@ */ #include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ static const WCHAR AddInterface[] = {'A','d','d','I','n','t','e','r','f','a','c','e',0}; Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -21,7 +21,8 @@ #include "setupapi_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#include <winver.h> +#include <lzexpand.h> /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -21,7 +21,7 @@ #include "setupapi_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#include <ndk/obfuncs.h> /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; Modified: trunk/reactos/dll/win32/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/query.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/query.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -20,8 +20,6 @@ #include "setupapi_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); - static const WCHAR source_disks_names[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; static const WCHAR source_disks_files[] = Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -21,8 +21,6 @@ #include "setupapi_private.h" #include <aclapi.h> - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ static const WCHAR DotSecurity[] = {'.','S','e','c','u','r','i','t','y',0}; Modified: trunk/reactos/dll/win32/setupapi/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/rpc.c?r… ============================================================================== --- trunk/reactos/dll/win32/setupapi/rpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/rpc.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -19,8 +19,6 @@ */ #include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); static RPC_BINDING_HANDLE LocalBindingHandle = NULL; static HSTRING_TABLE LocalStringTable = NULL; Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -20,42 +20,29 @@ #ifndef __SETUPAPI_PRIVATE_H #define __SETUPAPI_PRIVATE_H -#include <fcntl.h> -#include <share.h> #include <wchar.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 <winsvc.h> -#include <winver.h> -#include <wingdi.h> #include <wincon.h> #include <objbase.h> -#include <lzexpand.h> #include <cfgmgr32.h> -#include <fdi.h> #include <regstr.h> #include <sddl.h> #include <setupapi.h> #include <shlobj.h> -#include <wine/debug.h> #include <wine/unicode.h> #define NTOS_MODE_USER -#include <ndk/cmfuncs.h> -#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> -//#include <pseh/pseh2.h> - -#include <pnp_c.h> - -#include "rpc_private.h" -//#include "resource.h" +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #ifdef __REACTOS__ #undef __WINESRC__ Modified: trunk/reactos/dll/win32/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupca… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -24,6 +24,10 @@ */ #include "setupapi_private.h" + +#include <fcntl.h> +#include <share.h> +#include <fdi.h> HINSTANCE hInstance = 0; OSVERSIONINFOW OsVersionInfo; @@ -55,8 +59,6 @@ PVOID context; WCHAR most_recent_cabinet_name[MAX_PATH]; } SC_HSC_W, *PSC_HSC_W; - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); static BOOL LoadCABINETDll(void) { Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -21,8 +21,6 @@ #include "setupapi_private.h" #define TABLE_DEFAULT_SIZE 256 - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); typedef struct _TABLE_SLOT { Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Fri Dec 27 11:32:40 2013 @@ -19,8 +19,6 @@ */ #include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /*********************************************************************** * pSetupRegistryDelnode(SETUPAPI.@)

1 0

[akhaldi] 61442: [SCRRUN] * 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 27 Dec '13

27 Dec '13

Author: akhaldi Date: Fri Dec 27 11:14:56 2013 New Revision: 61442 URL: http://svn.reactos.org/svn/reactos?rev=61442&view=rev Log: [SCRRUN] * 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/scrrun/guid.c (with props) Modified: trunk/reactos/dll/win32/scrrun/CMakeLists.txt trunk/reactos/dll/win32/scrrun/dictionary.c trunk/reactos/dll/win32/scrrun/filesystem.c trunk/reactos/dll/win32/scrrun/scrrun.c trunk/reactos/dll/win32/scrrun/scrrun_private.h Modified: trunk/reactos/dll/win32/scrrun/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/scrrun/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/CMakeLists.txt [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -10,6 +10,7 @@ dictionary.c filesystem.c scrrun.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def) Modified: trunk/reactos/dll/win32/scrrun/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/dictionar… ============================================================================== --- trunk/reactos/dll/win32/scrrun/dictionary.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/dictionary.c [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -15,21 +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 */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "dispex.h" -#include "scrrun.h" + #include "scrrun_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scrrun); typedef struct { Modified: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesyste… ============================================================================== --- trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -16,25 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> -#include <limits.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "olectl.h" -#include "dispex.h" -#include "ntsecapi.h" -#include "scrrun.h" #include "scrrun_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +#include <winver.h> +#include <olectl.h> +#include <ntsecapi.h> struct folder { IFolder IFolder_iface; Added: trunk/reactos/dll/win32/scrrun/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/guid.c?re… ============================================================================== --- trunk/reactos/dll/win32/scrrun/guid.c (added) +++ trunk/reactos/dll/win32/scrrun/guid.c [iso-8859-1] Fri Dec 27 11:14:56 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 <scrrun.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/scrrun/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/scrrun/scrrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.c?… ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun.c [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -15,23 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "rpcproxy.h" - -#include <initguid.h> -#include "scrrun.h" + #include "scrrun_private.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +#include <rpcproxy.h> static HINSTANCE scrrun_instance; Modified: trunk/reactos/dll/win32/scrrun/scrrun_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_pr… ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] Fri Dec 27 11:14:56 2013 @@ -18,6 +18,28 @@ #ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ + +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <oleauto.h> +#include <dispex.h> +#include <scrrun.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(scrrun); extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

[akhaldi] 61441: [SCRRUN] * Fix a typo in the header guard. CORE-7716
by akhaldi＠svn.reactos.org 27 Dec '13

27 Dec '13

Author: akhaldi Date: Fri Dec 27 10:33:34 2013 New Revision: 61441 URL: http://svn.reactos.org/svn/reactos?rev=61441&view=rev Log: [SCRRUN] * Fix a typo in the header guard. CORE-7716 Modified: trunk/reactos/dll/win32/scrrun/scrrun_private.h Modified: trunk/reactos/dll/win32/scrrun/scrrun_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_pr… ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] Fri Dec 27 10:33:34 2013 @@ -15,8 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef _SCRRUN_PRIVATE_H_ -#define _SCRRUN_PRIVATE_H +#define _SCRRUN_PRIVATE_H_ extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; @@ -44,4 +45,4 @@ return HeapFree(GetProcessHeap(), 0, mem); } -#endif +#endif /* _SCRRUN_PRIVATE_H_ */

1 0

[akhaldi] 61440: [SCHANNEL] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that alr...
by akhaldi＠svn.reactos.org 27 Dec '13

27 Dec '13

Author: akhaldi Date: Fri Dec 27 10:31:09 2013 New Revision: 61440 URL: http://svn.reactos.org/svn/reactos?rev=61440&view=rev Log: [SCHANNEL] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Added: trunk/reactos/dll/win32/schannel/precomp.h (with props) Modified: trunk/reactos/dll/win32/schannel/lsamode.c trunk/reactos/dll/win32/schannel/schannel_main.c trunk/reactos/dll/win32/schannel/usermode.c Modified: trunk/reactos/dll/win32/schannel/lsamode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/lsamode… ============================================================================== --- trunk/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] Fri Dec 27 10:31:09 2013 @@ -18,22 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "precomp.h" -#include <ntstatus.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <windef.h> -#include <winbase.h> -#include <sspi.h> -#include <ntsecapi.h> -#include <ntsecpkg.h> #include <schannel.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(schannel); /*********************************************************************** * SpGetInfoUnified Added: trunk/reactos/dll/win32/schannel/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/precomp… ============================================================================== --- trunk/reactos/dll/win32/schannel/precomp.h (added) +++ trunk/reactos/dll/win32/schannel/precomp.h [iso-8859-1] Fri Dec 27 10:31:09 2013 @@ -0,0 +1,19 @@ +#ifndef _SCHANNEL_PCH_ +#define _SCHANNEL_PCH_ + +#include <stdarg.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <winbase.h> +#include <sspi.h> +#include <ntsecapi.h> +#include <ntsecpkg.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + +#endif /* _SCHANNEL_PCH_ */ Propchange: trunk/reactos/dll/win32/schannel/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/schannel/schannel_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_main.c [iso-8859-1] Fri Dec 27 10:31:09 2013 @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(schannel); +#include "precomp.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { Modified: trunk/reactos/dll/win32/schannel/usermode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/usermod… ============================================================================== --- trunk/reactos/dll/win32/schannel/usermode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/usermode.c [iso-8859-1] Fri Dec 27 10:31:09 2013 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include <ntstatus.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <windef.h> -#include <winbase.h> -#include <sspi.h> -#include <ntsecapi.h> -#include <ntsecpkg.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(schannel); +#include "precomp.h" static SECPKG_USER_FUNCTION_TABLE secPkgUserTables[2] = { {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2013