Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[akhaldi] 61439: [SAMSRV] * Set the default debugging channel globally through the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 27 10:25:26 2013 New Revision: 61439 URL: http://svn.reactos.org/svn/reactos?rev=61439&view=rev Log: [SAMSRV] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/samsrv/alias.c trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/domain.c trunk/reactos/dll/win32/samsrv/group.c trunk/reactos/dll/win32/samsrv/registry.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/security.c trunk/reactos/dll/win32/samsrv/setup.c trunk/reactos/dll/win32/samsrv/user.c trunk/reactos/dll/win32/samsrv/utils.c Modified: trunk/reactos/dll/win32/samsrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/alias.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2013 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2012 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/domain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/domain.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/domain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/domain.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2013 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/group.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2013 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -7,11 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -7,11 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ******************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -17,12 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* INCLUDES *****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -31,6 +31,7 @@ #include <sam_s.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); #include "resources.h" Modified: trunk/reactos/dll/win32/samsrv/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/security.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -7,12 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -7,19 +7,13 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - - /* GLOBALS *****************************************************************/ #define TICKS_PER_SECOND 10000000LL SID_IDENTIFIER_AUTHORITY SecurityNtAuthority = {SECURITY_NT_AUTHORITY}; - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2013 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/samsrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/utils.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/utils.c [iso-8859-1] Fri Dec 27 10:25:26 2013 @@ -7,15 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "samsrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samsrv); - - -/* GLOBALS *****************************************************************/ - /* FUNCTIONS ***************************************************************/

10 years, 8 months

[akhaldi] 61438: [SAMLIB] * Set the default debugging channel globally through the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 27 10:19:43 2013 New Revision: 61438 URL: http://svn.reactos.org/svn/reactos?rev=61438&view=rev Log: [SAMLIB] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/samlib/dllmain.c trunk/reactos/dll/win32/samlib/precomp.h trunk/reactos/dll/win32/samlib/samlib.c Modified: trunk/reactos/dll/win32/samlib/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] Fri Dec 27 10:19:43 2013 @@ -24,14 +24,7 @@ * PROGRAMER: Eric Kohl */ -/* INCLUDES *****************************************************************/ - #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samlib); - -/* GLOBALS *******************************************************************/ - /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/samlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] Fri Dec 27 10:19:43 2013 @@ -13,3 +13,4 @@ #include <sam_c.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(samlib); Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Fri Dec 27 10:19:43 2013 @@ -24,11 +24,7 @@ * PROGRAMER: Eric Kohl */ -/* INCLUDES *****************************************************************/ - #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samlib); NTSTATUS WINAPI

10 years, 8 months

