Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 27345: - Clean up the mess Magnus introduced (remove allowwarnings="true"). - RpcTryFinall set of macros was mapped to PSEH incorrectly, which lead to a "finally" block being treated as an "except" block (thus ending up in a memory leak). Reverting this part for now until a better solution is found.
by fireball＠svn.reactos.org 30 Jun '07

30 Jun '07

Author: fireball Date: Sat Jun 30 20:01:03 2007 New Revision: 27345 URL: http://svn.reactos.org/svn/reactos?rev=27345&view=rev Log: - Clean up the mess Magnus introduced (remove allowwarnings="true"). - RpcTryFinall set of macros was mapped to PSEH incorrectly, which lead to a "finally" block being treated as an "except" block (thus ending up in a memory leak). Reverting this part for now until a better solution is found. Modified: trunk/reactos/dll/win32/aclui/aclui.rbuild trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/include/psdk/rpc.h trunk/reactos/include/reactos/idl/idl.rbuild Modified: trunk/reactos/dll/win32/aclui/aclui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rbui… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rbuild (original) +++ trunk/reactos/dll/win32/aclui/aclui.rbuild Sat Jun 30 20:01:03 2007 @@ -1,4 +1,4 @@ -<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll" allowwarnings ="true"> +<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll"> <importlibrary definition="aclui.spec.def" /> <include base="aclui">.</include> <define name="UNICODE" /> Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Sat Jun 30 20:01:03 2007 @@ -1,4 +1,4 @@ -<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll" allowwarnings ="true"> +<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll"> <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=273… ============================================================================== --- trunk/reactos/include/psdk/rpc.h (original) +++ trunk/reactos/include/psdk/rpc.h Sat Jun 30 20:01:03 2007 @@ -150,9 +150,9 @@ } \ _SEH_END; - #define RpcTryFinally _SEH_TRY { - #define RpcFinally } _SEH_HANDLE { - #define RpcEndFinally } _SEH_END; + #define RpcTryFinally + #define RpcFinally + #define RpcEndFinally #define RpcExceptionCode() _SEH_GetExceptionCode() /* #define RpcAbnormalTermination() abort() */ Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild Sat Jun 30 20:01:03 2007 @@ -1,23 +1,23 @@ <group> -<module name="pnp_server" type="rpcserver" allowwarnings ="true"> +<module name="pnp_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file>pnp.idl</file> </module> -<module name="pnp_client" type="rpcclient" allowwarnings ="true"> +<module name="pnp_client" type="rpcclient"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file>pnp.idl</file> </module> -<module name="scm_server" type="rpcserver" allowwarnings ="true"> +<module name="scm_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file switches="--oldnames">svcctl.idl</file> </module> -<module name="scm_client" type="rpcclient" allowwarnings ="true"> +<module name="scm_client" type="rpcclient"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> @@ -35,13 +35,13 @@ <define name="_X86_" /> <file switches="--oldnames">eventlogrpc.idl</file> </module> -<module name="lsa_server" type="rpcserver" allowwarnings ="true"> +<module name="lsa_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file switches="--oldnames">lsa.idl</file> </module> -<module name="lsa_client" type="rpcclient" allowwarnings ="true"> +<module name="lsa_client" type="rpcclient"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" />

1 0

[greatlrd] 27344: accpect pacth in bug 2314, with one smaller change the msvcrt20.def change was not accpect, it need more time for review. and we do not support __set_error in libcntpr. the patch are base on current strtoul, the strtoull are the long long version of strtoul. so he took current stroul and adpate it to long long. and also add missing error code. patch are done by Pierre Schweitzer email heis_spiter at hotmail.com See issue #2314 for more details.
by greatlrd＠svn.reactos.org 30 Jun '07

30 Jun '07

Author: greatlrd Date: Sat Jun 30 18:12:10 2007 New Revision: 27344 URL: http://svn.reactos.org/svn/reactos?rev=27344&view=rev Log: accpect pacth in bug 2314, with one smaller change the msvcrt20.def change was not accpect, it need more time for review. and we do not support __set_error in libcntpr. the patch are base on current strtoul, the strtoull are the long long version of strtoul. so he took current stroul and adpate it to long long. and also add missing error code. patch are done by Pierre Schweitzer email heis_spiter at hotmail.com See issue #2314 for more details. Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/crtdll/crtdll.def trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild trunk/reactos/lib/sdk/libcntpr/string/strtoul.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Sat Jun 30 18:12:10 2007 @@ -1065,6 +1065,7 @@ strstr strtol strtoul +strtoull swprintf tan tolower Modified: trunk/reactos/dll/win32/crtdll/crtdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.de… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.def (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.def Sat Jun 30 18:12:10 2007 @@ -523,6 +523,7 @@ strtok strtol=NTDLL.strtol strtoul +strtoull strxfrm swprintf=crt_swprintf swscanf Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def Sat Jun 30 18:12:10 2007 @@ -797,6 +797,7 @@ strtok strtol=NTDLL.strtol strtoul +strtoull strxfrm swprintf=crt_swprintf swscanf Modified: trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/libcntpr.… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild (original) +++ trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild Sat Jun 30 18:12:10 2007 @@ -137,6 +137,7 @@ <file>splitp.c</file> <file>strtol.c</file> <file>strtoul.c</file> + <file>strtoull.c</file> <file>wcstol.c</file> <file>wcstombs.c</file> <file>wcstoul.c</file> Modified: trunk/reactos/lib/sdk/libcntpr/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/string/st… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/strtoul.c (original) +++ trunk/reactos/lib/sdk/libcntpr/string/strtoul.c Sat Jun 30 18:12:10 2007 @@ -1,6 +1,9 @@ +#include <stdio.h> #include <string.h> +#include <errno.h> #include <limits.h> #include <ctype.h> + /* * Convert a string to an unsigned long integer. @@ -64,6 +67,7 @@ if (any < 0) { acc = ULONG_MAX; + } else if (neg) acc = -acc;

1 0

[greatlrd] 27343: uodate rpc.h aganist trunk
by greatlrd＠svn.reactos.org 30 Jun '07

30 Jun '07

