Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 21676: Don't open other files until the HTML has been written, just in case it fails.
by gedmurphy＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: gedmurphy Date: Thu Apr 20 23:16:34 2006 New Revision: 21676 URL: http://svn.reactos.ru/svn/reactos?rev=21676&view=rev Log: Don't open other files until the HTML has been written, just in case it fails. Modified: trunk/web/reactos.org/scripts/audit_progress.pl Modified: trunk/web/reactos.org/scripts/audit_progress.pl URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/scripts/audit_progr… ============================================================================== --- trunk/web/reactos.org/scripts/audit_progress.pl (original) +++ trunk/web/reactos.org/scripts/audit_progress.pl Thu Apr 20 23:16:34 2006 @@ -40,13 +40,12 @@ $done_pct = 100; } +output_html(); + open LOCK, "> $locked_files" or die "couldn't open $locked_files for writing: $!\n"; - print LOCK "Number of locked files: $unclean_files\n\n"; print LOCK @locked_files; - -output_html(); open LOG, ">> $log_file" or die "couldn't open $log_file for writing: $!\n";

1 0

[tretiakov] 21675: [AUDIT] \trunk\reactos\lib\uuid (Unlocked) Wine code.
by tretiakov＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: tretiakov Date: Thu Apr 20 20:19:57 2006 New Revision: 21675 URL: http://svn.reactos.ru/svn/reactos?rev=21675&view=rev Log: [AUDIT] \trunk\reactos\lib\uuid (Unlocked) Wine code. Modified: trunk/reactos/lib/uuid/uuid.c (props changed) Propchange: trunk/reactos/lib/uuid/uuid.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21674: Add GDB property for debugging with gdb
by tretiakov＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: tretiakov Date: Thu Apr 20 20:13:50 2006 New Revision: 21674 URL: http://svn.reactos.ru/svn/reactos?rev=21674&view=rev Log: Add GDB property for debugging with gdb Modified: trunk/reactos/ReactOS.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=21674&r1… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Thu Apr 20 20:13:50 2006 @@ -24,11 +24,14 @@ <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + + <if property="GDB" value="0"> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> <compilerflag>-Wpointer-arith</compilerflag> <include>.</include> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/config.template.rbuild?rev=… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Thu Apr 20 20:13:50 2006 @@ -53,4 +53,11 @@ --> <property name="DBG" value="1" /> + + +<property name="GDB" value="0" /> + </rbuild>

1 0