[akhaldi] 61437: [RPCRT4] * Create a main header and move some inclusions to it. * Remove inclusions and definitions that already exist in the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 27 10:14:26 2013 New Revision: 61437 URL: http://svn.reactos.org/svn/reactos?rev=61437&view=rev Log: [RPCRT4] * Create a main header and move some inclusions to it. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Added: trunk/reactos/dll/win32/rpcrt4/precomp.h (with props) Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/epm_towers.h trunk/reactos/dll/win32/rpcrt4/ncastatus.h trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c trunk/reactos/dll/win32/rpcrt4/ndr_es.c trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_misc.h trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h trunk/reactos/dll/win32/rpcrt4/rpc_async.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -21,27 +21,7 @@ * TODO: Handle non-i386 architectures */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" - -#include <objbase.h> -#include <rpcproxy.h> - -#include "cpsf.h" -//#include "ndr_misc.h" -//#include "ndr_stubless.h" -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?re… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cpsf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/cpsf.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -18,31 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" +#include "precomp.h" + #include <winreg.h> - -#include <objbase.h> - -#include <rpcproxy.h> - -#include <wine/unicode.h> -#include <wine/debug.h> - -#include "cpsf.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -19,28 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "excpt.h" - -#include <objbase.h> -#include <rpcproxy.h> - -#include <wine/debug.h> -#include <wine/exception.h> - -#include "cpsf.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/rpcrt4/epm_towers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/epm_tower… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/epm_towers.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/epm_towers.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#pragma once #include <epm_c.h> Modified: trunk/reactos/dll/win32/rpcrt4/ncastatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ncastatus… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ncastatus.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ncastatus.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -17,6 +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 */ + +#pragma once #define NCA_S_COMM_FAILURE 0x1C010001 #define NCA_S_OP_RNG_ERROR 0x1C010002 Modified: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_clien… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -22,25 +22,7 @@ * - check for errors and throw exceptions */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" - -#include <objbase.h> - -//#include "rpcproxy.h" - -#include <wine/debug.h> - -//#include "ndr_misc.h" -//#include "rpcndr.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -19,18 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "ndr_misc.h" -#include "rpc_assoc.h" -//#include "rpcndr.h" - -//#include "wine/rpcfc.h" - -#include <wine/debug.h> -//#include "wine/list.h" - -#ifdef __REACTOS__ -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -#endif +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_es.c?… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -18,24 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <rpc.h> +#include "precomp.h" + #include <midles.h> -//#include "ndrtypes.h" - -//#include "ndr_misc.h" -#include "ndr_stubless.h" - -#include <wine/debug.h> -#include <wine/rpcfc.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_fullp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <rpc.h> -#include <rpcndr.h> - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -27,25 +27,7 @@ * - Checks for integer addition overflow in user marshall functions */ -#include <assert.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -//#include <limits.h> - -#define NONAMELESSUNION -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" - -#include "ndr_misc.h" -//#include "rpcndr.h" -#include <ndrtypes.h> - -#include <wine/unicode.h> -#include <wine/rpcfc.h> - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/rpcrt4/ndr_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_misc.… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_misc.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_misc.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -20,16 +20,6 @@ #ifndef __WINE_NDR_MISC_H #define __WINE_NDR_MISC_H - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <rpc.h> -#include <rpcndr.h> struct IPSFactoryBuffer; Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_ole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_ole.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -22,30 +22,7 @@ * - finish RpcStream_Vtbl */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" - -#include <objbase.h> - -#include "ndr_misc.h" -//#include "rpcndr.h" -//#include "rpcproxy.h" -#include <wine/rpcfc.h> -//#include "cpsf.h" - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -23,31 +23,7 @@ * - Some types of binding handles */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -#include <stdio.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" - -#include <objbase.h> -//#include "rpc.h" -#include <rpcproxy.h> - -#include <wine/exception.h> -#include <wine/debug.h> -#include <wine/rpcfc.h> - -#include "cpsf.h" -#include "ndr_misc.h" -#include "ndr_stubless.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -17,6 +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 */ + +#pragma once #include <ndrtypes.h> Added: trunk/reactos/dll/win32/rpcrt4/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/precomp.h (added) +++ trunk/reactos/dll/win32/rpcrt4/precomp.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -0,0 +1,40 @@ +#ifndef _RPCRT4_PCH_ +#define _RPCRT4_PCH_ + +#include <config.h> + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winternl.h> +#include <objbase.h> +#include <rpcproxy.h> +#include <security.h> + +#include <wine/debug.h> +#include <wine/exception.h> +#include <wine/list.h> +#include <wine/rpcfc.h> +#include <wine/unicode.h> + +#include "cpsf.h" +#include "ncastatus.h" +#include "ndr_misc.h" +#include "ndr_stubless.h" +#include "rpc_assoc.h" +#include "rpc_binding.h" +#include "rpc_message.h" +#include "rpc_server.h" + +#endif /* _RPCRT4_PCH_ */ Propchange: trunk/reactos/dll/win32/rpcrt4/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -19,24 +19,7 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#include <windef.h> -#include <winbase.h> -#include <rpc.h> -//#include "rpcndr.h" -#include <winternl.h> - -#include <wine/unicode.h> -#include <wine/debug.h> - -//#include "rpc_binding.h" -#include "rpc_assoc.h" -#include "rpc_message.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -20,7 +20,6 @@ */ #include "rpc_binding.h" -//#include "wine/list.h" typedef struct _RpcAssoc { Modified: trunk/reactos/dll/win32/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_async… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_async.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -19,22 +19,7 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <rpc.h> -#include <rpcndr.h> -//#include "rpcasync.h" - -#include <wine/debug.h> - -//#include "rpc_binding.h" -//#include "rpc_message.h" -#include "ndr_stubless.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -21,28 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -//#include <assert.h> - -#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -//#include "winerror.h" -//#include "winternl.h" -#include <wine/unicode.h> - -#include <rpc.h> -//#include "rpcndr.h" - -#include <wine/debug.h> - -//#include "rpc_binding.h" -#include "rpc_assoc.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -21,11 +21,7 @@ #ifndef __WINE_RPC_BINDING_H #define __WINE_RPC_BINDING_H -//#include "rpcndr.h" -#include <security.h> -#include <wine/list.h> #include "rpc_defs.h" - enum secure_packet_direction { Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -20,27 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" - -#include <rpc.h> - -#include <wine/debug.h> -#include <wine/exception.h> - -#include "rpc_binding.h" -//#include "epm_c.h" +#include "precomp.h" #include "epm_towers.h" - -#ifdef __REACTOS__ -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -#endif WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_message.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -20,27 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" +#include "precomp.h" + #include <winuser.h> - -#include <rpc.h> -//#include "rpcndr.h" -//#include "rpcdcep.h" - -#include <wine/debug.h> - -#include "rpc_binding.h" -//#include "rpc_defs.h" -#include "rpc_message.h" -#include "ncastatus.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_message.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_message.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -20,8 +20,6 @@ #ifndef __WINE_RPC_MESSAGE_H #define __WINE_RPC_MESSAGE_H - -//#include "rpc_defs.h" typedef unsigned int NCA_STATUS; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -20,32 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -#include <assert.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" - -#include <rpc.h> -//#include "rpcndr.h" -//#include "excpt.h" - -#include <wine/debug.h> -#include <wine/exception.h> - -#include "rpc_server.h" -#include "rpc_assoc.h" -#include "rpc_message.h" -//#include "rpc_defs.h" -#include "ncastatus.h" +#include "precomp.h" + #include <secext.h> WINE_DEFAULT_DEBUG_CHANNEL(rpc); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.h [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -22,7 +22,6 @@ #define __WINE_RPC_SERVER_H #include "rpc_binding.h" -//#include "wine/list.h" struct protseq_ops; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -23,20 +23,7 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <stdarg.h> -#include <stdio.h> -//#include <string.h> -#include <assert.h> -//#include <stdlib.h> -//#include <sys/types.h> - -#include <windef.h> -#include <winbase.h> +#include "precomp.h" #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> @@ -82,21 +69,8 @@ # define ioctlsocket ioctl #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ -//#include "winnls.h" -//#include "winerror.h" #include <wininet.h> -#include <winternl.h> -#include <wine/unicode.h> - -#include <rpc.h> -//#include "rpcndr.h" - -#include <wine/debug.h> - -//#include "rpc_binding.h" -#include "rpc_assoc.h" -#include "rpc_message.h" -#include "rpc_server.h" + #include "epm_towers.h" #ifndef SOL_TCP Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] Fri Dec 27 10:14:26 2013 @@ -28,36 +28,10 @@ * NT-based native rpcrt4's. Commonly-used transport for self-to-self RPC's. */ -#include <config.h> - -#include <stdarg.h> -#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#include <windef.h> -//#include "winerror.h" -#include <winbase.h> -//#include "winuser.h" -//#include "winnt.h" -#include <winternl.h> +#include "precomp.h" + #include <ntsecapi.h> -//#include "iptypes.h" #include <iphlpapi.h> -#include <wine/unicode.h> -#include <rpc.h> - -//#include "ole2.h" -//#include "rpcndr.h" -//#include "rpcproxy.h" - -//#include "rpc_binding.h" -#include "rpc_server.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(rpc);

