November 2007 - Wine-commits

Juan Lang : wininet: Initialize length of values that aren' t being requested.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: f15bbdcd5afb1ccf6f4771df6f6bd27c03511562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15bbdcd5afb1ccf6f4771df6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 8 09:09:36 2007 -0800 wininet: Initialize length of values that aren't being requested. --- dlls/wininet/cookie.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 31a0e19..f5f3975 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -184,6 +184,10 @@ static void COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostName UrlComponents.lpszUrlPath = path; UrlComponents.lpszUserName = NULL; UrlComponents.lpszHostName = hostName; + UrlComponents.dwExtraInfoLength = 0; + UrlComponents.dwPasswordLength = 0; + UrlComponents.dwSchemeLength = 0; + UrlComponents.dwUserNameLength = 0; UrlComponents.dwHostNameLength = hostNameLen; UrlComponents.dwUrlPathLength = pathLen;

1 0

Hans Leidekker : usp10: Fix a memory leak.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: ab4d8aec35e4a04778f1f159b58f924b682087e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4d8aec35e4a04778f1f159b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 8 19:18:07 2007 +0100 usp10: Fix a memory leak. --- dlls/usp10/tests/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ca2f5b6..052a0f4 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -279,6 +279,7 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok( hr == S_OK, "ScriptGetCMap(NULL,&psc,NULL,0,0,NULL), expected S_OK, " "got %08x\n", hr); ok( psc != NULL, "ScritpGetCMap expected psc to be not NULL\n"); + ScriptFreeCache( &psc); /* Set psc to NULL, to be able to check if a pointer is returned in psc */ psc = NULL;

1 0