[tretiakov] 21673: Update tests
by tretiakov＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: tretiakov Date: Thu Apr 20 20:00:36 2006 New Revision: 21673 URL: http://svn.reactos.ru/svn/reactos?rev=21673&view=rev Log: Update tests Modified: trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c trunk/reactos/base/applications/testsets/rpcrt4/context_handles/server.c Modified: trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/testsets/… ============================================================================== --- trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c (original) +++ trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c Thu Apr 20 20:00:36 2006 @@ -337,26 +337,42 @@ } +int interactive = 0; +void interact() +{ + if(interactive) + { + printf("\nPress any key to continue..."); + getch(); + printf("\n\n"); + } +} + void main(int argc, char **argv) { RPC_STATUS status; unsigned long ulCode; PCTXTYPE hContext; char *pszStringBinding = NULL; - int test_num = 0; RPC_BINDING_HANDLE Handle = 0; char buffer[255]; + int test_num = 0; + int test_value = 31337; + if(argc<2) { - printf("USAGE: client.exe <test_number>\n" + printf("USAGE: client.exe <test_number> [test_value] [interactive]\n" "Available tests:\n" "0. General test\n" - "1. NULL pointer test\n"); + "1. NULL pointer test\n" + "2. Context rundown routine"); return; } test_num = atoi(argv[1]); + if(argc>2) test_value = atoi(argv[2]); + if(argc>3) interactive = 1; status = RpcStringBindingCompose(NULL, "ncacn_np", @@ -384,9 +400,10 @@ switch(test_num) { case 0: - m_CtxOpen(&hContext, 31337); + m_CtxOpen(&hContext, test_value); RpcBindingFree(&hBinding); m_CtxHello(hContext); + interact(); m_CtxClose(&hContext); break; case 1: @@ -402,7 +419,7 @@ } RpcEndExcept - m_CtxOpen2(&hContext, 31337); + m_CtxOpen2(&hContext, test_value); ///////////////////////////////////////////////////////////////////////////////////////// RpcTryExcept @@ -415,9 +432,12 @@ printf("NDRCContextMarshall(NULL) reported exception = %d\n", RpcExceptionCode()); } RpcEndExcept - - ///////////////////////////////////////////////////////////////////////////////////////// + break; + case 2: + CtxOpen(&hContext, test_value); + interact(); + ExitProcess(0); break; default: printf("Unknown test %d\n", test_num); Modified: trunk/reactos/base/applications/testsets/rpcrt4/context_handles/server.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/testsets/… ============================================================================== --- trunk/reactos/base/applications/testsets/rpcrt4/context_handles/server.c (original) +++ trunk/reactos/base/applications/testsets/rpcrt4/context_handles/server.c Thu Apr 20 20:00:36 2006 @@ -6,19 +6,19 @@ void CtxOpen( PCTXTYPE *pphContext, long Value) { - printf("CtxOpen()\n"); + printf("CtxOpen(): Value=%d\n",Value); *pphContext = (PCTXTYPE)midl_user_allocate( sizeof(CTXTYPE) ); **pphContext = Value; } void CtxHello( PCTXTYPE phContext ) { - printf("Hello, World! Context value: %d\n", *phContext); + printf("CtxHello(): Hello, World! Context value: %d\n", *phContext); } void CtxClose(PCTXTYPE *pphContext ) { - printf("CtxClose()\n"); + printf("CtxClose(): %d\n", **pphContext); midl_user_free(*pphContext); *pphContext = NULL; } @@ -62,7 +62,8 @@ void __RPC_USER PCTXTYPE_rundown( PCTXTYPE hContext) { - printf("Context rundown \n"); + PCTXTYPE pCtx = (PCTXTYPE)hContext; + printf("Context rundown: Value=%d \n", *pCtx); midl_user_free(hContext); }

1 0