10 years, 8 months

[akhaldi] 61436: [MSI] * Include msidefs.h after propidl.h to prevent that dreadful PID_SECURITY two values problem. CORE-7724 #resolve #comment Should be fixed in r61436.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 27 09:56:20 2013 New Revision: 61436 URL: http://svn.reactos.org/svn/reactos?rev=61436&view=rev Log: [MSI] * Include msidefs.h after propidl.h to prevent that dreadful PID_SECURITY two values problem. CORE-7724 #resolve #comment Should be fixed in r61436. Modified: trunk/reactos/dll/win32/msi/msipriv.h Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Fri Dec 27 09:56:20 2013 @@ -40,13 +40,13 @@ #include <wincon.h> #include <winver.h> #include <msiquery.h> -#include <msidefs.h> #include <objbase.h> #include <msiserver.h> #include <shlobj.h> #include <shlwapi.h> #include <fusion.h> #include <sddl.h> +#include <msidefs.h> #include <wine/list.h> #include <wine/debug.h>

10 years, 8 months

[hbelusca] 61435: [NTVDM] Make colors appearing in CGA mode 4, but still buggy concerning the computation of the resolution (either the X-dimension is twice big or the Y-dimension is twice small), ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 26 21:40:20 2013 New Revision: 61435 URL: http://svn.reactos.org/svn/reactos?rev=61435&view=rev Log: [NTVDM] Make colors appearing in CGA mode 4, but still buggy concerning the computation of the resolution (either the X-dimension is twice big or the Y-dimension is twice small), and the position of the pixels... However the VGA registers are (almost) similar to http://www.brokenthorn.com/Resources/OSDevVid2.html and putting them equal to the settings given there don't change anything new... Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Thu Dec 26 21:40:20 2013 @@ -91,7 +91,7 @@ 0x63, /* Sequencer Registers */ - {0x00, 0x09, 0x00, 0x00, 0x02}, + {0x00, 0x09, 0x03, 0x00, 0x02}, /* CRTC Registers */ {0x2D, 0x27, 0x28, 0x90, 0x2B, 0x80, 0xBF, 0x1F, 0x00, 0xC1, 0x00, 0x00, @@ -99,7 +99,7 @@ 0xFF}, /* GC Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0F, 0x0F, 0xFF}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0F, 0x0F, 0xFF}, /* AC Registers */ {0x00, 0x13, 0x15, 0x17, 0x02, 0x04, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13,

