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

Hugh McMaster : regedit/tests: Add tests for value deletion.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: eca563e9ce02c54b4e1a2fbe42f07e11f0e2b690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca563e9ce02c54b4e1a2fbe4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:28 2017 +0000 regedit/tests: Add tests for value deletion. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 28e5c1d..6f56191 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1213,6 +1213,58 @@ static void test_key_creation_and_deletion(void) todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } +static void test_value_deletion(void) +{ + HKEY hkey; + LONG lr; + DWORD dword = 0x8; + BYTE hex[4] = {0x11, 0x22, 0x33, 0x44}; + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); + + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + + /* Test value deletion. We start by creating some registry values. */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine46e\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n"); + verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n"); + verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46b"); + verify_reg_nonexist(hkey, "Wine46c"); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg_nonexist(hkey, "Wine46e"); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + lr = RegCloseKey(hkey); + ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); +} + START_TEST(regedit) { WCHAR wchar_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', @@ -1233,4 +1285,5 @@ START_TEST(regedit) test_comments(); test_import_with_whitespace(); test_key_creation_and_deletion(); + test_value_deletion(); }

1 0

Hugh McMaster : regedit: Do not create registry keys that end without a closing bracket.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 5669282e1d7c45a59d69fb1214a776f3eabd29cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5669282e1d7c45a59d69fb121… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:36 2017 +0000 regedit: Do not create registry keys that end without a closing bracket. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 1 + programs/regedit/tests/regedit.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d5be72f..7bac6dc 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -568,6 +568,7 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) keyEnd = strrchrW(stdInput, ']'); if (keyEnd) *keyEnd='\0'; + else return; /* delete the key if we encounter '-' at the start of reg key */ if (stdInput[0] == '-') diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 6f56191..550c22b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1155,7 +1155,7 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\No_Closing_Bracket\n"); - todo_wine verify_key_nonexist(hkey, "No_Closing_Bracket"); + verify_key_nonexist(hkey, "No_Closing_Bracket"); exec_import_str("REGEDIT4\n\n" "[ HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1a]\n"); @@ -1210,7 +1210,7 @@ static void test_key_creation_and_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1262,7 +1262,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit: Do not use REG_NONE as the default data type if strtoulW() fails.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: afde1624cacc9b391805d0cec7889052b77315da URL: http://source.winehq.org/git/wine.git/?a=commit;h=afde1624cacc9b391805d0cec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 13:13:39 2017 +0000 regedit: Do not use REG_NONE as the default data type if strtoulW() fails. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 7bac6dc..ac72b94 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -239,7 +239,7 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) /* "hex(xx):" is special */ type = (int)strtoulW( *lpValue , &end, 16 ); if (**lpValue=='\0' || *end!=')' || *(end+1)!=':') { - type=REG_NONE; + type = REG_UNKNOWN_TYPE; } else { *lpValue = end + 2; }

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 65305a474e2c14cd0efdcdfd4936d20f527e636f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65305a474e2c14cd0efdcdfd4… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Jun 8 09:08:11 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 479385b..e478435 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11762,10 +11762,8 @@ msgid "Expand" msgstr "Utvid" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Endre binærdata..." +msgstr "Endre &binærdata..." #: regedit.rc:266 msgid "Export registry" @@ -11864,10 +11862,6 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Inneholder kommandoer for å få tilgang til nøkler som brukes ofte" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" @@ -12115,8 +12109,6 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: Linjen inneholder ugyldig syntaks.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Avslutter Registerredigering" @@ -12133,8 +12125,6 @@ msgid "Shows or hides the status bar" msgstr "Viser eller skjuler statuslinjen" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Endrer posisjonen til delingslinjen mellom to ruter" @@ -12179,10 +12169,8 @@ msgid "Adds a new binary value" msgstr "Legger til en ny binærverdis" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Legger til en ny binærverdis" +msgstr "Legger til en ny 32-bit verdi" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12197,10 +12185,8 @@ msgid "Prints all or part of the registry" msgstr "Skriver ut hele eller deler av registeret" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registerredigering" +msgstr "Åpner register-redigeringshjelp" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12243,26 +12229,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Kan ikke forespørre registernøkkelen \"%1\"." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Endrer verdiens data" +msgstr "Endrer verdiens data i binær form" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Legger til en ny flerstrengverdi" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksporterer den valgte greinen av registeret til en tekstfil" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Legger til en ny strengverdi" +msgstr "Legger til en ny utvidbar strengverdi" #: regedit.rc:211 msgid "Confirm Key Delete"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 27f82b46ada927124d20f4ccd551f4d5d1f33595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f82b46ada927124d20f4ccd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 13:26:46 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9e99cba..f176a29 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-02 09:06+0300\n" +"PO-Revision-Date: 2017-06-08 13:21+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11768,8 +11768,6 @@ msgid "Expand" msgstr "Развернуть" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." msgstr "Изменить &двоичные данные..."