Author: greatlrd Date: Sat Jun 30 13:16:02 2007 New Revision: 27343 URL: http://svn.reactos.org/svn/reactos?rev=27343&view=rev Log: uodate rpc.h aganist trunk Modified: branches/ddk2003/include/ddk2003/rpc.h branches/ddk2003/include/psdk/rpc.h Modified: branches/ddk2003/include/ddk2003/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/rpc.h?r… ============================================================================== --- branches/ddk2003/include/ddk2003/rpc.h (original) +++ branches/ddk2003/include/ddk2003/rpc.h Sat Jun 30 13:16:02 2007 @@ -3,6 +3,12 @@ #include <windows.h> #endif +#ifdef __GNUC__ + #ifndef _SEH_NO_NATIVE_NLG + /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ + #include <libs/pseh/pseh.h> + #endif +#endif #ifndef __RPC_H__ #define __RPC_H__ @@ -63,32 +69,26 @@ #define RPC_ENTRY #endif -#if !defined(DECLSPEC_IMPORT) - #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) - #define DECLSPEC_IMPORT __declspec(dllimport) + +#ifndef __GNUC__ + #if !defined(DECLSPEC_IMPORT) + #define DECLSPEC_IMPORT + #endif + + #if !defined(_RPCRT4_) + #define RPCRTAPI DECLSPEC_IMPORT #else - #define DECLSPEC_IMPORT + #define RPCRTAPI #endif -#endif -#if !defined(DECLSPEC_EXPORT) - #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) - #define DECLSPEC_EXPORT __declspec(dllexport) + #if !defined(_RPCNS4_) + #define RPCNSAPI DECLSPEC_IMPORT #else - #define DECLSPEC_EXPORT + #define RPCNSAPI #endif -#endif - -#if !defined(_RPCRT4_) - #define RPCRTAPI DECLSPEC_IMPORT #else - #define RPCRTAPI DECLSPEC_EXPORT -#endif - -#if !defined(_RPCNS4_) - #define RPCNSAPI DECLSPEC_IMPORT -#else - #define RPCNSAPI DECLSPEC_EXPORT + #define RPCRTAPI + #define RPCNSAPI #endif @@ -115,7 +115,7 @@ #include <poppack.h> #else #include <rpcdce.h> - #include <rpcnsi.h> + /* #include <rpcnsi.h> */ #include <rpcnterr.h> #include <excpt.h> #include <winerror.h> @@ -132,14 +132,31 @@ #else /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ - #define RpcTryExcept if (1) { - #define RpcExcept(expr) } else { - #define RpcEndExcept } - #define RpcTryFinally - #define RpcFinally - #define RpcEndFinally - #define RpcExceptionCode() 0 - /* #define RpcAbnormalTermination() abort() */ + #ifdef _SEH_NO_NATIVE_NLG + /* hack for _SEH_NO_NATIVE_NLG */ + #define RpcTryExcept if (1) { + #define RpcExcept(expr) } else { + #define RpcEndExcept } + #define RpcTryFinally + #define RpcFinally + #define RpcEndFinally + #define RpcExceptionCode() 0 + #else + #define RpcTryExcept _SEH_TRY { + #define RpcExcept(expr) } _SEH_HANDLE { \ + if (expr) \ + { + #define RpcEndExcept } \ + } \ + _SEH_END; + + #define RpcTryFinally _SEH_TRY { + #define RpcFinally } _SEH_HANDLE { + #define RpcEndFinally } _SEH_END; + #define RpcExceptionCode() _SEH_GetExceptionCode() + + /* #define RpcAbnormalTermination() abort() */ + #endif #endif #endif @@ -153,3 +170,4 @@ #endif + Modified: branches/ddk2003/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpc.h?rev=… ============================================================================== --- branches/ddk2003/include/psdk/rpc.h (original) +++ branches/ddk2003/include/psdk/rpc.h Sat Jun 30 13:16:02 2007 @@ -3,6 +3,12 @@ #include <windows.h> #endif +#ifdef __GNUC__ + #ifndef _SEH_NO_NATIVE_NLG + /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ + #include <libs/pseh/pseh.h> + #endif +#endif #ifndef __RPC_H__ #define __RPC_H__ @@ -63,32 +69,26 @@ #define RPC_ENTRY #endif -#if !defined(DECLSPEC_IMPORT) - #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) - #define DECLSPEC_IMPORT __declspec(dllimport) + +#ifndef __GNUC__ + #if !defined(DECLSPEC_IMPORT) + #define DECLSPEC_IMPORT + #endif + + #if !defined(_RPCRT4_) + #define RPCRTAPI DECLSPEC_IMPORT #else - #define DECLSPEC_IMPORT + #define RPCRTAPI #endif -#endif -#if !defined(DECLSPEC_EXPORT) - #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) - #define DECLSPEC_EXPORT __declspec(dllexport) + #if !defined(_RPCNS4_) + #define RPCNSAPI DECLSPEC_IMPORT #else - #define DECLSPEC_EXPORT + #define RPCNSAPI #endif -#endif - -#if !defined(_RPCRT4_) - #define RPCRTAPI DECLSPEC_IMPORT #else - #define RPCRTAPI DECLSPEC_EXPORT -#endif - -#if !defined(_RPCNS4_) - #define RPCNSAPI DECLSPEC_IMPORT -#else - #define RPCNSAPI DECLSPEC_EXPORT + #define RPCRTAPI + #define RPCNSAPI #endif @@ -115,7 +115,7 @@ #include <poppack.h> #else #include <rpcdce.h> - #include <rpcnsi.h> + /* #include <rpcnsi.h> */ #include <rpcnterr.h> #include <excpt.h> #include <winerror.h> @@ -132,14 +132,31 @@ #else /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ - #define RpcTryExcept if (1) { - #define RpcExcept(expr) } else { - #define RpcEndExcept } - #define RpcTryFinally - #define RpcFinally - #define RpcEndFinally - #define RpcExceptionCode() 0 - /* #define RpcAbnormalTermination() abort() */ + #ifdef _SEH_NO_NATIVE_NLG + /* hack for _SEH_NO_NATIVE_NLG */ + #define RpcTryExcept if (1) { + #define RpcExcept(expr) } else { + #define RpcEndExcept } + #define RpcTryFinally + #define RpcFinally + #define RpcEndFinally + #define RpcExceptionCode() 0 + #else + #define RpcTryExcept _SEH_TRY { + #define RpcExcept(expr) } _SEH_HANDLE { \ + if (expr) \ + { + #define RpcEndExcept } \ + } \ + _SEH_END; + + #define RpcTryFinally _SEH_TRY { + #define RpcFinally } _SEH_HANDLE { + #define RpcEndFinally } _SEH_END; + #define RpcExceptionCode() _SEH_GetExceptionCode() + + /* #define RpcAbnormalTermination() abort() */ + #endif #endif #endif @@ -153,3 +170,4 @@ #endif +

1 0

[greatlrd] 27342: part 7 of 7 at last removing wine hack, that disable seh in rpc.h we have now seh activate in rpcrt4 and some other idl stuff as well, they where complete hacked to be offline, in wine header, I reworte the header and move some prototype to right header.
by greatlrd＠svn.reactos.org 30 Jun '07