10 years, 8 months

[hbelusca] 61434: [NTVDM]: Code "formatting" + fix types.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 26 21:37:06 2013 New Revision: 61434 URL: http://svn.reactos.org/svn/reactos?rev=61434&view=rev Log: [NTVDM]: Code "formatting" + fix types. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Thu Dec 26 21:37:06 2013 @@ -224,7 +224,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static inline INT VgaGetAddressSize(VOID) +static inline DWORD VgaGetAddressSize(VOID) { if (VgaCrtcRegisters[VGA_CRTC_UNDERLINE_REG] & VGA_CRTC_UNDERLINE_DWORD) { @@ -550,6 +550,10 @@ DoubleVision = TRUE; Width *= 2; Height *= 2; + } + else + { + DoubleVision = FALSE; } /* Fill the bitmap info header */ @@ -713,7 +717,7 @@ { INT i, j, k; COORD Resolution = VgaGetDisplayResolution(); - INT AddressSize = VgaGetAddressSize(); + DWORD AddressSize = VgaGetAddressSize(); DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]); DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; @@ -755,7 +759,7 @@ /* One byte per pixel */ PixelData = VgaMemory[(j % VGA_NUM_BANKS) * VGA_BANK_SIZE + (Address + (j / VGA_NUM_BANKS)) - * AddressSize]; + * AddressSize]; } else { @@ -763,7 +767,7 @@ PixelData = VgaMemory[(j % VGA_NUM_BANKS) * VGA_BANK_SIZE + (Address + (j / (VGA_NUM_BANKS * 2))) - * AddressSize]; + * AddressSize]; /* Check if we should use the highest 4 bits or lowest 4 */ if (((j / VGA_NUM_BANKS) % 2) == 0) @@ -818,10 +822,11 @@ { /* The data is on plane k, 4 pixels per byte */ BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE - + (Address + (j / 4)) * AddressSize]; + + (Address + (j / VGA_NUM_BANKS)) + * AddressSize]; /* The mask of the first bit in the pair */ - BYTE BitMask = 1 << (((3 - (j % 4)) * 2) + 1); + BYTE BitMask = 1 << (((3 - (j % VGA_NUM_BANKS)) * 2) + 1); /* Bits 0, 1, 2 and 3 come from the first bit of the pair */ if (PlaneData & BitMask) PixelData |= 1 << k; @@ -837,7 +842,8 @@ for (k = 0; k < VGA_NUM_BANKS; k++) { BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE - + (Address + (j / 8)) * AddressSize]; + + (Address + (j / (VGA_NUM_BANKS * 2))) + * AddressSize]; /* If the bit on that plane is set, set it */ if (PlaneData & (1 << (7 - (j % 8)))) PixelData |= 1 << k; @@ -1462,7 +1468,7 @@ { INT i, j; COORD Resolution; - INT AddressSize; + DWORD AddressSize; DWORD ScanlineSize; COORD Origin = { 0, 0 }; SMALL_RECT ScreenRect;

