Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[dgorbachev] 42565: Add padding to ext2 superblock structure (to 512 bytes).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Aug 9 16:39:44 2009 New Revision: 42565 URL: http://svn.reactos.org/svn/reactos?rev=42565&view=rev Log: Add padding to ext2 superblock structure (to 512 bytes). Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h [iso-8859-1] Sun Aug 9 16:39:44 2009 @@ -104,6 +104,7 @@ char volume_name[16]; char last_mounted_on[64]; ULONG compression_info; + ULONG padding[77]; }; /* The ext2 blockgroup. */

15 years, 1 month

[cwittich] 42564: partial rpcrt4 sync to wine 1.1.27 (fixes ~180 rpcrt4 winetests)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 9 16:28:07 2009 New Revision: 42564 URL: http://svn.reactos.org/svn/reactos?rev=42564&view=rev Log: partial rpcrt4 sync to wine 1.1.27 (fixes ~180 rpcrt4 winetests) Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_es.c?… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] Sun Aug 9 16:28:07 2009 @@ -105,7 +105,7 @@ handle_t Handle, void *UserState, MIDL_ES_ALLOC AllocFn, MIDL_ES_WRITE WriteFn, MIDL_ES_READ ReadFn, MIDL_ES_CODE Operation) { - MIDL_ES_MESSAGE *pEsMsg = (MIDL_ES_MESSAGE *)Handle; + MIDL_ES_MESSAGE *pEsMsg = Handle; TRACE("(%p, %p, %p, %p, %p, %d)\n", Handle, UserState, AllocFn, WriteFn, ReadFn, Operation); @@ -324,7 +324,7 @@ { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; - MIDL_ES_MESSAGE *pEsMsg = (MIDL_ES_MESSAGE *)Handle; + MIDL_ES_MESSAGE *pEsMsg = Handle; /* size of stack */ unsigned short stack_size; /* header for procedure string */ Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Sun Aug 9 16:28:07 2009 @@ -102,9 +102,9 @@ } while(0) #define STD_OVERFLOW_CHECK(_Msg) do { \ - TRACE("buffer=%d/%d\n", _Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer, _Msg->BufferLength); \ + TRACE("buffer=%d/%d\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer), _Msg->BufferLength); \ if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ - ERR("buffer overflow %d bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)); \ + ERR("buffer overflow %d bytes\n", (ULONG)(_Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength))); \ } while (0) #define NDR_POINTER_ID_BASE 0x20000 @@ -998,9 +998,8 @@ /*********************************************************************** * PointerMemorySize [internal] */ -static unsigned long PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, - unsigned char *Buffer, - PFORMAT_STRING pFormat) +static ULONG PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *Buffer, PFORMAT_STRING pFormat) { unsigned type = pFormat[0], attr = pFormat[1]; PFORMAT_STRING desc; @@ -1043,6 +1042,8 @@ } if (attr & RPC_FC_P_DEREF) { + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void*)); + pStubMsg->MemorySize += sizeof(void*); TRACE("deref\n"); } @@ -1339,8 +1340,8 @@ /*********************************************************************** * EmbeddedPointerMemorySize [internal] */ -static unsigned long EmbeddedPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) +static ULONG EmbeddedPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) { unsigned char *Mark = pStubMsg->BufferMark; unsigned rep, count, stride; @@ -1500,18 +1501,28 @@ TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); - /* Increment the buffer here instead of in PointerUnmarshall, - * as that is used by embedded pointers which already handle the incrementing - * the buffer, and shouldn't read any additional pointer data from the - * buffer */ - if (*pFormat != RPC_FC_RP) - { + if (*pFormat == RPC_FC_RP) + { + Buffer = pStubMsg->Buffer; + /* Do the NULL ref pointer check here because embedded pointers can be + * NULL if the type the pointer is embedded in was allocated rather than + * being passed in by the client */ + if (pStubMsg->IsClient && !*ppMemory) + { + ERR("NULL ref pointer is not allowed\n"); + RpcRaiseException(RPC_X_NULL_REF_POINTER); + } + } + else + { + /* Increment the buffer here instead of in PointerUnmarshall, + * as that is used by embedded pointers which already handle the incrementing + * the buffer, and shouldn't read any additional pointer data from the + * buffer */ ALIGN_POINTER(pStubMsg->Buffer, 4); Buffer = pStubMsg->Buffer; safe_buffer_increment(pStubMsg, 4); } - else - Buffer = pStubMsg->Buffer; PointerUnmarshall(pStubMsg, Buffer, ppMemory, *ppMemory, pFormat, fMustAlloc); @@ -1545,10 +1556,14 @@ ULONG WINAPI NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - /* unsigned size = *(LPWORD)(pFormat+2); */ - FIXME("(%p,%p): stub\n", pStubMsg, pFormat); - PointerMemorySize(pStubMsg, pStubMsg->Buffer, pFormat); - return 0; + unsigned char *Buffer = pStubMsg->Buffer; + if (*pFormat != RPC_FC_RP) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + safe_buffer_increment(pStubMsg, 4); + } + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void *)); + return PointerMemorySize(pStubMsg, Buffer, pFormat); } /*********************************************************************** @@ -2559,8 +2574,8 @@ } NDR_RANGE; #include "poppack.h" -static unsigned long EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, - PFORMAT_STRING pFormat) +static ULONG EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, + PFORMAT_STRING pFormat) { switch (*pFormat) { case RPC_FC_STRUCT: @@ -2621,8 +2636,8 @@ } -static unsigned long EmbeddedComplexMemorySize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) +static ULONG EmbeddedComplexMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) { NDR_MEMORYSIZE m = NdrMemorySizer[*pFormat & NDR_TABLE_MASK]; @@ -2643,7 +2658,7 @@ { PFORMAT_STRING desc; NDR_MARSHALL m; - unsigned long size; + ULONG size; while (*pFormat != RPC_FC_END) { switch (*pFormat) { @@ -2709,7 +2724,7 @@ } TRACE("pStubMsg->Buffer after %p\n", pStubMsg->Buffer); pPointer += 4; - pMemory += 4; + pMemory += sizeof(void *); break; } case RPC_FC_ALIGNM4: @@ -2732,7 +2747,7 @@ pFormat += 2; desc = pFormat + *(const SHORT*)pFormat; size = EmbeddedComplexSize(pStubMsg, desc); - TRACE("embedded complex (size=%ld) <= %p\n", size, pMemory); + TRACE("embedded complex (size=%d) <= %p\n", size, pMemory); m = NdrMarshaller[*desc & NDR_TABLE_MASK]; if (m) { @@ -2768,7 +2783,7 @@ { PFORMAT_STRING desc; NDR_UNMARSHALL m; - unsigned long size; + ULONG size; while (*pFormat != RPC_FC_END) { switch (*pFormat) { @@ -2834,7 +2849,7 @@ safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } pPointer += 4; - pMemory += 4; + pMemory += sizeof(void *); break; } case RPC_FC_ALIGNM4: @@ -2858,7 +2873,7 @@ pFormat += 2; desc = pFormat + *(const SHORT*)pFormat; size = EmbeddedComplexSize(pStubMsg, desc); - TRACE("embedded complex (size=%ld) => %p\n", size, pMemory); + TRACE("embedded complex (size=%d) => %p\n", size, pMemory); if (fMustAlloc) /* we can't pass fMustAlloc=TRUE into the marshaller for this type * since the type is part of the memory block that is encompassed by @@ -2900,7 +2915,7 @@ { PFORMAT_STRING desc; NDR_BUFFERSIZE m; - unsigned long size; + ULONG size; while (*pFormat != RPC_FC_END) { switch (*pFormat) { @@ -2949,7 +2964,7 @@ safe_buffer_length_increment(pStubMsg, 4); } pPointer += 4; - pMemory += 4; + pMemory += sizeof(void*); break; case RPC_FC_ALIGNM4: ALIGN_POINTER(pMemory, 4); @@ -3005,7 +3020,7 @@ { PFORMAT_STRING desc; NDR_FREE m; - unsigned long size; + ULONG size; while (*pFormat != RPC_FC_END) { switch (*pFormat) { @@ -3032,7 +3047,7 @@ case RPC_FC_POINTER: NdrPointerFree(pStubMsg, *(unsigned char**)pMemory, pPointer); pPointer += 4; - pMemory += 4; + pMemory += sizeof(void *); break; case RPC_FC_ALIGNM4: ALIGN_POINTER(pMemory, 4); @@ -3080,12 +3095,12 @@ return pMemory; } -static unsigned long ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat, - PFORMAT_STRING pPointer) +static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat, + PFORMAT_STRING pPointer) { PFORMAT_STRING desc; - unsigned long size = 0; + ULONG size = 0; while (*pFormat != RPC_FC_END) { switch (*pFormat) { @@ -3143,7 +3158,7 @@ safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } pPointer += 4; - size += 4; + size += sizeof(void *); break; } case RPC_FC_ALIGNM4: @@ -3179,11 +3194,10 @@ return size; } -unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) +ULONG ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { PFORMAT_STRING desc; - unsigned long size = 0; + ULONG size = 0; while (*pFormat != RPC_FC_END) { switch (*pFormat) { @@ -3264,18 +3278,18 @@ { int saved_ignore_embedded = pStubMsg->IgnoreEmbeddedPointers; /* save buffer length */ - unsigned long saved_buffer_length = pStubMsg->BufferLength; + ULONG saved_buffer_length = pStubMsg->BufferLength; /* get the buffer pointer after complex array data, but before * pointer data */ - pStubMsg->BufferLength = pStubMsg->Buffer - pStubMsg->BufferStart; + pStubMsg->BufferLength = pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer; pStubMsg->IgnoreEmbeddedPointers = 1; NdrComplexStructBufferSize(pStubMsg, pMemory, pFormat); pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; /* save it for use by embedded pointer code later */ - pStubMsg->PointerBufferMark = pStubMsg->BufferStart + pStubMsg->BufferLength; - TRACE("difference = 0x%x\n", pStubMsg->PointerBufferMark - pStubMsg->Buffer); + pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; + TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer)); pointer_buffer_mark_set = 1; /* restore the original buffer length */ @@ -3294,7 +3308,7 @@ if (conf_array) { - unsigned long struct_size = ComplexStructSize(pStubMsg, pFormat); + ULONG struct_size = ComplexStructSize(pStubMsg, pFormat); array_compute_and_write_conformance(conf_array[0], pStubMsg, pMemory + struct_size, conf_array); /* these could be changed in ComplexMarshall so save them for later */ @@ -3361,7 +3375,7 @@ /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = pStubMsg->Buffer; - TRACE("difference = 0x%lx\n", (unsigned long)(pStubMsg->PointerBufferMark - saved_buffer)); + TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer)); pointer_buffer_mark_set = 1; /* restore the original buffer */ @@ -3438,7 +3452,7 @@ if(!pStubMsg->IgnoreEmbeddedPointers && !pStubMsg->PointerLength) { int saved_ignore_embedded = pStubMsg->IgnoreEmbeddedPointers; - unsigned long saved_buffer_length = pStubMsg->BufferLength; + ULONG saved_buffer_length = pStubMsg->BufferLength; /* get the buffer length after complex struct data, but before * pointer data */ @@ -3449,7 +3463,7 @@ /* save it for use by embedded pointer code later */ pStubMsg->PointerLength = pStubMsg->BufferLength; pointer_length_set = 1; - TRACE("difference = 0x%lx\n", pStubMsg->PointerLength - saved_buffer_length); + TRACE("difference = 0x%x\n", pStubMsg->PointerLength - saved_buffer_length); /* restore the original buffer length */ pStubMsg->BufferLength = saved_buffer_length; @@ -3465,7 +3479,7 @@ if (conf_array) { - unsigned long struct_size = ComplexStructSize(pStubMsg, pFormat); + ULONG struct_size = ComplexStructSize(pStubMsg, pFormat); array_compute_and_size_conformance(conf_array[0], pStubMsg, pMemory + struct_size, conf_array); @@ -3823,21 +3837,21 @@ /* save buffer fields that may be changed by buffer sizer functions * and that may be needed later on */ int saved_ignore_embedded = pStubMsg->IgnoreEmbeddedPointers; - unsigned long saved_buffer_length = pStubMsg->BufferLength; - unsigned long saved_max_count = pStubMsg->MaxCount; - unsigned long saved_offset = pStubMsg->Offset; - unsigned long saved_actual_count = pStubMsg->ActualCount; + ULONG saved_buffer_length = pStubMsg->BufferLength; + ULONG_PTR saved_max_count = pStubMsg->MaxCount; + ULONG saved_offset = pStubMsg->Offset; + ULONG saved_actual_count = pStubMsg->ActualCount; /* get the buffer pointer after complex array data, but before * pointer data */ - pStubMsg->BufferLength = pStubMsg->Buffer - pStubMsg->BufferStart; + pStubMsg->BufferLength = pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer; pStubMsg->IgnoreEmbeddedPointers = 1; NdrComplexArrayBufferSize(pStubMsg, pMemory, pFormat); pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; /* save it for use by embedded pointer code later */ - pStubMsg->PointerBufferMark = pStubMsg->BufferStart + pStubMsg->BufferLength; - TRACE("difference = 0x%x\n", pStubMsg->Buffer - pStubMsg->BufferStart); + pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; + TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer)); pointer_buffer_mark_set = 1; /* restore fields */ @@ -3915,7 +3929,7 @@ size = pStubMsg->MemorySize; pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; - TRACE("difference = 0x%lx\n", (unsigned long)(pStubMsg->Buffer - saved_buffer)); + TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - saved_buffer)); if (!pStubMsg->PointerBufferMark) { /* save it for use by embedded pointer code later */ @@ -3979,10 +3993,10 @@ /* save buffer fields that may be changed by buffer sizer functions * and that may be needed later on */ int saved_ignore_embedded = pStubMsg->IgnoreEmbeddedPointers; - unsigned long saved_buffer_length = pStubMsg->BufferLength; - unsigned long saved_max_count = pStubMsg->MaxCount; - unsigned long saved_offset = pStubMsg->Offset; - unsigned long saved_actual_count = pStubMsg->ActualCount; + ULONG saved_buffer_length = pStubMsg->BufferLength; + ULONG_PTR saved_max_count = pStubMsg->MaxCount; + ULONG saved_offset = pStubMsg->Offset; + ULONG saved_actual_count = pStubMsg->ActualCount; /* get the buffer pointer after complex array data, but before * pointer data */ @@ -4237,7 +4251,7 @@ unsigned index = *(const WORD*)&pFormat[2]; DWORD bufsize = *(const WORD*)&pFormat[6]; USER_MARSHAL_CB umcb; - unsigned long saved_buffer_length = 0; + ULONG saved_buffer_length = 0; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); @@ -4891,7 +4905,7 @@ { unsigned char type; unsigned char alignment; - unsigned long total_size; + ULONG total_size; } NDR_LGFARRAY_FORMAT; #include "poppack.h" @@ -4903,7 +4917,7 @@ PFORMAT_STRING pFormat) { const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; - unsigned long total_size; + ULONG total_size; TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); @@ -4946,7 +4960,7 @@ unsigned char fMustAlloc) { const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; - unsigned long total_size; + ULONG total_size; unsigned char *saved_buffer; TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -5001,7 +5015,7 @@ PFORMAT_STRING pFormat) { const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; - unsigned long total_size; + ULONG total_size; TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); @@ -5413,7 +5427,7 @@ } static PFORMAT_STRING get_arm_offset_from_union_arm_selector(PMIDL_STUB_MESSAGE pStubMsg, - unsigned long discriminant, + ULONG discriminant, PFORMAT_STRING pFormat) { unsigned short num_arms, arm, type; @@ -5436,13 +5450,13 @@ { if(type == 0xffff) { - ERR("no arm for 0x%lx and no default case\n", discriminant); + ERR("no arm for 0x%x and no default case\n", discriminant); RpcRaiseException(RPC_S_INVALID_TAG); return NULL; } if(type == 0) { - TRACE("falling back to empty default case for 0x%lx\n", discriminant); + TRACE("falling back to empty default case for 0x%x\n", discriminant); return NULL; } } @@ -5547,7 +5561,6 @@ case RPC_FC_UP: case RPC_FC_OP: case RPC_FC_FP: - **(void***)ppMemory = NULL; ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; if (pStubMsg->PointerBufferMark) @@ -5671,8 +5684,8 @@ ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; safe_buffer_increment(pStubMsg, 4); - ALIGN_LENGTH(pStubMsg->MemorySize, 4); - pStubMsg->MemorySize += 4; + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void *)); + pStubMsg->MemorySize += sizeof(void *); if (!pStubMsg->IgnoreEmbeddedPointers) PointerMemorySize(pStubMsg, saved_buffer, pFormat); break; @@ -5782,10 +5795,18 @@ if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); + /* we can't pass fMustAlloc=TRUE into the marshaller for the arm + * since the arm is part of the memory block that is encompassed by + * the whole union. Memory is forced to allocate when pointers + * are set to NULL, so we emulate that part of fMustAlloc=TRUE by + * clearing the memory we pass in to the unmarshaller */ + if (fMustAlloc) + memset(*ppMemory, 0, size); + NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &switch_type, FALSE); pMemoryArm = *ppMemory + increment; - return union_arm_unmarshall(pStubMsg, &pMemoryArm, switch_value, pFormat, fMustAlloc); + return union_arm_unmarshall(pStubMsg, &pMemoryArm, switch_value, pFormat, FALSE); } /*********************************************************************** @@ -5889,10 +5910,10 @@ return union_arm_marshall(pStubMsg, pMemory, pStubMsg->MaxCount, pFormat + *(const SHORT*)pFormat); } -static long unmarshall_discriminant(PMIDL_STUB_MESSAGE pStubMsg, +static LONG unmarshall_discriminant(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING *ppFormat) { - long discriminant = 0; + LONG discriminant = 0; switch(**ppFormat) { @@ -5945,7 +5966,7 @@ PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - long discriminant; + LONG discriminant; unsigned short size; TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -5953,7 +5974,7 @@ /* Unmarshall discriminant */ discriminant = unmarshall_discriminant(pStubMsg, &pFormat); - TRACE("unmarshalled discriminant %lx\n", discriminant); + TRACE("unmarshalled discriminant %x\n", discriminant); pFormat += *(const SHORT*)pFormat; @@ -5964,7 +5985,15 @@ if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); - return union_arm_unmarshall(pStubMsg, ppMemory, discriminant, pFormat, fMustAlloc); + /* we can't pass fMustAlloc=TRUE into the marshaller for the arm + * since the arm is part of the memory block that is encompassed by + * the whole union. Memory is forced to allocate when pointers + * are set to NULL, so we emulate that part of fMustAlloc=TRUE by + * clearing the memory we pass in to the unmarshaller */ + if (fMustAlloc) + memset(*ppMemory, 0, size); + + return union_arm_unmarshall(pStubMsg, ppMemory, discriminant, pFormat, FALSE); } /*********************************************************************** @@ -6179,68 +6208,68 @@ TRACE("base_type = 0x%02x, low_value = %d, high_value = %d\n", base_type, pRange->low_value, pRange->high_value); -#define RANGE_UNMARSHALL(type, format_spec) \ +#define RANGE_UNMARSHALL(mem_type, wire_type, format_spec) \ do \ { \ - ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ + ALIGN_POINTER(pStubMsg->Buffer, sizeof(wire_type)); \ if (!fMustAlloc && !*ppMemory) \ fMustAlloc = TRUE; \ if (fMustAlloc) \ - *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ - if (pStubMsg->Buffer + sizeof(type) > pStubMsg->BufferEnd) \ + *ppMemory = NdrAllocate(pStubMsg, sizeof(mem_type)); \ + if (pStubMsg->Buffer + sizeof(wire_type) > pStubMsg->BufferEnd) \ { \ ERR("buffer overflow - Buffer = %p, BufferEnd = %p\n", \ pStubMsg->Buffer, (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength); \ RpcRaiseException(RPC_X_BAD_STUB_DATA); \ } \ - if ((*(type *)pStubMsg->Buffer < (type)pRange->low_value) || \ - (*(type *)pStubMsg->Buffer > (type)pRange->high_value)) \ + if ((*(wire_type *)pStubMsg->Buffer < (mem_type)pRange->low_value) || \ + (*(wire_type *)pStubMsg->Buffer > (mem_type)pRange->high_value)) \ { \ ERR("value exceeded bounds: " format_spec ", low: " format_spec ", high: " format_spec "\n", \ - *(type *)pStubMsg->Buffer, (type)pRange->low_value, \ - (type)pRange->high_value); \ + *(wire_type *)pStubMsg->Buffer, (mem_type)pRange->low_value, \ + (mem_type)pRange->high_value); \ RpcRaiseException(RPC_S_INVALID_BOUND); \ return NULL; \ } \ TRACE("*ppMemory: %p\n", *ppMemory); \ - **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ - pStubMsg->Buffer += sizeof(type); \ + **(mem_type **)ppMemory = *(wire_type *)pStubMsg->Buffer; \ + pStubMsg->Buffer += sizeof(wire_type); \ } while (0) switch(base_type) { case RPC_FC_CHAR: case RPC_FC_SMALL: - RANGE_UNMARSHALL(UCHAR, "%d"); + RANGE_UNMARSHALL(UCHAR, UCHAR, "%d"); TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_BYTE: case RPC_FC_USMALL: - RANGE_UNMARSHALL(CHAR, "%u"); + RANGE_UNMARSHALL(CHAR, CHAR, "%u"); TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_WCHAR: /* FIXME: valid? */ case RPC_FC_USHORT: - RANGE_UNMARSHALL(USHORT, "%u"); + RANGE_UNMARSHALL(USHORT, USHORT, "%u"); TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); break; case RPC_FC_SHORT: - RANGE_UNMARSHALL(SHORT, "%d"); + RANGE_UNMARSHALL(SHORT, SHORT, "%d"); TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); break; case RPC_FC_LONG: - RANGE_UNMARSHALL(LONG, "%d"); + case RPC_FC_ENUM32: + RANGE_UNMARSHALL(LONG, LONG, "%d"); TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); break; case RPC_FC_ULONG: - RANGE_UNMARSHALL(ULONG, "%u"); + RANGE_UNMARSHALL(ULONG, ULONG, "%u"); TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); break; case RPC_FC_ENUM16: - case RPC_FC_ENUM32: - FIXME("Unhandled enum type\n"); + RANGE_UNMARSHALL(UINT, USHORT, "%u"); + TRACE("value: 0x%08x\n", **(UINT **)ppMemory); break; - case RPC_FC_ERROR_STATUS_T: /* FIXME: valid? */ case RPC_FC_FLOAT: case RPC_FC_DOUBLE: case RPC_FC_HYPER: @@ -6538,36 +6567,51 @@ case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); safe_buffer_increment(pStubMsg, sizeof(USHORT)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(USHORT)); pStubMsg->MemorySize += sizeof(USHORT); return sizeof(USHORT); case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG)); safe_buffer_increment(pStubMsg, sizeof(ULONG)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(ULONG)); pStubMsg->MemorySize += sizeof(ULONG); return sizeof(ULONG); case RPC_FC_FLOAT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(float)); safe_buffer_increment(pStubMsg, sizeof(float)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(float)); pStubMsg->MemorySize += sizeof(float); return sizeof(float); case RPC_FC_DOUBLE: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(double)); safe_buffer_increment(pStubMsg, sizeof(double)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(double)); pStubMsg->MemorySize += sizeof(double); return sizeof(double); case RPC_FC_HYPER: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG)); safe_buffer_increment(pStubMsg, sizeof(ULONGLONG)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(ULONGLONG)); pStubMsg->MemorySize += sizeof(ULONGLONG); return sizeof(ULONGLONG); case RPC_FC_ERROR_STATUS_T: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(error_status_t)); safe_buffer_increment(pStubMsg, sizeof(error_status_t)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(error_status_t)); pStubMsg->MemorySize += sizeof(error_status_t); return sizeof(error_status_t); case RPC_FC_ENUM16: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); safe_buffer_increment(pStubMsg, sizeof(USHORT)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(UINT)); pStubMsg->MemorySize += sizeof(UINT); return sizeof(UINT); case RPC_FC_IGNORE: + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void *)); pStubMsg->MemorySize += sizeof(void *); return sizeof(void *); default: @@ -6627,7 +6671,7 @@ if (pFormat[1] & 0x80) NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); else - NdrClientContextMarshall(pStubMsg, (NDR_CCONTEXT *)pMemory, FALSE); + NdrClientContextMarshall(pStubMsg, pMemory, FALSE); return NULL; }

15 years, 1 month

[sginsberg] 42563: - ne2000: Don't assume stdcall is default for MSVC - snmpapi: Define SNMP_FUNC_TYPE for MSVC too - rasman: Compatibly define function pointer prototype - vbe/vga/xboxvmp: Fix assumption that _MSC_VER means "compiling with Microsoft's headers"

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Aug 9 16:18:01 2009 New Revision: 42563 URL: http://svn.reactos.org/svn/reactos?rev=42563&view=rev Log: - ne2000: Don't assume stdcall is default for MSVC - snmpapi: Define SNMP_FUNC_TYPE for MSVC too - rasman: Compatibly define function pointer prototype - vbe/vga/xboxvmp: Fix assumption that _MSC_VER means "compiling with Microsoft's headers" Modified: trunk/reactos/dll/win32/rasman/rasman.c trunk/reactos/dll/win32/snmpapi/snmpapi.c trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c trunk/reactos/drivers/video/miniport/vbe/vbemp.h trunk/reactos/drivers/video/miniport/vga/vgamp.h trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h Modified: trunk/reactos/dll/win32/rasman/rasman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.c?… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasman/rasman.c [iso-8859-1] Sun Aug 9 16:18:01 2009 @@ -38,7 +38,7 @@ DWORD WINAPI RasSecurityDialogBegin(HPORT hPort, PBYTE pSendBuf, DWORD SendBufSize, PBYTE pRecvBuf, DWORD RecvBufSize, - VOID (WINAPI *RasSecurityDialogComplete)()) + VOID (WINAPI *RasSecurityDialogComplete)(SECURITY_MESSAGE*)) { FIXME("(%p,%p,0x%08x,%p,0x%08x,%p),stub!\n",hPort,pSendBuf,SendBufSize, pRecvBuf,RecvBufSize,*RasSecurityDialogComplete); Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.c [iso-8859-1] Sun Aug 9 16:18:01 2009 @@ -12,19 +12,9 @@ #include <winsock2.h> #include <windows.h> -#ifdef __GNUC__ #define SNMP_FUNC_TYPE WINAPI -#endif #include <snmp.h> #include "debug.h" - - -#ifdef __GNUC__ -#define EXPORT WINAPI -#else -#define EXPORT CALLBACK -#endif - #if DBG Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Sun Aug 9 16:18:01 2009 @@ -11,9 +11,7 @@ #include <debug.h> NTSTATUS -#ifndef _MSC_VER NTAPI -#endif DriverEntry( PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); @@ -927,9 +925,7 @@ NTSTATUS -#ifndef _MSC_VER NTAPI -#endif DriverEntry( PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] Sun Aug 9 16:18:01 2009 @@ -24,7 +24,10 @@ /* INCLUDES *******************************************************************/ #ifdef _MSC_VER -#include "dderror.h" +#pragma message ("INVESTIGATE ME") +#endif + +#if 0 //#ifdef _MSC_VER #include "devioctl.h" #else #include <ntddk.h> Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga/vgamp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.h [iso-8859-1] Sun Aug 9 16:18:01 2009 @@ -24,7 +24,10 @@ /* INCLUDES *******************************************************************/ #ifdef _MSC_VER -#include "dderror.h" +#pragma message ("INVESTIGATE ME") +#endif + +#if 0 //#ifdef _MSC_VER #include "devioctl.h" #else #include <ntddk.h> Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xbo… ============================================================================== --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h [iso-8859-1] Sun Aug 9 16:18:01 2009 @@ -26,7 +26,10 @@ /* INCLUDES *******************************************************************/ #ifdef _MSC_VER -#include "dderror.h" +#pragma message ("INVESTIGATE ME") +#endif + +#if 0 //#ifdef _MSC_VER #include "devioctl.h" #define PAGE_SIZE 4096 #else

15 years, 1 month

[cwittich] 42562: partial sync to wine 1.1.27

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 9 15:56:25 2009 New Revision: 42562 URL: http://svn.reactos.org/svn/reactos?rev=42562&view=rev Log: partial sync to wine 1.1.27 Modified: trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/shfldr_mycomp.c trunk/reactos/dll/win32/shell32/shlfolder.c Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Sun Aug 9 15:56:25 2009 @@ -31,14 +31,17 @@ extern LPVOID WINAPI Alloc(INT); extern BOOL WINAPI Free(LPVOID); -/************************************************************************* - * ILGetDisplayNameEx [SHELL32.186] +static LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl); +static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl); + +/************************************************************************* + * ILGetDisplayNameExA [SHELL32.186] * * Retrieves the display name of an ItemIDList * * PARAMS * psf [I] Shell Folder to start with, if NULL the desktop is used - * pidl [I] ItemIDList relativ to the psf to get the display name for + * pidl [I] ItemIDList relative to the psf to get the display name for * path [O] Filled in with the display name, assumed to be at least MAX_PATH long * type [I] Type of display name to retrieve * 0 = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR uses always the desktop as root @@ -48,7 +51,7 @@ * RETURNS * True if the display name could be retrieved successfully, False otherwise */ -BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type) +static BOOL ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type) { BOOL ret = FALSE; WCHAR wPath[MAX_PATH]; @@ -210,7 +213,7 @@ return NULL; len = ILGetSize(pidl); - newpidl = (LPITEMIDLIST)SHAlloc(len); + newpidl = SHAlloc(len); if (newpidl) memcpy(newpidl,pidl,len); @@ -237,7 +240,7 @@ if (pidl) { len = pidl->mkid.cb; - pidlNew = (LPITEMIDLIST) SHAlloc (len+2); + pidlNew = SHAlloc(len+2); if (pidlNew) { memcpy(pidlNew,pidl,len+2); /* 2 -> mind a desktop pidl */ @@ -271,7 +274,7 @@ IStream_AddRef (pStream); - if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead))) + if (SUCCEEDED(IStream_Read(pStream, &wLen, 2, &dwBytesRead))) { TRACE("PIDL length is %d\n", wLen); if (wLen != 0) @@ -326,7 +329,7 @@ wLen = ILGetSize(pPidl); - if (SUCCEEDED(IStream_Write(pStream, (LPVOID)&wLen, 2, NULL))) + if (SUCCEEDED(IStream_Write(pStream, &wLen, 2, NULL))) { if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL))) ret = S_OK; @@ -442,7 +445,7 @@ return NULL; len = ILGetSize(pidl); - newpidl = (LPITEMIDLIST)Alloc(len); + newpidl = Alloc(len); if (newpidl) memcpy(newpidl,pidl,len); @@ -703,7 +706,7 @@ if (SUCCEEDED(hr)) { /*assert(pida->cidl==1);*/ - LPIDA pida = (LPIDA)GlobalLock(medium.u.hGlobal); + LPIDA pida = GlobalLock(medium.u.hGlobal); LPCITEMIDLIST pidl_folder = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[0]); LPCITEMIDLIST pidl_child = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[1]); @@ -805,7 +808,7 @@ } /************************************************************************* - * ILAppendID [SHELL32.154] + * ILAppend [SHELL32.154] * * Adds the single ItemID item to the ItemIDList indicated by pidl. * If bEnd is FALSE, inserts the item in the front of the list, @@ -963,7 +966,7 @@ * is used to avoid having to verify the current path element on disk, so * that creating an ItemIDList from a nonexistent path still can work. */ -static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, +static HRESULT _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, BOOL bBindCtx, LPITEMIDLIST *ppidl, LPDWORD prgfInOut) { LPSHELLFOLDER pSF = NULL; @@ -994,7 +997,7 @@ IShellFolder_Release(pSF); - if (!SUCCEEDED(ret) && ppidl) + if (FAILED(ret) && ppidl) *ppidl = NULL; TRACE("%s %p 0x%x\n", debugstr_w(path), ppidl ? *ppidl : NULL, prgfInOut ? *prgfInOut : 0); @@ -1101,12 +1104,12 @@ shortname = _ILGetSTextPointer(pidl); if (filename) - lstrcpynA(pfd->cFileName, filename, MAX_PATH); + lstrcpynA(pfd->cFileName, filename, sizeof(pfd->cFileName)); else pfd->cFileName[0] = '\0'; if (shortname) - lstrcpynA(pfd->cAlternateFileName, shortname, MAX_PATH); + lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName)); else pfd->cAlternateFileName[0] = '\0'; return NOERROR; @@ -1300,7 +1303,14 @@ * ************************************************************************* */ -LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size) + +/* Basic PIDL constructor. Allocates size + 5 bytes, where: + * - two bytes are SHITEMID.cb + * - one byte is PIDLDATA.type + * - two bytes are the NULL PIDL terminator + * Sets type of the returned PIDL to type. + */ +static LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size) { LPITEMIDLIST pidlOut = NULL; @@ -1412,7 +1422,7 @@ { LPPIDLDATA pData = _ILGetDataPointer(pidlOut); - memcpy(&(pData->u.guid.guid), guid, sizeof(GUID)); + pData->u.guid.guid = *guid; TRACE("-- create GUID-pidl %s\n", debugstr_guid(&(pData->u.guid.guid))); } @@ -1429,7 +1439,7 @@ { IID iid; - if (!SUCCEEDED(SHCLSIDFromStringA(szGUID, &iid))) + if (FAILED(SHCLSIDFromStringA(szGUID, &iid))) { ERR("%s is not a GUID\n", szGUID); return NULL; @@ -1904,7 +1914,7 @@ LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) { if(pidl && pidl->mkid.cb != 0x00) - return (LPPIDLDATA) &(pidl->mkid.abID); + return (LPPIDLDATA)pidl->mkid.abID; return NULL; } @@ -1912,7 +1922,7 @@ * _ILGetTextPointerW() * gets a pointer to the unicode long filename string stored in the pidl */ -LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl) +static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl) { /* TRACE(pidl,"(pidl%p)\n", pidl);*/ @@ -1952,7 +1962,7 @@ return NULL; case PT_VALUEW: - return (LPWSTR)&(pdata->u.file.szNames); + return (LPWSTR)pdata->u.file.szNames; } return NULL; } @@ -1982,21 +1992,21 @@ case PT_DRIVE1: case PT_DRIVE2: case PT_DRIVE3: - return (LPSTR)&(pdata->u.drive.szDriveName); + return pdata->u.drive.szDriveName; case PT_FOLDER: case PT_FOLDER1: case PT_VALUE: case PT_IESPECIAL1: case PT_IESPECIAL2: - return (LPSTR)&(pdata->u.file.szNames); + return pdata->u.file.szNames; case PT_WORKGRP: case PT_COMP: case PT_NETWORK: case PT_NETPROVIDER: case PT_SHARE: - return (LPSTR)&(pdata->u.network.szNames); + return pdata->u.network.szNames; } return NULL; } @@ -2005,7 +2015,7 @@ * _ILGetSTextPointer() * gets a pointer to the short filename string stored in the pidl */ -LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl) +static LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl) { /* TRACE(pidl,"(pidl%p)\n", pidl); */ @@ -2020,10 +2030,10 @@ case PT_VALUE: case PT_IESPECIAL1: case PT_IESPECIAL2: - return (LPSTR)(pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1); + return pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1; case PT_WORKGRP: - return (LPSTR)(pdata->u.network.szNames + strlen (pdata->u.network.szNames) + 1); + return pdata->u.network.szNames + strlen (pdata->u.network.szNames) + 1; } return NULL; } Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Sun Aug 9 15:56:25 2009 @@ -35,7 +35,6 @@ #ifndef __WINE_PIDL_H #define __WINE_PIDL_H - #include <stdarg.h> #include <windef.h> @@ -50,7 +49,7 @@ * a pidl of NULL means the desktop * * The structure of the pidl seems to be a union. The first byte of the -* PIDLDATA desribes the type of pidl. +* PIDLDATA describes the type of pidl. * * object ! first byte / ! format ! living space * ! size @@ -107,7 +106,6 @@ #define PT_YAGUID 0x70 /* yet another guid.. */ #define PT_IESPECIAL2 0xb1 #define PT_SHARE 0xc3 - #include "pshpack1.h" typedef BYTE PIDLTYPE; @@ -257,14 +255,6 @@ * simple pidls */ -/* Basic PIDL constructor. Allocates size + 5 bytes, where: - * - two bytes are SHITEMID.cb - * - one byte is PIDLDATA.type - * - two bytes are the NULL PIDL terminator - * Sets type of the returned PIDL to type. - */ -LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size); - /* Creates a PIDL with guid format and type type, which must be one of PT_GUID, * PT_SHELLEXT, or PT_YAGUID. */ @@ -297,8 +287,6 @@ */ LPPIDLDATA _ILGetDataPointer (LPCITEMIDLIST); LPSTR _ILGetTextPointer (LPCITEMIDLIST); -LPWSTR _ILGetTextPointerW (LPCITEMIDLIST); -LPSTR _ILGetSTextPointer (LPCITEMIDLIST); IID *_ILGetGUIDPointer (LPCITEMIDLIST pidl); FileStructW *_ILGetFileStructW (LPCITEMIDLIST pidl); @@ -315,7 +303,6 @@ LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl); LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida); -BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type); BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type); #endif Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.c [iso-8859-1] Sun Aug 9 15:56:25 2009 @@ -94,7 +94,7 @@ sf->lpVtblPersistFolder2 = &vt_PersistFolder2; sf->pidlRoot = _ILCreateMyComputer (); /* my qualified pidl */ - if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) + if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { IUnknown_Release (_IUnknown_ (sf)); return E_NOINTERFACE; @@ -180,7 +180,7 @@ { TRACE ("-- destroying IShellFolder(%p)\n", This); SHFree (This->pidlRoot); - LocalFree ((HLOCAL) This); + LocalFree (This); } return refCount; } Modified: trunk/reactos/dll/win32/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.c [iso-8859-1] Sun Aug 9 15:56:25 2009 @@ -88,7 +88,7 @@ * * PARAMETERS * pszNext [IN] string to get the element from - * pszOut [IN] pointer to buffer whitch receives string + * pszOut [IN] pointer to buffer which receives string * dwOut [IN] length of pszOut * * RETURNS @@ -110,7 +110,7 @@ while (*pszTail && (*pszTail != (WCHAR) '\\')) pszTail++; - dwCopy = (const WCHAR *) pszTail - (const WCHAR *) pszNext + 1; + dwCopy = pszTail - pszNext + 1; lstrcpynW (pszOut, pszNext, (dwOut < dwCopy) ? dwOut : dwCopy); if (*pszTail)

15 years, 1 month

[fireball] 42561: - Add back STACK16/32FRAME which is needed by dbghelp.dll. - Add #include <exception.h> to get rid of "#include <exception.h> // ROS Hack" in windef16.h.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 9 15:31:58 2009 New Revision: 42561 URL: http://svn.reactos.org/svn/reactos?rev=42561&view=rev Log: - Add back STACK16/32FRAME which is needed by dbghelp.dll. - Add #include <exception.h> to get rid of "#include <exception.h> // ROS Hack" in windef16.h. Modified: branches/arwinss/reactos/dll/win32/dbghelp/stack.c branches/arwinss/reactos/include/reactos/wine/winbase16.h Modified: branches/arwinss/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/dbghe… ============================================================================== --- branches/arwinss/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] Sun Aug 9 15:31:58 2009 @@ -31,6 +31,7 @@ #define WIN32_NO_STATUS #include "dbghelp_private.h" #include "winternl.h" +#include <exception.h> #include "wine/winbase16.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Sun Aug 9 15:31:58 2009 @@ -164,6 +164,43 @@ DWORD dwAllocBreak; DWORD dwAllocCount; } WINDEBUGINFO16, *LPWINDEBUGINFO16; + +/* 32-bit stack layout after __wine_call_to_16() */ +typedef struct _STACK32FRAME +{ + DWORD restore_addr; /* 00 return address for restoring code selector */ + DWORD codeselector; /* 04 code selector to restore */ + EXCEPTION_REGISTRATION_RECORD frame; /* 08 Exception frame */ + SEGPTR frame16; /* 10 16-bit frame from last CallFrom16() */ + DWORD edi; /* 14 saved registers */ + DWORD esi; /* 18 */ + DWORD ebx; /* 1c */ + DWORD ebp; /* 20 saved 32-bit frame pointer */ + DWORD retaddr; /* 24 return address */ + DWORD target; /* 28 target address / CONTEXT86 pointer */ + DWORD nb_args; /* 2c number of 16-bit argument bytes */ +} STACK32FRAME; + +/* 16-bit stack layout after __wine_call_from_16() */ +typedef struct _STACK16FRAME +{ + STACK32FRAME *frame32; /* 00 32-bit frame from last CallTo16() */ + DWORD edx; /* 04 saved registers */ + DWORD ecx; /* 08 */ + DWORD ebp; /* 0c */ + WORD ds; /* 10 */ + WORD es; /* 12 */ + WORD fs; /* 14 */ + WORD gs; /* 16 */ + DWORD callfrom_ip; /* 18 callfrom tail IP */ + DWORD module_cs; /* 1c module code segment */ + DWORD relay; /* 20 relay function address */ + WORD entry_ip; /* 22 entry point IP */ + DWORD entry_point; /* 26 API entry point to call, reused as mutex count */ + WORD bp; /* 2a 16-bit stack frame chain */ + WORD ip; /* 2c return address */ + WORD cs; /* 2e */ +} STACK16FRAME; #include <poppack.h>

15 years, 1 month

[fireball] 42560: - Properly update commctrl.h taking in account ReactOS-specific changes.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 9 15:25:48 2009 New Revision: 42560 URL: http://svn.reactos.org/svn/reactos?rev=42560&view=rev Log: - Properly update commctrl.h taking in account ReactOS-specific changes. Modified: branches/arwinss/reactos/include/psdk/commctrl.h Modified: branches/arwinss/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/co… ============================================================================== --- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sun Aug 9 15:25:48 2009 @@ -132,7 +132,11 @@ /* callback constants */ #define LPSTR_TEXTCALLBACKA ((LPSTR)-1L) #define LPSTR_TEXTCALLBACKW ((LPWSTR)-1L) -#define LPSTR_TEXTCALLBACK WINELIB_NAME_AW(LPSTR_TEXTCALLBACK) +#ifdef UNICODE +#define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKW +#else +#define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKA +#endif #define I_IMAGECALLBACK (-1) #define I_IMAGENONE (-2) @@ -403,7 +407,6 @@ static const WCHAR UPDOWN_CLASSW[] = { 'm','s','c','t','l','s','_', 'u','p','d','o','w','n','3','2',0 }; #endif -#define UPDOWN_CLASS WINELIB_NAME_AW(UPDOWN_CLASS) typedef struct _UDACCEL { @@ -472,7 +475,6 @@ static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', 'p','r','o','g','r','e','s','s','3','2',0 }; #endif -#define PROGRESS_CLASS WINELIB_NAME_AW(PROGRESS_CLASS) #define PBM_SETRANGE (WM_USER+1) #define PBM_SETPOS (WM_USER+2) @@ -725,7 +727,6 @@ #else static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2',0 }; #endif -#define WC_HEADER WINELIB_NAME_AW(WC_HEADER) #define HDS_HORZ 0x0000 #define HDS_BUTTONS 0x0002 @@ -1024,7 +1025,6 @@ #else static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #endif -#define WC_BUTTON WINELIB_NAME_AW(WC_BUTTON) #define BCN_FIRST (0U-1250U) #define BCN_LAST (0U-1350U) @@ -1051,7 +1051,6 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', 'W','i','n','d','o','w','3','2',0 }; #endif -#define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME) #define CMB_MASKED 0x02 @@ -1618,7 +1617,41 @@ static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', 'c','l','a','s','s','3','2',0 }; #endif -#define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS) + +#ifdef UNICODE +#define UPDOWN_CLASS L"msctls_updown32" +#define PROGRESS_CLASS L"msctls_progress32" +#define WC_HEADER L"SysHeader32" +#define WC_BUTTON L"Button" +#define TOOLBARCLASSNAME L"ToolbarWindow32" +#define TOOLTIPS_CLASS L"tooltips_class32" +#else +#define UPDOWN_CLASS "msctls_updown32" +#define PROGRESS_CLASS "msctls_progress32" +#define WC_HEADER "SysHeader32" +#define WC_BUTTON "Button" +#define TOOLBARCLASSNAME "ToolbarWindow32" +#define TOOLTIPS_CLASS "tooltips_class32" +#endif + +#if (_WIN32_WINNT >= 0x501) +#define BUTTON_IMAGELIST_ALIGN_LEFT 0 +#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 +#define BUTTON_IMAGELIST_ALIGN_TOP 2 +#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 +#define BUTTON_IMAGELIST_ALIGN_CENTER 4 + +typedef struct +{ + HIMAGELIST himl; + RECT margin; + UINT uAlign; +} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; + +#define BCM_FIRST 0x1600 +#define BCM_GETIDEALSIZE (BCM_FIRST + 1) +#define BCM_SETIMAGELIST (BCM_FIRST + 2) +#endif /* _WIN32_WINNT */ #define INFOTIPSIZE 1024 @@ -2381,10 +2414,10 @@ #define TVIF_INTEGRAL 0x0080 #define TVIF_DI_SETITEM 0x1000 -#define TVI_ROOT ((HTREEITEM)-65536) -#define TVI_FIRST ((HTREEITEM)-65535) -#define TVI_LAST ((HTREEITEM)-65534) -#define TVI_SORT ((HTREEITEM)-65533) +#define TVI_ROOT ((HTREEITEM)(ULONG_PTR)-0x10000) /* -65536 */ +#define TVI_FIRST ((HTREEITEM)(ULONG_PTR)-0x0FFFF) /* -65535 */ +#define TVI_LAST ((HTREEITEM)(ULONG_PTR)-0x0FFFE) /* -65534 */ +#define TVI_SORT ((HTREEITEM)(ULONG_PTR)-0x0FFFD) /* -65533 */ #define TVIS_FOCUSED 0x0001 #define TVIS_SELECTED 0x0002 @@ -2781,7 +2814,7 @@ (LPARAM)(HTREEITEM)(hitem)) #define TreeView_EnsureVisible(hwnd, hitem) \ - (BOOL)SNDMSGA((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem)) + (BOOL)SNDMSGA((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(HTREEITEM)(hitem)) #define TreeView_SortChildrenCB(hwnd, psort, recurse) \ (BOOL)SNDMSGA((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \ @@ -3715,7 +3748,7 @@ { LVITEMA _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ SNDMSGA(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMA)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ - (UINT)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) + (BOOL)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) #define ListView_GetCountPerPage(hwnd) \ (BOOL)SNDMSGW((hwnd),LVM_GETCOUNTPERPAGE,0,0L) #define ListView_GetImageList(hwnd,iImageList) \

15 years, 1 month

[cwittich] 42559: sync shell32_winetest with wine 1.1.27

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 9 14:49:55 2009 New Revision: 42559 URL: http://svn.reactos.org/svn/reactos?rev=42559&view=rev Log: sync shell32_winetest with wine 1.1.27 Modified: trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shfldr_special.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… ============================================================================== --- trunk/rostests/winetests/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelllink.c [iso-8859-1] Sun Aug 9 14:49:55 2009 @@ -48,6 +48,7 @@ static fnSHDefExtractIconA pSHDefExtractIconA; static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); +static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); static const GUID _IID_IShellLinkDataList = { 0x45e2b4ae, 0xb1c3, 0x11d0, @@ -223,6 +224,7 @@ r = IShellLinkA_SetPath(sl, "\"c:\\nonexistent\\file\""); ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); + strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); ok(!lstrcmp(buffer, "C:\\nonexistent\\file") || @@ -613,6 +615,25 @@ desc.icon_id=0; desc.hotkey=0x1234; create_lnk(lnkfile, &desc, 0); + check_lnk(lnkfile, &desc, 0x0); + + r=pGetShortPathNameA(mydir, mypath, sizeof(mypath)); + strcpy(realpath, mypath); + strcat(realpath, "\\test.txt"); + strcat(mypath, "\\\\test.txt"); + + /* Overwrite the existing lnk file and test link to a short path with double backslashes */ + desc.description="non-executable file"; + desc.workdir=mydir; + desc.path=mypath; + desc.pidl=NULL; + desc.arguments=""; + desc.showcmd=SW_SHOWNORMAL; + desc.icon=mypath; + desc.icon_id=0; + desc.hotkey=0x1234; + create_lnk(lnkfile, &desc, 0); + desc.path=realpath; check_lnk(lnkfile, &desc, 0x0); r = DeleteFileA(mypath); @@ -750,6 +771,7 @@ pSHDefExtractIconA = (fnSHDefExtractIconA) GetProcAddress(hmod, "SHDefExtractIconA"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); + pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); r = CoInitialize(NULL); ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r); Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… ============================================================================== --- trunk/rostests/winetests/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shellpath.c [iso-8859-1] Sun Aug 9 14:49:55 2009 @@ -89,6 +89,7 @@ static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); static HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *); +static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; @@ -684,10 +685,17 @@ "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", systemDir, systemShellPath); } - /* CSIDL_SYSTEMX86 isn't checked in the same way, since it's different - * on Win64 (and non-x86 Windows systems, if there are any still in - * existence) than on Win32. - */ + + if (!pGetSystemWow64DirectoryA || !pGetSystemWow64DirectoryA(systemDir, sizeof(systemDir))) + GetSystemDirectoryA(systemDir, sizeof(systemDir)); + myPathRemoveBackslashA(systemDir); + if (pSHGetSpecialFolderPathA(NULL, systemShellPath, CSIDL_SYSTEMX86, FALSE)) + { + myPathRemoveBackslashA(systemShellPath); + ok(!lstrcmpiA(systemDir, systemShellPath), + "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", + systemDir, systemShellPath); + } } /* Globals used by subprocesses */ @@ -871,6 +879,8 @@ if (!init()) return; loadShell32(); + pGetSystemWow64DirectoryA = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), + "GetSystemWow64DirectoryA" ); if (myARGC >= 3) doChild(myARGV[2]); Modified: trunk/rostests/winetests/shell32/shfldr_special.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shfldr_… ============================================================================== --- trunk/rostests/winetests/shell32/shfldr_special.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shfldr_special.c [iso-8859-1] Sun Aug 9 14:49:55 2009 @@ -46,7 +46,6 @@ LPITEMIDLIST pidl; DWORD attr = ~0; DWORD expected_attr; - DWORD alter_attr; hr = SHGetDesktopFolder(&psfDesktop); ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); @@ -70,7 +69,9 @@ attr = ~0; hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); - if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) + if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || + hr == HRESULT_FROM_WIN32(ERROR_NO_NET_OR_BAD_PATH) || + hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) { win_skip("'EntireNetwork' is not available on Win9x, NT4 and Vista\n"); return; @@ -78,12 +79,12 @@ ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); - expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_STORAGEANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - alter_attr = (expected_attr & (~SFGAO_STORAGEANCESTOR)) | SFGAO_STREAM; + expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK; todo_wine - ok(attr == expected_attr || - attr == alter_attr, /* win2k */ - "attr should be 0x%x or 0x%x, not 0x%x\n", expected_attr, alter_attr, attr); + ok(attr == expected_attr || /* winme, nt4 */ + attr == (expected_attr | SFGAO_STREAM) || /* win2k */ + attr == (expected_attr | SFGAO_STORAGEANCESTOR), /* others */ + "attr should be 0x%x, not 0x%x\n", expected_attr, attr); ILFree(pidl); } Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… ============================================================================== --- trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] Sun Aug 9 14:49:55 2009 @@ -587,7 +587,79 @@ #define okChildPath(key, expected) _okChildPath(__FILE__, __LINE__, (key), (expected)) #define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) - +/*** + * + * GetLongPathNameA equivalent that supports Win95 and WinNT + * + ***/ + +static DWORD get_long_path_name(const char* shortpath, char* longpath, DWORD longlen) +{ + char tmplongpath[MAX_PATH]; + const char* p; + DWORD sp = 0, lp = 0; + DWORD tmplen; + WIN32_FIND_DATAA wfd; + HANDLE goit; + + if (!shortpath || !shortpath[0]) + return 0; + + if (shortpath[1] == ':') + { + tmplongpath[0] = shortpath[0]; + tmplongpath[1] = ':'; + lp = sp = 2; + } + + while (shortpath[sp]) + { + /* check for path delimiters and reproduce them */ + if (shortpath[sp] == '\\' || shortpath[sp] == '/') + { + if (!lp || tmplongpath[lp-1] != '\\') + { + /* strip double "\\" */ + tmplongpath[lp++] = '\\'; + } + tmplongpath[lp] = 0; /* terminate string */ + sp++; + continue; + } + + p = shortpath + sp; + if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) + { + tmplongpath[lp++] = *p++; + tmplongpath[lp++] = *p++; + } + for (; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (shortpath + sp); + lstrcpyn(tmplongpath + lp, shortpath + sp, tmplen + 1); + /* Check if the file exists and use the existing file name */ + goit = FindFirstFileA(tmplongpath, &wfd); + if (goit == INVALID_HANDLE_VALUE) + return 0; + FindClose(goit); + strcpy(tmplongpath + lp, wfd.cFileName); + lp += strlen(tmplongpath + lp); + sp += tmplen; + } + tmplen = strlen(shortpath) - 1; + if ((shortpath[tmplen] == '/' || shortpath[tmplen] == '\\') && + (tmplongpath[lp - 1] != '/' && tmplongpath[lp - 1] != '\\')) + tmplongpath[lp++] = shortpath[tmplen]; + tmplongpath[lp] = 0; + + tmplen = strlen(tmplongpath) + 1; + if (tmplen <= longlen) + { + strcpy(longpath, tmplongpath); + tmplen--; /* length without 0 */ + } + + return tmplen; +} /*** * @@ -864,8 +936,7 @@ ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %ld\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); - /* Win95 can't cope with double backslashes in FindExecutableA (tmpdir has a trailing backslash) */ - sprintf(filename, "%stest file.sfe", tmpdir); + sprintf(filename, "%s\\test file.sfe", tmpdir); rc=(INT_PTR)FindExecutableA(filename, NULL, command); ok(rc > 32, "FindExecutable(%s) returned %ld\n", filename, rc); /* Depending on the platform, command could be '%1' or 'test file.sfe' */ @@ -911,10 +982,6 @@ test=filename_tests; while (test->basename) { - /* Win95 can't cope with double slashes/backslashes in FindExecutableA */ - if (tmpdir[strlen(tmpdir) - 1] == '\\') - tmpdir[strlen(tmpdir) - 1] = 0; - sprintf(filename, test->basename, tmpdir); if (strchr(filename, '/')) { @@ -991,7 +1058,8 @@ GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); - sprintf(filename, "%s\\test file.shlexec", tmpdir); + sprintf(params, "%s\\test file.shlexec", tmpdir); + get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); @@ -1527,8 +1595,13 @@ "unable to find argv0!\n"); } - GetTempPathA(sizeof(tmpdir)/sizeof(*tmpdir), tmpdir); - assert(GetTempFileNameA(tmpdir, "wt", 0, child_file)!=0); + GetTempPathA(sizeof(filename), filename); + GetTempFileNameA(filename, "wt", 0, tmpdir); + DeleteFileA( tmpdir ); + rc = CreateDirectoryA( tmpdir, NULL ); + ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); + rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); + assert(rc != 0); init_event(child_file); /* Set up the test files */ @@ -1608,6 +1681,7 @@ testfile++; } DeleteFile(child_file); + RemoveDirectoryA(tmpdir); /* Delete the test association */ delete_test_association(".shlexec"); Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… ============================================================================== --- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Sun Aug 9 14:49:55 2009 @@ -189,7 +189,7 @@ /* Test whether fields of SHFILEINFOA are always cleared */ memset(&shfi, 0xcf, sizeof(shfi)); rc=SHGetFileInfoA("", 0, &shfi, sizeof(shfi), 0); - ok(rc, "SHGetFileInfoA('' | 0) should not fail\n"); + ok(rc == 1, "SHGetFileInfoA('' | 0) should return 1, got 0x%x\n", rc); todo_wine ok(shfi.hIcon == 0, "SHGetFileInfoA('' | 0) did not clear hIcon\n"); todo_wine ok(shfi.szDisplayName[0] == 0, "SHGetFileInfoA('' | 0) did not clear szDisplayName[0]\n"); todo_wine ok(shfi.szTypeName[0] == 0, "SHGetFileInfoA('' | 0) did not clear szTypeName[0]\n"); @@ -225,7 +225,7 @@ rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_ATTRIBUTES | SHGFI_USEFILEATTRIBUTES); - ok(rc, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) failed\n"); + ok(rc == 1, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) should return 1, got 0x%x\n", rc); if (rc) ok(shfi.dwAttributes != 0xcfcfcfcf, "dwFileAttributes is not set\n"); todo_wine ok(shfi.hIcon == 0, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) did not clear hIcon\n"); @@ -238,7 +238,7 @@ rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_EXETYPE | SHGFI_USEFILEATTRIBUTES); - todo_wine ok(rc == 1, "SHGetFileInfoA(c:\\nonexistent | SHGFI_EXETYPE) returned %d\n", rc); + todo_wine ok(rc == 1, "SHGetFileInfoA(c:\\nonexistent | SHGFI_EXETYPE) should return 1, got 0x%x\n", rc); /* Test SHGFI_USEFILEATTRIBUTES support */ strcpy(shfi.szDisplayName, "dummy"); @@ -246,7 +246,7 @@ rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); - ok(rc, "SHGetFileInfoA(c:\\nonexistent) failed\n"); + ok(rc == 1, "SHGetFileInfoA(c:\\nonexistent) should return 1, got 0x%x\n", rc); if (rc) { ok(strcpy(shfi.szDisplayName, "dummy") != 0, "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); @@ -263,13 +263,13 @@ rc=SHGetFileInfoA(notepad, GetFileAttributes(notepad), &shfi, sizeof(shfi), SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); - ok(rc, "SHGetFileInfoA(%s, SHGFI_USEFILEATTRIBUTES) failed\n", notepad); + ok(rc == 1, "SHGetFileInfoA(%s, SHGFI_USEFILEATTRIBUTES) should return 1, got 0x%x\n", notepad, rc); strcpy(shfi2.szDisplayName, "dummy"); shfi2.iIcon=0xdeadbeef; rc2=SHGetFileInfoA(notepad, 0, &shfi2, sizeof(shfi2), SHGFI_ICONLOCATION); - ok(rc2, "SHGetFileInfoA(%s) failed\n", notepad); + ok(rc2 == 1, "SHGetFileInfoA(%s) failed %x\n", notepad, rc2); if (rc && rc2) { ok(lstrcmpi(shfi2.szDisplayName, shfi.szDisplayName) == 0, "wrong display name %s != %s\n", shfi.szDisplayName, shfi2.szDisplayName); @@ -283,18 +283,31 @@ rc=SHGetFileInfoA("test4.txt", GetFileAttributes("test4.txt"), &shfi, sizeof(shfi), SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); - ok(rc, "SHGetFileInfoA(test4.txt/, SHGFI_USEFILEATTRIBUTES) failed\n"); + ok(rc == 1, "SHGetFileInfoA(test4.txt/, SHGFI_USEFILEATTRIBUTES) should return 1, got 0x%x\n", rc); strcpy(shfi2.szDisplayName, "dummy"); shfi2.iIcon=0xdeadbeef; rc2=SHGetFileInfoA("test4.txt", 0, &shfi2, sizeof(shfi2), SHGFI_ICONLOCATION); - ok(rc2, "SHGetFileInfoA(test4.txt/) failed\n"); + ok(rc2 == 1, "SHGetFileInfoA(test4.txt/) should return 1, got 0x%x\n", rc2); if (rc && rc2) { ok(lstrcmpi(shfi2.szDisplayName, shfi.szDisplayName) == 0, "wrong display name %s != %s\n", shfi.szDisplayName, shfi2.szDisplayName); ok(shfi2.iIcon == shfi.iIcon, "wrong icon index %d != %d\n", shfi.iIcon, shfi2.iIcon); } + /* with drive root directory */ + strcpy(shfi.szDisplayName, "dummy"); + strcpy(shfi.szTypeName, "dummy"); + shfi.hIcon=(HICON) 0xdeadbeef; + shfi.iIcon=0xdeadbeef; + shfi.dwAttributes=0xdeadbeef; + rc=SHGetFileInfoA("c:\\", 0, &shfi, sizeof(shfi), + SHGFI_TYPENAME | SHGFI_DISPLAYNAME | SHGFI_ICON | SHGFI_SMALLICON); + ok(rc == 1, "SHGetFileInfoA(c:\\) should return 1, got 0x%x\n", rc); + ok(lstrcmp(shfi.szDisplayName, "dummy") != 0, "display name was expected to change\n"); + ok(lstrcmp(shfi.szTypeName, "dummy") != 0, "type name was expected to change\n"); + ok(shfi.hIcon != (HICON) 0xdeadbeef, "hIcon was expected to change\n"); + ok(shfi.iIcon != 0xdeadbeef, "iIcon was expected to change\n"); } static void test_get_file_info_iconlist(void) @@ -318,7 +331,7 @@ hSysImageList = (HIMAGELIST) SHGetFileInfoA((const char *)pidList, 0, &shInfoa, sizeof(shInfoa), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_PIDL); - ok(hSysImageList != INVALID_HANDLE_VALUE, "Can't get handle for CSIDL_DESKTOP imagelist\n"); + ok((hSysImageList != INVALID_HANDLE_VALUE) && (hSysImageList > (HIMAGELIST) 0xffff), "Can't get handle for CSIDL_DESKTOP imagelist\n"); todo_wine ok(shInfoa.hIcon == 0, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); todo_wine ok(shInfoa.szTypeName[0] == 0, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); ok(shInfoa.iIcon != 0xcfcfcfcf, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should set iIcon\n"); @@ -344,7 +357,7 @@ win_skip("SHGetFileInfoW is not implemented\n"); return; } - ok(hSysImageList != INVALID_HANDLE_VALUE, "Can't get handle for CSIDL_DESKTOP imagelist\n"); + ok((hSysImageList != INVALID_HANDLE_VALUE) && (hSysImageList > (HIMAGELIST) 0xffff), "Can't get handle for CSIDL_DESKTOP imagelist\n"); todo_wine ok(shInfow.hIcon == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); ok(shInfow.szTypeName[0] == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); ok(shInfow.iIcon != 0xcfcfcfcf, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should set iIcon\n"); Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Sun Aug 9 14:49:55 2009 @@ -1565,21 +1565,21 @@ } if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) { - skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); + win_skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); return; } sprintf(testpath, "%s\\%s", appdata, winetemp); delret = RemoveDirectoryA(testpath); if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) ) { - skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); + win_skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); return; } sprintf(testpath, "%s\\%s", appdata, wine); delret = RemoveDirectoryA(testpath); if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) && (ERROR_FILE_NOT_FOUND != GetLastError())) { - skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); + win_skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); return; } @@ -1695,7 +1695,7 @@ len = lstrlenA(cCurrDirA); if (len == 0) { - trace("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n"); + win_skip("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n"); goto cleanup; } if(cCurrDirA[len-1] == '\\') @@ -1944,12 +1944,12 @@ if(pSHGetFolderPathAndSubDirA) testSHGetFolderPathAndSubDirA(); else - skip("SHGetFolderPathAndSubDirA not present\n"); + win_skip("SHGetFolderPathAndSubDirA not present\n"); test_LocalizedNames(); if(pSHCreateShellItem) test_SHCreateShellItem(); else - win_skip("test_SHCreateShellItem not present\n"); + win_skip("SHCreateShellItem not present\n"); OleUninitialize(); }

15 years, 1 month

[fireball] 42558: - Get rid of legacy win32k.def and import win32k.pspec from trunk. - Add a missing EngQueryFileTimeStamp stub.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 9 14:41:25 2009 New Revision: 42558 URL: http://svn.reactos.org/svn/reactos?rev=42558&view=rev Log: - Get rid of legacy win32k.def and import win32k.pspec from trunk. - Add a missing EngQueryFileTimeStamp stub. Added: branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec - copied unchanged from r42557, trunk/reactos/subsystems/win32/win32k/win32k.pspec Removed: branches/arwinss/reactos/subsystems/win32/win32k/win32k.def Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c [iso-8859-1] Sun Aug 9 14:41:25 2009 @@ -250,3 +250,13 @@ { UNIMPLEMENTED; } + +LARGE_INTEGER +APIENTRY +EngQueryFileTimeStamp(IN LPWSTR FileName) +{ + LARGE_INTEGER FileTime; + FileTime.QuadPart = 0; + UNIMPLEMENTED; + return FileTime; +} Removed: branches/arwinss/reactos/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.def [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.def (removed) @@ -1,212 +1,0 @@ -; Win32 Kernel Driver Exports -LIBRARY win32k -EXPORTS -FLOATOBJ_AddFloatObj@8 -FLOATOBJ_DivFloatObj@8 -FLOATOBJ_MulFloatObj@8 -FLOATOBJ_SubFloatObj@8 -BRUSHOBJ_hGetColorTransform@4 -BRUSHOBJ_pvAllocRbrush@8 -BRUSHOBJ_pvGetRbrush@4 -BRUSHOBJ_ulGetBrushColor@4 -CLIPOBJ_bEnum@12 -CLIPOBJ_cEnumStart@20 -CLIPOBJ_ppoGetPath@4 -EngAcquireSemaphore@4 -EngAllocMem@12 -EngAllocPrivateUserMem@12 -EngAllocSectionMem@16 -EngAllocUserMem@8 -EngAlphaBlend@28 -EngAssociateSurface@12 -EngBitBlt@44 -EngBugCheckEx(a)20=NTOSKRNL.KeBugCheckEx -EngCheckAbort@4 -EngClearEvent@4 -EngComputeGlyphSet@12 -EngControlSprites@8 -EngCopyBits@24 -EngCreateBitmap@24 -EngCreateClip@0 -EngCreateDeviceBitmap@16 -EngCreateDeviceSurface@16 -EngCreateDriverObj@12 -EngCreateEvent@4 -EngCreatePalette@24 -EngCreatePath@0 -EngCreateSemaphore@0 -EngCreateWnd@20 -EngDebugBreak(a)0=NTOSKRNL.DbgBreakPoint -EngDebugPrint@12 -EngDeleteClip@4 -EngDeleteDriverObj@12 -EngDeleteEvent@4 -EngDeleteFile@4 -EngDeletePalette@4 -EngDeletePath@4 -EngDeleteSafeSemaphore@4 -EngDeleteSemaphore@4 -EngDeleteSurface@4 -EngDeleteWnd@4 -EngDeviceIoControl@28 -EngDitherColor@16 -EngDxIoctl@12 -EngEnumForms@24 -EngEraseSurface@12 -EngFileIoControl@28 -EngFileWrite@16 -EngFillPath@28 -EngFindImageProcAddress@8 -EngFindResource@16 -EngFntCacheAlloc@8 -EngFntCacheFault@8 -EngFntCacheLookUp@8 -EngFreeMem@4 -EngFreeModule@4 -EngFreePrivateUserMem@8 -EngFreeSectionMem@8 -EngFreeUserMem@4 -EngGetCurrentCodePage@8 -EngGetCurrentProcessId@0 -EngGetCurrentThreadId@0 -EngGetDriverName@4 -EngGetFileChangeTime@8 -EngGetFilePath@8 -EngGetForm@24 -EngGetLastError@0 -EngGetPrinter@20 -EngGetPrinterData@24 -EngGetPrinterDataFileName@4 -EngGetPrinterDriver@24 -EngGetProcessHandle@0 -EngGetTickCount@0 -EngGetType1FontList@24 -EngGradientFill@40 -EngHangNotification@8 -EngInitializeSafeSemaphore@4 -EngIsSemaphoreOwned@4 -EngIsSemaphoreOwnedByCurrentThread@4 -EngLineTo@36 -EngLoadImage@4 -EngLoadModule@4 -EngLoadModuleForWrite@8 -EngLockDirectDrawSurface@4 -EngLockDriverObj@4 -EngLockSurface@4 -EngLpkInstalled@0 -EngMapEvent@20 -EngMapFontFile@12 -EngMapFontFileFD@12 -EngMapModule@8 -EngMapSection@16 -EngMarkBandingSurface@4 -EngModifySurface@32 -EngMovePointer@16 -EngMulDiv@12 -EngMultiByteToUnicodeN@20 -EngMultiByteToWideChar@20 -EngNineGrid@36 -EngPaint@20 -EngPlgBlt@44 -EngProbeForRead(a)12=NTOSKRNL.ProbeForRead -EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite -EngQueryDeviceAttribute@24 -EngQueryLocalTime@4 -EngQueryPalette@16 -EngQueryPerformanceCounter@4 -EngQueryPerformanceFrequency@4 -EngQuerySystemAttribute@8 -EngReadStateEvent@4 -EngReleaseSemaphore@4 -EngRestoreFloatingPointState@4 -EngSaveFloatingPointState@8 -EngSecureMem@8 -EngSetEvent@4 -EngSetLastError@4 -EngSetPointerShape@40 -EngSetPointerTag@20 -EngSetPrinterData@20 -EngSort@16 -EngStretchBlt@44 -EngStretchBltROP@52 -EngStrokeAndFillPath@40 -EngStrokePath@32 -EngTextOut@40 -EngTransparentBlt@32 -EngUnicodeToMultiByteN@20 -EngUnloadImage@4 -EngUnlockDirectDrawSurface@4 -EngUnlockDriverObj@4 -EngUnlockSurface@4 -EngUnmapFile@4 -EngUnmapEvent@4 -EngUnmapFontFile@4 -EngUnmapFontFileFD@4 -EngUnsecureMem@4 -EngWaitForSingleObject@8 -EngWideCharToMultiByte@20 -EngWritePrinter@16 -FLOATOBJ_Add@8 -FLOATOBJ_AddFloat@8 -FLOATOBJ_AddLong@8 -FLOATOBJ_Div@8 -FLOATOBJ_DivFloat@8 -FLOATOBJ_DivLong@8 -FLOATOBJ_Equal@8 -FLOATOBJ_EqualLong@8 -FLOATOBJ_GetFloat@4 -FLOATOBJ_GetLong@4 -FLOATOBJ_GreaterThan@8 -FLOATOBJ_GreaterThanLong@8 -FLOATOBJ_LessThan@8 -FLOATOBJ_LessThanLong@8 -FLOATOBJ_Mul@8 -FLOATOBJ_MulFloat@8 -FLOATOBJ_MulLong@8 -FLOATOBJ_Neg@4 -FLOATOBJ_SetFloat@8 -FLOATOBJ_SetLong@8 -FLOATOBJ_Sub@8 -FLOATOBJ_SubFloat@8 -FLOATOBJ_SubLong@8 -FONTOBJ_cGetAllGlyphHandles@8 -FONTOBJ_cGetGlyphs@20 -FONTOBJ_pQueryGlyphAttrs@8 -FONTOBJ_pfdg@4 -FONTOBJ_pifi@4 -FONTOBJ_pjOpenTypeTablePointer@12 -FONTOBJ_pvTrueTypeFontFile@8 -FONTOBJ_pwszFontFilePaths@8 -FONTOBJ_pxoGetXform@4 -FONTOBJ_vGetInfo@12 -HT_ComputeRGBGammaTable@24 -HT_Get8BPPFormatPalette@16 -HT_Get8BPPMaskPalette@24 -HeapVidMemAllocAligned@20 -PALOBJ_cGetColors@16 -PATHOBJ_bCloseFigure@4 -PATHOBJ_bEnum@8 -PATHOBJ_bEnumClipLines@12 -PATHOBJ_bMoveTo@12 -PATHOBJ_bPolyBezierTo@12 -PATHOBJ_bPolyLineTo@12 -PATHOBJ_vEnumStart@4 -PATHOBJ_vEnumStartClipLines@16 -PATHOBJ_vGetBounds@8 -RtlAnsiCharToUnicodeChar(a)4=NTOSKRNL.RtlAnsiCharToUnicodeChar -RtlMultiByteToUnicodeN(a)20=NTOSKRNL.RtlMultiByteToUnicodeN -RtlRaiseException(a)4=NTOSKRNL.RtlRaiseException -RtlUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUnicodeToMultiByteN -RtlUnicodeToMultiByteSize(a)12=NTOSKRNL.RtlUnicodeToMultiByteSize -RtlUnwind(a)16=NTOSKRNL.RtlUnwind -RtlUpcaseUnicodeChar(a)4=NTOSKRNL.RtlUpcaseUnicodeChar -RtlUpcaseUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN -XFORMOBJ_bApplyXform@20 -XFORMOBJ_iGetFloatObjXform@8 -XFORMOBJ_iGetXform@8 -_abnormal_termination=NTOSKRNL._abnormal_termination -_except_handler2=NTOSKRNL._except_handler2 -_global_unwind2=NTOSKRNL._global_unwind2 -_itoa(a)12=NTOSKRNL._itoa -_itow(a)12=NTOSKRNL._itow -_local_unwind2=NTOSKRNL._local_unwind2 Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Aug 9 14:41:25 2009 @@ -2,7 +2,7 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys"> - <importlibrary definition="win32k.def" /> + <importlibrary definition="win32k.pspec" /> <define name="_WIN32K_" /> <include base="win32k">.</include>

15 years, 1 month

[gschneider] 42557: Even without a CMINVOKECOMMANDINFOEX structure a link should be executed with the supplied parameters See issue #4323 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Aug 9 14:07:21 2009 New Revision: 42557 URL: http://svn.reactos.org/svn/reactos?rev=42557&view=rev Log: Even without a CMINVOKECOMMANDINFOEX structure a link should be executed with the supplied parameters See issue #4323 for more details. Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Sun Aug 9 14:07:21 2009 @@ -2816,6 +2816,10 @@ wcscat( args, iciex->lpParametersW ); } } + else if (This->sArgs != NULL) + { + args = This->sArgs; + } memset( &sei, 0, sizeof sei ); sei.cbSize = sizeof sei;

15 years, 1 month

[cwittich] 42556: fix build

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Aug 9 14:06:07 2009 New Revision: 42556 URL: http://svn.reactos.org/svn/reactos?rev=42556&view=rev Log: fix build Modified: trunk/reactos/dll/win32/avifil32/avifile_Lt.rc trunk/reactos/dll/win32/avifil32/avifile_Ro.rc Modified: trunk/reactos/dll/win32/avifil32/avifile_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Lt.rc [iso-8859-1] Sun Aug 9 14:06:07 2009 @@ -53,3 +53,4 @@ IDS_AVIFILETYPE "Wine numatyta-AVI-doroklÄ" IDS_UNCOMPRESSED "neglaudintas" } +#pragma code_page(default) Modified: trunk/reactos/dll/win32/avifil32/avifile_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ro.rc [iso-8859-1] Sun Aug 9 14:06:07 2009 @@ -55,3 +55,4 @@ IDS_AVIFILETYPE "Tratare implicitÄ Wine pentru AVI" IDS_UNCOMPRESSED "necomprimat" } +#pragma code_page(default)

15 years, 1 month

← Newer
1
...
39
40
41
42
43
44
45
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009