June 2017 - Wine-commits - list.winehq.org

Rosanne DiMesio : Revise bug link message
by Jeremy Newman 26 Jun '17

26 Jun '17

Module: appdb Branch: master Commit: 9e07aab1b18a63c497de0bfbf251eacdba239a7a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9e07aab1b18a63c497de0bfb… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 26 12:53:31 2017 -0500 Revise bug link message Changes the message to match the way the process actually works. Fixes bug 36179. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/bugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bugs.php b/include/bugs.php index f8c3f41..331600e 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -271,7 +271,7 @@ class Bug { $sSubject = "Link between Bug ".$this->iBug_id." and ".$sAppName." submitted by ".$_SESSION['current']->sRealname; $sMsg .= "This Bug Link has been queued.\n"; - addmsg("The Bug Link you submitted will be added to the database after being reviewed.", "green"); + addmsg("The Bug Link you submitted has been added to the database and queued for review by the maintainer or an administrator.", "green"); } } else // Bug Link deleted. {

1 0

Francois Gouget : testbot/TestLauncher: Fix the 'missing dll' messages.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: tools Branch: master Commit: 913cfde454e888c8a1a036f0a33faddd79000e97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=913cfde454e888c8a1a036f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 21 16:26:51 2017 +0200 testbot/TestLauncher: Fix the 'missing dll' messages. The messages issued when skipping a test due to a missing dll must match those issued by WineTest. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 1d0abac..9a7dce2 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -26,7 +26,6 @@ static unsigned Failures = 0; static unsigned Skips = 0; -static char TestName[_MAX_PATH]; #define ReportError (_SetErrorLocation(__FILE__, __LINE__), 0) ? (void)0 : _ReportError @@ -91,7 +90,7 @@ static BOOL DllPresent(const char *DllName) * So instead we just dive into the executable's import table, determine which modules are being * imported and check if they are present. */ -static BOOL AllImportedDllsPresent(const char *TestExeName) +static BOOL AllImportedDllsPresent(const char *TestExeName, const char *Subtest) { HANDLE TestExe; IMAGE_DOS_HEADER DosHeader; @@ -259,7 +258,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName) { if (AllPresent) { - printf("%s:0 Test skipped: required DLL %s", TestName, ModuleName); + printf("%s.c:0: Tests skipped: required DLL %s", Subtest, ModuleName); AllPresent = FALSE; } else @@ -288,6 +287,7 @@ int main(int argc, char *argv[]) char TestExeFullName[_MAX_PATH]; char *TestExeFileName; const char *Suffix; + char TestName[_MAX_PATH]; const char *Subtest; int TestArg; char *CommandLine; @@ -378,9 +378,9 @@ int main(int argc, char *argv[]) Start = GetTickCount(); printf("%s:%s start - -\n", TestName, Subtest); - if (! AllImportedDllsPresent(TestExeFullName)) + if (! AllImportedDllsPresent(TestExeFullName, Subtest)) { - printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", TestName, Failures, Failures, Skips); + printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Subtest, Failures, Failures, Skips); printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, (GetTickCount() - Start) / 1000); exit(0);

1 0

Francois Gouget : testbot/TestLauncher: Print the process pid on the 'done ' lines.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: tools Branch: master Commit: e8249b696d96edd61010d4971db282bb65d0a313 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e8249b696d96edd61010d497… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 21 16:27:02 2017 +0200 testbot/TestLauncher: Print the process pid on the 'done' lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 9a7dce2..fb48484 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -380,8 +380,8 @@ int main(int argc, char *argv[]) if (! AllImportedDllsPresent(TestExeFullName, Subtest)) { - printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Subtest, Failures, Failures, Skips); - printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, + printf("0000:%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Subtest, Failures, Failures, Skips); + printf("%s:%s:0000 done (%u) in %lds\n", TestName, Subtest, Failures, (GetTickCount() - Start) / 1000); exit(0); } @@ -451,7 +451,8 @@ int main(int argc, char *argv[]) } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s done (%lu) in %lds\n", TestName, Subtest, ExitCode, + printf("%s:%s:%04lx done (%lu) in %lds\n", TestName, Subtest, + ProcessInformation.dwProcessId, ExitCode, (GetTickCount() - Start) / 1000); return 0;

1 0

Francois Gouget : testbot/TestLauncher: Report the exit code as a signed integer.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: tools Branch: master Commit: 441990cc867ce10d44da52944aa2c5efeca980b1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=441990cc867ce10d44da5294… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 21 16:27:36 2017 +0200 testbot/TestLauncher: Report the exit code as a signed integer. This is for consistency with WineTest. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index fb48484..3052198 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -451,7 +451,7 @@ int main(int argc, char *argv[]) } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s:%04lx done (%lu) in %lds\n", TestName, Subtest, + printf("%s:%s:%04lx done (%ld) in %lds\n", TestName, Subtest, ProcessInformation.dwProcessId, ExitCode, (GetTickCount() - Start) / 1000);