10 years, 8 months

[ekohl] 61433: [LSASRV][MSV1_0] - Add local group SIDs to the token groups list (LocalSID and LogonSID). - Remove these SIDs from the hard-coded list.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Dec 26 19:20:33 2013 New Revision: 61433 URL: http://svn.reactos.org/svn/reactos?rev=61433&view=rev Log: [LSASRV][MSV1_0] - Add local group SIDs to the token groups list (LocalSID and LogonSID). - Remove these SIDs from the hard-coded list. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Thu Dec 26 19:20:33 2013 @@ -645,6 +645,90 @@ static NTSTATUS +LsapAddLocalGroups( + IN PVOID TokenInformation, + IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType, + IN PTOKEN_GROUPS LocalGroups) +{ + PLSA_TOKEN_INFORMATION_V1 TokenInfo1; + PTOKEN_GROUPS Groups; + ULONG Length; + ULONG i; + ULONG j; + + if (LocalGroups == NULL || LocalGroups->GroupCount == 0) + return STATUS_SUCCESS; + + if (TokenInformationType == LsaTokenInformationV1) + { + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + if (TokenInfo1->Groups != NULL) + { + Length = sizeof(TOKEN_GROUPS) + + (LocalGroups->GroupCount + TokenInfo1->Groups->GroupCount - ANYSIZE_ARRAY) * sizeof(SID_AND_ATTRIBUTES); + + Groups = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); + if (Groups == NULL) + { + ERR("Group buffer allocation failed!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Groups->GroupCount = LocalGroups->GroupCount + TokenInfo1->Groups->GroupCount; + + for (i = 0; i < TokenInfo1->Groups->GroupCount; i++) + { + Groups->Groups[i].Sid = TokenInfo1->Groups->Groups[i].Sid; + Groups->Groups[i].Attributes = TokenInfo1->Groups->Groups[i].Attributes; + } + + for (j = 0; j < LocalGroups->GroupCount; i++, j++) + { + Groups->Groups[i].Sid = LocalGroups->Groups[j].Sid; + Groups->Groups[i].Attributes = LocalGroups->Groups[j].Attributes; + LocalGroups->Groups[j].Sid = NULL; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, TokenInfo1->Groups); + + TokenInfo1->Groups = Groups; + } + else + { + Length = sizeof(TOKEN_GROUPS) + + (LocalGroups->GroupCount - ANYSIZE_ARRAY) * sizeof(SID_AND_ATTRIBUTES); + + Groups = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); + if (Groups == NULL) + { + ERR("Group buffer allocation failed!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Groups->GroupCount = LocalGroups->GroupCount; + + for (i = 0; i < LocalGroups->GroupCount; i++) + { + Groups->Groups[i].Sid = LocalGroups->Groups[i].Sid; + Groups->Groups[i].Attributes = LocalGroups->Groups[i].Attributes; + } + + TokenInfo1->Groups = Groups; + } + } + else + { + FIXME("TokenInformationType %d is not supported!\n", TokenInformationType); + return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_SUCCESS; +} + + +static +NTSTATUS LsapSetTokenOwner( IN PVOID TokenInformation, IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType) @@ -862,6 +946,19 @@ goto done; } + if (LocalGroups->GroupCount > 0) + { + /* Add local groups to the token information */ + Status = LsapAddLocalGroups(TokenInformation, + TokenInformationType, + LocalGroups); + if (!NT_SUCCESS(Status)) + { + ERR("LsapAddLocalGroupsToTokenInfo() failed (Status 0x%08lx)\n", Status); + goto done; + } + } + Status = LsapSetTokenOwner(TokenInformation, TokenInformationType); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Thu Dec 26 19:20:33 2013 @@ -274,10 +274,9 @@ OUT PSID *PrimaryGroupSid) { SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; - SID_IDENTIFIER_AUTHORITY LocalAuthority = {SECURITY_LOCAL_SID_AUTHORITY}; SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; PTOKEN_GROUPS TokenGroups; -#define MAX_GROUPS 8 +#define MAX_GROUPS 6 DWORD GroupCount = 0; PSID Sid; NTSTATUS Status = STATUS_SUCCESS; @@ -345,40 +344,6 @@ 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - TokenGroups->Groups[GroupCount].Sid = Sid; - TokenGroups->Groups[GroupCount].Attributes = - SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - GroupCount++; - - /* Logon SID */ - RtlAllocateAndInitializeSid(&SystemAuthority, - SECURITY_LOGON_IDS_RID_COUNT, - SECURITY_LOGON_IDS_RID, - LogonId->HighPart, - LogonId->LowPart, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - TokenGroups->Groups[GroupCount].Sid = Sid; - TokenGroups->Groups[GroupCount].Attributes = - SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY | SE_GROUP_LOGON_ID; - GroupCount++; - - /* Member of 'Local users */ - RtlAllocateAndInitializeSid(&LocalAuthority, - 1, - SECURITY_LOCAL_RID, - SECURITY_NULL_RID, SECURITY_NULL_RID, SECURITY_NULL_RID, SECURITY_NULL_RID,

