Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 28872: Duplicate widl tool to widl_new
by hpoussin＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: hpoussin Date: Wed Sep 5 15:11:31 2007 New Revision: 28872 URL: http://svn.reactos.org/svn/reactos?rev=28872&view=rev Log: Duplicate widl tool to widl_new Added: trunk/reactos/tools/widl_new/ - copied from r28869, trunk/reactos/tools/widl/ trunk/reactos/tools/widl_new/widl.mak - copied unchanged from r28870, trunk/reactos/tools/widl/widl.mak

1 0

[gedmurphy] 28871: sync rpcrt4_new to Wine 0.9.44
by gedmurphy＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: gedmurphy Date: Wed Sep 5 14:21:30 2007 New Revision: 28871 URL: http://svn.reactos.org/svn/reactos?rev=28871&view=rev Log: sync rpcrt4_new to Wine 0.9.44 Modified: trunk/reactos/dll/win32/rpcrt4_new/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.c trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.h trunk/reactos/dll/win32/rpcrt4_new/rpc_defs.h trunk/reactos/dll/win32/rpcrt4_new/rpc_message.c trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c Modified: trunk/reactos/dll/win32/rpcrt4_new/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/ndr_m… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/ndr_marshall.c Wed Sep 5 14:21:30 2007 @@ -21,7 +21,6 @@ * TODO: * - Non-conformant strings * - String structs - * - Encapsulated unions * - Byte count pointers * - transmit_as/represent as * - Multi-dimensional arrays @@ -351,6 +350,8 @@ static PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { ALIGN_POINTER(pStubMsg->Buffer, 4); + if (pStubMsg->Buffer + 4 > pStubMsg->BufferEnd) + RpcRaiseException(RPC_X_BAD_STUB_DATA); pStubMsg->MaxCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->Buffer += 4; TRACE("unmarshalled conformance is %ld\n", pStubMsg->MaxCount); @@ -370,6 +371,8 @@ } ALIGN_POINTER(pStubMsg->Buffer, 4); + if (pStubMsg->Buffer + 8 > pStubMsg->BufferEnd) + RpcRaiseException(RPC_X_BAD_STUB_DATA); pStubMsg->Offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->Buffer += 4; TRACE("offset is %d\n", pStubMsg->Offset); @@ -571,6 +574,24 @@ return ret; } +static inline void safe_buffer_increment(MIDL_STUB_MESSAGE *pStubMsg, ULONG size) +{ + if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ + (pStubMsg->Buffer + size > pStubMsg->BufferEnd)) + RpcRaiseException(RPC_X_BAD_STUB_DATA); + pStubMsg->Buffer += size; +} + +/* copies data from the buffer, checking that there is enough data in the buffer + * to do so */ +static inline void safe_buffer_copy(MIDL_STUB_MESSAGE *pStubMsg, void *p, ULONG size) +{ + if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ + (pStubMsg->Buffer + size > pStubMsg->BufferEnd)) + RpcRaiseException(RPC_X_BAD_STUB_DATA); + memcpy(p, pStubMsg->Buffer, size); + pStubMsg->Buffer += size; +} /* * NdrConformantString: @@ -735,6 +756,17 @@ RpcRaiseException(RPC_S_INVALID_BOUND); return NULL; } + + /* verify the buffer is safe to access */ + if ((pStubMsg->Buffer + bufsize < pStubMsg->Buffer) || + (pStubMsg->Buffer + bufsize > pStubMsg->BufferEnd)) + { + ERR("bufsize 0x%x exceeded buffer end %p of buffer %p\n", bufsize, + pStubMsg->BufferEnd, pStubMsg->Buffer); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + return NULL; + } + for (i = bufsize - esize; i < bufsize; i++) if (pStubMsg->Buffer[i] != 0) { @@ -747,9 +779,7 @@ if (fMustAlloc || !*ppMemory) *ppMemory = NdrAllocate(pStubMsg, memsize); - memcpy(*ppMemory, pStubMsg->Buffer, bufsize); - - pStubMsg->Buffer += bufsize; + safe_buffer_copy(pStubMsg, *ppMemory, bufsize); if (*pFormat == RPC_FC_C_CSTRING) { TRACE("string=%s\n", debugstr_a((char*)*ppMemory)); @@ -1539,7 +1569,7 @@ { ALIGN_POINTER(pStubMsg->Buffer, 4); Buffer = pStubMsg->Buffer; - pStubMsg->Buffer += 4; + safe_buffer_increment(pStubMsg, 4); } else Buffer = pStubMsg->Buffer; @@ -1718,7 +1748,7 @@ } -static unsigned long EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned long EmbeddedComplexSize(const MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { switch (*pFormat) { @@ -1894,31 +1924,27 @@ case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - memcpy(pMemory, pStubMsg->Buffer, 1); + safe_buffer_copy(pStubMsg, pMemory, 1); TRACE("byte=%d => %p\n", *(WORD*)pMemory, pMemory); - pStubMsg->Buffer += 1; pMemory += 1; break; case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: - memcpy(pMemory, pStubMsg->Buffer, 2); + safe_buffer_copy(pStubMsg, pMemory, 2); TRACE("short=%d => %p\n", *(WORD*)pMemory, pMemory); - pStubMsg->Buffer += 2; pMemory += 2; break; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: - memcpy(pMemory, pStubMsg->Buffer, 4); + safe_buffer_copy(pStubMsg, pMemory, 4); TRACE("long=%d => %p\n", *(DWORD*)pMemory, pMemory); - pStubMsg->Buffer += 4; pMemory += 4; break; case RPC_FC_HYPER: - memcpy(pMemory, pStubMsg->Buffer, 8); + safe_buffer_copy(pStubMsg, pMemory, 8); TRACE("longlong=%s => %p\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory), pMemory); - pStubMsg->Buffer += 8; pMemory += 8; break; case RPC_FC_POINTER: @@ -2547,10 +2573,8 @@ ALIGN_POINTER(pStubMsg->Buffer, alignment); - memcpy(*ppMemory, pStubMsg->Buffer, size); - pStubMsg->BufferMark = pStubMsg->Buffer; - pStubMsg->Buffer += size; + safe_buffer_copy(pStubMsg, *ppMemory, size); EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2697,8 +2721,7 @@ if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, memsize); - memcpy(*ppMemory + pStubMsg->Offset, pStubMsg->Buffer, bufsize); - pStubMsg->Buffer += bufsize; + safe_buffer_copy(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -3086,7 +3109,7 @@ pMemory = ComplexFree(pStubMsg, pMemory, pFormat, NULL); } -static ULONG UserMarshalFlags(PMIDL_STUB_MESSAGE pStubMsg) +static ULONG UserMarshalFlags(const MIDL_STUB_MESSAGE *pStubMsg) { return MAKELONG(pStubMsg->dwDestContext, pStubMsg->RpcMsg->DataRepresentation); @@ -3436,8 +3459,7 @@ /* now copy the data */ pStubMsg->BufferMark = pStubMsg->Buffer; - memcpy(*ppMemory, pStubMsg->Buffer, pCStructFormat->memory_size + bufsize); - pStubMsg->Buffer += pCStructFormat->memory_size + bufsize; + safe_buffer_copy(pStubMsg, *ppMemory, pCStructFormat->memory_size + bufsize); if (pCStructFormat->type == RPC_FC_CPSTRUCT) EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -3659,8 +3681,7 @@ /* copy the constant data */ pStubMsg->BufferMark = pStubMsg->Buffer; - memcpy(*ppMemory, pStubMsg->Buffer, pCVStructFormat->memory_size); - pStubMsg->Buffer += pCVStructFormat->memory_size; + safe_buffer_copy(pStubMsg, *ppMemory, pCVStructFormat->memory_size); pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat, pStubMsg->MaxCount); @@ -3688,9 +3709,7 @@ } /* copy the array data */ - memcpy(*ppMemory + pCVStructFormat->memory_size, pStubMsg->Buffer, - bufsize); - pStubMsg->Buffer += bufsize; + safe_buffer_copy(pStubMsg, *ppMemory + pCVStructFormat->memory_size, bufsize); if (cvarray_type == RPC_FC_C_CSTRING) TRACE("string=%s\n", debugstr_a((char *)(*ppMemory + pCVStructFormat->memory_size))); @@ -3999,9 +4018,8 @@ if (fMustAlloc || !*ppMemory) *ppMemory = NdrAllocate(pStubMsg, total_size); - memcpy(*ppMemory, pStubMsg->Buffer, total_size); pStubMsg->BufferMark = pStubMsg->Buffer; - pStubMsg->Buffer += total_size; + safe_buffer_copy(pStubMsg, *ppMemory, total_size); pFormat = EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -4234,8 +4252,7 @@ if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); - memcpy(*ppMemory + pStubMsg->Offset, pStubMsg->Buffer, bufsize); - pStubMsg->Buffer += bufsize; + safe_buffer_copy(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -4402,7 +4419,7 @@ EmbeddedPointerFree(pStubMsg, pMemory, pFormat); } -static ULONG get_discriminant(unsigned char fc, unsigned char *pMemory) +static ULONG get_discriminant(unsigned char fc, const unsigned char *pMemory) { switch (fc) { @@ -4410,16 +4427,16 @@ case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - return *(UCHAR *)pMemory; + return *(const UCHAR *)pMemory; case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: case RPC_FC_ENUM16: - return *(USHORT *)pMemory; + return *(const USHORT *)pMemory; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: - return *(ULONG *)pMemory; + return *(const ULONG *)pMemory; default: FIXME("Unhandled base type: 0x%02x\n", fc); return 0; @@ -4539,7 +4556,7 @@ if((type & 0xff00) == 0x8000) { unsigned char basetype = LOBYTE(type); - return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, fMustAlloc); + return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, FALSE); } else { @@ -4566,6 +4583,9 @@ } else pStubMsg->Buffer += 4; /* for pointer ID */ + + if (saved_buffer + 4 > pStubMsg->BufferEnd) + RpcRaiseException(RPC_X_BAD_STUB_DATA); PointerUnmarshall(pStubMsg, saved_buffer, *(unsigned char ***)ppMemory, desc, fMustAlloc); if (pointer_buffer_mark_set) @@ -4900,22 +4920,31 @@ case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - discriminant = *(UCHAR *)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(UCHAR); + { + UCHAR d; + safe_buffer_copy(pStubMsg, &d, sizeof(d)); + discriminant = d; break; + } case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + { + USHORT d; ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); - discriminant = *(USHORT *)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(USHORT); + safe_buffer_copy(pStubMsg, &d, sizeof(d)); + discriminant = d; break; + } case RPC_FC_LONG: case RPC_FC_ULONG: + { + ULONG d; ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG)); - discriminant = *(ULONG *)pStubMsg->Buffer; - pStubMsg->Buffer += sizeof(ULONG); + safe_buffer_copy(pStubMsg, &d, sizeof(d)); + discriminant = d; break; + } default: FIXME("Unhandled base type: 0x%02x\n", **ppFormat); } @@ -5354,7 +5383,7 @@ break; case RPC_FC_ENUM16: /* only 16-bits on the wire, so do a sanity check */ - if (*(UINT *)pMemory > USHRT_MAX) + if (*(UINT *)pMemory > SHRT_MAX) RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); *(USHORT *)pStubMsg->Buffer = *(UINT *)pMemory; @@ -5655,6 +5684,9 @@ ALIGN_POINTER(pStubMsg->Buffer, 4); + if (pStubMsg->Buffer + cbNDRContext > pStubMsg->BufferEnd) + RpcRaiseException(RPC_X_BAD_STUB_DATA); + NDRCContextUnmarshall(pContextHandle, BindHandle, pStubMsg->Buffer, @@ -5741,7 +5773,7 @@ return che; } -static struct context_handle_entry *context_entry_from_guid(LPGUID uuid) +static struct context_handle_entry *context_entry_from_guid(LPCGUID uuid) { struct context_handle_entry *che; LIST_FOR_EACH_ENTRY(che, &context_handle_list, struct context_handle_entry, entry) @@ -5791,7 +5823,7 @@ static UINT ndr_update_context_handle(NDR_CCONTEXT *CContext, RPC_BINDING_HANDLE hBinding, - ndr_context_handle *chi) + const ndr_context_handle *chi) { struct context_handle_entry *che = NULL; Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_b… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.c Wed Sep 5 14:21:30 2007 @@ -274,8 +274,8 @@ } RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, - PRPC_SYNTAX_IDENTIFIER TransferSyntax, - PRPC_SYNTAX_IDENTIFIER InterfaceId) + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, + const RPC_SYNTAX_IDENTIFIER *InterfaceId) { TRACE("(Binding == ^%p)\n", Binding); Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_b… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.h (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.h Wed Sep 5 14:21:30 2007 @@ -161,13 +161,14 @@ RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection); RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding); RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding); -RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, PRPC_SYNTAX_IDENTIFIER TransferSyntax, PRPC_SYNTAX_IDENTIFIER InterfaceId); +RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId); RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection); BOOL RPCRT4_RPCSSOnDemandCall(PRPCSS_NP_MESSAGE msg, char *vardata_payload, PRPCSS_NP_REPLY reply); HANDLE RPCRT4_GetMasterMutex(void); HANDLE RPCRT4_RpcssNPConnect(void); -static inline const char *rpcrt4_conn_get_name(RpcConnection *Connection) +static inline const char *rpcrt4_conn_get_name(const RpcConnection *Connection) { return Connection->ops->name; } Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_d… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_defs.h (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_defs.h Wed Sep 5 14:21:30 2007 @@ -177,9 +177,25 @@ #define PKT_CO_CANCEL 18 #define PKT_ORPHANED 19 -#define RESULT_ACCEPT 0 - -#define NO_REASON 0 +#define RESULT_ACCEPT 0 +#define RESULT_USER_REJECTION 1 +#define RESULT_PROVIDER_REJECTION 2 + +#define REASON_NONE 0 +#define REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED 1 +#define REASON_TRANSFER_SYNTAXES_NOT_SUPPORTED 2 +#define REASON_LOCAL_LIMIT_EXCEEDED 3 + +#define REJECT_REASON_NOT_SPECIFIED 0 +#define REJECT_TEMPORARY_CONGESTION 1 +#define REJECT_LOCAL_LIMIT_EXCEEDED 2 +#define REJECT_CALLED_PADDR_UNKNOWN 3 /* not used */ +#define REJECT_PROTOCOL_VERSION_NOT_SUPPORTED 4 +#define REJECT_DEFAULT_CONTEXT_NOT_SUPPORTED 5 /* not used */ +#define REJECT_USER_DATA_NOT_READABLE 6 /* not used */ +#define REJECT_NO_PSAP_AVAILABLE 7 /* not used */ +#define REJECT_UNKNOWN_AUTHN_SERVICE 8 +#define REJECT_INVALID_CHECKSUM 9 #define NCADG_IP_UDP 0x08 #define NCACN_IP_TCP 0x07 Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_m… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_message.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_message.c Wed Sep 5 14:21:30 2007 @@ -230,6 +230,7 @@ RPCRT4_BuildCommonHeader(header, PKT_BIND_NACK, DataRepresentation); header->common.frag_len = sizeof(header->bind_nack); + header->bind_nack.reject_reason = REJECT_REASON_NOT_SPECIFIED; header->bind_nack.protocols_count = 1; header->bind_nack.protocols[0].rpc_ver = RpcVersion; header->bind_nack.protocols[0].rpc_ver_minor = RpcVersionMinor; @@ -301,6 +302,12 @@ case RPC_S_INVALID_BOUND: return NCA_S_FAULT_INVALID_BOUND; case RPC_S_PROCNUM_OUT_OF_RANGE: return NCA_S_OP_RNG_ERROR; case RPC_X_SS_HANDLES_MISMATCH: return NCA_S_FAULT_CONTEXT_MISMATCH; + case RPC_S_CALL_CANCELLED: return NCA_S_FAULT_CANCEL; + case RPC_S_COMM_FAILURE: return NCA_S_COMM_FAILURE; + case RPC_X_WRONG_PIPE_ORDER: return NCA_S_FAULT_PIPE_ORDER; + case RPC_X_PIPE_CLOSED: return NCA_S_FAULT_PIPE_CLOSED; + case RPC_X_PIPE_DISCIPLINE_ERROR: return NCA_S_FAULT_PIPE_DISCIPLINE; + case RPC_X_PIPE_EMPTY: return NCA_S_FAULT_PIPE_EMPTY; case STATUS_FLOAT_DIVIDE_BY_ZERO: return NCA_S_FAULT_FP_DIV_ZERO; case STATUS_FLOAT_INVALID_OPERATION: return NCA_S_FAULT_FP_ERROR; case STATUS_FLOAT_OVERFLOW: return NCA_S_FAULT_FP_OVERFLOW; @@ -433,7 +440,7 @@ */ static RPC_STATUS RPCRT4_SendAuth(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength, - void *Auth, unsigned int AuthLength) + const void *Auth, unsigned int AuthLength) { PUCHAR buffer_pos; DWORD hdr_size; @@ -1013,6 +1020,7 @@ case RPC_S_PROTOCOL_ERROR: case RPC_S_CALL_FAILED: case RPC_S_CALL_FAILED_DNE: + case RPC_S_SEC_PKG_ERROR: return TRUE; default: return FALSE; Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_s… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c Wed Sep 5 14:21:30 2007 @@ -119,7 +119,7 @@ } static RpcServerInterface* RPCRT4_find_interface(UUID* object, - RPC_SYNTAX_IDENTIFIER* if_id, + const RPC_SYNTAX_IDENTIFIER* if_id, BOOL check_object) { UUID* MgrType = NULL; @@ -198,7 +198,7 @@ RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, conn->Endpoint, - RESULT_ACCEPT, NO_REASON, + RESULT_ACCEPT, REASON_NONE, &sif->If->TransferSyntax); /* save the interface for later use */ Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_t… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c Wed Sep 5 14:21:30 2007 @@ -1211,7 +1211,7 @@ if (!poll_info) return -1; - + ret = poll(poll_info, count, -1); if (ret < 0) { @@ -1484,7 +1484,9 @@ return refs; } -static RPC_STATUS RpcAssoc_BindConnection(RpcAssoc *assoc, RpcConnection *conn, +#define ROUND_UP(value, alignment) (((value) + ((alignment) - 1)) & ~((alignment)-1)) + +static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection *conn, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax) { @@ -1512,23 +1514,98 @@ return status; } - if (response_hdr->common.ptype != PKT_BIND_ACK) + switch (response_hdr->common.ptype) { - ERR("failed to bind for interface %s, %d.%d\n", - debugstr_guid(&InterfaceId->SyntaxGUID), - InterfaceId->SyntaxVersion.MajorVersion, - InterfaceId->SyntaxVersion.MinorVersion); - RPCRT4_FreeHeader(response_hdr); - return RPC_S_PROTOCOL_ERROR; - } - - /* FIXME: do more checks? */ - - conn->assoc_group_id = response_hdr->bind_ack.assoc_gid; - conn->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; - conn->ActiveInterface = *InterfaceId; + case PKT_BIND_ACK: + { + RpcAddressString *server_address = msg.Buffer; + if ((msg.BufferLength >= FIELD_OFFSET(RpcAddressString, string[0])) || + (msg.BufferLength >= ROUND_UP(FIELD_OFFSET(RpcAddressString, string[server_address->length]), 4))) + { + unsigned short remaining = msg.BufferLength - + ROUND_UP(FIELD_OFFSET(RpcAddressString, string[server_address->length]), 4); + RpcResults *results = (RpcResults*)((ULONG_PTR)server_address + + ROUND_UP(FIELD_OFFSET(RpcAddressString, string[server_address->length]), 4)); + if ((results->num_results == 1) && (remaining >= sizeof(*results))) + { + switch (results->results[0].result) + { + case RESULT_ACCEPT: + conn->assoc_group_id = response_hdr->bind_ack.assoc_gid; + conn->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; + conn->ActiveInterface = *InterfaceId; + break; + case RESULT_PROVIDER_REJECTION: + switch (results->results[0].reason) + { + case REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED: + ERR("syntax %s, %d.%d not supported\n", + debugstr_guid(&InterfaceId->SyntaxGUID), + InterfaceId->SyntaxVersion.MajorVersion, + InterfaceId->SyntaxVersion.MinorVersion); + status = RPC_S_UNKNOWN_IF; + break; + case REASON_TRANSFER_SYNTAXES_NOT_SUPPORTED: + ERR("transfer syntax not supported\n"); + status = RPC_S_SERVER_UNAVAILABLE; + break; + case REASON_NONE: + default: + status = RPC_S_CALL_FAILED_DNE; + } + break; + case RESULT_USER_REJECTION: + default: + ERR("rejection result %d\n", results->results[0].result); + status = RPC_S_CALL_FAILED_DNE; + } + } + else + { + ERR("incorrect results size\n"); + status = RPC_S_CALL_FAILED_DNE; + } + } + else + { + ERR("bind ack packet too small (%d)\n", msg.BufferLength); + status = RPC_S_PROTOCOL_ERROR; + } + break; + } + case PKT_BIND_NACK: + switch (response_hdr->bind_nack.reject_reason) + { + case REJECT_LOCAL_LIMIT_EXCEEDED: + case REJECT_TEMPORARY_CONGESTION: + ERR("server too busy\n"); + status = RPC_S_SERVER_TOO_BUSY; + break; + case REJECT_PROTOCOL_VERSION_NOT_SUPPORTED: + ERR("protocol version not supported\n"); + status = RPC_S_PROTOCOL_ERROR; + break; + case REJECT_UNKNOWN_AUTHN_SERVICE: + ERR("unknown authentication service\n"); + status = RPC_S_UNKNOWN_AUTHN_SERVICE; + break; + case REJECT_INVALID_CHECKSUM: + ERR("invalid checksum\n"); + status = ERROR_ACCESS_DENIED; + break; + default: + ERR("rejected bind for reason %d\n", response_hdr->bind_nack.reject_reason); + status = RPC_S_CALL_FAILED_DNE; + } + break; + default: + ERR("wrong packet type received %d\n", response_hdr->common.ptype); + status = RPC_S_PROTOCOL_ERROR; + break; + } + RPCRT4_FreeHeader(response_hdr); - return RPC_S_OK; + return status; } static RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc,

