Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 57364: [RPCRT4:FORMATTING] - Forgotten file
by tfaber＠svn.reactos.org 22 Sep '12

22 Sep '12

Author: tfaber Date: Sat Sep 22 11:10:01 2012 New Revision: 57364 URL: http://svn.reactos.org/svn/reactos?rev=57364&view=rev Log: [RPCRT4:FORMATTING] - Forgotten file Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c 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] Sat Sep 22 11:10:01 2012 @@ -430,7 +430,7 @@ BOOL ret = TRUE; unsigned int bytes_left = count; OVERLAPPED ovl; - + ZeroMemory(&ovl, sizeof(ovl)); ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); @@ -438,7 +438,7 @@ { DWORD bytes_read; ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &ovl); - if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) + if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) break; ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_read, TRUE); if (!ret && (GetLastError() != ERROR_MORE_DATA)) @@ -468,7 +468,6 @@ ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &ovl); if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) break; - ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_written, TRUE); if (!ret && (GetLastError() != ERROR_MORE_DATA)) break;

1 0

[tfaber] 57363: [RPCRT4] - Make rpcrt4_ros.diff actually reflect our difference to Wine
by tfaber＠svn.reactos.org 22 Sep '12

22 Sep '12

Author: tfaber Date: Sat Sep 22 11:08:44 2012 New Revision: 57363 URL: http://svn.reactos.org/svn/reactos?rev=57363&view=rev Log: [RPCRT4] - Make rpcrt4_ros.diff actually reflect our difference to Wine Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Sat Sep 22 11:08:44 2012 @@ -2,9 +2,7 @@ =================================================================== --- epm_towers.h (working copy) +++ epm_towers.h (working copy) -@@ -17,11 +17,11 @@ - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +@@ -19,7 +19,7 @@ * */ @@ -13,27 +11,41 @@ #define EPM_PROTOCOL_DNET_NSP 0x04 #define EPM_PROTOCOL_OSI_TP4 0x05 - #define EPM_PROTOCOL_OSI_CLNS 0x06 - #define EPM_PROTOCOL_TCP 0x07 Index: ndr_marshall.c =================================================================== --- ndr_marshall.c (working copy) +++ ndr_marshall.c (working copy) -@@ -6032,6 +6032,7 @@ +@@ -6159,6 +6159,7 @@ static LONG unmarshall_discriminant(PMID case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + case RPC_FC_ENUM16: { USHORT d; - ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); + align_pointer(&pStubMsg->Buffer, sizeof(USHORT)); +Index: ndr_stubless.c +=================================================================== +--- ndr_stubless.c (working copy) ++++ ndr_stubless.c (working copy) +@@ -981,11 +981,12 @@ __declspec(naked) LONG_PTR __cdecl call_ + __asm + { + push ebp ++ mov ebp, esp + push edi ; Save registers + push esi +- mov ebp, esp + mov eax, [ebp+16] ; Get stack size + sub esp, eax ; Make room in stack for arguments ++ and esp, 0xFFFFFFF0 + mov edi, esp + mov ecx, eax + mov esi, [ebp+12] Index: rpc_epmap.c =================================================================== --- rpc_epmap.c (working copy) +++ rpc_epmap.c (working copy) -@@ -30,11 +30,11 @@ - - #include "wine/debug.h" +@@ -32,7 +32,7 @@ #include "wine/exception.h" #include "rpc_binding.h" @@ -42,261 +54,154 @@ #include "epm_towers.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); - - /* The "real" RPC portmapper endpoints that I know of are: +@@ -162,7 +162,7 @@ static RPC_STATUS get_epm_handle_server( + + static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) + { +- switch (GetExceptionCode()) ++ switch (__eptr->ExceptionRecord->ExceptionCode) + { + case EXCEPTION_ACCESS_VIOLATION: + case EXCEPTION_ILLEGAL_INSTRUCTION: Index: rpc_server.c =================================================================== --- rpc_server.c (working copy) +++ rpc_server.c (working copy) -@@ -1040,22 +1040,28 @@ - /*********************************************************************** - * RpcMgmtServerWaitListen (RPCRT4.@) - */ - RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) - { -- TRACE("()\n"); -+ RpcServerProtseq *cps; - - EnterCriticalSection(&listen_cs); - - if (!std_listen) { - LeaveCriticalSection(&listen_cs); - return RPC_S_NOT_LISTENING; - } - -+ do { - LeaveCriticalSection(&listen_cs); -+ LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) -+ WaitForSingleObject(cps->server_ready_event, INFINITE); - -- FIXME("not waiting for server calls to finish\n"); -+ EnterCriticalSection(&listen_cs); -+ } while (!std_listen); -+ -+ LeaveCriticalSection(&listen_cs); - - return RPC_S_OK; - } - - /*********************************************************************** +@@ -1071,8 +1071,6 @@ void RPCRT4_destroy_all_protseqs(void) + EnterCriticalSection(&server_cs); + LIST_FOR_EACH_ENTRY_SAFE(cps, cursor2, &protseqs, RpcServerProtseq, entry) + { +- if (listen_count != 0) +- RPCRT4_sync_with_server_thread(cps); + destroy_serverprotoseq(cps); + } + LeaveCriticalSection(&server_cs); Index: rpc_transport.c =================================================================== --- rpc_transport.c (working copy) +++ rpc_transport.c (working copy) -@@ -65,10 +65,13 @@ - # include <sys/poll.h> - # endif - # define closesocket close - #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ - -+#include <winsock2.h> -+#include <ws2tcpip.h> -+ - #include "windef.h" - #include "winbase.h" - #include "winnls.h" - #include "winerror.h" - #include "winternl.h" -@@ -82,10 +85,12 @@ - #include "rpc_binding.h" - #include "rpc_message.h" - #include "rpc_server.h" - #include "epm_towers.h" - -+#include "unix_func.h" -+ - #ifndef SOL_TCP - # define SOL_TCP IPPROTO_TCP - #endif - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); -@@ -94,11 +99,11 @@ - - typedef struct _RpcConnection_np - { - RpcConnection common; - HANDLE pipe; -- OVERLAPPED ovl; -+ OVERLAPPED ovl[2]; - BOOL listening; - } RpcConnection_np; - - static RpcConnection *rpcrt4_conn_np_alloc(void) - { -@@ -118,17 +123,17 @@ - return RPC_S_OK; - - npc->listening = TRUE; - for (;;) - { -- if (ConnectNamedPipe(npc->pipe, &npc->ovl)) -+ if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) - return RPC_S_OK; - - switch(GetLastError()) - { - case ERROR_PIPE_CONNECTED: -- SetEvent(npc->ovl.hEvent); -+ SetEvent(npc->ovl[0].hEvent); - return RPC_S_OK; - case ERROR_IO_PENDING: - /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ - return RPC_S_OK; - case ERROR_NO_DATA_DETECTED: -@@ -146,11 +151,11 @@ - static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) +@@ -224,6 +224,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( + if (err == ERROR_PIPE_BUSY) { + TRACE("connection failed, error=%x\n", err); + return RPC_S_SERVER_TOO_BUSY; ++ } else if (err == ERROR_BAD_NETPATH) { ++ TRACE("connection failed, error=%x\n", err); ++ return RPC_S_SERVER_UNAVAILABLE; + } + if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { + err = GetLastError(); +@@ -305,18 +308,32 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc + static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - TRACE("listening on %s\n", pname); - -- npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, -+ npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, - PIPE_UNLIMITED_INSTANCES, - RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); - if (npc->pipe == INVALID_HANDLE_VALUE) { - WARN("CreateNamedPipe failed with error %d\n", GetLastError()); -@@ -159,11 +164,12 @@ - else - return RPC_S_CANT_CREATE_ENDPOINT; - } - - memset(&npc->ovl, 0, sizeof(npc->ovl)); -- npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); -+ npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); -+ npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - - /* Note: we don't call ConnectNamedPipe here because it must be done in the - * server thread as the thread must be alertable */ - return RPC_S_OK; - } -@@ -220,11 +226,12 @@ - /* success */ - memset(&npc->ovl, 0, sizeof(npc->ovl)); - /* pipe is connected; change to message-read mode. */ - dwMode = PIPE_READMODE_MESSAGE; - SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); -- npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); -+ npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); -+ npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - npc->pipe = pipe; - - return RPC_S_OK; - } - -@@ -326,11 +333,12 @@ - { - /* because of the way named pipes work, we'll transfer the connected pipe - * to the child, then reopen the server binding to continue listening */ - - new_npc->pipe = old_npc->pipe; -- new_npc->ovl = old_npc->ovl; -+ new_npc->ovl[0] = old_npc->ovl[0]; -+ new_npc->ovl[1] = old_npc->ovl[1]; - old_npc->pipe = 0; - memset(&old_npc->ovl, 0, sizeof(old_npc->ovl)); - old_npc->listening = FALSE; - } - -@@ -377,13 +385,18 @@ +- static const char prefix[] = "\\\\."; ++ static const char prefix[] = "\\\\"; ++ static const char local[] ="."; + RPC_STATUS r; + LPSTR pname; ++ INT size; + + /* already connected? */ + if (npc->pipe) + return RPC_S_OK; + + /* protseq=ncacn_np: named pipes */ +- pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); +- strcat(strcpy(pname, prefix), Connection->Endpoint); +- r = rpcrt4_conn_open_pipe(Connection, pname, FALSE); ++ size = strlen(prefix); ++ if (Connection->NetworkAddr == NULL || strlen(Connection->NetworkAddr) == 0) ++ size += strlen(local); ++ else ++ size += strlen(Connection->NetworkAddr); ++ size += strlen(Connection->Endpoint) + 1; ++ ++ pname = I_RpcAllocate(size); ++ strcpy(pname, prefix); ++ if (Connection->NetworkAddr == NULL || strlen(Connection->NetworkAddr) == 0) ++ strcat(pname, local); ++ else ++ strcat(pname, Connection->NetworkAddr); ++ strcat(pname, Connection->Endpoint); ++ r = rpcrt4_conn_open_pipe(Connection, pname, TRUE); + I_RpcFree(pname); + + return r; +@@ -412,18 +429,24 @@ static int rpcrt4_conn_np_read(RpcConnec + char *buf = buffer; + BOOL ret = TRUE; unsigned int bytes_left = count; ++ OVERLAPPED ovl; ++ ++ ZeroMemory(&ovl, sizeof(ovl)); ++ ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); while (bytes_left) { DWORD bytes_read; - ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); +- if (!ret && GetLastError() == ERROR_MORE_DATA) +- ret = TRUE; - if (!ret || !bytes_read) -+ ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->ovl[0]); ++ ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &ovl); + if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) + break; -+ -+ ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); ++ ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_read, TRUE); + if (!ret && (GetLastError() != ERROR_MORE_DATA)) break; -+ bytes_left -= bytes_read; buf += bytes_read; } ++ CloseHandle(ovl.hEvent); return ret ? count : -1; } -@@ -397,13 +410,18 @@ + +@@ -434,16 +457,24 @@ static int rpcrt4_conn_np_write(RpcConne + const char *buf = buffer; + BOOL ret = TRUE; unsigned int bytes_left = count; ++ OVERLAPPED ovl; ++ ++ ZeroMemory(&ovl, sizeof(ovl)); ++ ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); while (bytes_left) { DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); - if (!ret || !bytes_written) -+ ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &npc->ovl[1]); ++ ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &ovl); + if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) + break; -+ -+ ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); ++ ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_written, TRUE); + if (!ret && (GetLastError() != ERROR_MORE_DATA)) break; -+ bytes_left -= bytes_written; buf += bytes_written; } ++ CloseHandle(ovl.hEvent); return ret ? count : -1; } -@@ -414,13 +432,17 @@ - if (npc->pipe) { - FlushFileBuffers(npc->pipe); - CloseHandle(npc->pipe); - npc->pipe = 0; - } -- if (npc->ovl.hEvent) { -- CloseHandle(npc->ovl.hEvent); -- npc->ovl.hEvent = 0; -+ if (npc->ovl[0].hEvent) { -+ CloseHandle(npc->ovl[0].hEvent); -+ npc->ovl[0].hEvent = 0; -+ } -+ if (npc->ovl[1].hEvent) { -+ CloseHandle(npc->ovl[1].hEvent); -+ npc->ovl[1].hEvent = 0; - } - return 0; - } - - static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) -@@ -579,11 +601,11 @@ - /* open and count connections */ - *count = 1; - conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); - while (conn) { - rpcrt4_conn_listen_pipe(conn); -- if (conn->ovl.hEvent) -+ if (conn->ovl[0].hEvent) - (*count)++; - conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); - } - - /* make array of connections */ -@@ -600,11 +622,11 @@ - - objs[0] = npps->mgr_event; - *count = 1; - conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); - while (conn) { -- if ((objs[*count] = conn->ovl.hEvent)) -+ if ((objs[*count] = conn->ovl[0].hEvent)) - (*count)++; - conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); - } - LeaveCriticalSection(&protseq->cs); - return objs; -@@ -647,11 +669,11 @@ - b_handle = objs[res - WAIT_OBJECT_0]; - /* find which connection got a RPC */ - EnterCriticalSection(&protseq->cs); - conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); - while (conn) { -- if (b_handle == conn->ovl.hEvent) break; -+ if (b_handle == conn->ovl[0].hEvent) break; - conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); - } - cconn = NULL; - if (conn) - RPCRT4_SpawnConnection(&cconn, &conn->common); + +Index: rpcrt4.spec +=================================================================== +--- rpcrt4.spec (working copy) ++++ rpcrt4.spec (working copy) +@@ -53,7 +53,7 @@ + @ stub I_RpcIfInqTransferSyntaxes + @ stub I_RpcLogEvent + @ stdcall I_RpcMapWin32Status(long) +-@ stub I_RpcNegotiateTransferSyntax # wxp ++@ stdcall I_RpcNegotiateTransferSyntax(ptr) + @ stub I_RpcNsBindingSetEntryName + @ stub I_RpcNsBindingSetEntryNameA + @ stub I_RpcNsBindingSetEntryNameW +@@ -266,7 +266,7 @@ + @ stdcall NdrRangeUnmarshall(ptr ptr ptr long) + @ stub NdrRpcSmClientAllocate + @ stub NdrRpcSmClientFree +-@ stub NdrRpcSmSetClientToOsf ++@ stdcall NdrRpcSmSetClientToOsf(ptr) + @ stub NdrRpcSsDefaultAllocate + @ stub NdrRpcSsDefaultFree + @ stub NdrRpcSsDisableAllocate