1 0

Rosanne DiMesio : Control Center: add 3 functions
by Jeremy Newman 26 Jun '17

26 Jun '17

Module: appdb Branch: master Commit: 09a6f1ff2c70b1a46ecb5f0d0bd1b65b42f1a472 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=09a6f1ff2c70b1a46ecb5f0d… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 26 10:08:13 2017 -0500 Control Center: add 3 functions Adds purgeRejectedDistributions, purgeRejectedVendors, and viewAppdbAdmins to the admin Control Center. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/admin.php b/admin.php index 79fbd58..f82fc2b 100644 --- a/admin.php +++ b/admin.php @@ -220,6 +220,22 @@ function deleteOrphanVersions() echo "Deleted ".query_affected_rows()." orphan versions. "; } +function purgeRejectedDistributions() +{ + $sQuery = "DELETE FROM distributions WHERE state = 'deleted'"; + $hResult = query_parameters($sQuery); + + echo "Removed " .query_affected_rows()." rejected distributions from database. "; +} + +function purgeRejectedVendors() +{ + $sQuery = "DELETE FROM vendor WHERE state = 'deleted'"; + $hResult = query_parameters($sQuery); + + echo "Removed " .query_affected_rows()." rejected vendors from database. "; +} + function updateVersionRatings() { $hResult = version::objectGetEntries('accepted'); @@ -235,6 +251,36 @@ function updateVersionRatings() echo "Updated $i entries"; } +function viewAppdbAdmins() +{ + echo html_frame_start("AppDB Admins","90%","",0); + echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n"; + echo "<tr class=color1>\n"; + echo "<td>Real name</td>\n"; + echo "<td>Email</td>\n"; + echo "<td>Last connected</td>\n"; + echo "</tr>\n\n"; + + $sQuery = "SELECT user_list.userid, realname, email, stamp FROM user_list, user_privs WHERE user_list.userid = user_privs.userid AND user_privs.priv = 'admin' ORDER BY realname"; + + $hResult = query_parameters($sQuery); + + $i = 0; + while($oRow = query_fetch_object($hResult)) + { + $oUser = new User($oRow->userid); + echo "<tr class=color0>"; + echo "<td>".$oUser->objectMakeLink()."</td>\n"; + echo "<td>".$oUser->sEmail."</td>\n"; + echo "<td>".$oUser->sStamp."</td>\n"; + $i++; + } + echo "</table>"; + echo html_frame_end(); + + echo "Found $i entries. "; +} + function showChoices() { echo '<a href="admin.php?sAction=fixNoteLinks">Fix/Show note links</a> '; @@ -242,7 +288,10 @@ function showChoices() echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a> '; echo '<a href="admin.php?sAction=deleteOrphanComments">Delete Orphan Comments</a> '; echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a> '; + echo '<a href="admin.php?sAction=purgeRejectedDistributions">Purge Rejected Distributions</a> '; + echo '<a href="admin.php?sAction=purgeRejectedVendors">Purge Rejected Vendors</a> '; echo '<a href="admin.php?sAction=updateVersionRatings">Update Version Ratings</a> '; + echo '<a href="admin.php?sAction=viewAppdbAdmins">View AppDB Admins</a> '; } switch(getInput('sAction', $aClean)) @@ -267,9 +316,23 @@ switch(getInput('sAction', $aClean)) deleteOrphanVersions(); break; + case 'purgeRejectedDistributions': + purgeRejectedDistributions(); + break; + + case 'purgeRejectedVendors': + purgeRejectedVendors(); + break; + case 'updateVersionRatings': updateVersionRatings(); break; + + case 'viewAppdbAdmins': + viewAppdbAdmins(); + break; + + default: showChoices();

1 0

Rosanne DiMesio : Fix delete button in adminUsers
by Jeremy Newman 26 Jun '17

26 Jun '17

Module: appdb Branch: master Commit: e23200864d25497bc10d2625f464a0026d8cf401 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e23200864d25497bc10d2625… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Jun 23 12:49:07 2017 -0500 Fix delete button in adminUsers Fixes bug 31859. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin/adminUsers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/adminUsers.php b/admin/adminUsers.php index f7861ca..581bf34 100644 --- a/admin/adminUsers.php +++ b/admin/adminUsers.php @@ -134,7 +134,7 @@ if(isset($aClean['sSubmit'])) if($oUser->hasPriv("admin")) echo "A"; if($oUser->isMaintainer()) echo "M"; echo " </td>\n"; - echo " <td align=\"center\">[<a href=\"../preferences.php?iUserId=".$oRow->userid."&sSearch=".$sSearch."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."\">edit</a>] [<a onclick=\"if(!confirm('".$sAreYouSure."'))return false;\" \"href=\"".$_SERVER['PHP_SELF']."?sAction=delete&iUserId=".$oRow->userid."&sSearch=".$sSearch."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."&sSubmit=true\">delete</a>]</td>\n"; + echo " <td align=\"center\">[<a href=\"../preferences.php?iUserId=".$oRow->userid."&sSearch=".$sSearch."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."\">edit</a>] [<a onclick=\"if(!confirm('".$sAreYouSure."'))return false;\" \"<a href=\"".$_SERVER['PHP_SELF']."?sAction=delete&iUserId=".$oRow->userid."&sSearch=".$sSearch."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."&sSubmit=true\">delete</a>]</td>\n"; echo "</tr>\n\n"; } }

