January 2010 - Wine-commits

Andrew Nguyen : ntdll/tests: Add a few additional tests for wcschr.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: dca1bd86337c078d39d9bb7e7bca0b450da7c4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca1bd86337c078d39d9bb7e7… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jan 13 06:45:02 2010 -0600 ntdll/tests: Add a few additional tests for wcschr. --- dlls/ntdll/tests/string.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 16c1192..f9b8665 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1113,10 +1113,21 @@ static void test_wtoi64(void) } } -static void test_wcsfuncs(void) +static void test_wcschr(void) +{ + static const WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + + ok(p_wcschr(teststringW, 'a') == teststringW + 0, + "wcschr should have returned a pointer to the first 'a' character\n"); + ok(p_wcschr(teststringW, 0) == teststringW + 11, + "wcschr should have returned a pointer to the null terminator\n"); + ok(p_wcschr(teststringW, 'x') == NULL, + "wcschr should have returned NULL\n"); +} + +static void test_wcsrchr(void) { static const WCHAR testing[] = {'T','e','s','t','i','n','g',0}; - ok (p_wcschr(testing,0)!=NULL, "wcschr Not finding terminating character\n"); ok (p_wcsrchr(testing,0)!=NULL, "wcsrchr Not finding terminating character\n"); } @@ -1140,8 +1151,10 @@ START_TEST(string) test_wtol(); if (p_wtoi64) test_wtoi64(); - if (p_wcschr && p_wcsrchr) - test_wcsfuncs(); + if (p_wcschr) + test_wcschr(); + if (p_wcsrchr) + test_wcsrchr(); if (patoi) test_atoi(); if (patol)

1 0

Andrew Nguyen : ntdll/tests: Add a few additional tests for wcsrchr.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: d7557a192672c0e00dd368f686bfe51a91ea8f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7557a192672c0e00dd368f68… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jan 13 06:45:22 2010 -0600 ntdll/tests: Add a few additional tests for wcsrchr. --- dlls/ntdll/tests/string.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index f9b8665..cd3ae37 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1126,9 +1126,15 @@ static void test_wcschr(void) } static void test_wcsrchr(void) -{ - static const WCHAR testing[] = {'T','e','s','t','i','n','g',0}; - ok (p_wcsrchr(testing,0)!=NULL, "wcsrchr Not finding terminating character\n"); +{ + static const WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + + ok(p_wcsrchr(teststringW, 'a') == teststringW + 10, + "wcsrchr should have returned a pointer to the last 'a' character\n"); + ok(p_wcsrchr(teststringW, 0) == teststringW + 11, + "wcsrchr should have returned a pointer to the null terminator\n"); + ok(p_wcsrchr(teststringW, 'x') == NULL, + "wcsrchr should have returned NULL\n"); } START_TEST(string)

1 0

Marcus Meissner : dplayx: Remove currently unused unicode code (Coverity).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 44ab484af80255e09dea0eba45202f83adb247c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ab484af80255e09dea0eba4… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jan 13 18:08:53 2010 +0100 dplayx: Remove currently unused unicode code (Coverity). --- dlls/dplayx/name_server.c | 29 +++++++---------------------- 1 files changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 65d36ef..0acdc5f 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -362,21 +362,13 @@ void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg, DWORD dwVariableSize; DWORD dwVariableLen; /* LPCDPMSG_ENUMSESSIONSREQUEST msg = (LPDPMSG_ENUMSESSIONSREQUEST)lpcMsg; */ - BOOL bAnsi = TRUE; /* FIXME: This needs to be in the DPLAY interface */ - FIXME( ": few fixed + need to check request for response\n" ); - - if (bAnsi) - { - dwVariableLen = MultiByteToWideChar( CP_ACP, 0, - lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA, - -1, NULL, 0 ); - } - else - { - dwVariableLen = strlenW( lpDP->dp2->lpSessionDesc->u1.lpszSessionName ) + 1; - } + /* FIXME: Should handle ANSI or WIDECHAR input. Currently just ANSI input */ + FIXME( ": few fixed + need to check request for response, might need UNICODE input ability.\n" ); + dwVariableLen = MultiByteToWideChar( CP_ACP, 0, + lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA, + -1, NULL, 0 ); dwVariableSize = dwVariableLen * sizeof( WCHAR ); *lpdwReplySize = lpDP->dp2->spData.dwSPHeaderSize + @@ -394,13 +386,6 @@ void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg, CopyMemory( &rmsg->sd, lpDP->dp2->lpSessionDesc, lpDP->dp2->lpSessionDesc->dwSize ); rmsg->dwUnknown = 0x0000005c; - if( bAnsi ) - { - MultiByteToWideChar( CP_ACP, 0, lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA, -1, - (LPWSTR)(rmsg+1), dwVariableLen ); - } - else - { - strcpyW( (LPWSTR)(rmsg+1), lpDP->dp2->lpSessionDesc->u1.lpszSessionName ); - } + MultiByteToWideChar( CP_ACP, 0, lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA, -1, + (LPWSTR)(rmsg+1), dwVariableLen ); }