10 years, 8 months

[akhaldi] 61432: [QMGR] * 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 th...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 26 19:19:09 2013 New Revision: 61432 URL: http://svn.reactos.org/svn/reactos?rev=61432&view=rev Log: [QMGR] * 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/qmgr/enum_files.c trunk/reactos/dll/win32/qmgr/enum_jobs.c trunk/reactos/dll/win32/qmgr/factory.c trunk/reactos/dll/win32/qmgr/file.c trunk/reactos/dll/win32/qmgr/job.c trunk/reactos/dll/win32/qmgr/qmgr.c trunk/reactos/dll/win32/qmgr/qmgr.h trunk/reactos/dll/win32/qmgr/qmgr_main.c trunk/reactos/dll/win32/qmgr/service.c Modified: trunk/reactos/dll/win32/qmgr/enum_files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/enum_files.… ============================================================================== --- trunk/reactos/dll/win32/qmgr/enum_files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/enum_files.c [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -19,9 +19,6 @@ */ #include "qmgr.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); typedef struct { Modified: trunk/reactos/dll/win32/qmgr/enum_jobs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/enum_jobs.c… ============================================================================== --- trunk/reactos/dll/win32/qmgr/enum_jobs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/enum_jobs.c [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -19,9 +19,6 @@ */ #include "qmgr.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); typedef struct { Modified: trunk/reactos/dll/win32/qmgr/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/factory.c?r… ============================================================================== --- trunk/reactos/dll/win32/qmgr/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/factory.c [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - #include "qmgr.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static ULONG WINAPI BITS_IClassFactory_AddRef(IClassFactory *iface) Modified: trunk/reactos/dll/win32/qmgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/file.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -18,26 +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> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> +#include "qmgr.h" + #include <urlmon.h> #include <wininet.h> - -#include "qmgr.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile(IBackgroundCopyFile *iface) { Modified: trunk/reactos/dll/win32/qmgr/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/job.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" - #include "qmgr.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) { Modified: trunk/reactos/dll/win32/qmgr/qmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr.c [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -19,9 +19,6 @@ */ #include "qmgr.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); BackgroundCopyManagerImpl globalMgr; Modified: trunk/reactos/dll/win32/qmgr/qmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.h?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr.h [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -21,21 +21,24 @@ #ifndef __QMGR_H__ #define __QMGR_H__ +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> +#define COBJMACROS #include <windef.h> #include <winbase.h> +#include <winsvc.h> #include <objbase.h> - -#define COBJMACROS #include <bits1_5.h> -//#include <string.h> #include <wine/list.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr); /* Background copy job vtbl and related data */ typedef struct Modified: trunk/reactos/dll/win32/qmgr/qmgr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr_main.c… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr_main.c [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -21,28 +21,15 @@ * 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 "qmgr.h" #include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <objbase.h> #include <winuser.h> #include <winreg.h> #include <advpub.h> #include <olectl.h> -#include <winsvc.h> - -//#include "bits.h" -#include "qmgr.h" #include <initguid.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); /* Handle to the base address of this DLL */ static HINSTANCE hInst; Modified: trunk/reactos/dll/win32/qmgr/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/service.c?r… ============================================================================== --- trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] Thu Dec 26 19:19:09 2013 @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -//#include "objbase.h" -#include <winsvc.h> -//#include "bits.h" - #include "qmgr.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); HANDLE stop_event = NULL;