1 0

[hpoussin] 28870: Finally let Wine package version depend of ReactOS version
by hpoussin＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: hpoussin Date: Wed Sep 5 13:27:40 2007 New Revision: 28870 URL: http://svn.reactos.org/svn/reactos?rev=28870&view=rev Log: Finally let Wine package version depend of ReactOS version Modified: trunk/reactos/include/reactos/wine/config.h trunk/reactos/tools/widl/widl.mak Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h (original) +++ trunk/reactos/include/reactos/wine/config.h Wed Sep 5 13:27:40 2007 @@ -1,5 +1,7 @@ /* include/config.h. Generated by configure. */ /* include/config.h.in. Generated from configure.ac by autoheader. */ + +#include "reactos/buildno.h" #define __WINE_CONFIG_H @@ -878,14 +880,14 @@ /* Define to the full name of this package. */ #define PACKAGE_NAME "ReactOS" -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ReactOS 0.3.0" - /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ReactOS" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.3.0" +#define PACKAGE_VERSION KERNEL_VERSION_STR + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION /* Define to the soname of the libcapi20 library. */ /* #undef SONAME_LIBCAPI20 */ Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=28… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Wed Sep 5 13:27:40 2007 @@ -59,7 +59,8 @@ WIDL_HOST_CFLAGS = $(TOOLS_CFLAGS) \ -DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 -D__REACTOS__=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -I$(INTERMEDIATE_)include WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[hpoussin] 28869: Let tools including the version number depend of buildno.h Remove useless tool tools-check (replaced by a rbuild check) Add .phony targets for gendib and nci
by hpoussin＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: hpoussin Date: Wed Sep 5 13:22:14 2007 New Revision: 28869 URL: http://svn.reactos.org/svn/reactos?rev=28869&view=rev Log: Let tools including the version number depend of buildno.h Remove useless tool tools-check (replaced by a rbuild check) Add .phony targets for gendib and nci Removed: trunk/reactos/tools/tools-check.c trunk/reactos/tools/tools-check.mak Modified: trunk/reactos/tools/bin2res/bin2res.mak trunk/reactos/tools/gendib/gendib.mak trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wpp/wpp.mak trunk/reactos/tools/wrc/wrc.mak Modified: trunk/reactos/tools/bin2res/bin2res.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2res/bin2res.mak?… ============================================================================== --- trunk/reactos/tools/bin2res/bin2res.mak (original) +++ trunk/reactos/tools/bin2res/bin2res.mak Wed Sep 5 13:22:14 2007 @@ -18,6 +18,8 @@ BIN2RES_TARGET = \ $(EXEPREFIX)$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) +BIN2RES_DEPENDS = $(BUILDNO_H) + BIN2RES_SOURCES = $(addprefix $(BIN2RES_BASE_), \ bin2res.c \ mkstemps.c \ @@ -26,7 +28,7 @@ BIN2RES_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BIN2RES_SOURCES:.c=.o)) -BIN2RES_HOST_CFLAGS = -Iinclude/reactos/wine -D__REACTOS__ $(TOOLS_CFLAGS) +BIN2RES_HOST_CFLAGS = -Iinclude/reactos/wine -I$(INTERMEDIATE_)include -D__REACTOS__ $(TOOLS_CFLAGS) BIN2RES_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -34,11 +36,11 @@ $(ECHO_LD) ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $@ -$(BIN2RES_INT_)bin2res.o: $(BIN2RES_BASE_)bin2res.c | $(BIN2RES_INT) +$(BIN2RES_INT_)bin2res.o: $(BIN2RES_BASE_)bin2res.c $(BIN2RES_DEPENDS) | $(BIN2RES_INT) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ -$(BIN2RES_INT_)mkstemps.o: $(BIN2RES_BASE_)mkstemps.c | $(BIN2RES_INT) +$(BIN2RES_INT_)mkstemps.o: $(BIN2RES_BASE_)mkstemps.c $(BIN2RES_DEPENDS) | $(BIN2RES_INT) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/gendib/gendib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.mak?re… ============================================================================== --- trunk/reactos/tools/gendib/gendib.mak (original) +++ trunk/reactos/tools/gendib/gendib.mak Wed Sep 5 13:22:14 2007 @@ -36,6 +36,9 @@ $(ECHO_CC) ${host_gcc} $(GENDIB_HOST_CFLAGS) -c $< -o $@ +.PHONY: gendib +gendib: $(GENDIB_TARGET) + .PHONY: gendib_clean gendib_clean: -@$(rm) $(GENDIB_TARGET) $(GENDIB_OBJECTS) 2>$(NUL) Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2886… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Wed Sep 5 13:22:14 2007 @@ -35,6 +35,9 @@ $(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c | $(NCI_INT) $(ECHO_CC) ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ + +.PHONY: nci +nci: $(NCI_TARGET) .PHONY: nci_clean nci_clean: Removed: trunk/reactos/tools/tools-check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools-check.c?rev=28… ============================================================================== --- trunk/reactos/tools/tools-check.c (original) +++ trunk/reactos/tools/tools-check.c (removed) @@ -1,32 +1,0 @@ -#include "tools-check.h" - -/* - * - Binutils older than 2003/10/01 have broken windres which can't handle - * icons with alpha channel. - * - Binutils between 2004/09/02 and 2004/10/08 have broken handling of - * forward exports in dlltool. - */ - -#if (BINUTILS_VERSION_DATE >= 20040902 && BINUTILS_VERSION_DATE <= 20041008) || \ - (BINUTILS_VERSION_DATE < 20031001) -#error "Due to technical reasons your binutils version can't be used to" \ - "build ReactOS. Please consider upgrading to newer version. See" \ - "www.mingw.org for details." -#endif - -/* - * GCC 3.3.1 is lowest allowed version. Older versions have various problems - * with C++ code. - */ - -#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3) || \ - (__GNUC__ < 3) -#error "Due to technical reasons your GCC version can't be used to" \ - "build ReactOS. Please consider upgrading to newer version. See" \ - "www.mingw.org for details." -#endif - -/* - * FIXME: GCC 3.4.1 has broken headers which cause Explorer to not build. - * We should warn in this case...maybe add check for the broken headers? - */ Removed: trunk/reactos/tools/tools-check.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools-check.mak?rev=… ============================================================================== --- trunk/reactos/tools/tools-check.mak (original) +++ trunk/reactos/tools/tools-check.mak (removed) @@ -1,22 +1,0 @@ -PATH_TO_TOP = .. -include $(PATH_TO_TOP)/rules.mak - -# -# Get the binutils version -# -# The "ld -v" output can be in either of these two formats: -# "GNU ld version 050113 20050113" (nightly build) -# "GNU ld version 2.15.94 20050118" (official release) -# - -BINUTILS_VERSION_DATE=$(word 5,$(shell $(PREFIX)ld -v)) - -all: -ifeq ($(HOST_TYPE),unix) - @echo "#define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE)" > tools-check.h -else - @echo #define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE) > tools-check.h -endif - $(HOST_CC) -c tools-check.c -o tools-check.temp - $(RM) tools-check.temp - $(RM) tools-check.h Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=28… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Wed Sep 5 13:22:14 2007 @@ -35,6 +35,8 @@ WIDL_TARGET = \ $(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) +WIDL_DEPENDS = $(BUILDNO_H) + WIDL_SOURCES = $(addprefix $(WIDL_BASE_), \ client.c \ hash.c \ @@ -70,55 +72,55 @@ $(ECHO_LD) ${host_gcc} $(WIDL_OBJECTS) $(WIDL_LIBS) $(WIDL_HOST_LFLAGS) -o $@ -$(WIDL_INT_)client.o: $(WIDL_BASE_)client.c | $(WIDL_INT) +$(WIDL_INT_)client.o: $(WIDL_BASE_)client.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)hash.o: $(WIDL_BASE_)hash.c | $(WIDL_INT) +$(WIDL_INT_)hash.o: $(WIDL_BASE_)hash.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)header.o: $(WIDL_BASE_)header.c | $(WIDL_INT) +$(WIDL_INT_)header.o: $(WIDL_BASE_)header.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)lex.yy.o: $(WIDL_BASE_)lex.yy.c | $(WIDL_INT) +$(WIDL_INT_)lex.yy.o: $(WIDL_BASE_)lex.yy.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)proxy.o: $(WIDL_BASE_)proxy.c | $(WIDL_INT) +$(WIDL_INT_)proxy.o: $(WIDL_BASE_)proxy.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)server.o: $(WIDL_BASE_)server.c | $(WIDL_INT) +$(WIDL_INT_)server.o: $(WIDL_BASE_)server.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)typegen.o: $(WIDL_BASE_)typegen.c | $(WIDL_INT) +$(WIDL_INT_)typegen.o: $(WIDL_BASE_)typegen.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)typelib.o: $(WIDL_BASE_)typelib.c | $(WIDL_INT) +$(WIDL_INT_)typelib.o: $(WIDL_BASE_)typelib.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)utils.o: $(WIDL_BASE_)utils.c | $(WIDL_INT) +$(WIDL_INT_)utils.o: $(WIDL_BASE_)utils.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)widl.o: $(WIDL_BASE_)widl.c | $(WIDL_INT) +$(WIDL_INT_)widl.o: $(WIDL_BASE_)widl.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)write_msft.o: $(WIDL_BASE_)write_msft.c | $(WIDL_INT) +$(WIDL_INT_)write_msft.o: $(WIDL_BASE_)write_msft.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)parser.tab.o: $(WIDL_BASE_)parser.tab.c | $(WIDL_INT) +$(WIDL_INT_)parser.tab.o: $(WIDL_BASE_)parser.tab.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_PORT_INT_)mkstemps.o: $(WIDL_PORT_BASE_)mkstemps.c | $(WIDL_PORT_INT) +$(WIDL_PORT_INT_)mkstemps.o: $(WIDL_PORT_BASE_)mkstemps.c $(WIDL_DEPENDS) | $(WIDL_PORT_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/winebuild/winebuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… ============================================================================== --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak Wed Sep 5 13:22:14 2007 @@ -18,6 +18,8 @@ WINEBUILD_TARGET = \ $(EXEPREFIX)$(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) +WINEBUILD_DEPENDS = $(BUILDNO_H) + WINEBUILD_SOURCES = $(addprefix $(WINEBUILD_BASE_), \ import.c \ main.c \ @@ -32,7 +34,9 @@ WINEBUILD_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o)) -WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude/reactos/wine -Iinclude -Iinclude/reactos -Iinclude/psdk +WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API \ + -Iinclude/reactos/wine -Iinclude -Iinclude/reactos -Iinclude/psdk \ + -I$(INTERMEDIATE_)include WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -43,35 +47,35 @@ $(ECHO_LD) ${host_gcc} $(WINEBUILD_OBJECTS) $(WINEBUILD_HOST_LFLAGS) -o $@ -$(WINEBUILD_INT_)import.o: $(WINEBUILD_BASE_)import.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)import.o: $(WINEBUILD_BASE_)import.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)main.o: $(WINEBUILD_BASE_)main.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)main.o: $(WINEBUILD_BASE_)main.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)parser.o: $(WINEBUILD_BASE_)parser.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)parser.o: $(WINEBUILD_BASE_)parser.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)res16.o: $(WINEBUILD_BASE_)res16.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)res16.o: $(WINEBUILD_BASE_)res16.c $(WINEBUILD_DEPENDS | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)res32.o: $(WINEBUILD_BASE_)res32.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)res32.o: $(WINEBUILD_BASE_)res32.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)spec32.o: $(WINEBUILD_BASE_)spec32.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)spec32.o: $(WINEBUILD_BASE_)spec32.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)utils.o: $(WINEBUILD_BASE_)utils.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)utils.o: $(WINEBUILD_BASE_)utils.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)mkstemps.o: $(WINEBUILD_BASE_)mkstemps.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)mkstemps.o: $(WINEBUILD_BASE_)mkstemps.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/wmc/wmc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=2886… ============================================================================== --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak Wed Sep 5 13:22:14 2007 @@ -18,6 +18,8 @@ WMC_TARGET = \ $(EXEPREFIX)$(WMC_OUT_)wmc$(EXEPOSTFIX) +WMC_DEPENDS = $(BUILDNO_H) + WMC_SOURCES = $(addprefix $(WMC_BASE_), \ lang.c \ mcl.c \ @@ -32,7 +34,8 @@ WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= -I$(UNICODE_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -I$(INTERMEDIATE_)/include WMC_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -45,27 +48,27 @@ $(ECHO_LD) ${host_gcc} $(WMC_OBJECTS) $(WMC_LIBS) $(WMC_HOST_LFLAGS) -o $@ -$(WMC_INT_)lang.o: $(WMC_BASE_)lang.c | $(WMC_INT) +$(WMC_INT_)lang.o: $(WMC_BASE_)lang.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)mcl.o: $(WMC_BASE_)mcl.c | $(WMC_INT) +$(WMC_INT_)mcl.o: $(WMC_BASE_)mcl.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)utils.o: $(WMC_BASE_)utils.c | $(WMC_INT) +$(WMC_INT_)utils.o: $(WMC_BASE_)utils.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)wmc.o: $(WMC_BASE_)wmc.c | $(WMC_INT) +$(WMC_INT_)wmc.o: $(WMC_BASE_)wmc.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)write.o: $(WMC_BASE_)write.c | $(WMC_INT) +$(WMC_INT_)write.o: $(WMC_BASE_)write.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)mcy.tab.o: $(WMC_BASE_)mcy.tab.c | $(WMC_INT) +$(WMC_INT_)mcy.tab.o: $(WMC_BASE_)mcy.tab.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/wpp/wpp.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.mak?rev=2886… ============================================================================== --- trunk/reactos/tools/wpp/wpp.mak (original) +++ trunk/reactos/tools/wpp/wpp.mak Wed Sep 5 13:22:14 2007 @@ -18,6 +18,8 @@ WPP_TARGET = \ $(WPP_OUT_)libwpp.a +WPP_DEPENDS = $(BUILDNO_H) + WPP_SOURCES = $(addprefix $(WPP_BASE_), \ lex.yy.c \ preproc.c \ @@ -28,7 +30,7 @@ WPP_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WPP_SOURCES:.c=.o)) -WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk $(TOOLS_CFLAGS) +WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk -I$(INTERMEDIATE_)include $(TOOLS_CFLAGS) .PHONY: wpp wpp: $(WPP_TARGET) @@ -37,19 +39,19 @@ $(ECHO_AR) ${host_ar} -rc $(WPP_TARGET) $(WPP_OBJECTS) -$(WPP_INT_)lex.yy.o: $(WPP_BASE_)lex.yy.c | $(WPP_INT) +$(WPP_INT_)lex.yy.o: $(WPP_BASE_)lex.yy.c $(WPP_DEPENDS) | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(WPP_INT_)preproc.o: $(WPP_BASE_)preproc.c | $(WPP_INT) +$(WPP_INT_)preproc.o: $(WPP_BASE_)preproc.c $(WPP_DEPENDS) | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(WPP_INT_)wpp.o: $(WPP_BASE_)wpp.c | $(WPP_INT) +$(WPP_INT_)wpp.o: $(WPP_BASE_)wpp.c $(WPP_DEPENDS) | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(WPP_INT_)ppy.tab.o: $(WPP_BASE_)ppy.tab.c | $(WPP_INT) +$(WPP_INT_)ppy.tab.o: $(WPP_BASE_)ppy.tab.c $(WPP_DEPENDS) | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=2886… ============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Wed Sep 5 13:22:14 2007 @@ -35,6 +35,8 @@ WRC_TARGET = \ $(EXEPREFIX)$(WRC_OUT_)wrc$(EXEPOSTFIX) +WRC_DEPENDS = $(BUILDNO_H) + WRC_SOURCES = $(addprefix $(WRC_BASE_), \ dumpres.c \ genres.c \ @@ -56,7 +58,8 @@ -D__USE_W32API -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ -I$(UNICODE_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -I$(INTERMEDIATE_)include WRC_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -69,47 +72,47 @@ $(ECHO_LD) ${host_gcc} $(WRC_OBJECTS) $(WRC_LIBS) $(WRC_HOST_LFLAGS) -o $@ -$(WRC_INT_)dumpres.o: $(WRC_BASE_)dumpres.c | $(WRC_INT) +$(WRC_INT_)dumpres.o: $(WRC_BASE_)dumpres.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)genres.o: $(WRC_BASE_)genres.c | $(WRC_INT) +$(WRC_INT_)genres.o: $(WRC_BASE_)genres.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)newstruc.o: $(WRC_BASE_)newstruc.c | $(WRC_INT) +$(WRC_INT_)newstruc.o: $(WRC_BASE_)newstruc.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)readres.o: $(WRC_BASE_)readres.c | $(WRC_INT) +$(WRC_INT_)readres.o: $(WRC_BASE_)readres.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)translation.o: $(WRC_BASE_)translation.c | $(WRC_INT) +$(WRC_INT_)translation.o: $(WRC_BASE_)translation.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)utils.o: $(WRC_BASE_)utils.c | $(WRC_INT) +$(WRC_INT_)utils.o: $(WRC_BASE_)utils.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)wrc.o: $(WRC_BASE_)wrc.c | $(WRC_INT) +$(WRC_INT_)wrc.o: $(WRC_BASE_)wrc.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)writeres.o: $(WRC_BASE_)writeres.c | $(WRC_INT) +$(WRC_INT_)writeres.o: $(WRC_BASE_)writeres.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)parser.tab.o: $(WRC_BASE_)parser.tab.c | $(WRC_INT) +$(WRC_INT_)parser.tab.o: $(WRC_BASE_)parser.tab.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)lex.yy.o: $(WRC_BASE_)lex.yy.c | $(WRC_INT) +$(WRC_INT_)lex.yy.o: $(WRC_BASE_)lex.yy.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_PORT_INT_)mkstemps.o: $(WRC_PORT_BASE_)mkstemps.c | $(WRC_PORT_INT) +$(WRC_PORT_INT_)mkstemps.o: $(WRC_PORT_BASE_)mkstemps.c $(WRC_DEPENDS) | $(WRC_PORT_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@

