March 2009 - Wine-Commits - list.winehq.org

Austin English : configure: inet_ntop and inet_pton depend on -lsocket on Solaris.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 0656691706dc5d85ed643c949d87aa9b70867eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0656691706dc5d85ed643c949… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Mar 28 00:13:09 2009 -0500 configure: inet_ntop and inet_pton depend on -lsocket on Solaris. --- configure | 8 ++++---- configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 668adbc..eb66b54 100755 --- a/configure +++ b/configure @@ -17950,8 +17950,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" - - for ac_func in \ _pclose \ _popen \ @@ -17983,8 +17981,6 @@ for ac_func in \ gettid \ gettimeofday \ getuid \ - inet_ntop \ - inet_pton \ kqueue \ lstat \ memmove \ @@ -18656,6 +18652,8 @@ fi + + for ac_func in \ getaddrinfo \ getnameinfo \ @@ -18664,6 +18662,8 @@ for ac_func in \ getprotobynumber \ getservbyport \ inet_network \ + inet_ntop \ + inet_pton \ sendmsg \ socketpair \ diff --git a/configure.ac b/configure.ac index c13abc4..9c90bff 100644 --- a/configure.ac +++ b/configure.ac @@ -1456,8 +1456,6 @@ AC_CHECK_FUNCS(\ gettid \ gettimeofday \ getuid \ - inet_ntop \ - inet_pton \ kqueue \ lstat \ memmove \ @@ -1530,6 +1528,8 @@ AC_CHECK_FUNCS(\ getprotobynumber \ getservbyport \ inet_network \ + inet_ntop \ + inet_pton \ sendmsg \ socketpair \ )

1 0

Austin English : cryptui: Fix a compiler warning on PC-BSD.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: f52c7e2ad0ac6fe8c2999ec649cfa25f7a6611df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52c7e2ad0ac6fe8c2999ec64… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Mar 27 17:13:48 2009 -0500 cryptui: Fix a compiler warning on PC-BSD. --- dlls/cryptui/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index ddbea8e..f29f1e6 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3337,7 +3337,7 @@ static void show_cert_usages(HWND hwnd, struct edit_cert_data *data) DWORD size; RECT rc; LVCOLUMNW column; - PurposeSelection purposeSelection; + PurposeSelection purposeSelection = PurposeEnableAll; GetWindowRect(lv, &rc); column.mask = LVCF_WIDTH;

1 0

Scott Ritchie : Update-download-and-download-deb-page-for-Ubuntu-9.04
by Jeremy Newman March 30, 2009

March 30, 2009

Module: website Branch: master Commit: 7ed6536bc070fa779ec67e82669184872ea13d9a URL: http://source.winehq.org/git/website.git/?a=commit;h=7ed6536bc070fa779ec67e… Author: Scott Ritchie <scott(a)open-vote.org> Date: Sat Mar 28 18:43:12 2009 -0700 Update-download-and-download-deb-page-for-Ubuntu-9.04 Update-download-and-download-deb-page-for-Ubuntu-9.04 >From 68aae6bbfe0f45c9c8bf8c8433d531354a87d4b1 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Sat, 28 Mar 2009 11:52:47 -0700 Subject: Update download and download-deb page for Ubuntu 9.04 To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- templates/en/download.template | 2 +- templates/en/download/deb.template | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index f1fefbb..12829b9 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Ubuntu</a> - binary and source .debs for Ubuntu Hardy (8.04) and Intrepid (8.10) + binary and source .debs for Ubuntu Hardy (8.04), Intrepid (8.10), and Jaunty (9.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index e7d8c8c..18972d9 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -32,6 +32,8 @@ Party Software tab and click Add. Then, copy and paste one of the lines below depending on which version you are running. +For Ubuntu Jaunty (9.04): +deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" For Ubuntu Intrepid (8.10): deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" For Ubuntu Hardy (8.04): @@ -85,6 +87,8 @@ and pasting the following into your terminal: Next, add the repository to your system's list of APT sources: +For Ubuntu Jaunty (9.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Intrepid (8.10): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Hardy (8.04):

1 0

Maik Schulz : german translation for release 1.1.18 news item
by Jeremy Newman March 30, 2009

March 30, 2009

Module: website Branch: master Commit: 7256ae8d8b7b5f1deff4cbd4fbf64a954b10c53f URL: http://source.winehq.org/git/website.git/?a=commit;h=7256ae8d8b7b5f1deff4cb… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Mar 28 09:36:01 2009 +0100 german translation for release 1.1.18 news item Hi, please find the patch for the translation for the 1.1.18 release news item attached. Cheers, -Maik >From 1584248d3698fe1eed779635bb0cb648f2dd360a Mon Sep 17 00:00:00 2001 From: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat, 28 Mar 2009 09:32:16 +0100 Subject: german translation for release 1.1.18 news item --- news/de/2009032701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2009032701.xml b/news/de/2009032701.xml new file mode 100644 index 0000000..ec1e6dd --- /dev/null +++ b/news/de/2009032701.xml @@ -0,0 +1,16 @@ +<news> +<date>March 27, 2009</date> +<title>Wine 1.1.18 Released</title> +<body> + Die Entwicklungsversion 1.1.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für RPC über HTTP.</li> + <li>Verbesserte Unterstützung von Aktualisierungen in MSI.</li> + <li>Debug Symbole in WineDbg unter Mac OS X.</li> + <li>Viele Aufräumarbeiten im Direct3D Quellcode.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.18.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.18
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: website Branch: master Commit: 9af3985067dd773d017971c0eb109ca3f26a81ca URL: http://source.winehq.org/git/website.git/?a=commit;h=9af3985067dd773d017971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 19:37:55 2009 +0100 Wine release 1.1.18 --- news/en/2009032701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2009032701.xml b/news/en/2009032701.xml new file mode 100644 index 0000000..8f108f1 --- /dev/null +++ b/news/en/2009032701.xml @@ -0,0 +1,16 @@ +<news> +<date>March 27, 2009</date> +<title>Wine 1.1.18 Released</title> +<body> + The Wine development release 1.1.18 is now available. + <a href="{$root}/announce/1.1.18">What's new</a> in this release: +<ul> + <li>RPC over HTTP support.</li> + <li>Improved support for upgrades in MSI.</li> + <li>Debug symbols in WineDbg on Mac OS X.</li> + <li>Many Direct3D code cleanups.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.18.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.18 : Alexandre Julliard : Release 1.1.18
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: refs/tags/wine-1.1.18 Tag: b5ed058c46b885c503820d0b22b218af4e2e6ecb URL: http://source.winehq.org/git/wine.git/?a=tag;h=b5ed058c46b885c503820d0b22b2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 19:31:23 2009 +0100 Release 1.1.18