[tretiakov] 21672: Implement context handle support for servers: NdrServerContextMarshall, NdrServerContextUnmarshall, NDRSContextMarshall, NDRSContextUnmarshall. MSDN context handle examples now work in ros. Context rundown routines don't work yet.
by tretiakov＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: tretiakov Date: Thu Apr 20 19:45:01 2006 New Revision: 21672 URL: http://svn.reactos.ru/svn/reactos?rev=21672&view=rev Log: Implement context handle support for servers: NdrServerContextMarshall, NdrServerContextUnmarshall, NDRSContextMarshall, NDRSContextUnmarshall. MSDN context handle examples now work in ros. Context rundown routines don't work yet. Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_contex… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c Thu Apr 20 19:45:01 2006 @@ -25,6 +25,110 @@ #include "rpc_binding.h" #include "ndr_contexth.h" +static SContextHandle *CtxList = NULL; + +static CRITICAL_SECTION CtxList_cs; +static CRITICAL_SECTION_DEBUG CtxList_cs_debug = +{ + 0, 0, &CtxList_cs, + { &CtxList_cs_debug.ProcessLocksList, &CtxList_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": CtxList_cs") } +}; +static CRITICAL_SECTION CtxList_cs = { &CtxList_cs_debug, -1, 0, 0, 0, 0 }; + +SContextHandle* RPCRT4_SrvAllocCtxHdl() +{ + SContextHandle *Hdl, *Tmp; + + if((Hdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(SContextHandle)))==NULL) return NULL; + + EnterCriticalSection(&CtxList_cs); + + if(!CtxList) CtxList = Hdl; + else + { + for(Tmp = CtxList; Tmp->Next; Tmp = Tmp->Next); + Tmp->Next = Hdl; + Hdl->Prev = Tmp; + } + + LeaveCriticalSection(&CtxList_cs); + + return Hdl; +} + +void RPCRT4_SrvFreeCtxHdl(SContextHandle *Hdl) +{ + EnterCriticalSection(&CtxList_cs); + + if(Hdl->Prev && Hdl->Next) + { + ((SContextHandle*)Hdl->Prev)->Next = Hdl->Next; + ((SContextHandle*)Hdl->Next)->Prev = Hdl->Prev; + } + else if(Hdl->Next) + { + ((SContextHandle*)Hdl->Next)->Prev = NULL; + CtxList = (SContextHandle*)Hdl->Next; + } + else if(Hdl->Prev) + ((SContextHandle*)Hdl->Prev)->Next = NULL; + else CtxList = NULL; + + HeapFree(GetProcessHeap(), 0, Hdl); + LeaveCriticalSection(&CtxList_cs); +} + +SContextHandle* RPCRT4_SrvFindCtxHdl(ContextHandleNdr *CtxNdr) +{ + SContextHandle *Hdl, *Ret=NULL; + RPC_STATUS status; + EnterCriticalSection(&CtxList_cs); + + for(Hdl = CtxList; Hdl; Hdl = Hdl->Next) + if(UuidCompare(&Hdl->Ndr.uuid, &CtxNdr->uuid, &status)==0) + { + Ret = Hdl; + break; + } + + LeaveCriticalSection(&CtxList_cs); + return Ret; +} + +SContextHandle* RPCRT4_SrvUnmarshallCtxHdl(ContextHandleNdr *Ndr) +{ + SContextHandle *Hdl = NULL; + RPC_STATUS status; + + if(!Ndr) + { + if((Hdl = RPCRT4_SrvAllocCtxHdl())==NULL) + RpcRaiseException(ERROR_OUTOFMEMORY); + + UuidCreate(&Hdl->Ndr.uuid); + } + else if(!UuidIsNil(&Ndr->uuid, &status)) + Hdl = RPCRT4_SrvFindCtxHdl(Ndr); + + return Hdl; +} + +void RPCRT4_SrvMarshallCtxHdl(SContextHandle *Hdl, ContextHandleNdr *Ndr) +{ + if(!Hdl->Value) + { + RPCRT4_SrvFreeCtxHdl(Hdl); + ZeroMemory(Ndr, sizeof(ContextHandleNdr)); + } + else memcpy(Ndr, &Hdl->Ndr, sizeof(ContextHandleNdr)); +} + +void RPCRT4_DoContextRundownIfNeeded(RpcConnection *Conn) +{ + +} /*********************************************************************** * NDRCContextBinding @@ -103,11 +207,12 @@ NDR_CCONTEXT * pContextHandle, RPC_BINDING_HANDLE BindHandle) { - if(!pContextHandle) + + if(!pContextHandle || !BindHandle) RpcRaiseException(ERROR_INVALID_HANDLE); - + NDRCContextUnmarshall(pContextHandle, - ((CContextHandle*)pContextHandle)->Binding, + (CContextHandle*)BindHandle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation); @@ -165,39 +270,24 @@ } /*********************************************************************** - * NDRSContextMarshall2 - */ -void WINAPI NDRSContextMarshall2(IN RPC_BINDING_HANDLE BindingHandle, - IN NDR_SCONTEXT CContext, - OUT void *pBuff, - IN NDR_RUNDOWN userRunDownIn, - IN void *CtxGuard, - IN unsigned long Flags) -{ - FIXME("stub\n"); -} - -/*********************************************************************** - * NDRSContextUnmarshall2 - */ -NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(IN RPC_BINDING_HANDLE BindingHandle, - IN void *pBuff, - IN unsigned long DataRepresentation, - IN void *CtxGuard, - IN unsigned long Flags) -{ - FIXME("stub\n"); - return NULL; -} - -/*********************************************************************** * NdrServerContextMarshall */ void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine) { - FIXME("(%p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine); + SContextHandle *Hdl; + RpcBinding *Binding; + + if(!ContextHandle) + RpcRaiseException(ERROR_INVALID_HANDLE); + + Hdl = (SContextHandle*)ContextHandle; + Binding = (RpcBinding*)pStubMsg->RpcMsg->Handle; + Hdl->Rundown = RundownRoutine; + Hdl->Conn = Binding->FromConn; + RPCRT4_SrvMarshallCtxHdl(Hdl, (ContextHandleNdr*)pStubMsg->Buffer); + pStubMsg->Buffer += sizeof(ContextHandleNdr); } /*********************************************************************** @@ -205,8 +295,10 @@ */ NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) { - FIXME("(%p): stub\n", pStubMsg); - return NULL; + SContextHandle *Hdl; + + Hdl = RPCRT4_SrvUnmarshallCtxHdl((ContextHandleNdr*)pStubMsg->Buffer); + return (NDR_SCONTEXT)Hdl; } /*********************************************************************** @@ -237,7 +329,14 @@ OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn) { - FIXME("stub\n"); + SContextHandle *Hdl; + + if(!CContext) + RpcRaiseException(ERROR_INVALID_HANDLE); + + Hdl = (SContextHandle*)CContext; + Hdl->Rundown = userRunDownIn; + RPCRT4_SrvMarshallCtxHdl(Hdl, (ContextHandleNdr*)pBuff); } /*********************************************************************** @@ -246,8 +345,7 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall(IN void *pBuff, IN unsigned long DataRepresentation) { - FIXME("stub\n"); - return NULL; + return (NDR_SCONTEXT) RPCRT4_SrvUnmarshallCtxHdl((ContextHandleNdr*)pBuff); } /*********************************************************************** Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_contex… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h Thu Apr 20 19:45:01 2006 @@ -36,4 +36,25 @@ ContextHandleNdr Ndr; } CContextHandle; +/* + Keep this structure compatible with public rpcndr.h + declaration, otherwise NDRSContextValue macro won't work. + typedef struct { + void *pad[2]; + void *userContext; + } *NDR_SCONTEXT; +*/ + +typedef struct _SContextHandle +{ + PVOID Prev; + PVOID Next; + PVOID Value; + NDR_RUNDOWN Rundown; + RpcConnection *Conn; + ContextHandleNdr Ndr; +} SContextHandle; + +void RPCRT4_DoContextRundownIfNeeded(RpcConnection *Conn); + #endif //__WINE_NDR_CONTEXTH_H Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.spe… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Thu Apr 20 19:45:01 2006 @@ -140,10 +140,10 @@ @ stdcall NDRCContextBinding(ptr) @ stdcall NDRCContextMarshall(ptr ptr) @ stdcall NDRCContextUnmarshall(ptr ptr ptr long) -@ stdcall NDRSContextMarshall2(ptr ptr ptr ptr ptr long) +@ stub NDRSContextMarshall2 @ stdcall NDRSContextMarshall(ptr ptr ptr) @ stdcall NDRSContextMarshallEx(ptr ptr ptr ptr) -@ stdcall NDRSContextUnmarshall2(ptr ptr ptr ptr long) +@ stub NDRSContextUnmarshall2 @ stdcall NDRSContextUnmarshall(ptr long) @ stdcall NDRSContextUnmarshallEx(ptr ptr long) @ stub NDRcopy

1 0

[cwittich] 21671: draw icons with the correct size fixes the last Miranda menu issue I know of
by cwittich＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: cwittich Date: Thu Apr 20 11:03:58 2006 New Revision: 21671 URL: http://svn.reactos.ru/svn/reactos?rev=21671&view=rev Log: draw icons with the correct size fixes the last Miranda menu issue I know of Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/dr… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c Thu Apr 20 11:03:58 2006 @@ -29,7 +29,7 @@ /* INCLUDES *******************************************************************/ #include <user32.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ @@ -1487,7 +1487,7 @@ return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags); case DST_ICON: - return DrawIcon(hdc, rc->left, rc->top, (HICON)lp); + return DrawIconEx(hdc, rc->left, rc->top, (HICON)lp, cx, cy, 0, NULL, DI_NORMAL); case DST_BITMAP: memdc = CreateCompatibleDC(hdc);

1 0

[greatlrd] 21670: bug 1346 : patch from w3seek : Support SE_FILE_OBJECT in GetNamedSecurityInfo
by greatlrd＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: greatlrd Date: Thu Apr 20 08:36:18 2006 New Revision: 21670 URL: http://svn.reactos.ru/svn/reactos?rev=21670&view=rev Log: bug 1346 : patch from w3seek : Support SE_FILE_OBJECT in GetNamedSecurityInfo Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c (contents, props changed) trunk/reactos/dll/win32/ntmarta/ntmarta.def (props changed) trunk/reactos/dll/win32/ntmarta/ntmarta.h (props changed) trunk/reactos/dll/win32/ntmarta/ntmarta.rc (props changed) Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.c… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Thu Apr 20 08:36:18 2006 @@ -437,6 +437,7 @@ BOOL Write) { LPWSTR lpPath; + NTSTATUS Status; ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; DWORD Ret = ERROR_SUCCESS; @@ -496,6 +497,45 @@ /* open a handle to the path depending on the object type */ switch (ObjectType) { + case SE_FILE_OBJECT: + { + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING FileName; + + if (!RtlDosPathNameToNtPathName_U(pObjectName, + &FileName, + NULL, + NULL)) + { + Ret = ERROR_INVALID_NAME; + goto Cleanup; + } + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(Handle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileName.Buffer); + + if (!NT_SUCCESS(Status)) + { + Ret = RtlNtStatusToDosError(Status); + } + break; + } + case SE_REGISTRY_KEY: { static const struct @@ -679,6 +719,9 @@ break; case SE_FILE_OBJECT: + NtClose(Handle); + break; + case SE_KERNEL_OBJECT: case SE_WINDOW_OBJECT: CloseHandle(Handle); Propchange: trunk/reactos/dll/win32/ntmarta/ntmarta.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/ntmarta/ntmarta.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/ntmarta/ntmarta.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/ntmarta/ntmarta.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21669: Bug 1345 : patch from w3seek Fixes for BuildTrusteeWithObjectsAndName, BuildTrusteeWithObjectsAndSid and GetTrusteeName A test apps exits also from w3seek not commited.
by greatlrd＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: greatlrd Date: Thu Apr 20 08:28:47 2006 New Revision: 21669 URL: http://svn.reactos.ru/svn/reactos?rev=21669&view=rev Log: Bug 1345 : patch from w3seek Fixes for BuildTrusteeWithObjectsAndName, BuildTrusteeWithObjectsAndSid and GetTrusteeName A test apps exits also from w3seek not commited. Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/trus… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/trustee.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/trustee.c Thu Apr 20 08:28:47 2006 @@ -198,14 +198,33 @@ SE_OBJECT_TYPE ObjectType, LPSTR ObjectTypeName, LPSTR InheritedObjectTypeName, LPSTR Name) { + DWORD ObjectsPresent = 0; + DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, Name); + /* Fill the OBJECTS_AND_NAME structure */ + pObjName->ObjectType = ObjectType; + if (ObjectTypeName != NULL) + { + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + + pObjName->InheritedObjectTypeName = InheritedObjectTypeName; + if (InheritedObjectTypeName != NULL) + { + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + + pObjName->ObjectsPresent = ObjectsPresent; + pObjName->ptstrName = Name; + + /* Fill the TRUSTEE structure */ pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = Name; + pTrustee->ptstrName = (LPSTR)pObjName; } @@ -217,14 +236,33 @@ SE_OBJECT_TYPE ObjectType, LPWSTR ObjectTypeName, LPWSTR InheritedObjectTypeName, LPWSTR Name) { - DPRINT("%p %p 0x%08x %p %p %S\n", pTrustee, pObjName, + DWORD ObjectsPresent = 0; + + DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, Name); + /* Fill the OBJECTS_AND_NAME structure */ + pObjName->ObjectType = ObjectType; + if (ObjectTypeName != NULL) + { + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + + pObjName->InheritedObjectTypeName = InheritedObjectTypeName; + if (InheritedObjectTypeName != NULL) + { + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + + pObjName->ObjectsPresent = ObjectsPresent; + pObjName->ptstrName = Name; + + /* Fill the TRUSTEE structure */ pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = Name; + pTrustee->ptstrName = (LPWSTR)pObjName; } @@ -235,13 +273,42 @@ BuildTrusteeWithObjectsAndSidA(PTRUSTEEA pTrustee, POBJECTS_AND_SID pObjSid, GUID* pObjectGuid, GUID* pInheritedObjectGuid, PSID pSid) { + DWORD ObjectsPresent = 0; + DPRINT("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + /* Fill the OBJECTS_AND_SID structure */ + if (pObjectGuid != NULL) + { + pObjSid->ObjectTypeGuid = *pObjectGuid; + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->ObjectTypeGuid, + sizeof(GUID)); + } + + if (pInheritedObjectGuid != NULL) + { + pObjSid->InheritedObjectTypeGuid = *pInheritedObjectGuid; + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->InheritedObjectTypeGuid, + sizeof(GUID)); + } + + pObjSid->ObjectsPresent = ObjectsPresent; + pObjSid->pSid = pSid; + + /* Fill the TRUSTEE structure */ pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_SID; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPSTR) pSid; + pTrustee->ptstrName = (LPSTR) pObjSid; } @@ -252,13 +319,42 @@ BuildTrusteeWithObjectsAndSidW(PTRUSTEEW pTrustee, POBJECTS_AND_SID pObjSid, GUID* pObjectGuid, GUID* pInheritedObjectGuid, PSID pSid) { + DWORD ObjectsPresent = 0; + DPRINT("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + /* Fill the OBJECTS_AND_SID structure */ + if (pObjectGuid != NULL) + { + pObjSid->ObjectTypeGuid = *pObjectGuid; + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->ObjectTypeGuid, + sizeof(GUID)); + } + + if (pInheritedObjectGuid != NULL) + { + pObjSid->InheritedObjectTypeGuid = *pInheritedObjectGuid; + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->InheritedObjectTypeGuid, + sizeof(GUID)); + } + + pObjSid->ObjectsPresent = ObjectsPresent; + pObjSid->pSid = pSid; + + /* Fill the TRUSTEE structure */ pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_SID; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPWSTR) pSid; + pTrustee->ptstrName = (LPWSTR) pObjSid; } @@ -328,7 +424,7 @@ LPSTR WINAPI GetTrusteeNameA(PTRUSTEE_A pTrustee) { - return (pTrustee->TrusteeForm == TRUSTEE_IS_NAME) ? pTrustee->ptstrName : NULL; + return pTrustee->ptstrName; } @@ -338,7 +434,7 @@ LPWSTR WINAPI GetTrusteeNameW(PTRUSTEE_W pTrustee) { - return (pTrustee->TrusteeForm == TRUSTEE_IS_NAME) ? pTrustee->ptstrName : NULL; + return pTrustee->ptstrName; }

1 0

[gedmurphy] 21668: [AUDIT] reporterror This is a ReactOS application unrelated to Windows. However I've been through the code anyway and it comprises of modular code documented on MSDN.
by gedmurphy＠svn.reactos.org 19 Apr '06

19 Apr '06

Author: gedmurphy Date: Thu Apr 20 00:56:44 2006 New Revision: 21668 URL: http://svn.reactos.ru/svn/reactos?rev=21668&view=rev Log: [AUDIT] reporterror This is a ReactOS application unrelated to Windows. However I've been through the code anyway and it comprises of modular code documented on MSDN. Modified: trunk/reactos/base/applications/reporterror/reporterror.c (props changed) trunk/reactos/base/applications/reporterror/reporterror.h (props changed) trunk/reactos/base/applications/reporterror/resources/header.bmp (props changed) trunk/reactos/base/applications/reporterror/resources/watermark.bmp (props changed) Propchange: trunk/reactos/base/applications/reporterror/reporterror.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/reporterror/reporterror.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/reporterror/resources/header.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/reporterror/resources/watermark.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21667: [AUDIT] sc I am the author and can verify this code is clean
by gedmurphy＠svn.reactos.org 19 Apr '06

19 Apr '06

Author: gedmurphy Date: Thu Apr 20 00:21:43 2006 New Revision: 21667 URL: http://svn.reactos.ru/svn/reactos?rev=21667&view=rev Log: [AUDIT] sc I am the author and can verify this code is clean Modified: trunk/reactos/base/applications/sc/control.c (props changed) trunk/reactos/base/applications/sc/create.c (props changed) trunk/reactos/base/applications/sc/delete.c (props changed) trunk/reactos/base/applications/sc/query.c (props changed) trunk/reactos/base/applications/sc/sc.c (props changed) trunk/reactos/base/applications/sc/sc.h (props changed) trunk/reactos/base/applications/sc/start.c (props changed) trunk/reactos/base/applications/sc/usage.c (props changed) Propchange: trunk/reactos/base/applications/sc/control.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/create.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/delete.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/query.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/sc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/sc.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/start.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/usage.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

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