1 0

[fireball] 28868: - Fix a typo in the code (thanks to "zimme" for spotting).
by fireball＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: fireball Date: Wed Sep 5 12:20:03 2007 New Revision: 28868 URL: http://svn.reactos.org/svn/reactos?rev=28868&view=rev Log: - Fix a typo in the code (thanks to "zimme" for spotting). Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Wed Sep 5 12:20:03 2007 @@ -457,12 +457,12 @@ /* * Page two is reserved for the KUSER_SHARED_DATA */ - MmPageArray[1].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[1].Flags.Consumer = MC_NPPOOL; - MmPageArray[1].Flags.Zero = 0; - MmPageArray[1].ReferenceCount = 0; + MmPageArray[2].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[2].Flags.Consumer = MC_NPPOOL; + MmPageArray[2].Flags.Zero = 0; + MmPageArray[2].ReferenceCount = 0; InsertTailList(&BiosPageListHead, - &MmPageArray[1].ListEntry); + &MmPageArray[2].ListEntry); MmStats.NrReservedPages++; } /* Protect the Page Directory. This will be changed in r3 */

1 0

[fireball] 28867: - Apply 28852 changes to setupldr.c (fixes bootcd).
by fireball＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: fireball Date: Wed Sep 5 12:10:41 2007 New Revision: 28867 URL: http://svn.reactos.org/svn/reactos?rev=28867&view=rev Log: - Apply 28852 changes to setupldr.c (fixes bootcd). Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Wed Sep 5 12:10:41 2007 @@ -22,6 +22,9 @@ #include <freeldr.h> #include <debug.h> +extern ULONG PageDirectoryStart; +extern ULONG PageDirectoryEnd; + ROS_LOADER_PARAMETER_BLOCK LoaderBlock; char reactos_kernel_cmdline[255]; // Command line passed to kernel LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel @@ -175,6 +178,8 @@ /* Setup multiboot information structure */ LoaderBlock.CommandLine = reactos_kernel_cmdline; + LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t);