1 0

Paul Vriens : rsaenh/tests: Don't check result twice (Coccinelle).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 8a737bc1ba305cc664f7bf85425251269f571274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a737bc1ba305cc664f7bf854… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 12 13:42:51 2010 +0100 rsaenh/tests: Don't check result twice (Coccinelle). --- dlls/rsaenh/tests/rsaenh.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 83ec872..94da116 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -275,7 +275,6 @@ static BOOL derive_key(ALG_ID aiAlgid, HCRYPTKEY *phKey, DWORD len) return FALSE; } ok(result, "%08x\n", GetLastError()); - if (!result) return FALSE; result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); if (!result) return FALSE;

1 0

Paul Vriens : winealsa.drv: Don't check input parameter twice (Coccinelle).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 46abd44f0eda75ab619c42c94a67e58ac509be07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46abd44f0eda75ab619c42c94… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 12 13:47:04 2010 +0100 winealsa.drv: Don't check input parameter twice (Coccinelle). --- dlls/winealsa.drv/waveout.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 3476f59..5c3787b 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -1069,9 +1069,6 @@ static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol) wwo = &WOutDev[wDevID]; - if (lpdwVol == NULL) - return MMSYSERR_NOTENABLED; - rc = ALSA_CheckSetVolume(wwo->hctl, &left, &right, &min, &max, NULL, NULL, NULL); if (rc == MMSYSERR_NOERROR) {

1 0

Paul Vriens : dinput: Don't check a parameter twice (Coccinelle).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: ff4047a956ab6da62b11ed765b9dd636e06af5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4047a956ab6da62b11ed765… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 12 13:52:23 2010 +0100 dinput: Don't check a parameter twice (Coccinelle). --- dlls/dinput/joystick_osx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 57a8559..bc6908b 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -257,9 +257,6 @@ static int get_osx_device_name(int id, char *name, int length) tIOHIDDeviceRef = ( IOHIDDeviceRef ) CFArrayGetValueAtIndex( gDevices, id ); - if (!tIOHIDDeviceRef) - return 0; - if (name) name[0] = 0;

1 0

Paul Vriens : dxdiagn/tests: Fix some test failures on a clean W2K3.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 16d161bc95960a71856b0eb110d2e6aa9b17b91e URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d161bc95960a71856b0eb11… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 13 08:25:15 2010 +0100 dxdiagn/tests: Fix some test failures on a clean W2K3. --- dlls/dxdiagn/tests/provider.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c index 47732bc..0aa228b 100644 --- a/dlls/dxdiagn/tests/provider.c +++ b/dlls/dxdiagn/tests/provider.c @@ -32,7 +32,9 @@ static void test_Initialize(void) hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, &IID_IDxDiagProvider, (LPVOID*)&pddp); - ok(hr == S_OK, "Creating a IDxDiagProvider instance failed with %x\n", hr); + ok(hr == S_OK || + broken(hr == REGDB_E_CLASSNOTREG), /* Clean W2K3 */ + "Creating a IDxDiagProvider instance failed with %x\n", hr); if (FAILED(hr)) { skip("Failed to create a IDxDiagProvider instance\n"); @@ -97,7 +99,9 @@ static void test_GetRootContainer(void) hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, &IID_IDxDiagProvider, (LPVOID*)&pddp); - ok(hr == S_OK, "Creating a IDxDiagProvider instance failed with %x\n", hr); + ok(hr == S_OK || + broken(hr == REGDB_E_CLASSNOTREG), /* Clean W2K3 */ + "Creating a IDxDiagProvider instance failed with %x\n", hr); if (FAILED(hr)) { skip("Failed to create a IDxDiagProvider instance\n");

1 0

Paul Vriens : inetmib1/tests: Free memory after use (Valgrind).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 5f8717d7f67e3406f7477214873bbfa512d320a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8717d7f67e3406f74772148… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 13 20:34:06 2010 +0100 inetmib1/tests: Free memory after use (Valgrind). --- dlls/inetmib1/tests/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index c52cc43..158e23c 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -47,6 +47,8 @@ static void testInit(void) ok(ret, "SnmpExtensionInit failed: %d\n", GetLastError()); ok(!strcmp("1.3.6.1.2.1.1", SnmpUtilOidToA(&oid)), "Expected 1.3.6.1.2.1.1, got %s\n", SnmpUtilOidToA(&oid)); + + SnmpUtilOidFree(&oid); } static void testQuery(void)