30 Jun '07

Author: greatlrd Date: Sat Jun 30 04:33:38 2007 New Revision: 27342 URL: http://svn.reactos.org/svn/reactos?rev=27342&view=rev Log: part 7 of 7 at last removing wine hack, that disable seh in rpc.h we have now seh activate in rpcrt4 and some other idl stuff as well, they where complete hacked to be offline, in wine header, I reworte the header and move some prototype to right header. Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/include/psdk/rpc.h trunk/reactos/include/psdk/rpcdce.h trunk/reactos/include/psdk/rpcndr.h trunk/reactos/include/reactos/idl/eventlogrpc.idl trunk/reactos/include/reactos/idl/idl.rbuild Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Sat Jun 30 04:33:38 2007 @@ -1,4 +1,5 @@ -<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll"> +<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll" allowwarnings ="true"> + <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> <include base="scm_client">.</include> @@ -15,6 +16,7 @@ <library>rpcrt4</library> <library>wine</library> <library>kernel32</library> + <library>pseh</library> <pch>advapi32.h</pch> <directory name="crypt"> <file>crypt.c</file> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild Sat Jun 30 04:33:38 2007 @@ -13,6 +13,7 @@ <library>ntdll</library> <library>kernel32</library> <library>rpcrt4</library> + <library>pseh</library> <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild Sat Jun 30 04:33:38 2007 @@ -20,6 +20,7 @@ <library>comctl32</library> <library>urlmon</library> <library>uuid</library> + <library>pseh</library> <file>connpt.c</file> <file>dispatch.c</file> <file>hash.c</file> Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild Sat Jun 30 04:33:38 2007 @@ -24,6 +24,7 @@ <library>rpcrt4</library> <library>version</library> <library>shell32</library> + <library>pseh</library> <file>cfgmgr.c</file> <file>devclass.c</file> <file>devinst.c</file> Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Sat Jun 30 04:33:38 2007 @@ -110,6 +110,8 @@ PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; DPRINT("IntVideoPortDispatchOpen\n"); + + ASSERT(Irp != NULL); if (CsrssInitialized == FALSE) { Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=273… ============================================================================== --- trunk/reactos/include/psdk/rpc.h (original) +++ trunk/reactos/include/psdk/rpc.h Sat Jun 30 04:33:38 2007 @@ -1,74 +1,173 @@ -/* - * RPC interface - * - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef RPC_NO_WINDOWS_H -# ifdef __WINESRC__ -# include <windef.h> -# else -# include <windows.h> -# endif +#if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) +#include <windows.h> #endif -#ifndef __WINE_RPC_H -#define __WINE_RPC_H +#ifdef __GNUC__ + #ifndef _SEH_NO_NATIVE_NLG + /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ + #include <libs/pseh/pseh.h> + #endif +#endif -#if defined(__powerpc__) || defined(_MAC) /* ? */ -# define __RPC_MAC__ - /* Also define __RPC_WIN32__ to ensure compatibility */ -# define __RPC_WIN32__ -#elif defined(_WIN64) -# define __RPC_WIN64__ -#else -# define __RPC_WIN32__ +#ifndef __RPC_H__ +#define __RPC_H__ + +#if _MSC_VER > 1000 +#pragma once +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) + #define __RPC_MAC__ + #define __RPC_WIN32__ + #include <pshpack2.h> + +#else + #if defined(_M_IA64) || defined(_M_AMD64) || defined(_WIN64) + #define __RPC_WIN64__ + #else + #define __RPC_WIN32__ + #endif #endif #include <basetsd.h> +#if defined(__RPC_WIN64__) + #include <pshpack8.h> +#endif + +#ifndef __MIDL_USER_DEFINED + #define midl_user_allocate MIDL_user_allocate + #define midl_user_free MIDL_user_free + #define __MIDL_USER_DEFINED +#endif + + +typedef void * I_RPC_HANDLE; +typedef long RPC_STATUS; #define __RPC_FAR -#define __RPC_API __stdcall -#define __RPC_USER __stdcall -#define __RPC_STUB __stdcall -#define RPC_ENTRY __stdcall -#define RPCRTAPI -typedef long RPC_STATUS; -typedef void* I_RPC_HANDLE; +#if defined(__RPC_WIN32__) || defined(__RPC_WIN64__) + #define RPC_UNICODE_SUPPORTED +#endif -#include <rpcdce.h> -/* #include <rpcnsi.h> */ -#include <rpcnterr.h> -#include <excpt.h> -#include <winerror.h> -/* ignore exception handling for now */ -#define RpcTryExcept if (1) { -#define RpcExcept(expr) } else { -#define RpcEndExcept } -#define RpcTryFinally -#define RpcFinally -#define RpcEndFinally -#define RpcExceptionCode() 0 -/* #define RpcAbnormalTermination() abort() */ +#if !defined(__RPC_MAC__) + #define __RPC_API __stdcall + #define __RPC_USER __stdcall + #define __RPC_STUB __stdcall + #define RPC_ENTRY __stdcall +#else + #define __RPC_API + #define __RPC_USER + #define __RPC_STUB + #define RPC_ENTRY +#endif -RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE); -RPC_STATUS RPC_ENTRY RpcRevertToSelf(void); -DWORD WINAPI I_RpcMapWin32Status(RPC_STATUS status); -#endif /*__WINE_RPC_H */ +#ifndef __GNUC__ + #if !defined(DECLSPEC_IMPORT) + #define DECLSPEC_IMPORT + #endif + + #if !defined(_RPCRT4_) + #define RPCRTAPI DECLSPEC_IMPORT + #else + #define RPCRTAPI + #endif + + #if !defined(_RPCNS4_) + #define RPCNSAPI DECLSPEC_IMPORT + #else + #define RPCNSAPI + #endif +#else + #define RPCRTAPI + #define RPCNSAPI +#endif + + +#ifdef __RPC_MAC__ + #include <setjmp.h> + #define RPCXCWORD (sizeof(jmp_buf)/sizeof(int)) + + #pragma warning(push) + #pragma warning( disable: 4005 ) + #include <rpcdce.h> + #include <rpcnsi.h> + #include <rpcerr.h> + #include <rpcmac.h> + #pragma warning(pop) + + typedef void (RPC_ENTRY *MACYIELDCALLBACK)(short *) ; + RPC_STATUS RPC_ENTRY + RpcMacSetYieldInfo(MACYIELDCALLBACK pfnCallback) ; + + #if !defined(UNALIGNED) + #define UNALIGNED + #endif + + #include <poppack.h> +#else + #include <rpcdce.h> + /* #include <rpcnsi.h> */ + #include <rpcnterr.h> + #include <excpt.h> + #include <winerror.h> + + #ifndef __GNUC__ + #define RpcTryExcept __try { + #define RpcExcept(expr) } __except (expr) { + #define RpcEndExcept } + #define RpcTryFinally __try { + #define RpcFinally } __finally { + #define RpcEndFinally } + #define RpcExceptionCode() GetExceptionCode() + #define RpcAbnormalTermination() AbnormalTermination() + #else + /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ + + #ifdef _SEH_NO_NATIVE_NLG + /* hack for _SEH_NO_NATIVE_NLG */ + #define RpcTryExcept if (1) { + #define RpcExcept(expr) } else { + #define RpcEndExcept } + #define RpcTryFinally + #define RpcFinally + #define RpcEndFinally + #define RpcExceptionCode() 0 + #else + #define RpcTryExcept _SEH_TRY { + #define RpcExcept(expr) } _SEH_HANDLE { \ + if (expr) \ + { + #define RpcEndExcept } \ + } \ + _SEH_END; + + #define RpcTryFinally _SEH_TRY { + #define RpcFinally } _SEH_HANDLE { + #define RpcEndFinally } _SEH_END; + #define RpcExceptionCode() _SEH_GetExceptionCode() + + /* #define RpcAbnormalTermination() abort() */ + #endif + #endif +#endif + +#if defined(__RPC_WIN64__) + #include <poppack.h> +#endif + +#ifdef __cplusplus +} +#endif + +#endif + + Modified: trunk/reactos/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcdce.h (original) +++ trunk/reactos/include/psdk/rpcdce.h Sat Jun 30 04:33:38 2007 @@ -504,6 +504,13 @@ RPCRTAPI int RPC_ENTRY UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ ); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcImpersonateClient (IN RPC_BINDING_HANDLE BindingHandle OPTIONAL); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcRevertToSelf (); + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h (original) +++ trunk/reactos/include/psdk/rpcndr.h Sat Jun 30 04:33:38 2007 @@ -651,6 +651,13 @@ RPCRTAPI void RPC_ENTRY NdrRpcSsDefaultFree( void *NodeToFree ); + +#define RPC_BAD_STUB_DATA_EXCEPTION_FILTER \ + ( (RpcExceptionCode() == STATUS_ACCESS_VIOLATION) || \ + (RpcExceptionCode() == STATUS_DATATYPE_MISALIGNMENT) || \ + (RpcExceptionCode() == RPC_X_BAD_STUB_DATA) || \ + (RpcExceptionCode() == RPC_S_INVALID_BOUND) ) + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl Sat Jun 30 04:33:38 2007 @@ -16,6 +16,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + + #ifdef __midl [ @@ -26,6 +28,12 @@ interface eventlog { + cpp_quote("#ifdef __GNUC__") + cpp_quote("/* FIXME ReactOS SEH support, we need remove this when gcc support native seh */") + cpp_quote("#include <pseh/pseh.h>") + cpp_quote("#endif") + + cpp_quote("#define RPC_ENABLED") cpp_quote("#if 0") typedef [handle, unique] wchar_t *LPWSTR; @@ -221,7 +229,10 @@ } #else - + cpp_quote("#ifdef __GNUC__") + cpp_quote("/* FIXME ReactOS SEH support, we need remove this when gcc support native seh */") + cpp_quote("#include <pseh/pseh.h>") + cpp_quote("#endif") [ uuid(82273FDC-E32A-18C3-3F78-827929DC23EA), Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild Sat Jun 30 04:33:38 2007 @@ -1,23 +1,23 @@ <group> -<module name="pnp_server" type="rpcserver"> +<module name="pnp_server" type="rpcserver" allowwarnings ="true"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file>pnp.idl</file> </module> -<module name="pnp_client" type="rpcclient"> +<module name="pnp_client" type="rpcclient" allowwarnings ="true"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file>pnp.idl</file> </module> -<module name="scm_server" type="rpcserver"> +<module name="scm_server" type="rpcserver" allowwarnings ="true"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file switches="--oldnames">svcctl.idl</file> </module> -<module name="scm_client" type="rpcclient"> +<module name="scm_client" type="rpcclient" allowwarnings ="true"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> @@ -29,19 +29,19 @@ <define name="_X86_" /> <file switches="--oldnames">eventlogrpc.idl</file> </module> -<module name="eventlog_client" type="rpcclient"> +<module name="eventlog_client" type="rpcclient" > <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file switches="--oldnames">eventlogrpc.idl</file> </module> -<module name="lsa_server" type="rpcserver"> +<module name="lsa_server" type="rpcserver" allowwarnings ="true"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> <file switches="--oldnames">lsa.idl</file> </module> -<module name="lsa_client" type="rpcclient"> +<module name="lsa_client" type="rpcclient" allowwarnings ="true"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" />