1 0

[janderwald] 28866: - no comment
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Wed Sep 5 03:47:16 2007 New Revision: 28866 URL: http://svn.reactos.org/svn/reactos?rev=28866&view=rev Log: - no comment Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Wed Sep 5 03:47:16 2007 @@ -80,7 +80,7 @@ return true; } #else - h_Pipe = open("PipeCmd.c_str()", O_RDONLY); + h_Pipe = open(PipeCmd.c_str(), O_RDONLY); if(INVALID_HANDLE_VALUE == h_Pipe) { cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << endl; Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Wed Sep 5 03:47:16 2007 @@ -34,9 +34,9 @@ ifeq ($(HOST),mingw32-linux) -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__LINUX__ +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__LINUX__ -Wall else -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$(INTERMEDIATE_)$(SEP)include$(SEP)psdk +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$(INTERMEDIATE_)$(SEP)include$(SEP)psdk -Wall endif SYSREGBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Wed Sep 5 03:47:16 2007 @@ -10,8 +10,8 @@ ; ; This variable sets the path to the emulator ; -;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe -ROS_EMU_PATH=/usr/bin/qemu +ROS_EMU_PATH=E:\reactos\qemu\qemu.exe +;ROS_EMU_PATH=/usr/bin/qemu ; ROS_HDD_IMAGE ;