1 0

Alexandre Julliard : Wine release 2.11
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: website Branch: master Commit: 3d98781bd8b4ec3dc546335c61f85000f6ba3b96 URL: http://source.winehq.org/git/website.git/?a=commit;h=3d98781bd8b4ec3dc54633… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 20:08:11 2017 +0200 Wine release 2.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017062301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017062301.xml b/news/en/2017062301.xml new file mode 100644 index 0000000..2f5ed35 --- /dev/null +++ b/news/en/2017062301.xml @@ -0,0 +1,17 @@ +<news> +<date>June 23, 2017</date> +<title>Wine 2.11 Released</title> +<body> + The Wine development release 2.11 is now available. + <a href="{$root}/announce/2.11">What's new</a> in this release: +<ul> + <li>OpenGL support in the Android driver.</li> + <li>Support for security labels.</li> + <li>Relay debugging on ARM64.</li> + <li>More dictionary support in WebServices.</li> + <li>New registry file parser in RegEdit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.11.tar.xz">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

Nikolay Sivov : d3drm: Added IDirect3DRMAnimation stub.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 7fd7f6557ee1d3def8ffc033ee91008fc6f6f302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd7f6557ee1d3def8ffc033e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 23 16:15:00 2017 +0300 d3drm: Added IDirect3DRMAnimation stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 48 ++++- dlls/d3drm/d3drm_private.h | 11 ++ dlls/d3drm/frame.c | 460 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/tests/d3drm.c | 102 ++++++---- 4 files changed, 583 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fd7f6557ee1d3def8ffc…

1 0