1 0

Alexandre Julliard : Release 1.1.18.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 3949bb691839c5745c41e14ad1e88aee7d974e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3949bb691839c5745c41e14ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 19:31:22 2009 +0100 Release 1.1.18. --- ANNOUNCE | 936 +++++++++++++++++++++++-------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 368 insertions(+), 588 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3949bb691839c5745c41e…

1 0

Hans Leidekker : msi: Allocate token information buffer dynamically.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 4365b34838f14c0a6908ea794429ba6e493a59d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4365b34838f14c0a6908ea794… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 13:41:35 2009 +0100 msi: Allocate token information buffer dynamically. --- dlls/msi/tests/msi.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 13afd92..c3ef72b 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -516,15 +516,19 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) static void get_user_sid(LPSTR *usersid) { HANDLE token; - BYTE buf[1024]; DWORD size; PTOKEN_USER user; OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); - size = sizeof(buf); - GetTokenInformation(token, TokenUser, buf, size, &size); - user = (PTOKEN_USER)buf; + + size = 0; + GetTokenInformation(token, TokenUser, NULL, size, &size); + user = HeapAlloc(GetProcessHeap(), 0, size); + + GetTokenInformation(token, TokenUser, user, size, &size); pConvertSidToStringSidA(user->User.Sid, usersid); + + HeapFree(GetProcessHeap(), 0, user); CloseHandle(token); }

1 0

Stefano Guidoni : winemp3: Fixed mpeg3_streamsize.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 21186d5a69a4d1f787edfe92ad26d4a7a964651a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21186d5a69a4d1f787edfe92a… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Tue Mar 24 20:52:54 2009 +0100 winemp3: Fixed mpeg3_streamsize. mpeg3_streamsize must estimate the number of samples of an mp3 chunk. The result must be block aligned (PCM) or frame aligned (MP3). --- dlls/winemp3.acm/mpegl3.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 6d476e4..e0f0ebd 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -471,6 +471,8 @@ static LRESULT MPEG3_StreamClose(PACMDRVSTREAMINSTANCE adsi) */ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss) { + DWORD nblocks; + switch (adss->fdwSize) { case ACM_STREAMSIZEF_DESTINATION: @@ -478,14 +480,19 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbSrcLength = adss->cbDstLength * 12; + nblocks = (adsi->pwfxDst->nAvgBytesPerSec * 8 * 144 / adsi->pwfxDst->nSamplesPerSec); + nblocks = (adss->cbDstLength - 3002 - nblocks) / nblocks; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * 1152 * adsi->pwfxSrc->nBlockAlign; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - FIXME("misses the block header overhead\n"); - adss->cbSrcLength = 256 + adss->cbDstLength / 12; + nblocks = adss->cbDstLength / (adsi->pwfxDst->nBlockAlign * 1152); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 8 * 144 / adsi->pwfxSrc->nSamplesPerSec); } else { @@ -497,14 +504,19 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) { - FIXME("misses the block header overhead\n"); - adss->cbDstLength = 256 + adss->cbSrcLength / 12; + nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbDstLength = nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 8 * 144 / adsi->pwfxDst->nSamplesPerSec); } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbDstLength = adss->cbSrcLength * 12; + nblocks = (adsi->pwfxSrc->nAvgBytesPerSec * 8 * 144 / adsi->pwfxSrc->nSamplesPerSec); + nblocks = (adss->cbSrcLength - 3002 - nblocks) / nblocks; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; } else {

1 0

Paul Vriens : kernel32/tests: Fix some test failures on NT4 and below.
by Alexandre Julliard March 27, 2009

March 27, 2009

Module: wine Branch: master Commit: 7eca8022df557e06aabf32c7c1268753127c8e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eca8022df557e06aabf32c7c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 27 11:46:25 2009 +0100 kernel32/tests: Fix some test failures on NT4 and below. --- dlls/kernel32/tests/profile.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 5651deb..ab7c7fa 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -843,7 +843,9 @@ static void test_WritePrivateProfileString(void) SetLastError(0xdeadbeef); ret = WritePrivateProfileStringA(NULL, "key", "string", path); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ + broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, "Expected path to not exist\n"); @@ -855,7 +857,9 @@ static void test_WritePrivateProfileString(void) SetLastError(0xdeadbeef); ret = WritePrivateProfileStringA(NULL, "key", "string", path); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ + broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path);

1 0