1 0

Paul Vriens : shell32: Remove some unneeded parameter setting.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 3cbaaaa564bb5471653b8c47b1a6dfa8fa52d7fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbaaaa564bb5471653b8c47b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 14 13:47:48 2010 +0100 shell32: Remove some unneeded parameter setting. --- dlls/shell32/shlexec.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 20e2888..a81cada 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -587,7 +587,6 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) { strcpyW(filetype, wszFolder); - filetypelen = 6; /* strlen("Folder") */ } else { @@ -660,14 +659,12 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera else { *filetype = '\0'; - filetypelen = 0; } } if (*filetype) { /* pass the operation string to SHELL_FindExecutableByOperation() */ - filetype[filetypelen] = '\0'; retval = SHELL_FindExecutableByOperation(lpOperation, key, filetype, command, sizeof(command)); if (retval > 32)

1 0

Julius Schwartzenberg : avifil32: Overwrite dwRate in the audiostream with the nBlockAlign from the wave header .
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: cf73a26c6bc20e03904f23cc9c55546db27f44d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf73a26c6bc20e03904f23cc9… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Tue Jan 12 00:30:54 2010 +0100 avifil32: Overwrite dwRate in the audiostream with the nBlockAlign from the wave header. --- dlls/avifil32/avifile.c | 9 ++++++++- dlls/avifil32/tests/api.c | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 57ebb11..aa1df3b 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1819,7 +1819,14 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) if (FAILED(hr)) return hr; }; - + if (pStream->lpFormat != NULL && pStream->sInfo.fccType == streamtypeAUDIO) + { + WAVEFORMATEX *wfx = pStream->lpFormat; /* wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; could be added */ + pStream->sInfo.dwSampleSize = wfx->nBlockAlign; /* to deal with corrupt wfx->nBlockAlign but Windows doesn't do this */ + TRACE("Block size reset to %u, chan=%u bpp=%u\n", wfx->nBlockAlign, wfx->nChannels, wfx->wBitsPerSample); + pStream->sInfo.dwScale = 1; + pStream->sInfo.dwRate = wfx->nSamplesPerSec; + } if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEREAD; } diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 28bae04..a68ce9c 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -404,7 +404,7 @@ static void test_ash1_corruption(void) /* The result will still be 2, because the value is dynamically replaced with the nBlockAlign value from the stream format header. The next test will prove this */ - todo_wine{ ok(asi1.dwSampleSize == 2, "got %u (expected 2)\n", asi1.dwSampleSize); } + ok(asi1.dwSampleSize == 2, "got %u (expected 2)\n", asi1.dwSampleSize); AVIStreamRelease(pStream1); AVIFileRelease(pFile); @@ -438,7 +438,7 @@ static void test_ash1_corruption2(void) ok(AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)) == 0, "Unable to read stream info\n"); /* The result will also be the corrupt value, as explained above. */ - todo_wine{ ok(asi1.dwSampleSize == 0xdead, "got 0x%x (expected 0xdead)\n", asi1.dwSampleSize); } + ok(asi1.dwSampleSize == 0xdead, "got 0x%x (expected 0xdead)\n", asi1.dwSampleSize); AVIStreamRelease(pStream1); AVIFileRelease(pFile);

1 0