10 years, 8 months

[akhaldi] 61431: [PROPSYS] * 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

Author: akhaldi Date: Thu Dec 26 19:11:46 2013 New Revision: 61431 URL: http://svn.reactos.org/svn/reactos?rev=61431&view=rev Log: [PROPSYS] * 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/propsys/propstore.c trunk/reactos/dll/win32/propsys/propsys_main.c trunk/reactos/dll/win32/propsys/propsys_private.h trunk/reactos/dll/win32/propsys/propvar.c Modified: trunk/reactos/dll/win32/propsys/propstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propstor… ============================================================================== --- trunk/reactos/dll/win32/propsys/propstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propstore.c [iso-8859-1] Thu Dec 26 19:11:46 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 <config.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -//#include "rpcproxy.h" -#include <propsys.h> -#include <wine/debug.h> -//#include "wine/unicode.h" +#include "propsys_private.h" + #include <wine/list.h> #include <initguid.h> -//#include "propsys_private.h" - DEFINE_GUID(FMTID_NamedProperties, 0xd5cdd505, 0x2e9c, 0x101b, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae); - -WINE_DEFAULT_DEBUG_CHANNEL(propsys); typedef struct { struct list entry; Modified: trunk/reactos/dll/win32/propsys/propsys_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] Thu Dec 26 19:11:46 2013 @@ -19,26 +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 - -#define COBJMACROS -#include <config.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> +#include "propsys_private.h" + #include <rpcproxy.h> -#include <propsys.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -#include "propsys_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(propsys); static HINSTANCE propsys_hInstance; Modified: trunk/reactos/dll/win32/propsys/propsys_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propsys_private.h [iso-8859-1] Thu Dec 26 19:11:46 2013 @@ -18,4 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <propsys.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(propsys); + HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/propsys/propvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propvar.… ============================================================================== --- trunk/reactos/dll/win32/propsys/propvar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propvar.c [iso-8859-1] Thu Dec 26 19:11:46 2013 @@ -18,27 +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 - -//#include <stdarg.h> +#include "propsys_private.h" + #include <stdio.h> - -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" #include <winreg.h> -//#include "winuser.h" -#include <shlobj.h> +#include <oleauto.h> #include <propvarutil.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(propsys); static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, VARTYPE vt)