1 0

[weiden] 27341: Create the named pipe with R/W access for everyone. This enables VMware running without administrative privileges to connect to the service.
by weiden＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: weiden Date: Sat Jun 30 01:43:18 2007 New Revision: 27341 URL: http://svn.reactos.org/svn/reactos?rev=27341&view=rev Log: Create the named pipe with R/W access for everyone. This enables VMware running without administrative privileges to connect to the service. Modified: trunk/tools/vmwaregateway/vmwaregateway.cpp Modified: trunk/tools/vmwaregateway/vmwaregateway.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/vmwaregateway/vmwaregateway.… ============================================================================== --- trunk/tools/vmwaregateway/vmwaregateway.cpp (original) +++ trunk/tools/vmwaregateway/vmwaregateway.cpp Sat Jun 30 01:43:18 2007 @@ -36,11 +36,160 @@ // verbose output - traces a lot BOOL verbose = FALSE; +PSECURITY_DESCRIPTOR +CreateVmwareGatewaySD(VOID) +{ + static SID_IDENTIFIER_AUTHORITY LocalSystemAuthority = {SECURITY_NT_AUTHORITY}; + static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; + PSID LocalSystemSid = NULL; + PSID AdministratorsSid = NULL; + PSID EveryoneSid = NULL; + PACL Dacl; + DWORD DaclSize; + PSECURITY_DESCRIPTOR pSD = NULL; + + /* create the SYSTEM, Administrators and Everyone SIDs */ + if (!AllocateAndInitializeSid(&LocalSystemAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &LocalSystemSid) || + !AllocateAndInitializeSid(&LocalSystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid) || + !AllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid)) + { + printf("Failed initializing the SIDs for the default security descriptor (0x%p, 0x%p, 0x%p)\n", + LocalSystemSid, AdministratorsSid, EveryoneSid); + goto Cleanup; + } + + /* allocate the security descriptor and DACL */ + DaclSize = sizeof(ACL) + + ((GetLengthSid(LocalSystemSid) + + GetLengthSid(AdministratorsSid) + + GetLengthSid(EveryoneSid)) + + (3 * FIELD_OFFSET(ACCESS_ALLOWED_ACE, + SidStart))); + + pSD = (PSECURITY_DESCRIPTOR)LocalAlloc(LMEM_FIXED, + (SIZE_T)DaclSize + sizeof(SECURITY_DESCRIPTOR)); + if (pSD == NULL) + { + printf("Failed to allocate the default security descriptor and ACL\n"); + goto Cleanup; + } + + if (!InitializeSecurityDescriptor(pSD, + SECURITY_DESCRIPTOR_REVISION)) + { + printf("Failed to initialize the default security descriptor\n"); + goto Cleanup; + } + + /* initialize and build the DACL */ + Dacl = (PACL)((ULONG_PTR)pSD + sizeof(SECURITY_DESCRIPTOR)); + if (!InitializeAcl(Dacl, + (DWORD)DaclSize, + ACL_REVISION)) + { + printf("Failed to initialize the DACL of the default security descriptor\n"); + goto Cleanup; + } + + /* add the SYSTEM Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + FILE_GENERIC_READ | FILE_GENERIC_WRITE | FILE_GENERIC_EXECUTE, + LocalSystemSid)) + { + printf("Failed to add the SYSTEM ACE\n"); + goto Cleanup; + } + + /* add the Administrators Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + FILE_GENERIC_READ | FILE_GENERIC_WRITE | FILE_GENERIC_EXECUTE, + AdministratorsSid)) + { + printf("Failed to add the Administrators ACE\n"); + goto Cleanup; + } + + /* add the Everyone Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + FILE_GENERIC_READ | FILE_GENERIC_WRITE | FILE_GENERIC_EXECUTE, + EveryoneSid)) + { + printf("Failed to add the Everyone ACE\n"); + goto Cleanup; + } + + /* set the DACL */ + if (!SetSecurityDescriptorDacl(pSD, + TRUE, + Dacl, + FALSE)) + { + printf("Failed to set the DACL of the default security descriptor\n"); + +Cleanup: + if (pSD != NULL) + { + LocalFree((HLOCAL)pSD); + pSD = NULL; + } + } + + if (LocalSystemSid != NULL) + { + FreeSid(LocalSystemSid); + } + if (AdministratorsSid != NULL) + { + FreeSid(AdministratorsSid); + } + if (EveryoneSid != NULL) + { + FreeSid(EveryoneSid); + } + + return pSD; +} + // the central server loop void Server() { WORD wVersionRequested; WSADATA wsaData; + PSECURITY_DESCRIPTOR sd; + SECURITY_ATTRIBUTES sa; wVersionRequested = MAKEWORD( 2, 2 ); // socket and pipe handles @@ -69,6 +218,12 @@ return; } + // create a suitable security descriptor + sd = CreateVmwareGatewaySD(); + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + // first create the named pipe pipe = CreateNamedPipe(PIPE_NAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, @@ -77,7 +232,9 @@ 100, 100, NMPWAIT_WAIT_FOREVER, - NULL); + &sa); + if (sd != NULL) + LocalFree((HLOCAL)sd); if (pipe == INVALID_HANDLE_VALUE) { printf("Could not create named pipe (%d)\n", GetLastError());