1 0

Zebediah Figura : msacm32: Add more invalid parameter checks for acmFormatEnum().
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: c984aa5fc94e8f64c6b924fea942b9fef8f8f5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c984aa5fc94e8f64c6b924fea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:50 2017 -0500 msacm32: Add more invalid parameter checks for acmFormatEnum(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 21 +++++++++++++++++++++ dlls/msacm32/tests/msacm.c | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 3f3ee54..902807c 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -492,6 +492,9 @@ MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda, if (!pafda) return MMSYSERR_INVALPARAM; + if (!fnCallback) + return MMSYSERR_INVALPARAM; + if (pafda->cbStruct < sizeof(*pafda)) return MMSYSERR_INVALPARAM; @@ -499,6 +502,7 @@ MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda, afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafda->dwFormatIndex; afdw.dwFormatTag = pafda->dwFormatTag; + afdw.fdwSupport = pafda->fdwSupport; afdw.pwfx = pafda->pwfx; afdw.cbwfx = pafda->cbwfx; @@ -613,6 +617,8 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, PWINE_ACMDRIVERID padid; WAVEFORMATEX wfxRef; BOOL ret; + DWORD cbwfxMax; + MMRESULT mmr; TRACE("(%p, %p, %p, %ld, %d)\n", had, pafd, fnCallback, dwInstance, fdwEnum); @@ -620,9 +626,18 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, if (!pafd) return MMSYSERR_INVALPARAM; + if (!fnCallback) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (!pafd->pwfx) + return MMSYSERR_INVALPARAM; + if (fdwEnum & (ACM_FORMATENUMF_WFORMATTAG|ACM_FORMATENUMF_NCHANNELS| ACM_FORMATENUMF_NSAMPLESPERSEC|ACM_FORMATENUMF_WBITSPERSAMPLE| ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_SUGGEST)) @@ -639,6 +654,12 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); + mmr = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax); + if (mmr != MMSYSERR_NOERROR) + return mmr; + if (pafd->cbwfx < cbwfxMax) + return MMSYSERR_INVALPARAM; + if (had) { HACMDRIVERID hadid; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 6e79f46..f5ab168 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -330,12 +330,10 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); - if (dwSize < sizeof(WAVEFORMATEX)) - dwSize = sizeof(WAVEFORMATEX); - pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); - pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); + if (dwSize >= sizeof(WAVEFORMATEX)) + pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; fd.cbStruct = sizeof(fd); @@ -343,6 +341,36 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, fd.cbwfx = dwSize; fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + /* try bad callback */ + rc = acmFormatEnumA(had, &fd, NULL, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* fdwSupport must be zero */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = dwSize-1; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = dwSize; + /* try valid parameters */ rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR,

1 0

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

08 Jun '17

Module: wine Branch: master Commit: 1e30f79b70c5717ef9b710bf81e4e12d1cc46534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e30f79b70c5717ef9b710bf8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:51 2017 -0500 msacm32: Add invalid parameter checks for acmFormatDetails(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 37 +++++++++++-- dlls/msacm32/tests/msacm.c | 131 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 902807c..05d4fbe 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -68,7 +68,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; unsigned int i, len; MMRESULT mmr; WCHAR buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; @@ -87,6 +87,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, int j; afd.dwFormatIndex = i; + afd.fdwSupport = 0; mmr = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX); if (mmr == MMSYSERR_NOERROR) { lstrcpynW(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); @@ -112,7 +113,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; afd.cbStruct = sizeof(afd); afd.dwFormatTag = paftd->dwFormatTag; @@ -376,10 +377,14 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd, ACMFORMATDETAILSW afdw; MMRESULT mmr; + if (!pafd) + return MMSYSERR_INVALPARAM; + memset(&afdw, 0, sizeof(afdw)); afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafd->dwFormatIndex; afdw.dwFormatTag = pafd->dwFormatTag; + afdw.fdwSupport = pafd->fdwSupport; afdw.pwfx = pafd->pwfx; afdw.cbwfx = pafd->cbwfx; @@ -401,11 +406,27 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; + ACMFORMATTAGDETAILSW aftd = {0}; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + if (!pafd) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; + if (!pafd->pwfx) + return MMSYSERR_INVALPARAM; + + if (pafd->cbwfx < sizeof(PCMWAVEFORMAT)) + return MMSYSERR_INVALPARAM; + + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (pafd->pwfx->wFormatTag == WAVE_FORMAT_UNKNOWN) + return MMSYSERR_INVALPARAM; + switch (fdwDetails) { case ACM_FORMATDETAILSF_FORMAT: if (pafd->dwFormatTag != pafd->pwfx->wFormatTag) { @@ -430,7 +451,16 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD } break; case ACM_FORMATDETAILSF_INDEX: - /* should check pafd->dwFormatIndex < aftd->cStandardFormats */ + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = pafd->dwFormatTag; + mmr = acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (mmr != MMSYSERR_NOERROR) + break; + if (pafd->dwFormatIndex >= aftd.cStandardFormats) + { + mmr = MMSYSERR_INVALPARAM; + break; + } mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); break; default: @@ -581,6 +611,7 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, for (j = 0; j < aftd.cStandardFormats; j++) { pafd->dwFormatIndex = j; pafd->dwFormatTag = aftd.dwFormatTag; + pafd->fdwSupport = 0; if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_INDEX) != MMSYSERR_NOERROR) continue; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index f5ab168..894dd53 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -38,9 +38,109 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, DWORD_PTR dwInstance, DWORD fdwSupport) { + MMRESULT rc; + HACMDRIVER had; + if (winetest_interactive) trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); + rc = acmDriverOpen(&had, hadid, 0); + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, + "acmDriverOpen(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + if (rc == MMSYSERR_NOERROR) + { + ACMFORMATDETAILSA fd = {0}; + WAVEFORMATEX *pwfx; + DWORD i; + + fd.cbStruct = sizeof(fd); + if (paftd->cbFormatSize < sizeof(WAVEFORMATEX)) + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WAVEFORMATEX)); + else + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, paftd->cbFormatSize); + fd.pwfx = pwfx; + fd.cbwfx = paftd->cbFormatSize; + fd.dwFormatTag = paftd->dwFormatTag; + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* try bad wFormatTag */ + fd.pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx->wFormatTag = paftd->dwFormatTag; + + /* try bad fdwSupport */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = sizeof(PCMWAVEFORMAT)-1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = paftd->cbFormatSize; + + /* test bad parameters (all zero) */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test index */ + for (i = 0; i < paftd->cStandardFormats; i++) + { + fd.dwFormatIndex = i; + + fd.fdwSupport = 0; + fd.cbwfx = paftd->cbFormatSize; + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + /* Windows will write cbSize (and other data) even if the + * given cbwfx is not large enough */ + fd.fdwSupport = 0; + fd.cbwfx = sizeof(PCMWAVEFORMAT); + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + todo_wine_if(rc != MMSYSERR_NOERROR) /* remove when fixed */ + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + todo_wine_if(fd.pwfx->cbSize != paftd->cbFormatSize - sizeof(WAVEFORMATEX)) /* remove when fixed */ + ok(fd.pwfx->cbSize == paftd->cbFormatSize - sizeof(WAVEFORMATEX), + "got %d\n", fd.pwfx->cbSize); + } + + /* one more */ + fd.dwFormatIndex = paftd->cStandardFormats; + fd.fdwSupport = 0; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + HeapFree(GetProcessHeap(), 0, pwfx); + } return TRUE; } @@ -411,6 +511,37 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); + /* try bad pointer */ + rc = acmFormatDetailsA(had, NULL, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad structure size */ + ZeroMemory(&fd, sizeof(fd)); + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd) - 1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd); + fd.pwfx = pwfx; + ZeroMemory(fd.pwfx, dwSize); + fd.cbwfx = dwSize; + fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + + /* try WAVE_FORMAT_UNKNOWN */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + HeapFree(GetProcessHeap(), 0, pwfx); /* try invalid handle */

1 0

Zebediah Figura : msacm32: Add more invalid parameter checks for acmFormatSuggest().
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 8e88af31cd455743991a6e40dddc8fd0c676e783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e88af31cd455743991a6e40d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:52 2017 -0500 msacm32: Add more invalid parameter checks for acmFormatSuggest(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 11 ++ dlls/msacm32/tests/msacm.c | 246 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 210 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e88af31cd455743991a6…

1 0

Zebediah Figura : msacm32: Try to suggest PCM to PCM conversion first.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: ab2760ec339e6499fc31870c5b5862c8acd8c63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2760ec339e6499fc31870c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:53 2017 -0500 msacm32: Try to suggest PCM to PCM conversion first. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 16 ++++++++++++++++ dlls/msacm32/tests/msacm.c | 2 -- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index d7a2cc9..f3c5155 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -733,6 +733,22 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, ACM_FORMATSUGGESTF_WBITSPERSAMPLE|ACM_FORMATSUGGESTF_WFORMATTAG)) return MMSYSERR_INVALFLAG; + /* if we were given PCM, try to convert to PCM */ + if (pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && !had && + !(fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) + { + ACMFORMATDETAILSW afd = {0}; + afd.cbStruct = sizeof(afd); + afd.dwFormatTag = WAVE_FORMAT_PCM; + afd.pwfx = pwfxSrc; + afd.cbwfx = sizeof(PCMWAVEFORMAT); + if (!acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_FORMAT)) + { + memcpy(pwfxDst, pwfxSrc, sizeof(PCMWAVEFORMAT)); + return MMSYSERR_NOERROR; + } + } + aftd.cbStruct = sizeof(aftd); if (fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG) aftd.dwFormatTag = pwfxDst->wFormatTag; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 31262a3..13494a6 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1062,7 +1062,6 @@ static void test_acmFormatSuggest(void) suggest = 0; memset(&dst, 0, sizeof(dst)); rc = acmFormatSuggest(NULL, &src, &dst, sizeof(PCMWAVEFORMAT), suggest); - todo_wine { ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); @@ -1070,7 +1069,6 @@ static void test_acmFormatSuggest(void) ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); - } /* All parameters from destination are valid */ suggest = ACM_FORMATSUGGESTF_NCHANNELS

1 0

Jacek Caban : rpcrt4: Fix a race when server grabs a connection from the list of active connections.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: e889b027efa99fdc783fcf48c59adfe119e0d65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e889b027efa99fdc783fcf48c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 8 14:16:50 2017 +0200 rpcrt4: Fix a race when server grabs a connection from the list of active connections. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 58 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0ae7125..909fec1 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3373,40 +3373,50 @@ void rpcrt4_conn_release_and_wait(RpcConnection *connection) } } -RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) +RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) { - InterlockedIncrement( &conn->ref ); - return conn; + LONG ref = InterlockedIncrement(&connection->ref); + TRACE("%p ref=%u\n", connection, ref); + return connection; } -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection *connection) { - if (InterlockedDecrement( &Connection->ref ) > 0) return RPC_S_OK; + LONG ref = InterlockedDecrement(&connection->ref); - TRACE("destroying connection %p\n", Connection); + if (!ref && connection->protseq) + { + /* protseq stores a list of active connections, but does not own references to them. + * It may need to grab a connection from the list, which could lead to a race if + * connection is being released, but not yet removed from the list. We handle that + * by synchronizing on CS here. */ + EnterCriticalSection(&connection->protseq->cs); + ref = connection->ref; + if (!ref) + list_remove(&connection->protseq_entry); + LeaveCriticalSection(&connection->protseq->cs); + } - RPCRT4_CloseConnection(Connection); - RPCRT4_strfree(Connection->Endpoint); - RPCRT4_strfree(Connection->NetworkAddr); - HeapFree(GetProcessHeap(), 0, Connection->NetworkOptions); - HeapFree(GetProcessHeap(), 0, Connection->CookieAuth); - if (Connection->AuthInfo) RpcAuthInfo_Release(Connection->AuthInfo); - if (Connection->QOS) RpcQualityOfService_Release(Connection->QOS); + TRACE("%p ref=%u\n", connection, ref); - /* server-only */ - if (Connection->server_binding) RPCRT4_ReleaseBinding(Connection->server_binding); + if (!ref) + { + RPCRT4_CloseConnection(connection); + RPCRT4_strfree(connection->Endpoint); + RPCRT4_strfree(connection->NetworkAddr); + HeapFree(GetProcessHeap(), 0, connection->NetworkOptions); + HeapFree(GetProcessHeap(), 0, connection->CookieAuth); + if (connection->AuthInfo) RpcAuthInfo_Release(connection->AuthInfo); + if (connection->QOS) RpcQualityOfService_Release(connection->QOS); - if (Connection->protseq) - { - EnterCriticalSection(&Connection->protseq->cs); - list_remove(&Connection->protseq_entry); - LeaveCriticalSection(&Connection->protseq->cs); - } + /* server-only */ + if (connection->server_binding) RPCRT4_ReleaseBinding(connection->server_binding); - if (Connection->wait_release) SetEvent(Connection->wait_release); + if (connection->wait_release) SetEvent(connection->wait_release); - HeapFree(GetProcessHeap(), 0, Connection); - return RPC_S_OK; + HeapFree(GetProcessHeap(), 0, connection); + } + return RPC_S_OK; } RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint)

1 0