Zebediah Figura : msacm32: Add invalid parameter checks for acmFormatChoose().
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 84e61e6a07b4dd93a04d74a88cff3b8f5da835a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e61e6a07b4dd93a04d74a88… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 22 18:02:40 2017 -0500 msacm32: Add invalid parameter checks for acmFormatChoose(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 9 +++++++++ dlls/msacm32/tests/msacm.c | 26 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 19a5ceb..24d6ea5 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -288,6 +288,9 @@ MMRESULT WINAPI acmFormatChooseA(PACMFORMATCHOOSEA pafmtc) LPWSTR templ = NULL; DWORD sz; + if (pafmtc->cbStruct < sizeof(ACMFORMATCHOOSEA)) + return MMSYSERR_INVALPARAM; + afcw.cbStruct = sizeof(afcw); afcw.fdwStyle = pafmtc->fdwStyle; afcw.hwndOwner = pafmtc->hwndOwner; @@ -359,6 +362,12 @@ done: */ MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) { + if (pafmtc->cbStruct < sizeof(ACMFORMATCHOOSEW)) + return MMSYSERR_INVALPARAM; + + if (!pafmtc->pwfx) + return MMSYSERR_INVALPARAM; + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE) return DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance, pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index a485f9a..337e20c 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1249,6 +1249,31 @@ static void test_acmFormatTagDetails(void) ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); } +static void test_acmFormatChoose(void) +{ + ACMFORMATCHOOSEW afc = {0}; + WAVEFORMATEX *pwfx; + DWORD sizeMax; + MMRESULT rc; + + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &sizeMax); + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeMax); + + afc.cbStruct = sizeof(afc); + afc.pwfx = pwfx; + + /* test invalid struct size */ + afc.cbStruct = sizeof(afc)-1; + rc = acmFormatChooseW(&afc); + ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); + afc.cbStruct = sizeof(afc); + + afc.pwfx = NULL; + rc = acmFormatChooseW(&afc); + ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); + afc.pwfx = pwfx; +} + static struct { struct @@ -1418,6 +1443,7 @@ START_TEST(msacm) test_convert(); test_acmFormatSuggest(); test_acmFormatTagDetails(); + test_acmFormatChoose(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd();

1 0

Zebediah Figura : msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 993faf576d7c7ea954491c66b5ca406d4b2c52b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=993faf576d7c7ea954491c66b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 23 10:53:53 2017 -0500 msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 24d6ea5..b3d2900 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -62,8 +62,16 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_FINDSTRINGEXACT, -1, (LPARAM)paftd->szFormatTag) == CB_ERR) - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + { + int index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); + if (((affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + (paftd->dwFormatTag == affd->afc->pwfx->wFormatTag)) || + (!(affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + (paftd->dwFormatTag == WAVE_FORMAT_PCM))) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_SETCURSEL, index, 0); + } } break; case WINE_ACMFF_FORMAT: @@ -87,7 +95,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, for (i = 0; i < paftd->cStandardFormats; i++) { static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'}; - int j; + int j, index; afd.dwFormatIndex = i; afd.fdwSupport = 0; @@ -99,14 +107,17 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, buffer[j] = ' '; wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024); - SendDlgItemMessageW(affd->hWnd, + index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_ADDSTRING, 0, (LPARAM)buffer); + if ((affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + affd->afc->cbwfx >= paftd->cbFormatSize && + !memcmp(afd.pwfx, affd->afc->pwfx, paftd->cbFormatSize)) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, + CB_SETCURSEL, index, 0); } } acmDriverClose(had, 0); - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, - CB_SETCURSEL, 0, 0); HeapFree(MSACM_hHeap, 0, afd.pwfx); } } @@ -138,7 +149,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, return TRUE; } -static BOOL MSACM_FillFormatTags(HWND hWnd) +static BOOL MSACM_FillFormatTags(HWND hWnd, PACMFORMATCHOOSEW afc) { ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; @@ -148,13 +159,15 @@ static BOOL MSACM_FillFormatTags(HWND hWnd) affd.hWnd = hWnd; affd.mode = WINE_ACMFF_TAG; + affd.afc = afc; acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); + if (SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETCURSEL, 0, 0) == CB_ERR) + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); return TRUE; } -static BOOL MSACM_FillFormat(HWND hWnd) +static BOOL MSACM_FillFormat(HWND hWnd, PACMFORMATCHOOSEW afc) { ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; @@ -166,6 +179,7 @@ static BOOL MSACM_FillFormat(HWND hWnd) affd.hWnd = hWnd; affd.mode = WINE_ACMFF_FORMAT; + affd.afc = afc; SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETLBTEXT, SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, @@ -173,7 +187,8 @@ static BOOL MSACM_FillFormat(HWND hWnd) (LPARAM)affd.szFormatTag); acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); + if (SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_GETCURSEL, 0, 0) == CB_ERR) + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); return TRUE; } @@ -212,10 +227,11 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, case WM_INITDIALOG: afc = (PACMFORMATCHOOSEW)lParam; SetPropW(hWnd, fmt_prop, (HANDLE)afc); - MSACM_FillFormatTags(hWnd); - MSACM_FillFormat(hWnd); + MSACM_FillFormatTags(hWnd, afc); + MSACM_FillFormat(hWnd, afc); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| ACMFORMATCHOOSE_STYLEF_SHOWHELP| + ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) FIXME("Unsupported style %08x\n", afc->fdwStyle); @@ -234,7 +250,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, case IDD_ACMFORMATCHOOSE_CMB_FORMATTAG: switch (HIWORD(wParam)) { case CBN_SELCHANGE: - MSACM_FillFormat(hWnd); + MSACM_FillFormat(hWnd, afc); break; default: TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08lx\n",

1 0