1 0

[fireball] 27340: - Create a branch for an ongoing ReactX work by Magnus Olsen (GreatLord).
by fireball＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: fireball Date: Sat Jun 30 00:51:06 2007 New Revision: 27340 URL: http://svn.reactos.org/svn/reactos?rev=27340&view=rev Log: - Create a branch for an ongoing ReactX work by Magnus Olsen (GreatLord). Added: branches/reactx/ - copied from r27339, trunk/

1 0

[weiden] 27339: Add the vmwaregateway tool source code of Volkmar Uhlig <volkmar@ira.uka.de>. Upgraded project file and changed headers to get it to compile.
by weiden＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: weiden Date: Sat Jun 30 00:18:47 2007 New Revision: 27339 URL: http://svn.reactos.org/svn/reactos?rev=27339&view=rev Log: Add the vmwaregateway tool source code of Volkmar Uhlig <volkmar(a)ira.uka.de>. Upgraded project file and changed headers to get it to compile. Added: trunk/tools/vmwaregateway/ (with props) trunk/tools/vmwaregateway/servicemgr.cpp (with props) trunk/tools/vmwaregateway/servicemgr.h (with props) trunk/tools/vmwaregateway/vmwaregateway.cpp (with props) trunk/tools/vmwaregateway/vmwaregateway.sln (with props) trunk/tools/vmwaregateway/vmwaregateway.vcproj (with props) Propchange: trunk/tools/vmwaregateway/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jun 30 00:18:47 2007 @@ -1,0 +1,5 @@ +Debug +Release +*.ncb +*.suo +*.vcproj.* Added: trunk/tools/vmwaregateway/servicemgr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/vmwaregateway/servicemgr.cpp… ============================================================================== --- trunk/tools/vmwaregateway/servicemgr.cpp (added) +++ trunk/tools/vmwaregateway/servicemgr.cpp Sat Jun 30 00:18:47 2007 @@ -1,0 +1,132 @@ +/////////////////////////////////////////////////////////////////////////////// +// +// (c) 2000 by Volkmar Uhlig, volkmar(a)ira.uka.de, www.uhlig-langert.de/volkmar +// +// all code can be reused and modified +// +// +// + +#include <windows.h> +#include <stdio.h> +#include "servicemgr.h" + +extern void Server(); + +SERVICE_STATUS ssStatus; +SERVICE_STATUS_HANDLE sshStatusHandle; + +HANDLE hServiceEvent = NULL; + +BOOL ReportStatusToSCMgr(DWORD dwCurrentState, DWORD dwWin32ExitCode, DWORD dwCheckPoint, DWORD dwWaitHint) +{ + BOOL fResult; + if (dwCurrentState==SERVICE_START_PENDING) + ssStatus.dwControlsAccepted=0; + else + ssStatus.dwControlsAccepted=SERVICE_ACCEPT_STOP; // | SERVICE_ACCEPT_PAUSE_CONTINUE; + ssStatus.dwCurrentState=dwCurrentState; + ssStatus.dwWin32ExitCode=dwWin32ExitCode; + ssStatus.dwCheckPoint=dwCheckPoint; + ssStatus.dwWaitHint=dwWaitHint; + if (!(fResult = SetServiceStatus(sshStatusHandle, &ssStatus))) { + SetEvent(hServiceEvent); + } + return fResult; +} + + +void RegisterService(LPCSTR lpszBinaryPathName, LPCSTR lpszDependencies) +{ + printf("Create %s Service for executable %s\n", GetServiceName(), lpszBinaryPathName); + SC_HANDLE schService, schSCManager; + schSCManager=OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (schSCManager!=NULL) { + schService=CreateService( + schSCManager, + GetServiceName(FALSE), + GetServiceName(TRUE), + SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, + (char*)lpszBinaryPathName, + NULL, // no load ordering + NULL, // no tag id + lpszDependencies, + NULL, // Local system account + NULL); // no pwd + if (schService==NULL) + printf("CreateService Error: %ld", GetLastError()); + else + printf("CreateService SUCCESS\n"); + } + CloseServiceHandle(schService); + CloseServiceHandle(schSCManager); +} + +void UnregisterService() { + SC_HANDLE schService, schSCManager; + schSCManager=OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + schService=OpenService(schSCManager, + GetServiceName(FALSE), + SERVICE_ALL_ACCESS); + if (DeleteService(schService)) + printf("Service %s successfully unregistered.\n", GetServiceName()); + else + printf("Error while unregistering service %s: %ld\n", GetServiceName(), GetLastError()); + CloseServiceHandle(schService); + CloseServiceHandle(schSCManager); +} + +VOID service_ctrl(DWORD dwCtrlCode) { + DWORD dwState = SERVICE_RUNNING; + switch(dwCtrlCode) { + case SERVICE_CONTROL_STOP: + dwState = SERVICE_STOP_PENDING; + ReportStatusToSCMgr( + SERVICE_STOP_PENDING, + NO_ERROR, + 1, + 3000); + SetEvent(hServiceEvent); + return; + case SERVICE_CONTROL_INTERROGATE: + break; + default: + break; + } + ReportStatusToSCMgr(dwState, NO_ERROR, 0, 0); +} + +VOID service_main(DWORD dwArgs, LPTSTR *lpszArgv) +{ + DWORD dwWait; + sshStatusHandle=RegisterServiceCtrlHandler(GetServiceName(), + (LPHANDLER_FUNCTION)service_ctrl); + if (!sshStatusHandle) goto cleanup; + ssStatus.dwServiceType=SERVICE_WIN32_OWN_PROCESS; + ssStatus.dwServiceSpecificExitCode=0; + if(!ReportStatusToSCMgr(SERVICE_START_PENDING, //service state + NO_ERROR, // exit code + 1, // checkpoint + 3000)) // wait hint + goto cleanup; + hServiceEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + if (hServiceEvent == (HANDLE)NULL) goto cleanup; + if (!ReportStatusToSCMgr(SERVICE_START_PENDING, NO_ERROR, 2, 3000)) goto cleanup; + + // starting... + if (CreateThread(NULL, 4000, LPTHREAD_START_ROUTINE(Server), NULL, 0, NULL)==NULL) goto cleanup; + if (!ReportStatusToSCMgr(SERVICE_RUNNING, NO_ERROR, 0, 0)) goto cleanup; + + dwWait = WaitForSingleObject( hServiceEvent, INFINITE); + +cleanup: + CloseHandle(hServiceEvent); + + if (sshStatusHandle!=NULL) + ReportStatusToSCMgr(SERVICE_STOPPED, 0, 0, 0); + + return; +} Propchange: trunk/tools/vmwaregateway/servicemgr.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/vmwaregateway/servicemgr.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/vmwaregateway/servicemgr.h?r… ============================================================================== --- trunk/tools/vmwaregateway/servicemgr.h (added) +++ trunk/tools/vmwaregateway/servicemgr.h Sat Jun 30 00:18:47 2007 @@ -1,0 +1,19 @@ +/////////////////////////////////////////////////////////////////////////////// +// +// (c) 2000 by Volkmar Uhlig, volkmar(a)ira.uka.de, www.uhlig-langert.de/volkmar +// +// all code can be reused and modified +// +// +// + + +VOID service_ctrl(DWORD dwCtrlCode); +VOID service_main(DWORD dwArgs, LPTSTR *lpszArgv); + +void RegisterService(LPCSTR lpszBinaryPathName, LPCSTR lpszDependencies); +void UnregisterService(); + +LPCSTR GetServiceName(BOOL bLongName = FALSE); + +extern HANDLE hServiceEvent; Propchange: trunk/tools/vmwaregateway/servicemgr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/vmwaregateway/vmwaregateway.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/vmwaregateway/vmwaregateway.… ============================================================================== --- trunk/tools/vmwaregateway/vmwaregateway.cpp (added) +++ trunk/tools/vmwaregateway/vmwaregateway.cpp Sat Jun 30 00:18:47 2007 @@ -1,0 +1,307 @@ +/////////////////////////////////////////////////////////////////////////////// +// +// (c) 2000 by Volkmar Uhlig, volkmar(a)ira.uka.de, www.uhlig-langert.de/volkmar +// +// all code can be reused and modified +// +// +// + + +#define WINVER 0x401 + +#include "winsock2.h" +#include <stdio.h> +#include "servicemgr.h" + +#define SERVICE_NAME "VMWareGateway" +#define DISPLAY_NAME "VMWareGateway" + +#define SERVER_PORT 567 +#define BUFFER_SIZE 1024 + +#define PIPE_NAME "\\\\.\\pipe\\vmwaredebug" + +const char* errServerBusy = "Server is currently connected\n"; + + +// event numbers/index into event array +#define LISTEN_EVENT 0 +#define IO_EVENT 1 +#define PIPE_CONNECT 2 +#define PIPE_READ 3 +#define SERVICE_EVENT 4 +#define MAX_EVENTS 5 + +// verbose output - traces a lot +BOOL verbose = FALSE; + +// the central server loop +void Server() +{ + WORD wVersionRequested; + WSADATA wsaData; + wVersionRequested = MAKEWORD( 2, 2 ); + + // socket and pipe handles + HANDLE pipe; + SOCKET s, conn; + WSAEVENT hEvents[MAX_EVENTS]; + OVERLAPPED ovRead, ovConnect; + + // copy buffers + char buffersocket[BUFFER_SIZE]; + char bufferpipe[BUFFER_SIZE]; + DWORD dwBytesSocket, dwBytesPipe; + + // booleans of connection states + BOOL pipeConnected = FALSE; + BOOL socketConnected = FALSE; + + // socket stuff + sockaddr_in sockaddr; + int err; + int addrlen; + + // init network + if (err = WSAStartup(wVersionRequested, &wsaData)) { + printf("Error initializing network\n"); + return; + } + + // first create the named pipe + pipe = CreateNamedPipe(PIPE_NAME, + PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + 0, + 1, + 100, + 100, + NMPWAIT_WAIT_FOREVER, + NULL); + + if (pipe == INVALID_HANDLE_VALUE) { + printf("Could not create named pipe (%d)\n", GetLastError()); + exit(0); + } + + hEvents[SERVICE_EVENT] = hServiceEvent; + + // now create the listen socket to wait for incoming requests + hEvents[LISTEN_EVENT] = WSACreateEvent(); + hEvents[IO_EVENT] = WSACreateEvent(); + ovConnect.hEvent = hEvents[PIPE_CONNECT] = CreateEvent(NULL, TRUE, FALSE, NULL); + ovRead.hEvent = hEvents[PIPE_READ] = CreateEvent(NULL, TRUE, FALSE, NULL); + + if (hEvents[LISTEN_EVENT] == WSA_INVALID_EVENT || + hEvents[IO_EVENT] == WSA_INVALID_EVENT || + hEvents[PIPE_CONNECT] == NULL || + hEvents[PIPE_READ] == NULL) + { + printf("Error creating net event\n"); + return; + } + + // async connect to named pipe + err = ConnectNamedPipe(pipe, &ovConnect); + + // listen socket + s = socket(AF_INET, SOCK_STREAM, 0); + if (s == INVALID_SOCKET) { + printf("Could not initialize socket (%d)\n", GetLastError()); + return; + } + sockaddr.sin_family=AF_INET; + sockaddr.sin_port=htons(SERVER_PORT); + sockaddr.sin_addr.s_addr = ADDR_ANY; + + err = bind(s, (struct sockaddr*)&sockaddr, sizeof(sockaddr)); + if (err) { + printf("Could not bind socket (%d)\n", GetLastError()); + return; + } + err = listen(s, 5); + WSAEventSelect(s, hEvents[LISTEN_EVENT], FD_ACCEPT); + + + // central loop + while(1) + { + DWORD numEvent = WSAWaitForMultipleEvents(MAX_EVENTS, hEvents, + FALSE, WSA_INFINITE, TRUE); + //printf("Event: %d\n", numEvent); + switch(numEvent) { + case LISTEN_EVENT: + printf("incoming telnet request "); + if (!socketConnected) { + addrlen = sizeof(sockaddr); + conn = accept(s, (struct sockaddr*)&sockaddr, &addrlen); + if (conn == INVALID_SOCKET) { + printf("error connecting\n"); + } + else { + //err = listen(s, 5); relisten??? + hEvents[IO_EVENT] = WSACreateEvent(); + WSAEventSelect(conn, hEvents[IO_EVENT], FD_READ|FD_CLOSE); + socketConnected = TRUE; + printf("accepted\n"); + } + } + else { + addrlen = sizeof(sockaddr); + SOCKET tmp = accept(s, (struct sockaddr*)&sockaddr, &addrlen); + send(tmp, errServerBusy, strlen(errServerBusy), 0); + closesocket(tmp); + printf("denied\n"); + } + + WSAResetEvent(hEvents[LISTEN_EVENT]); + break; + + case IO_EVENT: + { + WSANETWORKEVENTS NetEvents; + WSAEnumNetworkEvents(conn, hEvents[IO_EVENT], &NetEvents); + switch(NetEvents.lNetworkEvents) + { + case FD_READ: + dwBytesSocket = recv(conn, buffersocket, sizeof(buffersocket), 0); + if (verbose) { + buffersocket[dwBytesSocket]=0; + printf("%s", buffersocket); + } + if (pipeConnected) { + DWORD dwWritten; + WriteFile(pipe, buffersocket, dwBytesSocket, &dwWritten, NULL); + } + break; + case FD_CLOSE: + /* connection closed by host */ + closesocket(conn); + socketConnected = FALSE; + listen(s, 5); + printf("telnet session closed\n"); + break; + } + + } break; + case PIPE_CONNECT: + if (!GetOverlappedResult(pipe, &ovConnect, &dwBytesPipe, FALSE)) + { + printf("error pipe connect (%d)\n", GetLastError()); + break; + } + printf("pipe connected\n"); + ResetEvent(hEvents[PIPE_CONNECT]); + ResetEvent(hEvents[PIPE_READ]); + pipeConnected = TRUE; + + ovRead.Offset = 0; + ovRead.OffsetHigh = 0; + ReadFile(pipe, bufferpipe, sizeof(bufferpipe), &dwBytesPipe, &ovRead); + break; + + case PIPE_READ: + if (GetOverlappedResult(pipe, &ovRead, &dwBytesPipe, FALSE)) + { + if (verbose) { + bufferpipe[dwBytesPipe] = 0; + printf(bufferpipe); + } + if (socketConnected) + { + send(conn, bufferpipe, dwBytesPipe, 0); + } + ResetEvent(hEvents[PIPE_READ]); + } + else + { + DWORD err = GetLastError(); + switch (err) { + case ERROR_BROKEN_PIPE: /* disconnect and reconnect pipe */ + DisconnectNamedPipe(pipe); + ConnectNamedPipe(pipe, &ovConnect); + ResetEvent(hEvents[PIPE_CONNECT]); + ResetEvent(hEvents[PIPE_READ]); + pipeConnected = FALSE; + printf("pipe disconnected\n"); + continue;break; + } + } + ovRead.Offset = 0; + ovRead.OffsetHigh = 0; + ReadFile(pipe, bufferpipe, sizeof(bufferpipe), &dwBytesPipe, &ovRead); + break; + } + } + WSACleanup(); +} + +LPCSTR GetServiceName(BOOL bLongName) +{ + if (bLongName) + return DISPLAY_NAME; + else + return SERVICE_NAME; +} + +void ShowHelp() { + printf("Named pipe <-> telnet server for Windows NT/2000 (use on your own risk :)\n" + "Volkmar Uhlig (volkmar(a)ira.uka.de), www.uhlig-langert.de/volkmar\n\n" + "Commands:\n" + "\t/R register as a service\n" + "\t/U unregister service\n" + "\t/T testmode\n" + "\t/V verbose mode\n" + "\nThe pipe name is \"%s\" and the telnet port is %d.\n", PIPE_NAME, SERVER_PORT); +} + +BOOL CheckArg(int argc, char * argv[], char * arg) +{ + for (int i=1; i<argc; i++) + if (_stricmp(argv[i], arg) == 0) return TRUE; + return FALSE; +} + +int main(int argc, char* argv[]) +{ + char modulename[512]; + GetModuleFileName(NULL, modulename, sizeof(modulename)); + if (argc > 1) { + if (CheckArg(argc, argv, "/v")) + { + verbose = TRUE; + printf("verbose mode\n"); + } + + if (CheckArg(argc, argv, "/r")) + { + RegisterService(modulename, "\0\0"); + return 0; + } + + if (CheckArg(argc, argv, "/u")) + { + UnregisterService(); + return 0; + } + + if (CheckArg(argc, argv, "/t")) { + printf("test mode - press Ctrl+C to stop program\n"); + hServiceEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + Server(); + CloseHandle(hServiceEvent); + return 0; + } + + ShowHelp(); + } + else { + SERVICE_TABLE_ENTRY dispatchTable[] = + { + { TEXT(SERVICE_NAME), (LPSERVICE_MAIN_FUNCTION)service_main}, + { NULL, NULL } + }; + StartServiceCtrlDispatcher(dispatchTable); + } + return 0; +} Propchange: trunk/tools/vmwaregateway/vmwaregateway.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/vmwaregateway/vmwaregateway.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/vmwaregateway/vmwaregateway.… ============================================================================== --- trunk/tools/vmwaregateway/vmwaregateway.sln (added) +++ trunk/tools/vmwaregateway/vmwaregateway.sln Sat Jun 30 00:18:47 2007 @@ -1,0 +1,20 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmwaregateway", "vmwaregateway.vcproj", "{AF9DB704-DF0A-4DA0-8B73-676F07538978}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AF9DB704-DF0A-4DA0-8B73-676F07538978}.Debug|Win32.ActiveCfg = Debug|Win32 + {AF9DB704-DF0A-4DA0-8B73-676F07538978}.Debug|Win32.Build.0 = Debug|Win32 + {AF9DB704-DF0A-4DA0-8B73-676F07538978}.Release|Win32.ActiveCfg = Release|Win32 + {AF9DB704-DF0A-4DA0-8B73-676F07538978}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Propchange: trunk/tools/vmwaregateway/vmwaregateway.sln ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/vmwaregateway/vmwaregateway.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/vmwaregateway/vmwaregateway.… ============================================================================== --- trunk/tools/vmwaregateway/vmwaregateway.vcproj (added) +++ trunk/tools/vmwaregateway/vmwaregateway.vcproj Sat Jun 30 00:18:47 2007 @@ -1,0 +1,268 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="vmwaregateway" + ProjectGUID="{AF9DB704-DF0A-4DA0-8B73-676F07538978}" + RootNamespace="vmwaregateway" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/vmwaregateway.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib" + OutputFile=".\Debug/vmwaregateway.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/vmwaregateway.pdb" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/vmwaregateway.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/vmwaregateway.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib" + OutputFile=".\Release/vmwaregateway.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + ProgramDatabaseFile=".\Release/vmwaregateway.pdb" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/vmwaregateway.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="servicemgr.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="vmwaregateway.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="servicemgr.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Propchange: trunk/tools/vmwaregateway/vmwaregateway.vcproj ------------------------------------------------------------------------------ svn:eol-style = CRLF