10 years, 8 months

[akhaldi] 61430: [OLEDLG] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 26 19:01:25 2013 New Revision: 61430 URL: http://svn.reactos.org/svn/reactos?rev=61430&view=rev Log: [OLEDLG] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc trunk/reactos/dll/win32/oledlg/oledlg_main.c trunk/reactos/dll/win32/oledlg/oledlg_private.h trunk/reactos/dll/win32/oledlg/pastespl.c trunk/reactos/dll/win32/oledlg/resource.h trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg… ============================================================================== --- trunk/reactos/dll/win32/oledlg/insobjdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/insobjdlg.c [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -18,25 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> +#include "oledlg_private.h" + #include <winreg.h> -//#include "winternl.h" -//#include "winerror.h" -#include <wingdi.h> -#include <winuser.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -//#include "oledlg.h" -#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(oledlg); Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc [iso-8859-1] Thu Dec 26 19:01:25 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_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc [iso-8859-1] Thu Dec 26 19:01:25 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/oledlg/lang/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc [iso-8859-1] Thu Dec 26 19:01:25 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" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc [iso-8859-1] Thu Dec 26 19:01:25 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_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc [iso-8859-1] Thu Dec 26 19:01:25 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" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc [iso-8859-1] Thu Dec 26 19:01:25 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_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc [iso-8859-1] Thu Dec 26 19:01:25 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/oledlg/lang/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc [iso-8859-1] Thu Dec 26 19:01:25 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_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc [iso-8859-1] Thu Dec 26 19:01:25 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" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc [iso-8859-1] Thu Dec 26 19:01:25 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_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc [iso-8859-1] Thu Dec 26 19:01:25 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/oledlg/lang/oledlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -15,8 +15,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/oledlg/lang/oledlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc [iso-8859-1] Thu Dec 26 19:01:25 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/oledlg/oledlg_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_ma… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_main.c [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <wingdi.h> -#include <winuser.h> -#include <oledlg.h> -//#include "ole2.h" -//#include "oledlg_private.h" - -#include <wine/debug.h> +#include "oledlg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oledlg/oledlg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_pr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_private.h [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -21,6 +21,27 @@ #ifndef __OLEDLG_PRIVATE_H__ #define __OLEDLG_PRIVATE_H__ +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <oledlg.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "resource.h" + extern HINSTANCE OLEDLG_hInstance DECLSPEC_HIDDEN; extern UINT cf_embed_source DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/oledlg/pastespl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/pastespl.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/pastespl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/pastespl.c [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -18,29 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <wingdi.h> -#include <winuser.h> -//#include "winnls.h" -//#include "oledlg.h" - #include "oledlg_private.h" -#include "resource.h" - -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oledlg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/resource.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/resource.h [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <oledlg.h> +#pragma once #define IDS_RESULTOBJDESC 101 #define IDS_RESULTFILEOBJDESC 102 Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] Thu Dec 26 19:01:25 2013 @@ -18,17 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include <oledlg.h> -#include <windef.h> -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "oledlg.h" - -//#include "resource.h" +#include "resource.h" /* * Everything specific to any language goes

10 years, 8 months

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2013