Maarten Lankhorst : dsound: Add mixing and normalization functions.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: a938f693606faa0ca569cce9cbbee60b56eb8301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a938f693606faa0ca569cce9c… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Wed Nov 7 20:32:09 2007 +0100 dsound: Add mixing and normalization functions. --- dlls/dsound/dsound_convert.c | 132 ++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 4 + 2 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 6290a07..649bd78 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -182,3 +182,135 @@ const bitsconvertfunc convertbpp[4][4] = { { convert_24_to_8, convert_24_to_16, convert_24_to_24, convert_24_to_32 }, { convert_32_to_8, convert_32_to_16, convert_32_to_24, convert_32_to_32 }, }; + +static void mix8(int8_t *src, int32_t *dst, unsigned len) +{ + TRACE("%p - %p %d\n", src, dst, len); + while (len--) + /* 8-bit WAV is unsigned, it's here converted to signed, normalize function will convert it back again */ + *(dst++) += (int8_t)((uint8_t)*(src++) - (uint8_t)0x80); +} + +static void mix16(int16_t *src, int32_t *dst, unsigned len) +{ + TRACE("%p - %p %d\n", src, dst, len); + len /= 2; + while (len--) + { + *dst += le16(*src); + ++dst; ++src; + } +} + +static void mix24(int24_struct *src, int32_t *dst, unsigned len) +{ + TRACE("%p - %p %d\n", src, dst, len); + len /= 3; + while (len--) + { + uint32_t field; + field = ((unsigned)src->byte[2] << 16) + ((unsigned)src->byte[1] << 8) + (unsigned)src->byte[0]; + if (src->byte[2] & 0x80) + field |= 0xFF000000U; + *(dst++) += field; + ++src; + } +} + +static void mix32(int32_t *src, int64_t *dst, unsigned len) +{ + TRACE("%p - %p %d\n", src, dst, len); + len /= 4; + while (len--) + *(dst++) += le32(*(src++)); +} + +const mixfunc mixfunctions[4] = { + (mixfunc)mix8, + (mixfunc)mix16, + (mixfunc)mix24, + (mixfunc)mix32 +}; + +static void norm8(int32_t *src, int8_t *dst, unsigned len) +{ + TRACE("%p - %p %d\n", src, dst, len); + while (len--) + { + *dst = (*src) + 0x80; + if (*src < -0x80) + *dst = 0; + else if (*src > 0x7f) + *dst = 0xff; + ++dst; + ++src; + } +} + +static void norm16(int32_t *src, int16_t *dst, unsigned len) +{ + TRACE("%p - %p %d\n", src, dst, len); + len /= 2; + while (len--) + { + *dst = le16(*src); + if (*src <= -0x8000) + *dst = le16(0x8000); + else if (*src > 0x7fff) + *dst = le16(0x7fff); + ++dst; + ++src; + } +} + +static void norm24(int32_t *src, int24_struct *dst, unsigned len) +{ + TRACE("%p - %p %d\n", src, dst, len); + len /= 3; + while (len--) + { + if (*src <= -0x800000) + { + dst->byte[0] = 0; + dst->byte[1] = 0; + dst->byte[2] = 0x80; + } + else if (*src > 0x7fffff) + { + dst->byte[0] = 0xff; + dst->byte[1] = 0xff; + dst->byte[2] = 0x7f; + } + else + { + dst->byte[0] = *src; + dst->byte[1] = *src >> 8; + dst->byte[2] = *src >> 16; + } + ++dst; + ++src; + } +} + +static void norm32(int64_t *src, int32_t *dst, unsigned len) +{ + TRACE("%p - %p %d\n", src, dst, len); + len /= 4; + while (len--) + { + *dst = le32(*src); + if (*src <= -(int64_t)0x80000000) + *dst = le32(0x80000000); + else if (*src > 0x7fffffff) + *dst = le32(0x7fffffff); + ++dst; + ++src; + } +} + +const normfunc normfunctions[4] = { + (normfunc)norm8, + (normfunc)norm16, + (normfunc)norm24, + (normfunc)norm32, +}; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 21fcfe2..fbddefe 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -72,6 +72,10 @@ typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice; /* dsound_convert.h */ typedef void (*bitsconvertfunc)(const void *, void *); extern const bitsconvertfunc convertbpp[4][4]; +typedef void (*mixfunc)(const void *, void *, unsigned); +extern const mixfunc mixfunctions[4]; +typedef void (*normfunc)(const void *, void *, unsigned); +extern const normfunc normfunctions[4]; /***************************************************************************** * IDirectSoundDevice implementation structure

1 0

Maarten Lankhorst : dsound: Add support for 24/32 bits input sound buffers.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: fa3663d6c79601cac7663c0c477bec5ba089c944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3663d6c79601cac7663c0c4… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Wed Nov 7 20:31:53 2007 +0100 dsound: Add support for 24/32 bits input sound buffers. --- dlls/dsound/Makefile.in | 1 + dlls/dsound/dsound_convert.c | 184 ++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 6 +- dlls/dsound/mixer.c | 84 +++++-------------- 4 files changed, 211 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa3663d6c79601cac7663…

1 0

Alexander Nicolaysen Sørnes : objectManager: Support user-selected sorting in tables
by Chris Morgan 09 Nov '07

09 Nov '07

Module: appdb Branch: master Commit: e7625791a07aec1d993fdf2a17b9b73329b00df2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e7625791a07aec1d993fdf2a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Nov 8 17:32:00 2007 +0100 objectManager: Support user-selected sorting in tables --- include/application.php | 27 ++++++++----- include/application_queue.php | 11 ++++- include/objectManager.php | 61 +++++++++++++++++++++++++-- include/table.php | 91 ++++++++++++++++++++++++++++++++++++++++- objectManager.php | 1 + 5 files changed, 173 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=e7625791a07aec1d993f…

1 0

Alexander Nicolaysen Sørnes : version_queue: Only reject version when app is unqueued
by Chris Morgan 09 Nov '07

09 Nov '07

Module: appdb Branch: master Commit: 7643ac8229388d7d01f63054505a03663643bcab URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7643ac8229388d7d01f63054… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Nov 8 12:24:00 2007 +0100 version_queue: Only reject version when app is unqueued --- include/version_queue.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/version_queue.php b/include/version_queue.php index d2bb809..725f8b0 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -57,7 +57,10 @@ class version_queue function reject() { - $this->oVersion->reject(); + $oApp = new application($this->oVersion->iAppId); + + if($oApp->sQueued == "false") + $this->oVersion->reject(); if($this->oDownloadUrl->iId) $this->oDownloadUrl->reject();

1 0

Scott Ritchie : Update download-deb to reflect 64 bit packages for Debian Etch
by Jeremy Newman 08 Nov '07

08 Nov '07

Module: website Branch: master Commit: 540ea75b8538ff47d70a28d18576f65fb2ed31db URL: http://source.winehq.org/git/website.git/?a=commit;h=540ea75b8538ff47d70a28… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Nov 5 11:15:29 2007 -0800 Update download-deb to reflect 64 bit packages for Debian Etch Update download-deb to reflect 64 bit packages for Debian Etch Thanks, Scott Ritchie >From f866aa1fcd5ad34d537a79b42ff2e9b4be5eae5a Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Mon, 5 Nov 2007 11:12:58 -0800 Subject: Update download-deb to reflect 64 bit packages for Debian Etch --- templates/en/download-deb.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index c716eb0..2cf6894 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -33,7 +33,7 @@ list of trusted APT keys by copy and pasting the following: sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/edgy.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Dapper (6.06): *64-bit packages not available* sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/dapper.list -O /etc/apt/sources.list.d/winehq.list -For Debian Etch (4.0): *64-bit packages not available* +For Debian Etch (4.0): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list Then, you can install Wine from WineHQ like it were any other package, such as by

1 0

Jeremy Newman : Marcus Meissner <meissner@suse.de>
by Jeremy Newman 08 Nov '07

08 Nov '07

Module: website Branch: master Commit: 9047e31004fc7116b38e75357fc23a71200174ad URL: http://source.winehq.org/git/website.git/?a=commit;h=9047e31004fc7116b38e75… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 8 16:55:53 2007 -0600 Marcus Meissner <meissner(a)suse.de> updated SUSE entry to match current versions --- templates/en/download.template | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 3b44af6..b2d73f8 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -39,7 +39,8 @@ for post-installation instructions. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - release binary and source .rpms and daily snapshot RPMs for SUSE Linux 9.3, 10.0, 10.1, and openSUSE 10.2. + release binary and source .rpms and daily snapshot RPMs for SUSE Linux 10.0, 10.1, openSUSE 10.2 and 10.3. + Old versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr>

1 0

Vitaliy Margolen : Fix SuSE download link
by Jeremy Newman 08 Nov '07

08 Nov '07

Module: website Branch: master Commit: 4dbad523cdbde1c07b21a7011766ee020cc853e9 URL: http://source.winehq.org/git/website.git/?a=commit;h=4dbad523cdbde1c07b21a7… Author: Vitaliy Margolen <wine-devel(a)kievinfo.com> Date: Sat Oct 27 11:08:30 2007 -0600 Fix SuSE download link Did this fall through the cracks? Resending. Link on the SuSE logo leads to the old place. --- templates/en/download.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 7df2fb6..3b44af6 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -35,7 +35,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…"> + <td align=center><a href="http://en.opensuse.org/Wine#Repositories"> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a>

1 0

Hans Leidekker : mlang: Fix buffer size calculation.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: b0c9e753d512ccb29d53f8b5e2e8635ca35b930c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c9e753d512ccb29d53f8b5e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 8 12:36:10 2007 +0100 mlang: Fix buffer size calculation. --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 98c62bb..ac455e6 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -693,7 +693,7 @@ static inline INT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) if (n) { rfc1766[n - 1] = '-'; - n += GetLocaleInfoA( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ) + 1; + n += GetLocaleInfoA( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); LCMapStringA( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); return n; } @@ -706,7 +706,7 @@ static inline INT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) if (n) { rfc1766[n - 1] = '-'; - n += GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ) + 1; + n += GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); return n; }

1 0