November 2009 - Wine-commits

Paul Chitescu : crypt32: Check the result of CryptAcquireContextW() when initializing default provider.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 7223d8b6d2f03533799eac3f958708042ce21cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7223d8b6d2f03533799eac3f9… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Nov 6 14:18:14 2009 +0200 crypt32: Check the result of CryptAcquireContextW() when initializing default provider. --- dlls/crypt32/main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index d93163c..1a5972f 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -64,8 +64,9 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void) { HCRYPTPROV prov; - CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT); + if (!CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT)) + return hDefProv; InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, NULL); if (hDefProv != prov)

1 0

Kai Blin : netapi32: Implement NetUserGetGroups stub.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: a61044b6757f134ca139a23f7032e261463b1c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61044b6757f134ca139a23f7… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 7 07:45:13 2009 +0100 netapi32: Implement NetUserGetGroups stub. --- dlls/netapi32/netapi32.spec | 2 +- dlls/netapi32/wksta.c | 23 +++++++++++++++++++++++ include/lmaccess.h | 1 + 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index eb3b841..6470280 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -205,7 +205,7 @@ @ stdcall NetUserChangePassword(wstr wstr wstr wstr) @ stdcall NetUserDel(wstr wstr) @ stdcall NetUserEnum(wstr long long ptr long ptr ptr ptr) -@ stub NetUserGetGroups +@ stdcall NetUserGetGroups(wstr wstr long ptr long ptr ptr) @ stdcall NetUserGetInfo(wstr wstr long ptr) @ stdcall NetUserGetLocalGroups(wstr wstr long long ptr long ptr ptr) @ stdcall NetUserModalsGet(wstr long ptr) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 67690b8..122a685 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -591,3 +591,26 @@ NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( return NERR_Success; } + +/************************************************************ + * NetUserGetGroups (NETAPI32.@) + */ +NET_API_STATUS NET_API_FUNCTION NetUserGetGroups( + LPCWSTR servername, + LPCWSTR username, + DWORD level, + LPBYTE *bufptr, + DWORD prefixmaxlen, + LPDWORD entriesread, + LPDWORD totalentries) +{ + FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername), + debugstr_w(username), level, bufptr, prefixmaxlen, entriesread, + totalentries); + + *bufptr = NULL; + *entriesread = 0; + *totalentries = 0; + + return ERROR_INVALID_LEVEL; +} diff --git a/include/lmaccess.h b/include/lmaccess.h index c29a40c..03bd504 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -467,6 +467,7 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetUserDel(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetUserEnum(LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR,LPCWSTR,DWORD,LPBYTE*); +NET_API_STATUS WINAPI NetUserGetGroups(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserGetLocalGroups(LPCWSTR,LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR,DWORD,LPBYTE*);

1 0

Kai Blin : secur32: Use empty credentials when cached creds fail.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: e987ec429945483908182490a0df12483f443b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e987ec429945483908182490a… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 7 11:27:54 2009 +0100 secur32: Use empty credentials when cached creds fail. --- dlls/secur32/ntlm.c | 3 +-- dlls/secur32/tests/ntlm.c | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7e44dd7..79f55e7 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -659,8 +659,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(!strncmp(buffer, "PW", 2)) { TRACE("Using cached credentials failed.\n"); - ret = SEC_E_NO_CREDENTIALS; - goto isc_end; + lstrcpynA(buffer, "PW AA==", max_len-1); } else /* Just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index b7c5105..2a66cf6 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1309,7 +1309,6 @@ static void test_null_auth_data(void) status = pInitializeSecurityContextA(&cred, NULL, (SEC_CHAR *)user, ISC_REQ_CONNECTION, 0, SECURITY_NETWORK_DREP, NULL, 0, &ctx, &buffer_desc, &attr, &ttl); - todo_wine ok(status == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed %s\n", getSecError(status)); }

1 0

Nicolas Le Cam : winmm/tests: Skip tests when running on non-english locale .
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 556b1ca7edf89a8677b2fad963c66284126d2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556b1ca7edf89a8677b2fad96… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Fri Nov 6 23:32:33 2009 +0100 winmm/tests: Skip tests when running on non-english locale. --- dlls/winmm/tests/mci.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6b1ecb7..5366810 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -163,9 +163,16 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"mci %s returned error: %d\n", command_open, err); ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); - err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); - ok(!err,"mci status time format returned error: %d\n", err); - ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (test with hardcoded 'milliseconds')\n"); + } + else + { + err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); + ok(!err,"mci status time format returned error: %d\n", err); + ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + } err = mciSendString(command_close_my, NULL, 0, hwnd); ok(!err,"mci %s returned error: %d\n", command_close_my, err); @@ -376,10 +383,17 @@ static void test_asyncWAVE(HWND hwnd) * will be 333ms, 667ms etc. at best. */ Sleep(100); /* milliseconds */ - buf[0]=0; - err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); - ok(!err,"mci status time format returned error: %d\n", err); - ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (test with hardcoded 'milliseconds')\n"); + } + else + { + buf[0]=0; + err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); + ok(!err,"mci status time format returned error: %d\n", err); + ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + } buf[0]=0; err = mciSendString("status mysound position", buf, sizeof(buf), hwnd);

1 0

Marcus Meissner : ws2_32: Use correct buffer for 17 byte write.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 94efd487f0d7b3c9b7dd349099cac610a41fe05a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94efd487f0d7b3c9b7dd34909… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Nov 7 14:06:10 2009 +0100 ws2_32: Use correct buffer for 17 byte write. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 518ab4a..98b94e8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2443,7 +2443,7 @@ static void test_addr_to_print(void) /* Test longer length is ok */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst, 18); + pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 18); ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); }

1 0

Juan Lang : rsaenh: Explicitly clear unused memory when exporting a private key.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 49c11910d8e0856715d14567c48a2489ff92d80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c11910d8e0856715d14567c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 09:49:00 2009 -0800 rsaenh: Explicitly clear unused memory when exporting a private key. --- dlls/rsaenh/implglue.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 68a9380..3477210 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -397,24 +397,45 @@ BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD { mp_to_unsigned_bin(&pKeyContext->rsa.N, pbDest); reverse_bytes(pbDest, dwKeyLen); + if (mp_unsigned_bin_size(&pKeyContext->rsa.N) < dwKeyLen) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.N), 0, + dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.N)); pbDest += dwKeyLen; mp_to_unsigned_bin(&pKeyContext->rsa.p, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.p) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.p), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.p)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.q, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.q) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.q), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.q)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.dP, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.dP) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.dP), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.dP)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.dQ, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.dQ) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.dQ), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.dQ)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.qP, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.qP) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.qP), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.qP)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.d, pbDest); reverse_bytes(pbDest, dwKeyLen); + if (mp_unsigned_bin_size(&pKeyContext->rsa.d) < dwKeyLen) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.d), 0, + dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.d)); *pdwPubExp = (DWORD)mp_get_int(&pKeyContext->rsa.e); return TRUE;

1 0

Paul Chitescu : gpkcsp: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 329fc386e0b65ea6e70fcbb80bc43b0085a4edc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329fc386e0b65ea6e70fcbb80… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:31 2009 +0200 gpkcsp: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/gpkcsp/gpkcsp.spec | 4 ++-- dlls/gpkcsp/main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gpkcsp/gpkcsp.spec b/dlls/gpkcsp/gpkcsp.spec index 1f828b0..af3cdee 100644 --- a/dlls/gpkcsp/gpkcsp.spec +++ b/dlls/gpkcsp/gpkcsp.spec @@ -22,5 +22,5 @@ @ stub CPSignHash @ stub CPVerifySignature @ stdcall DllMain(ptr long ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/gpkcsp/main.c b/dlls/gpkcsp/main.c index b6d9f17..79f1e2d 100644 --- a/dlls/gpkcsp/main.c +++ b/dlls/gpkcsp/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (GPKCSP.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (GPKCSP.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +}

1 0

Jörg Höhle : winmm/tests: Add MCI waveaudio tests .
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 4aa5f5bc10a4b186cddc1a2802d3f5b2b396a7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa5f5bc10a4b186cddc1a280… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Oct 15 17:28:40 2009 +0200 winmm/tests: Add MCI waveaudio tests. --- dlls/winmm/tests/mci.c | 600 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 577 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4aa5f5bc10a4b186cddc1…

1 0

Jörg Höhle : winmm: Do not crash on NULL MCI Sysinfo command output buffer pointer.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: f177e613380010335fb0876213d619a376deae18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f177e613380010335fb087621… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 18:41:10 2009 +0200 winmm: Do not crash on NULL MCI Sysinfo command output buffer pointer. --- dlls/winmm/mci.c | 4 ++-- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index e28a298..c6f3701 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1746,8 +1746,8 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm LPWINE_MCIDRIVER wmd; HKEY hKey; - if (lpParms == NULL || lpParms->lpstrReturn == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms->lpstrReturn == NULL) return MCIERR_PARAM_OVERFLOW; TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 4151664..59cf4ae 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -511,7 +511,7 @@ static void test_AutoOpenWAVE(HWND hwnd) /* Do not crash on NULL buffer pointer */ err = mciSendString("sysinfo waveaudio quantity open", NULL, 0, NULL); - todo_wine ok(err==MCIERR_PARAM_OVERFLOW,"mci sysinfo without buffer returned error: %d\n", err); + ok(err==MCIERR_PARAM_OVERFLOW,"mci sysinfo without buffer returned error: %d\n", err); err = mciSendString("sysinfo waveaudio quantity open", buf, sizeof(buf), NULL); ok(!err,"mci sysinfo waveaudio quantity open returned error: %d\n", err);

1 0

Jörg Höhle : mciwave: Set wave format PCM is the only one accepted.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 518f4f8cdb035aa7a0820448deabe533f19bae35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518f4f8cdb035aa7a0820448d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 18:31:15 2009 +0200 mciwave: Set wave format PCM is the only one accepted. --- dlls/mciwave/mciwave.c | 10 +++++----- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 0c17f32..fc1c2b2 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1310,6 +1310,11 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpPa TRACE("MCI_WAVE_SET_ANYINPUT !\n"); if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) TRACE("MCI_WAVE_SET_ANYOUTPUT !\n"); + if (dwFlags & MCI_WAVE_SET_FORMATTAG) { + TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", ((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag); + if (((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag != WAVE_FORMAT_PCM) + return MCIERR_OUTOFRANGE; + } if (dwFlags & MCI_WAVE_SET_AVGBYTESPERSEC) { wmw->wfxRef.nAvgBytesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nAvgBytesPerSec; TRACE("MCI_WAVE_SET_AVGBYTESPERSEC = %d\n", wmw->wfxRef.nAvgBytesPerSec); @@ -1326,11 +1331,6 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpPa wmw->wfxRef.nChannels = ((LPMCI_WAVE_SET_PARMS)lpParms)->nChannels; TRACE("MCI_WAVE_SET_CHANNELS = %d\n", wmw->wfxRef.nChannels); } - if (dwFlags & MCI_WAVE_SET_FORMATTAG) { - /* Dangerous because the correct cbSize cannot be set */ - wmw->wfxRef.wFormatTag = ((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag; - TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", wmw->wfxRef.wFormatTag); - } if (dwFlags & MCI_WAVE_SET_SAMPLESPERSEC) { wmw->wfxRef.nSamplesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nSamplesPerSec; TRACE("MCI_WAVE_SET_SAMPLESPERSEC = %d\n", wmw->wfxRef.nSamplesPerSec); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 59cf4ae..e84f108 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -233,7 +233,7 @@ static void test_recordWAVE(HWND hwnd) /* MCI seems to solely support PCM, no need for ACM conversion. */ err = mciSendString("set x format tag 2", NULL, 0, NULL); - todo_wine ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned error: %d\n", err); + ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned error: %d\n", err); err = mciSendString("set x format tag pcm", NULL, 0, NULL); ok(!err,"mci set format tag pcm returned error: %d\n", err);

1 0