[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 2b5cdba09a4cc631f62096ca30e51d4288eadd55
Author: Piotr Caban <piotr at codeweavers.com>
Date:   Mon Apr 16 18:11:37 2012 +0200

    msvcr90: Added _byteswap_{ushort,ulong,uint64} implementation.
    (cherry picked from commit e24e6eb278f601fcb7ea5086ec5c8dbf38008eae)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 28b208e..0260dde 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -517,9 +517,9 @@
 @ cdecl _beep(long long) msvcrt._beep
 @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex
-@ stub _byteswap_uint64
-@ stub _byteswap_ulong
-@ stub _byteswap_ushort
+@ cdecl _byteswap_uint64(int64) msvcr90._byteswap_uint64
+@ cdecl _byteswap_ulong(long) msvcr90._byteswap_ulong
+@ cdecl _byteswap_ushort(long) msvcr90._byteswap_ushort
 @ cdecl _c_exit() msvcrt._c_exit
 @ cdecl _cabs(long) msvcrt._cabs
 @ cdecl _callnewh(long) msvcrt._callnewh
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index ef24427..0d51c8c 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -356,9 +356,9 @@
 @ cdecl _beep(long long) msvcrt._beep
 @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex
-@ stub _byteswap_uint64
-@ stub _byteswap_ulong
-@ stub _byteswap_ushort
+@ cdecl _byteswap_uint64(int64) msvcr90._byteswap_uint64
+@ cdecl _byteswap_ulong(long) msvcr90._byteswap_ulong
+@ cdecl _byteswap_ushort(long) msvcr90._byteswap_ushort
 @ cdecl _c_exit() msvcrt._c_exit
 @ cdecl _cabs(long) msvcrt._cabs
 @ cdecl _callnewh(long) msvcrt._callnewh
diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c
index 663dd37..2caf60d 100644
--- a/dlls/msvcr90/msvcr90.c
+++ b/dlls/msvcr90/msvcr90.c
@@ -366,3 +366,28 @@ int CDECL MSVCR90__vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *fo
 {
     return _vswprintf_p_l(buffer, length, format, NULL, args);
 }
+
+/*********************************************************************
+ *              _byteswap_ushort (MSVCR90.@)
+ */
+unsigned short CDECL _byteswap_ushort(unsigned short s)
+{
+    return (s<<8) + (s>>8);
+}
+
+/*********************************************************************
+ *              _byteswap_ulong (MSVCR90.@)
+ */
+unsigned long CDECL _byteswap_ulong(unsigned long l)
+{
+    return (l<<24) + ((l<<8)&0xFF0000) + ((l>>8)&0xFF00) + (l>>24);
+}
+
+/*********************************************************************
+ *              _byteswap_uint64 (MSVCR90.@)
+ */
+unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i)
+{
+    return (i<<56) + ((i&0xFF00)<<40) + ((i&0xFF0000)<<24) + ((i&0xFF000000)<<8) +
+        ((i>>8)&0xFF000000) + ((i>>24)&0xFF0000) + ((i>>40)&0xFF00) + (i>>56);
+}
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index db3f973..b0672c4 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -348,9 +348,9 @@
 @ cdecl _beep(long long) msvcrt._beep
 @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex
-@ stub _byteswap_uint64
-@ stub _byteswap_ulong
-@ stub _byteswap_ushort
+@ cdecl _byteswap_uint64(int64)
+@ cdecl _byteswap_ulong(long)
+@ cdecl _byteswap_ushort(long)
 @ cdecl _c_exit() msvcrt._c_exit
 @ cdecl _cabs(long) msvcrt._cabs
 @ cdecl _callnewh(long) msvcrt._callnewh

-- 
Debian Wine packaging