1 0

[gedmurphy] 27338: don't clear paths when the browse folder dialog is cancelled
by gedmurphy＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: gedmurphy Date: Sat Jun 30 00:05:38 2007 New Revision: 27338 URL: http://svn.reactos.org/svn/reactos?rev=27338&view=rev Log: don't clear paths when the browse folder dialog is cancelled Modified: trunk/tools/RosTE/GUI/ConsoleSettings.cs Modified: trunk/tools/RosTE/GUI/ConsoleSettings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.cs… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.cs (original) +++ trunk/tools/RosTE/GUI/ConsoleSettings.cs Sat Jun 30 00:05:38 2007 @@ -36,12 +36,6 @@ get { return conAppDebug.Checked; } } - private string GetFolderLocation() - { - folderBrowserDialog.ShowDialog(); - return folderBrowserDialog.SelectedPath; - } - public ConsoleSettings(MainConfig mainConf) { InitializeComponent(); @@ -60,17 +54,20 @@ private void button3_Click(object sender, EventArgs e) { - conQemuLoc.Text = GetFolderLocation(); + if (folderBrowserDialog.ShowDialog() == DialogResult.OK) + conQemuLoc.Text = folderBrowserDialog.SelectedPath; } private void button4_Click(object sender, EventArgs e) { - conVdkLoc.Text = GetFolderLocation(); + if (folderBrowserDialog.ShowDialog() == DialogResult.OK) + conVdkLoc.Text = folderBrowserDialog.SelectedPath; } private void button5_Click(object sender, EventArgs e) { - conDefVmLoc.Text = GetFolderLocation(); + if (folderBrowserDialog.ShowDialog() == DialogResult.OK) + conDefVmLoc.Text = folderBrowserDialog.SelectedPath; } private void conDialogOK_Click(object sender, EventArgs e)