1 0

[tfaber] 57362: [NPFS] - Do not fail for a valid buffer size in NpfsPeekPipe - Do not read from an output buffer in NpfsPeekPipe
by tfaber＠svn.reactos.org 22 Sep '12

22 Sep '12

Author: tfaber Date: Sat Sep 22 09:48:27 2012 New Revision: 57362 URL: http://svn.reactos.org/svn/reactos?rev=57362&view=rev Log: [NPFS] - Do not fail for a valid buffer size in NpfsPeekPipe - Do not read from an output buffer in NpfsPeekPipe Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sat Sep 22 09:48:27 2012 @@ -581,14 +581,14 @@ DPRINT("OutputBufferLength: %lu\n", OutputBufferLength); /* Validate parameters */ - if (OutputBufferLength < sizeof(FILE_PIPE_PEEK_BUFFER)) + if (OutputBufferLength < FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])) { DPRINT1("Buffer too small\n"); return STATUS_INVALID_PARAMETER; } Ccb = IoStack->FileObject->FsContext2; - Reply = (PFILE_PIPE_PEEK_BUFFER)Irp->AssociatedIrp.SystemBuffer; + Reply = Irp->AssociatedIrp.SystemBuffer; //Fcb = Ccb->Fcb; @@ -604,46 +604,49 @@ { DPRINT("Byte Stream Mode\n"); Reply->MessageLength = Ccb->ReadDataAvailable; - DPRINT("Reply->MessageLength %lu\n",Reply->MessageLength ); + DPRINT("Reply->MessageLength %lu\n", Reply->MessageLength); MessageCount = 1; - if (Reply->Data[0] && (OutputBufferLength >= Ccb->ReadDataAvailable + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]))) - { + if (OutputBufferLength >= FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[Ccb->ReadDataAvailable])) + { + RtlCopyMemory(Reply->Data, BufferPtr, Ccb->ReadDataAvailable); ReturnLength = Ccb->ReadDataAvailable; - memcpy(&Reply->Data[0], (PVOID)BufferPtr, Ccb->ReadDataAvailable); } } else { DPRINT("Message Mode\n"); - ReadDataAvailable=Ccb->ReadDataAvailable; + ReadDataAvailable = Ccb->ReadDataAvailable; if (ReadDataAvailable > 0) { - memcpy(&Reply->MessageLength, BufferPtr, sizeof(ULONG)); + RtlCopyMemory(&Reply->MessageLength, + BufferPtr, + sizeof(Reply->MessageLength)); while ((ReadDataAvailable > 0) && (BufferPtr < Ccb->WritePtr)) { - memcpy(&MessageLength, BufferPtr, sizeof(MessageLength)); + RtlCopyMemory(&MessageLength, BufferPtr, sizeof(MessageLength)); ASSERT(MessageLength > 0); - DPRINT("MessageLength = %lu\n",MessageLength); + DPRINT("MessageLength = %lu\n", MessageLength); ReadDataAvailable -= MessageLength; MessageCount++; /* If its the first message, copy the Message if the size of buffer is large enough */ - if (MessageCount==1) + if (MessageCount == 1) { - if ((Reply->Data[0]) - && (OutputBufferLength >= (MessageLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) + if (OutputBufferLength >= FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[MessageLength])) { - memcpy(&Reply->Data[0], (PVOID)((ULONG_PTR)BufferPtr + sizeof(MessageLength)), MessageLength); + RtlCopyMemory(Reply->Data, + (PVOID)((ULONG_PTR)BufferPtr + sizeof(MessageLength)), + MessageLength); ReturnLength = MessageLength; } } - BufferPtr =(PVOID)((ULONG_PTR)BufferPtr + MessageLength + sizeof(MessageLength)); + BufferPtr = (PVOID)((ULONG_PTR)BufferPtr + sizeof(MessageLength) + MessageLength); DPRINT("BufferPtr = %x\n", BufferPtr); DPRINT("ReadDataAvailable: %lu\n", ReadDataAvailable); } @@ -659,7 +662,7 @@ Reply->NumberOfMessages = MessageCount; - Irp->IoStatus.Information = ReturnLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]); + Irp->IoStatus.Information = FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[ReturnLength]); Irp->IoStatus.Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;

1 0

[ekohl] 57361: [ADVAPI32] Implement LsaGetUserName and LsaOpenTrustedDomain.
by ekohl＠svn.reactos.org 22 Sep '12

22 Sep '12

Author: ekohl Date: Sat Sep 22 09:23:38 2012 New Revision: 57361 URL: http://svn.reactos.org/svn/reactos?rev=57361&view=rev Log: [ADVAPI32] Implement LsaGetUserName and LsaOpenTrustedDomain. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sat Sep 22 09:23:38 2012 @@ -381,7 +381,7 @@ @ stdcall LsaOpenPolicy(ptr ptr long ptr) @ stub LsaOpenPolicySce @ stdcall LsaOpenSecret(ptr ptr long ptr) -@ stub LsaOpenTrustedDomain +@ stdcall LsaOpenTrustedDomain(ptr ptr long ptr) @ stdcall LsaOpenTrustedDomainByName(ptr ptr long ptr) @ stdcall LsaQueryDomainInformationPolicy(ptr long ptr) @ stdcall LsaQueryForestTrustInformation(ptr ptr ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sat Sep 22 09:23:38 2012 @@ -547,12 +547,40 @@ */ NTSTATUS WINAPI -LsaGetUserName(PUNICODE_STRING *UserName, - PUNICODE_STRING *DomainName) -{ - FIXME("LsaGetUserName(%p %p) stub\n", +LsaGetUserName(OUT PUNICODE_STRING *UserName, + OUT PUNICODE_STRING *DomainName OPTIONAL) +{ + PRPC_UNICODE_STRING UserNameString = NULL; + PRPC_UNICODE_STRING DomainNameString = NULL; + NTSTATUS Status; + + TRACE("LsaGetUserName(%p %p)\n", UserName, DomainName); - return STATUS_NOT_IMPLEMENTED; + + RpcTryExcept + { + Status = LsarGetUserName(NULL, + &UserNameString, + (DomainName != NULL) ? &DomainNameString : NULL); + + *UserName = (PUNICODE_STRING)UserNameString; + + if (DomainName != NULL) + *DomainName = (PUNICODE_STRING)DomainNameString; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (UserNameString != NULL) + MIDL_user_free(UserNameString); + + if (DomainNameString != NULL) + MIDL_user_free(DomainNameString); + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -913,6 +941,38 @@ RpcEndExcept; TRACE("LsaOpenSecret() done (Status: 0x%08lx)\n", Status); + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaOpenTrustedDomain(IN LSA_HANDLE PolicyHandle, + IN PSID TrustedDomainSid, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE TrustedDomainHandle) +{ + NTSTATUS Status; + + TRACE("LsaOpenTrustedDomain(%p %p 0x%08lx %p)\n", + PolicyHandle, TrustedDomainSid, DesiredAccess, TrustedDomainHandle); + + RpcTryExcept + { + Status = LsarOpenTrustedDomain((LSAPR_HANDLE)PolicyHandle, + (PRPC_SID)TrustedDomainSid, + DesiredAccess, + (PLSAPR_HANDLE)TrustedDomainHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; return Status; } Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sat Sep 22 09:23:38 2012 @@ -679,18 +679,19 @@ NTSTATUS NTAPI LsaClearAuditLog(LSA_HANDLE); NTSTATUS NTAPI LsaClose(LSA_HANDLE); NTSTATUS NTAPI LsaConnectUntrusted(PHANDLE); -NTSTATUS NTAPI LsaCreateAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE); -NTSTATUS NTAPI LsaCreateSecret(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); -NTSTATUS NTAPI LsaCreateTrustedDomain(LSA_HANDLE, PLSA_TRUST_INFORMATION, - ACCESS_MASK, PLSA_HANDLE); -NTSTATUS NTAPI LsaCreateTrustedDomainEx(LSA_HANDLE, PTRUSTED_DOMAIN_INFORMATION_EX, - PTRUSTED_DOMAIN_AUTH_INFORMATION, ACCESS_MASK, PLSA_HANDLE); +NTSTATUS NTAPI LsaCreateAccount(LSA_HANDLE,PSID,ACCESS_MASK,PLSA_HANDLE); +NTSTATUS NTAPI LsaCreateSecret(LSA_HANDLE,PLSA_UNICODE_STRING,ACCESS_MASK,PLSA_HANDLE); +NTSTATUS NTAPI LsaCreateTrustedDomain(LSA_HANDLE,PLSA_TRUST_INFORMATION, + ACCESS_MASK,PLSA_HANDLE); +NTSTATUS NTAPI LsaCreateTrustedDomainEx(LSA_HANDLE,PTRUSTED_DOMAIN_INFORMATION_EX, + PTRUSTED_DOMAIN_AUTH_INFORMATION,ACCESS_MASK,PLSA_HANDLE); +NTSTATUS NTAPI LsaDelete(LSA_HANDLE); NTSTATUS NTAPI LsaDeleteTrustedDomain(LSA_HANDLE,PSID); NTSTATUS NTAPI LsaDeregisterLogonProcess(HANDLE); NTSTATUS NTAPI LsaEnumerateAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING*,PULONG); NTSTATUS NTAPI LsaEnumerateAccountsWithUserRight(LSA_HANDLE,PLSA_UNICODE_STRING, PVOID*,PULONG); -NTSTATUS NTAPI LsaEnumeratePrivilegesOfAccount(LSA_HANDLE, PPRIVILEGE_SET*); +NTSTATUS NTAPI LsaEnumeratePrivilegesOfAccount(LSA_HANDLE,PPRIVILEGE_SET*); NTSTATUS NTAPI LsaEnumerateTrustedDomains(LSA_HANDLE,PLSA_ENUMERATION_HANDLE, PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaEnumerateTrustedDomainsEx(LSA_HANDLE,PLSA_ENUMERATION_HANDLE, @@ -698,6 +699,7 @@ NTSTATUS NTAPI LsaFreeMemory(PVOID); NTSTATUS NTAPI LsaFreeReturnBuffer(PVOID); NTSTATUS NTAPI LsaGetSystemAccessAccount(LSA_HANDLE, PULONG); +NTSTATUS NTAPI LsaGetUserName(PUNICODE_STRING*,PUNICODE_STRING*); NTSTATUS NTAPI LsaLogonUser(HANDLE,PLSA_STRING,SECURITY_LOGON_TYPE,ULONG,PVOID, ULONG,PTOKEN_GROUPS,PTOKEN_SOURCE,PVOID*,PULONG, PLUID,PHANDLE,PQUOTA_LIMITS,PNTSTATUS); @@ -706,17 +708,18 @@ PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID*); NTSTATUS NTAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); -NTSTATUS NTAPI LsaLookupPrivilegeName(LSA_HANDLE, PLUID, PLSA_UNICODE_STRING*); -NTSTATUS NTAPI LsaLookupPrivilegeValue(LSA_HANDLE, PLSA_UNICODE_STRING, PLUID); +NTSTATUS NTAPI LsaLookupPrivilegeName(LSA_HANDLE,PLUID,PLSA_UNICODE_STRING*); +NTSTATUS NTAPI LsaLookupPrivilegeValue(LSA_HANDLE,PLSA_UNICODE_STRING,PLUID); NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_NAME*); ULONG NTAPI LsaNtStatusToWinError(NTSTATUS); -NTSTATUS NTAPI LsaOpenAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE); +NTSTATUS NTAPI LsaOpenAccount(LSA_HANDLE,PSID,ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaOpenSecret(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); -NTSTATUS NTAPI LsaOpenTrustedDomainByName(LSA_HANDLE, PLSA_UNICODE_STRING, - ACCESS_MASK, PLSA_HANDLE); +NTSTATUS NTAPI LsaOpenTrustedDomain(LSA_HANDLE,PSID,ACCESS_MASK,PLSA_HANDLE); +NTSTATUS NTAPI LsaOpenTrustedDomainByName(LSA_HANDLE,PLSA_UNICODE_STRING, + ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaQueryDomainInformationPolicy(LSA_HANDLE, POLICY_DOMAIN_INFORMATION_CLASS,PVOID*); NTSTATUS NTAPI LsaQueryInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); @@ -738,8 +741,8 @@ NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID); NTSTATUS NTAPI LsaSetLocalInformationPolicy(LSA_HANDLE, POLICY_LOCAL_INFORMATION_CLASS,PVOID); -NTSTATUS NTAPI LsaSetSecret(LSA_HANDLE, PLSA_UNICODE_STRING, PLSA_UNICODE_STRING); -NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE, ULONG); +NTSTATUS NTAPI LsaSetSecret(LSA_HANDLE,PLSA_UNICODE_STRING,PLSA_UNICODE_STRING); +NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE,ULONG); NTSTATUS NTAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID, TRUSTED_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaSetTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,

1 0

[tfaber] 57360: [KERNEL32] - Fix buffer overflow in PeekNamedPipe
by tfaber＠svn.reactos.org 22 Sep '12

22 Sep '12

Author: tfaber Date: Sat Sep 22 09:18:34 2012 New Revision: 57360 URL: http://svn.reactos.org/svn/reactos?rev=57360&view=rev Log: [KERNEL32] - Fix buffer overflow in PeekNamedPipe Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/npipe.c [iso-8859-1] Sat Sep 22 09:18:34 2012 @@ -1173,7 +1173,7 @@ NTSTATUS Status; /* Calculate the buffer space that we'll need and allocate it */ - BufferSize = nBufferSize + sizeof(FILE_PIPE_PEEK_BUFFER); + BufferSize = FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[nBufferSize]); Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferSize); if (Buffer == NULL) { @@ -1215,11 +1215,15 @@ /* Check if caller requested bytes available */ if (lpTotalBytesAvail) + { + /* Return bytes available */ *lpTotalBytesAvail = Buffer->ReadDataAvailable; + } /* Calculate the bytes returned, minus our structure overhead */ BytesRead = (ULONG)(Iosb.Information - FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])); + ASSERT(BytesRead <= nBufferSize); /* Check if caller requested bytes read */ if (lpBytesRead)

1 0

[tfaber] 57359: [KMTEST:IO] - Add a test for IoCreateNotificationEvent/IoCreateSynchronizationEvent
by tfaber＠svn.reactos.org 21 Sep '12

21 Sep '12

Author: tfaber Date: Fri Sep 21 22:12:47 2012 New Revision: 57359 URL: http://svn.reactos.org/svn/reactos?rev=57359&view=rev Log: [KMTEST:IO] - Add a test for IoCreateNotificationEvent/IoCreateSynchronizationEvent Added: trunk/rostests/kmtests/ntos_io/IoEvent.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Sep 21 22:12:47 2012 @@ -36,6 +36,7 @@ ntos_ex/ExTimer.c ntos_fsrtl/FsRtlExpression.c ntos_io/IoDeviceInterface.c + ntos_io/IoEvent.c ntos_io/IoInterrupt.c ntos_io/IoIrp.c ntos_io/IoMdl.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Sep 21 22:12:47 2012 @@ -21,6 +21,7 @@ KMT_TESTFUNC Test_ExTimer; KMT_TESTFUNC Test_FsRtlExpression; KMT_TESTFUNC Test_IoDeviceInterface; +KMT_TESTFUNC Test_IoEvent; KMT_TESTFUNC Test_IoInterrupt; KMT_TESTFUNC Test_IoIrp; KMT_TESTFUNC Test_IoMdl; @@ -60,6 +61,7 @@ { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, { "IoDeviceInterface", Test_IoDeviceInterface }, + { "IoEvent", Test_IoEvent }, { "IoInterrupt", Test_IoInterrupt }, { "IoIrp", Test_IoIrp }, { "IoMdl", Test_IoMdl }, Added: trunk/rostests/kmtests/ntos_io/IoEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoEvent.c… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoEvent.c (added) +++ trunk/rostests/kmtests/ntos_io/IoEvent.c [iso-8859-1] Fri Sep 21 22:12:47 2012 @@ -1,0 +1,118 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Event creation test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +#ifdef _WIN64 +#define KERNEL_HANDLE_FLAG 0xFFFFFFFF80000000ULL +#else +#define KERNEL_HANDLE_FLAG 0x80000000 +#endif + +#define CheckEventObject(Handle, Pointers, Handles) do \ +{ \ + PUBLIC_OBJECT_BASIC_INFORMATION ObjectInfo; \ + Status = ZwQueryObject(Handle, ObjectBasicInformation, \ + &ObjectInfo, sizeof ObjectInfo, NULL); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_ulong(ObjectInfo.PointerCount, Pointers); \ + ok_eq_ulong(ObjectInfo.HandleCount, Handles); \ + ok_eq_ulong(ObjectInfo.Attributes, 0); \ + ok_eq_ulong(ObjectInfo.GrantedAccess, EVENT_ALL_ACCESS); \ + ok(((ULONG_PTR)Handle & KERNEL_HANDLE_FLAG) == KERNEL_HANDLE_FLAG, \ + "Handle %p is not a kernel handle\n", Handle); \ +} while (0) + +static +VOID +TestCreateEvent( + PRKEVENT (NTAPI *CreateEvent)(PUNICODE_STRING, PHANDLE), + PUNICODE_STRING EventName, + EVENT_TYPE Type) +{ + NTSTATUS Status; + NTSTATUS ExceptionStatus; + PKEVENT Event, Event2; + HANDLE EventHandle, EventHandle2; + LONG State; + + /* Nameless event */ + KmtStartSeh() + Event = CreateEvent(NULL, &EventHandle); + ok(Event != NULL, "Event is NULL\n"); + ok(EventHandle != NULL, "EventHandle is NULL\n"); + if (!skip(EventHandle != NULL, "No event\n")) + { + ok_eq_uint(Event->Header.Type, Type); + State = KeReadStateEvent(Event); + ok_eq_long(State, 1L); + CheckEventObject(EventHandle, 2UL, 1UL); + Status = ZwClose(EventHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + } + KmtEndSeh(STATUS_SUCCESS); + + /* Named event */ + EventHandle = NULL; + Event = CreateEvent(EventName, &EventHandle); + ok(Event != NULL, "Event is NULL\n"); + ok(EventHandle != NULL, "EventHandle is NULL\n"); + if (!skip(EventHandle != NULL, "No event\n")) + { + ok_eq_uint(Event->Header.Type, Type); + State = KeReadStateEvent(Event); + ok_eq_long(State, 1L); + CheckEventObject(EventHandle, 3UL, 1UL); + + /* Open the existing one */ + EventHandle2 = NULL; + Event2 = CreateEvent(EventName, &EventHandle2); + CheckEventObject(EventHandle, 4UL, 2UL); + ok(Event2 != NULL, "Event is NULL\n"); + ok(EventHandle2 != NULL, "EventHandle is NULL\n"); + if (!skip(EventHandle2 != NULL, "No event\n")) + { + CheckEventObject(EventHandle2, 4UL, 2UL); + ZwClose(EventHandle2); + } + + CheckEventObject(EventHandle, 3UL, 1UL); + Status = ZwClose(EventHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + } +} + +START_TEST(IoEvent) +{ + PKEVENT Event, Event2; + HANDLE EventHandle = NULL, EventHandle2 = NULL; + UNICODE_STRING NotificationEventName = RTL_CONSTANT_STRING(L"\\BaseNamedObjects\\KmTestIoEventNotificationEvent"); + UNICODE_STRING SynchronizationEventName = RTL_CONSTANT_STRING(L"\\BaseNamedObjects\\KmTestIoEventSynchronizationEvent"); + + TestCreateEvent(IoCreateNotificationEvent, &NotificationEventName, NotificationEvent); + TestCreateEvent(IoCreateSynchronizationEvent, &SynchronizationEventName, SynchronizationEvent); + + /* Create different types with the same name */ + Event = IoCreateNotificationEvent(&NotificationEventName, &EventHandle); + ok(Event != NULL, "Event is NULL\n"); + ok(EventHandle != NULL, "EventHandle is NULL\n"); + if (!skip(EventHandle != NULL, "No event\n")) + { + ok_eq_uint(Event->Header.Type, NotificationEvent); + Event2 = IoCreateSynchronizationEvent(&NotificationEventName, &EventHandle2); + ok(Event2 != NULL, "Event is NULL\n"); + ok(EventHandle2 != NULL, "EventHandle is NULL\n"); + if (!skip(EventHandle2 != NULL, "No event\n")) + { + ok_eq_uint(Event2->Header.Type, NotificationEvent); + ZwClose(EventHandle2); + } + ZwClose(EventHandle); + } + +} + Propchange: trunk/rostests/kmtests/ntos_io/IoEvent.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 57358: [ADVAPI32] - Implement LsaClearAuditLog. - Sort functions, update function headers and trace-messages.
by ekohl＠svn.reactos.org 21 Sep '12

21 Sep '12

Author: ekohl Date: Fri Sep 21 17:19:54 2012 New Revision: 57358 URL: http://svn.reactos.org/svn/reactos?rev=57358&view=rev Log: [ADVAPI32] - Implement LsaClearAuditLog. - Sort functions, update function headers and trace-messages. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Fri Sep 21 17:19:54 2012 @@ -346,7 +346,7 @@ @ stub LookupSecurityDescriptorPartsW @ stdcall LsaAddAccountRights(ptr ptr ptr long) @ stdcall LsaAddPrivilegesToAccount(ptr ptr) -@ stub LsaClearAuditLog +@ stdcall LsaClearAuditLog(ptr) @ stdcall LsaClose(ptr) @ stdcall LsaCreateAccount(ptr ptr long ptr) @ stdcall LsaCreateSecret(ptr ptr long ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Fri Sep 21 17:19:54 2012 @@ -10,11 +10,15 @@ * 20030202 KJK compressed stubs * */ + #include <advapi32.h> + WINE_DEFAULT_DEBUG_CHANNEL(advapi); -static BOOL LsapIsLocalComputer(PLSA_UNICODE_STRING ServerName) +static +BOOL +LsapIsLocalComputer(PLSA_UNICODE_STRING ServerName) { DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; BOOL Result; @@ -34,7 +38,8 @@ } -handle_t __RPC_USER +handle_t +__RPC_USER PLSAPR_SERVER_NAME_bind(PLSAPR_SERVER_NAME pszSystemName) { handle_t hBinding = NULL; @@ -73,7 +78,8 @@ } -void __RPC_USER +void +__RPC_USER PLSAPR_SERVER_NAME_unbind(PLSAPR_SERVER_NAME pszSystemName, handle_t hBinding) { @@ -86,56 +92,6 @@ { TRACE("RpcBindingFree returned 0x%x\n", status); } -} - - -/* - * @implemented - */ -NTSTATUS -WINAPI -LsaClose(IN LSA_HANDLE ObjectHandle) -{ - NTSTATUS Status; - - TRACE("LsaClose(0x%p) called\n", ObjectHandle); - - RpcTryExcept - { - Status = LsarClose((PLSAPR_HANDLE)&ObjectHandle); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - return Status; -} - - -/* - * @implemented - */ -NTSTATUS -WINAPI -LsaDelete(IN LSA_HANDLE ObjectHandle) -{ - NTSTATUS Status; - - TRACE("LsaDelete(0x%p) called\n", ObjectHandle); - - RpcTryExcept - { - Status = LsarDelete((LSAPR_HANDLE)ObjectHandle); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - return Status; } @@ -207,6 +163,56 @@ * @implemented */ NTSTATUS +NTAPI +LsaClearAuditLog(IN LSA_HANDLE PolicyHandle) +{ + NTSTATUS Status; + + TRACE("LsaClearAuditLog(%p)\n", PolicyHandle); + + RpcTryExcept + { + Status = LsarClearAuditLog((LSAPR_HANDLE)PolicyHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaClose(IN LSA_HANDLE ObjectHandle) +{ + NTSTATUS Status; + + TRACE("LsaClose(%p) called\n", ObjectHandle); + + RpcTryExcept + { + Status = LsarClose((PLSAPR_HANDLE)&ObjectHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS WINAPI LsaCreateAccount(IN LSA_HANDLE PolicyHandle, IN PSID AccountSid, @@ -215,7 +221,7 @@ { NTSTATUS Status; - TRACE("LsaCreateAccount(%p %p 0x%08x %p)\n", + TRACE("LsaCreateAccount(%p %p 0x%08lx %p)\n", PolicyHandle, AccountSid, DesiredAccess, AccountHandle); RpcTryExcept @@ -279,8 +285,8 @@ { NTSTATUS Status; - TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, TrustedDomainInformation, - DesiredAccess, TrustedDomainHandle); + TRACE("LsaCreateTrustedDomain(%p %p 0x%08lx %p)\n", + PolicyHandle, TrustedDomainInformation, DesiredAccess, TrustedDomainHandle); RpcTryExcept { @@ -304,14 +310,14 @@ */ NTSTATUS WINAPI -LsaCreateTrustedDomainEx( - LSA_HANDLE PolicyHandle, - PTRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, - PTRUSTED_DOMAIN_AUTH_INFORMATION AuthenticationInformation, - ACCESS_MASK DesiredAccess, - PLSA_HANDLE TrustedDomainHandle) -{ - FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, TrustedDomainInformation, AuthenticationInformation, +LsaCreateTrustedDomainEx(IN LSA_HANDLE PolicyHandle, + IN PTRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, + IN PTRUSTED_DOMAIN_AUTH_INFORMATION AuthenticationInformation, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE TrustedDomainHandle) +{ + FIXME("LsaCreateTrustedDomainEx(%p %p %p 0x%08lx %p) stub\n", + PolicyHandle, TrustedDomainInformation, AuthenticationInformation, DesiredAccess, TrustedDomainHandle); return STATUS_SUCCESS; } @@ -322,12 +328,38 @@ */ NTSTATUS WINAPI +LsaDelete(IN LSA_HANDLE ObjectHandle) +{ + NTSTATUS Status; + + TRACE("LsaDelete(%p)\n", ObjectHandle); + + RpcTryExcept + { + Status = LsarDelete((LSAPR_HANDLE)ObjectHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI LsaDeleteTrustedDomain(IN LSA_HANDLE PolicyHandle, IN PSID TrustedDomainSid) { NTSTATUS Status; - TRACE("(%p,%p)\n", PolicyHandle, TrustedDomainSid); + TRACE("LsaDeleteTrustedDomain(%p %p)\n", + PolicyHandle, TrustedDomainSid); RpcTryExcept { @@ -357,7 +389,8 @@ LSAPR_USER_RIGHT_SET UserRightsSet; NTSTATUS Status; - TRACE("(%p,%p,%p,%p) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + TRACE("LsaEnumerateAccountRights(%p %p %p %p)\n", + PolicyHandle, AccountSid, UserRights, CountOfRights); UserRightsSet.Entries = 0; UserRightsSet.UserRights = NULL; @@ -391,13 +424,13 @@ */ NTSTATUS WINAPI -LsaEnumerateAccountsWithUserRight( - LSA_HANDLE PolicyHandle, - OPTIONAL PLSA_UNICODE_STRING UserRights, - PVOID *EnumerationBuffer, - PULONG CountReturned) -{ - FIXME("(%p,%p,%p,%p) stub\n", PolicyHandle, UserRights, EnumerationBuffer, CountReturned); +LsaEnumerateAccountsWithUserRight(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING UserRight OPTIONAL, + OUT PVOID *Buffer, + OUT PULONG CountReturned) +{ + FIXME("LsaEnumerateAccountsWithUserRight(%p %p %p %p) stub\n", + PolicyHandle, UserRight, Buffer, CountReturned); return STATUS_NO_MORE_ENTRIES; } @@ -412,7 +445,8 @@ { NTSTATUS Status; - TRACE("(%p,%p) stub\n", AccountHandle, Privileges); + TRACE("LsaEnumeratePrivilegesOfAccount(%p %p)\n", + AccountHandle, Privileges); RpcTryExcept { @@ -434,15 +468,15 @@ */ NTSTATUS WINAPI -LsaEnumerateTrustedDomains( - LSA_HANDLE PolicyHandle, - PLSA_ENUMERATION_HANDLE EnumerationContext, - PVOID *Buffer, - ULONG PreferedMaximumLength, - PULONG CountReturned) -{ - FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, - Buffer, PreferedMaximumLength, CountReturned); +LsaEnumerateTrustedDomains(IN LSA_HANDLE PolicyHandle, + IN OUT PLSA_ENUMERATION_HANDLE EnumerationContext, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + FIXME("LsaEnumerateTrustedDomains(%p %p %p %lu %p) stub\n", + PolicyHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); if (CountReturned) *CountReturned = 0; return STATUS_SUCCESS; @@ -453,15 +487,16 @@ */ NTSTATUS WINAPI -LsaEnumerateTrustedDomainsEx( - LSA_HANDLE PolicyHandle, - PLSA_ENUMERATION_HANDLE EnumerationContext, - PVOID *Buffer, - ULONG PreferedMaximumLength, - PULONG CountReturned) -{ - FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, Buffer, - PreferedMaximumLength, CountReturned); +LsaEnumerateTrustedDomainsEx(IN LSA_HANDLE PolicyHandle, + IN OUT PLSA_ENUMERATION_HANDLE EnumerationContext, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + FIXME("LsaEnumerateTrustedDomainsEx(%p %p %p %lu %p) stub\n", + PolicyHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + if (CountReturned) *CountReturned = 0; return STATUS_SUCCESS; } @@ -474,7 +509,7 @@ WINAPI LsaFreeMemory(IN PVOID Buffer) { - TRACE("(%p)\n", Buffer); + TRACE("LsaFreeMemory(%p)\n", Buffer); return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); } @@ -489,7 +524,8 @@ { NTSTATUS Status; - TRACE("(%p,%p)\n", AccountHandle, SystemAccess); + TRACE("LsaGetSystemAccessAccount(%p %p)\n", + AccountHandle, SystemAccess); RpcTryExcept { @@ -503,6 +539,20 @@ RpcEndExcept; return Status; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaGetUserName(PUNICODE_STRING *UserName, + PUNICODE_STRING *DomainName) +{ + FIXME("LsaGetUserName(%p %p) stub\n", + UserName, DomainName); + return STATUS_NOT_IMPLEMENTED; } @@ -521,8 +571,8 @@ ULONG MappedCount = 0; NTSTATUS Status; - TRACE("(%p,0x%08x,%p,%p,%p)\n", PolicyHandle, Count, Names, - ReferencedDomains, Sids); + TRACE("LsaLookupNames(%p %lu %p %p %p)\n", + PolicyHandle, Count, Names, ReferencedDomains, Sids); if (ReferencedDomains == NULL || Sids == NULL) return STATUS_INVALID_PARAMETER; @@ -573,8 +623,8 @@ ULONG MappedCount = 0; NTSTATUS Status; - TRACE("(%p,0x%08x,0x%08x,%p,%p,%p) stub\n", PolicyHandle, Flags, - Count, Names, ReferencedDomains, Sids); + TRACE("LsaLookupNames2(%p 0x%08x %lu %p %p %p)\n", + PolicyHandle, Flags, Count, Names, ReferencedDomains, Sids); if (ReferencedDomains == NULL || Sids == NULL) return STATUS_INVALID_PARAMETER; @@ -623,7 +673,8 @@ PRPC_UNICODE_STRING NameBuffer = NULL; NTSTATUS Status; - TRACE("(%p,%p,%p)\n", PolicyHandle, Value, Name); + TRACE("LsaLookupPrivilegeName(%p %p %p)\n", + PolicyHandle, Value, Name); RpcTryExcept { @@ -658,7 +709,8 @@ LUID Luid; NTSTATUS Status; - TRACE("(%p,%p,%p)\n", PolicyHandle, Name, Value); + TRACE("LsaLookupPrivilegeValue(%p %p %p)\n", + PolicyHandle, Name, Value); RpcTryExcept { @@ -694,8 +746,8 @@ ULONG MappedCount = 0; NTSTATUS Status; - TRACE("(%p,%u,%p,%p,%p)\n", PolicyHandle, Count, Sids, - ReferencedDomains, Names); + TRACE("LsaLookupSids(%p %lu %p %p %p)\n", + PolicyHandle, Count, Sids, ReferencedDomains, Names); if (Count == 0) return STATUS_INVALID_PARAMETER; @@ -747,7 +799,7 @@ WINAPI LsaNtStatusToWinError(IN NTSTATUS Status) { - TRACE("(%lx)\n", Status); + TRACE("LsaNtStatusToWinError(0x%lx)\n", Status); return RtlNtStatusToDosError(Status); } @@ -764,7 +816,8 @@ { NTSTATUS Status; - TRACE("(%p,%p,0x%08lx,%p)\n", PolicyHandle, AccountSid, DesiredAccess, AccountHandle); + TRACE("LsaOpenAccount(%p %p 0x%08lx %p)\n", + PolicyHandle, AccountSid, DesiredAccess, AccountHandle); RpcTryExcept { @@ -796,14 +849,14 @@ */ NTSTATUS WINAPI -LsaOpenPolicy(IN PLSA_UNICODE_STRING SystemName, +LsaOpenPolicy(IN PLSA_UNICODE_STRING SystemName OPTIONAL, IN PLSA_OBJECT_ATTRIBUTES ObjectAttributes, IN ACCESS_MASK DesiredAccess, OUT PLSA_HANDLE PolicyHandle) { NTSTATUS Status; - TRACE("LsaOpenPolicy (%s,%p,0x%08x,%p)\n", + TRACE("LsaOpenPolicy(%s %p 0x%08lx %p)\n", SystemName ? debugstr_w(SystemName->Buffer) : "(null)", ObjectAttributes, DesiredAccess, PolicyHandle); @@ -841,7 +894,7 @@ { NTSTATUS Status; - TRACE("LsaOpenSecret(%p %p 0x%08x %p)\n", + TRACE("LsaOpenSecret(%p %p 0x%08lx %p)\n", PolicyHandle, SecretName, DesiredAccess, SecretHandle); RpcTryExcept @@ -877,8 +930,8 @@ { NTSTATUS Status; - TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, TrustedDomainName, - DesiredAccess, TrustedDomainHandle); + TRACE("LsaOpenTrustedDomainByName(%p %p 0x%08lx %p)\n", + PolicyHandle, TrustedDomainName, DesiredAccess, TrustedDomainHandle); RpcTryExcept { @@ -902,12 +955,12 @@ */ NTSTATUS WINAPI -LsaQueryDomainInformationPolicy( - LSA_HANDLE PolicyHandle, - POLICY_DOMAIN_INFORMATION_CLASS InformationClass, - PVOID *Buffer) -{ - FIXME("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); +LsaQueryDomainInformationPolicy(IN LSA_HANDLE PolicyHandle, + IN POLICY_DOMAIN_INFORMATION_CLASS InformationClass, + OUT PVOID *Buffer) +{ + FIXME("LsaQueryDomainInformationPolicy(%p %lu %p) stub\n", + PolicyHandle, InformationClass, Buffer); return STATUS_NOT_IMPLEMENTED; } @@ -917,12 +970,27 @@ */ NTSTATUS WINAPI -LsaQueryForestTrustInformation( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - PLSA_FOREST_TRUST_INFORMATION * ForestTrustInfo) -{ - FIXME("(%p,%p,%p) stub\n", PolicyHandle, TrustedDomainName, ForestTrustInfo); +LsaQueryForestTrustInformation(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING TrustedDomainName, + OUT PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo) +{ + FIXME("LsaQueryForestTrustInformation(%p %p %p) stub\n", + PolicyHandle, TrustedDomainName, ForestTrustInfo); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaQueryInfoTrustedDomain(IN LSA_HANDLE TrustedDomainHandle, + IN TRUSTED_INFORMATION_CLASS InformationClass, + OUT PVOID *Buffer) +{ + FIXME("LsaQueryInfoTrustedDomain(%p %d %p) stub\n", + TrustedDomainHandle, InformationClass, Buffer); return STATUS_NOT_IMPLEMENTED; } @@ -939,7 +1007,8 @@ PLSAPR_POLICY_INFORMATION PolicyInformation = NULL; NTSTATUS Status; - TRACE("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); + TRACE("LsaQueryInformationPolicy(%p %d %p)\n", + PolicyHandle, InformationClass, Buffer); RpcTryExcept { @@ -980,6 +1049,10 @@ PLSA_UNICODE_STRING DecryptedOldValue = NULL; SIZE_T BufferSize; NTSTATUS Status; + + TRACE("LsaQuerySecret(%p %p %p %p %p)\n", + SecretHandle, CurrentValue, CurrentValueSetTime, + OldValue, OldValueSetTime); RpcTryExcept { @@ -1087,13 +1160,13 @@ */ NTSTATUS WINAPI -LsaQueryTrustedDomainInfo( - LSA_HANDLE PolicyHandle, - PSID TrustedDomainSid, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID *Buffer) -{ - FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainSid, InformationClass, Buffer); +LsaQueryTrustedDomainInfo(IN LSA_HANDLE PolicyHandle, + IN PSID TrustedDomainSid, + IN TRUSTED_INFORMATION_CLASS InformationClass, + OUT PVOID *Buffer) +{ + FIXME("LsaQueryTrustedDomainInfo(%p %p %d %p) stub\n", + PolicyHandle, TrustedDomainSid, InformationClass, Buffer); return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -1110,7 +1183,8 @@ { NTSTATUS Status; - TRACE("(%p,%p,%d,%p)\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); + TRACE("LsaQueryTrustedDomainInfoByName(%p %p %d %p)\n", + PolicyHandle, TrustedDomainName, InformationClass, Buffer); if (InformationClass == TrustedDomainAuthInformationInternal || InformationClass == TrustedDomainFullInformationInternal) @@ -1130,6 +1204,20 @@ RpcEndExcept; return Status; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaRegisterPolicyChangeNotification(IN POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, + IN HANDLE NotificationEventHandle) +{ + FIXME("LsaRegisterPolicyChangeNotification(%d %p) stub\n", + InformationClass, NotificationEventHandle); + return STATUS_UNSUCCESSFUL; } @@ -1146,7 +1234,7 @@ { LSAPR_USER_RIGHT_SET UserRightSet; - TRACE("LsaRemoveAccountRights(%p %p %d %p 0x%08x) stub\n", + TRACE("LsaRemoveAccountRights(%p %p %d %p %lu)\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); UserRightSet.Entries = CountOfRights; @@ -1174,27 +1262,45 @@ */ NTSTATUS WINAPI -LsaRetrievePrivateData( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING KeyName, - PLSA_UNICODE_STRING *PrivateData) -{ - FIXME("(%p,%p,%p) stub\n", PolicyHandle, KeyName, PrivateData); +LsaRetrievePrivateData(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING KeyName, + OUT PLSA_UNICODE_STRING *PrivateData) +{ + FIXME("LsaRetrievePrivateData(%p %p %p) stub\n", + PolicyHandle, KeyName, PrivateData); return STATUS_OBJECT_NAME_NOT_FOUND; } -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaSetDomainInformationPolicy( - LSA_HANDLE PolicyHandle, - POLICY_DOMAIN_INFORMATION_CLASS InformationClass, - PVOID Buffer) -{ - FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, InformationClass, Buffer); + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaSetDomainInformationPolicy(IN LSA_HANDLE PolicyHandle, + IN POLICY_DOMAIN_INFORMATION_CLASS InformationClass, + IN PVOID Buffer OPTIONAL) +{ + FIXME("LsaSetDomainInformationPolicy(%p %d %p) stub\n", + PolicyHandle, InformationClass, Buffer); return STATUS_UNSUCCESSFUL; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaSetForestTrustInformation(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING TrustedDomainName, + IN PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, + IN BOOL CheckOnly, + OUT PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) +{ + FIXME("LsaSetForestTrustInformation(%p %p %p %d %p) stub\n", + PolicyHandle, TrustedDomainName, ForestTrustInfo, CheckOnly, CollisionInfo); + return STATUS_NOT_IMPLEMENTED; } @@ -1209,7 +1315,7 @@ { NTSTATUS Status; - TRACE("LsaSetInformationPolicy(%p 0x%08x %p)\n", + TRACE("LsaSetInformationPolicy(%p %d %p)\n", PolicyHandle, InformationClass, Buffer); RpcTryExcept @@ -1242,7 +1348,7 @@ SIZE_T BufferSize; NTSTATUS Status; - TRACE("LsaSetSecret(%p,%p,%p)\n", + TRACE("LsaSetSecret(%p %p %p)\n", SecretHandle, EncryptedCurrentValue, EncryptedOldValue); if (CurrentValue != NULL) @@ -1335,108 +1441,59 @@ */ NTSTATUS WINAPI -LsaSetForestTrustInformation( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, - BOOL CheckOnly, - PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) -{ - FIXME("(%p,%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, ForestTrustInfo, CheckOnly, CollisionInfo); - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaSetTrustedDomainInfoByName( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID Buffer) -{ - FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); +LsaSetTrustedDomainInfoByName(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING TrustedDomainName, + IN TRUSTED_INFORMATION_CLASS InformationClass, + IN PVOID Buffer) +{ + FIXME("LsaSetTrustedDomainInfoByName(%p %p %d %p) stub\n", + PolicyHandle, TrustedDomainName, InformationClass, Buffer); return STATUS_SUCCESS; } -/* - * @unimplemented - */ -NTSTATUS WINAPI LsaRegisterPolicyChangeNotification( - POLICY_NOTIFICATION_INFORMATION_CLASS class, - HANDLE event) -{ - FIXME("(%d,%p) stub\n", class, event); - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaSetTrustedDomainInformation( - LSA_HANDLE PolicyHandle, - PSID TrustedDomainSid, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID Buffer) -{ - FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainSid, InformationClass, Buffer); + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaSetTrustedDomainInformation(IN LSA_HANDLE PolicyHandle, + IN PSID TrustedDomainSid, + IN TRUSTED_INFORMATION_CLASS InformationClass, + IN PVOID Buffer) +{ + FIXME("LsaSetTrustedDomainInformation(%p %p %d %p) stub\n", + PolicyHandle, TrustedDomainSid, InformationClass, Buffer); return STATUS_SUCCESS; } -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaStorePrivateData( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING KeyName, - PLSA_UNICODE_STRING PrivateData) -{ - FIXME("(%p,%p,%p) stub\n", PolicyHandle, KeyName, PrivateData); + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaStorePrivateData(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING KeyName, + IN PLSA_UNICODE_STRING PrivateData OPTIONAL) +{ + FIXME("LsaStorePrivateData(%p %p %p) stub\n", + PolicyHandle, KeyName, PrivateData); return STATUS_OBJECT_NAME_NOT_FOUND; } -/* - * @unimplemented - */ -NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification( - POLICY_NOTIFICATION_INFORMATION_CLASS class, - HANDLE event) -{ - FIXME("(%d,%p) stub\n", class, event); + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaUnregisterPolicyChangeNotification(IN POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, + IN HANDLE NotificationEventHandle) +{ + FIXME("(%d %p) stub\n", + InformationClass, NotificationEventHandle); return STATUS_SUCCESS; } -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaGetUserName( - PUNICODE_STRING *UserName, - PUNICODE_STRING *DomainName) -{ - FIXME("(%p,%p) stub\n", UserName, DomainName); - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaQueryInfoTrustedDomain (DWORD Unknonw0, - DWORD Unknonw1, - DWORD Unknonw2) -{ - FIXME("(%d,%d,%d) stub\n", Unknonw0, Unknonw1, Unknonw2); - return STATUS_NOT_IMPLEMENTED; -} - - /* EOF */ Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Fri Sep 21 17:19:54 2012 @@ -676,6 +676,7 @@ NTSTATUS NTAPI LsaAddPrivilegesToAccount(LSA_HANDLE, PPRIVILEGE_SET); NTSTATUS NTAPI LsaCallAuthenticationPackage(HANDLE,ULONG,PVOID,ULONG,PVOID*, PULONG,PNTSTATUS); +NTSTATUS NTAPI LsaClearAuditLog(LSA_HANDLE); NTSTATUS NTAPI LsaClose(LSA_HANDLE); NTSTATUS NTAPI LsaConnectUntrusted(PHANDLE); NTSTATUS NTAPI LsaCreateAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE);

1 0

[akhaldi] 57357: * Exclude host tools when setting the default build type.
by akhaldi＠svn.reactos.org 21 Sep '12

21 Sep '12

Author: akhaldi Date: Fri Sep 21 14:35:19 2012 New Revision: 57357 URL: http://svn.reactos.org/svn/reactos?rev=57357&view=rev Log: * Exclude host tools when setting the default build type. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/config.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=57357&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Fri Sep 21 14:35:19 2012 @@ -90,6 +90,10 @@ set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF) set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF) endif() + + # Default to Debug for the build type + set(CMAKE_BUILD_TYPE "Debug" CACHE STRING +"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) # Do some cleanup file(REMOVE Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=573… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Fri Sep 21 14:35:19 2012 @@ -52,9 +52,6 @@ "Whether to compile with the KD protocol.") endif() -set(CMAKE_BUILD_TYPE "Debug" CACHE STRING -"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) - set(_ELF_ FALSE CACHE BOOL "Whether to compile support for ELF files. Do not enable unless you know what you're doing.")

1 0

[akhaldi] 57356: * Make CMAKE_BUILD_TYPE default to Debug for all our builds.
by akhaldi＠svn.reactos.org 21 Sep '12

21 Sep '12

Author: akhaldi Date: Fri Sep 21 14:29:02 2012 New Revision: 57356 URL: http://svn.reactos.org/svn/reactos?rev=57356&view=rev Log: * Make CMAKE_BUILD_TYPE default to Debug for all our builds. Modified: trunk/reactos/cmake/config.cmake Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=573… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Fri Sep 21 14:29:02 2012 @@ -52,6 +52,9 @@ "Whether to compile with the KD protocol.") endif() +set(CMAKE_BUILD_TYPE "Debug" CACHE STRING +"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) + set(_ELF_ FALSE CACHE BOOL "Whether to compile support for ELF files. Do not enable unless you know what you're doing.")

1 0

[tfaber] 57355: [RTL] - Separate condition calculation in RtlVerifyVersionInfo into an extra function. Patch by Hermès Bélusca (2/X) - Don't make the Hungarian more ridiculous than it needs to be C...
by tfaber＠svn.reactos.org 20 Sep '12

20 Sep '12

Author: tfaber Date: Thu Sep 20 20:46:08 2012 New Revision: 57355 URL: http://svn.reactos.org/svn/reactos?rev=57355&view=rev Log: [RTL] - Separate condition calculation in RtlVerifyVersionInfo into an extra function. Patch by Hermès Bélusca (2/X) - Don't make the Hungarian more ridiculous than it needs to be CORE-6611 Modified: trunk/reactos/lib/rtl/version.c Modified: trunk/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/version.c?rev=5735… ============================================================================== --- trunk/reactos/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/version.c [iso-8859-1] Thu Sep 20 20:46:08 2012 @@ -3,7 +3,8 @@ * PROJECT: ReactOS system libraries * PURPOSE: Runtime code * FILE: lib/rtl/version.c - * PROGRAMER: Filip Navara + * PROGRAMERS: Filip Navara + * Hermes BELUSCA - MAITO */ /* INCLUDES *****************************************************************/ @@ -22,6 +23,10 @@ ); /* FUNCTIONS ****************************************************************/ + +static BYTE +RtlpVerGetCondition(IN ULONGLONG dwlConditionMask, + IN DWORD dwTypeBitMask); static BOOLEAN RtlpVerCompare(ULONG left, ULONG right, UCHAR condition) @@ -67,7 +72,7 @@ */ ver.dwOSVersionInfoSize = sizeof(ver); - status = RtlGetVersion( (PRTL_OSVERSIONINFOW)&ver ); + status = RtlGetVersion((PRTL_OSVERSIONINFOW)&ver); if (status != STATUS_SUCCESS) return status; if (!TypeMask || !ConditionMask) return STATUS_INVALID_PARAMETER; @@ -76,14 +81,14 @@ { comparison = RtlpVerCompare(ver.wProductType, VersionInfo->wProductType, - ConditionMask >> 7 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + RtlpVerGetCondition(ConditionMask, VER_PRODUCT_TYPE)); if (!comparison) return STATUS_REVISION_MISMATCH; } if (TypeMask & VER_SUITENAME) { - switch (ConditionMask >> 6 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK) + switch (RtlpVerGetCondition(ConditionMask, VER_SUITENAME)) { case VER_AND: if ((VersionInfo->wSuiteMask & ver.wSuiteMask) != VersionInfo->wSuiteMask) @@ -106,7 +111,7 @@ { comparison = RtlpVerCompare(ver.dwPlatformId, VersionInfo->dwPlatformId, - ConditionMask >> 3 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + RtlpVerGetCondition(ConditionMask, VER_PLATFORMID)); if (!comparison) return STATUS_REVISION_MISMATCH; } @@ -115,24 +120,21 @@ { comparison = RtlpVerCompare(ver.dwBuildNumber, VersionInfo->dwBuildNumber, - ConditionMask >> 2 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); - if (!comparison) - return STATUS_REVISION_MISMATCH; - } - - if (TypeMask & (VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR)) - { - UCHAR condition = 0; + RtlpVerGetCondition(ConditionMask, VER_BUILDNUMBER)); + if (!comparison) + return STATUS_REVISION_MISMATCH; + } + + TypeMask &= VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR; + if (TypeMask) + { BOOLEAN do_next_check = TRUE; - - if (TypeMask & VER_MAJORVERSION) - condition = ConditionMask >> 1 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if (TypeMask & VER_MINORVERSION) - condition = ConditionMask >> 0 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if (TypeMask & VER_SERVICEPACKMAJOR) - condition = ConditionMask >> 5 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if (TypeMask & VER_SERVICEPACKMINOR) - condition = ConditionMask >> 4 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; + /* + * Select the leading comparison operator (for example, the comparison + * operator for VER_MAJORVERSION supersedes the others for VER_MINORVERSION, + * VER_SERVICEPACKMAJOR and VER_SERVICEPACKMINOR). + */ + BYTE condition = RtlpVerGetCondition(ConditionMask, TypeMask); comparison = TRUE; if (TypeMask & VER_MAJORVERSION) @@ -171,6 +173,40 @@ } return STATUS_SUCCESS; +} + +static BYTE +RtlpVerGetCondition(IN ULONGLONG dwlConditionMask, + IN DWORD dwTypeBitMask) +{ + BYTE bConditionMask = 0; + + if (dwTypeBitMask & VER_PRODUCT_TYPE) + bConditionMask |= dwlConditionMask >> 7 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_SUITENAME) + bConditionMask |= dwlConditionMask >> 6 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_PLATFORMID) + bConditionMask |= dwlConditionMask >> 3 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_BUILDNUMBER) + bConditionMask |= dwlConditionMask >> 2 * VER_NUM_BITS_PER_CONDITION_MASK; + /* + * We choose here the lexicographical order on the 4D space + * {(Major ; Minor ; SP Major ; SP Minor)} to select the + * appropriate comparison operator. + * Therefore the following 'else if' instructions must be in this order. + */ + else if (dwTypeBitMask & VER_MAJORVERSION) + bConditionMask |= dwlConditionMask >> 1 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_MINORVERSION) + bConditionMask |= dwlConditionMask >> 0 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_SERVICEPACKMAJOR) + bConditionMask |= dwlConditionMask >> 5 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_SERVICEPACKMINOR) + bConditionMask |= dwlConditionMask >> 4 * VER_NUM_BITS_PER_CONDITION_MASK; + + bConditionMask &= VER_CONDITION_MASK; + + return bConditionMask; } /* @@ -180,32 +216,32 @@ NTAPI VerSetConditionMask(IN ULONGLONG dwlConditionMask, IN DWORD dwTypeBitMask, - IN BYTE dwConditionMask) + IN BYTE bConditionMask) { if (dwTypeBitMask == 0) return dwlConditionMask; - dwConditionMask &= VER_CONDITION_MASK; - - if (dwConditionMask == 0) + bConditionMask &= VER_CONDITION_MASK; + + if (bConditionMask == 0) return dwlConditionMask; if (dwTypeBitMask & VER_PRODUCT_TYPE) - dwlConditionMask |= dwConditionMask << 7 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 7 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_SUITENAME) - dwlConditionMask |= dwConditionMask << 6 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 6 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_SERVICEPACKMAJOR) - dwlConditionMask |= dwConditionMask << 5 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 5 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_SERVICEPACKMINOR) - dwlConditionMask |= dwConditionMask << 4 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 4 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_PLATFORMID) - dwlConditionMask |= dwConditionMask << 3 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 3 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_BUILDNUMBER) - dwlConditionMask |= dwConditionMask << 2 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 2 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_MAJORVERSION) - dwlConditionMask |= dwConditionMask << 1 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 1 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_MINORVERSION) - dwlConditionMask |= dwConditionMask << 0 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 0 * VER_NUM_BITS_PER_CONDITION_MASK; return dwlConditionMask; }

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