1 0

[cwittich] 28865: fix linux build
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Wed Sep 5 02:51:21 2007 New Revision: 28865 URL: http://svn.reactos.org/svn/reactos?rev=28865&view=rev Log: fix linux build Modified: trunk/reactos/tools/sysreg/user_types.h Modified: trunk/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?… ============================================================================== --- trunk/reactos/tools/sysreg/user_types.h (original) +++ trunk/reactos/tools/sysreg/user_types.h Wed Sep 5 02:51:21 2007 @@ -18,6 +18,7 @@ #else #define TCHAR char #define tstrcpy strcpy + #define _tcstok strtok #define _tcschr strchr #define _tcscat strcat #define _tcscpy(str1, str2) strcpy(str1, str2)

1 0

[janderwald] 28864: - split boot cmd into tokens
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Wed Sep 5 02:44:01 2007 New Revision: 28864 URL: http://svn.reactos.org/svn/reactos?rev=28864&view=rev Log: - split boot cmd into tokens Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Sep 5 02:44:01 2007 @@ -76,10 +76,34 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::executeBootCmd() { - m_Pid = OsSupport::createProcess ((TCHAR*)m_BootCmd.c_str(), 0, NULL, false); + int numargs = 0; + char * args[128]; + char * pBuf; + char szBuffer[128]; + + pBuf = (char*)m_BootCmd.c_str (); + if (pBuf) + { + pBuf = strtok(pBuf, _T(" ")); + while(pBuf != NULL) + { + if (!numargs) + strcpy(szBuffer, pBuf); + + args[numargs] = pBuf; + numargs++; + pBuf = _tcstok(NULL, _T(" ")); + } + args[numargs++] = 0; + } + else + { + strcpy(szBuffer, pBuf); + } + m_Pid = OsSupport::createProcess (szBuffer, numargs-1, args, false); if (!m_Pid) { - cerr << "Error: failed to launch boot cmd" << m_BootCmd << endl; + cerr << "Error: failed to launch boot cmd " << m_BootCmd << endl; return false; }

1 0

[gedmurphy] 28863: remove 4bpp bitmaps, add 24bpps and clean them all up.
by gedmurphy＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: gedmurphy Date: Wed Sep 5 02:10:57 2007 New Revision: 28863 URL: http://svn.reactos.org/svn/reactos?rev=28863&view=rev Log: remove 4bpp bitmaps, add 24bpps and clean them all up. Modified: trunk/reactos/base/shell/explorer/res/restart.ico Modified: trunk/reactos/base/shell/explorer/res/restart.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/re… ============================================================================== Binary files - no diff available.

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