1 0

[greatlrd] 27337: part 6 of xx removing wine hack, that disable seh in rpc.h 1. adding allowwarnings ="true"
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 23:58:33 2007 New Revision: 27337 URL: http://svn.reactos.org/svn/reactos?rev=27337&view=rev Log: part 6 of xx removing wine hack, that disable seh in rpc.h 1. adding allowwarnings ="true" Modified: trunk/reactos/dll/win32/aclui/aclui.rbuild Modified: trunk/reactos/dll/win32/aclui/aclui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rbui… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rbuild (original) +++ trunk/reactos/dll/win32/aclui/aclui.rbuild Fri Jun 29 23:58:33 2007 @@ -1,4 +1,4 @@ -<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll"> +<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll" allowwarnings ="true"> <importlibrary definition="aclui.spec.def" /> <include base="aclui">.</include> <define name="UNICODE" />

1 0

[greatlrd] 27336: part 5 of xx removing wine hack, that disable seh in rpc.h cleanup work fireball ask about it
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 23:15:12 2007 New Revision: 27336 URL: http://svn.reactos.org/svn/reactos?rev=27336&view=rev Log: part 5 of xx removing wine hack, that disable seh in rpc.h cleanup work fireball ask about it Modified: trunk/reactos/base/services/eventlog/eventlog.rbuild Modified: trunk/reactos/base/services/eventlog/eventlog.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.rbuild (original) +++ trunk/reactos/base/services/eventlog/eventlog.rbuild Fri Jun 29 23:15:12 2007 @@ -9,11 +9,6 @@ <library>advapi32</library> <library>eventlog_server</library> <library>rpcrt4</library> - <library>kernel32</library> - <library>user32</library> - <library>ole32</library> - <library>user32</library> - <library>msvcrt</library> <library>pseh</library> <file>eventlog.c</file> <file>logport.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs