On 08/01/12 15:49, Corinna Vinschen wrote:
> On Aug  1 15:27, Jacek Caban wrote:
>> Hi Corinna,
>>
>> On 08/01/12 14:57, Corinna Vinschen wrote:
>>> Hi,
>>>
>>> per our discussion in the previous thread, here's a patch which replaces
>>> all long and unsigned long with LONG and ULONG in .idl files and their
>>> dependent .h files.  Hope that's ok.
>> All changes inside cpp_quotes are OK. Places outside long would be
>> translated to LONG by widl anyway, but if having explicit LONG there
>> makes your changes easier, that's fine with me with two exceptions:
>>
>>>     * axcore.idl: Throughout, replace long and unsigned long with LONG and
>>>     ULONG.
>> This is imported from Wine and uses longs only outside cpp_quote, so
>> it's fine as-is. Let's keep it unchanged to avoid the need for sync.
> Ok, I'll drop it from the patchset.
>
>>>     * msxml.idl: Ditto.
>>>     * objidl.idl: Ditto.
>>>     * ocidl.idl: Ditto.
>>>     * oleidl.idl: Ditto.
>>>     * propidl.idl: Ditto.
>>>     * shobjidl.idl: Ditto.
>>>     * strmif.idl: Ditto.
>>>     * urlmon.idl: Ditto.
>>>     * wtypes.idl: Ditto.
>> wtypes.idl is pretty critical IDL type-wise, and see what you have there:
>>
>> -    typedef long LONG;
>> +    typedef LONG LONG;
> Ouch!
>
>> Please change only cpp_quote parts in this file.
> Ok, that changes the wtypes.* patches to:
>
> Index: wtypes.idl
> ===================================================================
> --- wtypes.idl        (revision 5308)
> +++ wtypes.idl        (working copy)
> @@ -666,8 +666,8 @@
>  
>  cpp_quote("  typedef union tagCY {")
>  cpp_quote("    __C89_NAMELESS struct {")
> -cpp_quote("      unsigned long Lo;")
> -cpp_quote("      long Hi;")
> +cpp_quote("      ULONG Lo;")
> +cpp_quote("      LONG Hi;")
>  cpp_quote("    } DUMMYSTRUCTNAME;")
>  cpp_quote("    LONGLONG int64;")
>  cpp_quote("  } CY;")
> Index: wtypes.h
> ===================================================================
> --- wtypes.h  (revision 5308)
> +++ wtypes.h  (working copy)
> @@ -626,8 +626,8 @@
>  #else
>    typedef union tagCY {
>      __C89_NAMELESS struct {
> -      unsigned long Lo;
> -      long Hi;
> +      ULONG Lo;
> +      LONG Hi;
>      } DUMMYSTRUCTNAME;
>      LONGLONG int64;
>    } CY;
>
>
> Ok to apply?

Yes, thanks.

Jacek


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to