December 2008 - Wine-Commits

Nick Burns : wined3d: Fix a couple of typos in wined3d_gl.h
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: c52fd346ef4f57081945d71f2730214442e2d764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52fd346ef4f57081945d71f2… Author: Nick Burns <nwburns(a)nwburns2.mshome.net> Date: Sat Dec 20 20:02:22 2008 -0800 wined3d: Fix a couple of typos in wined3d_gl.h --- dlls/wined3d/wined3d_gl.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2d9c18a..5fccf9a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3614,8 +3614,8 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX2FVARBPROC, glUniformMatrix2fvARB, ARB_SHADER_OBJECTS, NULL )\ USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX3FVARBPROC, glUniformMatrix3fvARB, ARB_SHADER_OBJECTS, NULL )\ USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX4FVARBPROC, glUniformMatrix4fvARB, ARB_SHADER_OBJECTS, NULL )\ - USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMFVARBPROC, glGetUniform4fvARB, ARB_SHADER_OBJECTS, NULL )\ - USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMIVARBPROC, glGetUniform4ivARB, ARB_SHADER_OBJECTS, NULL )\ + USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMFVARBPROC, glGetUniformfvARB, ARB_SHADER_OBJECTS, NULL )\ + USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMIVARBPROC, glGetUniformivARB, ARB_SHADER_OBJECTS, NULL )\ USE_GL_FUNC(WINED3D_PFNGLGETINFOLOGARBPROC, glGetInfoLogARB, ARB_SHADER_OBJECTS, NULL )\ USE_GL_FUNC(WINED3D_PFNGLUSEPROGRAMOBJECTARBPROC, glUseProgramObjectARB, ARB_SHADER_OBJECTS, NULL )\ USE_GL_FUNC(WINED3D_PFNGLCREATESHADEROBJECTARBPROC, glCreateShaderObjectARB, ARB_SHADER_OBJECTS, NULL )\ @@ -3713,8 +3713,8 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLXFNGETVIDEOSYNCSGIPROC, glXGetVideoSyncSGI, SGI_VIDEO_SYNC, NULL )\ USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, glXWaitVideoSyncSGI, SGI_VIDEO_SYNC, NULL )\ /* GL_APPLE_flush_render */ \ - USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, glFlushRenderApple, APPLE_FLUSH_RENDER, NULL )\ - USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, glFinishRenderApple, APPLE_FLUSH_RENDER, NULL )\ + USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, glFlushRenderAPPLE, APPLE_FLUSH_RENDER, NULL )\ + USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, glFinishRenderAPPLE, APPLE_FLUSH_RENDER, NULL )\ /* GL_EXT_gpu_program_parameters */ \ USE_GL_FUNC(PGLFNPROGRAMENVPARAMETERS4FVEXTPROC, glProgramEnvParameters4fvEXT, EXT_GPU_PROGRAM_PARAMETERS,NULL )\ USE_GL_FUNC(PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC, glProgramLocalParameters4fvEXT, EXT_GPU_PROGRAM_PARAMETERS,NULL )\

1 0

Wolfgang Walter : ntdll: Fix set_XOff and set_XOn.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: a24f10b51173432fc2ce65c5c40f01f9a25c7243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24f10b51173432fc2ce65c5c… Author: Wolfgang Walter <wine(a)stwm.de> Date: Sat Dec 20 16:56:22 2008 +0100 ntdll: Fix set_XOff and set_XOn. --- dlls/ntdll/serial.c | 30 ++++++++---------------------- 1 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 95be78d..e174c12 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -800,39 +800,25 @@ static NTSTATUS set_wait_mask(HANDLE hDevice, DWORD mask) return status; } +/* + * does not change IXOFF but simulates that IXOFF has been received: + */ static NTSTATUS set_XOff(int fd) { - struct termios port; - - if (tcgetattr(fd,&port) == -1) - { - FIXME("tcgetattr on fd %d failed (%s)!\n", fd, strerror(errno)); - return FILE_GetNtStatus(); - - - } - port.c_iflag |= IXOFF; - if (tcsetattr(fd, TCSADRAIN, &port) == -1) + if (tcflow(fd, TCOOFF)) { - FIXME("tcsetattr on fd %d failed (%s)!\n", fd, strerror(errno)); return FILE_GetNtStatus(); } return STATUS_SUCCESS; } +/* + * does not change IXON but simulates that IXON has been received: + */ static NTSTATUS set_XOn(int fd) { - struct termios port; - - if (tcgetattr(fd,&port) == -1) - { - FIXME("tcgetattr on fd %d failed (%s)!\n", fd, strerror(errno)); - return FILE_GetNtStatus(); - } - port.c_iflag |= IXON; - if (tcsetattr(fd, TCSADRAIN, &port) == -1) + if (tcflow(fd, TCOON)) { - FIXME("tcsetattr on fd %d failed (%s)!\n", fd, strerror(errno)); return FILE_GetNtStatus(); } return STATUS_SUCCESS;

1 0

Christian Costa : winecoreaudio.drv: Initialize correctly the header before adding it to the queue.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: d700042f05560bc24793698d3cc0c607d5fa85f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d700042f05560bc24793698d3… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Dec 22 12:05:03 2008 +0100 winecoreaudio.drv: Initialize correctly the header before adding it to the queue. --- dlls/winecoreaudio.drv/midi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index a052e05..82d5e5e 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -689,6 +689,10 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } EnterCriticalSection(&midiInLock); + lpMidiHdr->dwFlags &= ~WHDR_DONE; + lpMidiHdr->dwFlags |= MHDR_INQUEUE; + lpMidiHdr->dwBytesRecorded = 0; + lpMidiHdr->lpNext = 0; if (sources[wDevID].lpQueueHdr == 0) { sources[wDevID].lpQueueHdr = lpMidiHdr; } else {

1 0

Hans Leidekker : pidgen: Fix typo.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: 04f03866ffc94de2d40c5708f5ae232c22bbc7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f03866ffc94de2d40c5708f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 22 14:18:30 2008 +0100 pidgen: Fix typo. --- dlls/pidgen/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in index e05833d..797417a 100644 --- a/dlls/pidgen/Makefile.in +++ b/dlls/pidgen/Makefile.in @@ -8,7 +8,7 @@ IMPORTS = kernel32 C_SRCS = \ main.c -RS_SRCS = rsrc.rc +RC_SRCS = rsrc.rc @MAKE_DLL_RULES@

1 0

Rico Schüller : d3d9/tests: Don' t create a Null-shader in d3d9, it will crash.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: bf5912208ff36d6306b839c191b1086582e01c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5912208ff36d6306b839c19… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 22 12:51:04 2008 +0100 d3d9/tests: Don't create a Null-shader in d3d9, it will crash. --- dlls/d3d9/tests/shader.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 522f128..3d80883 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -91,10 +91,6 @@ static void test_get_set_vertex_shader(IDirect3DDevice9 *device_ptr) int shader_refcount = 0; int i = 0; - hret = IDirect3DDevice9_CreateVertexShader(device_ptr, NULL, &shader_ptr); - ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned %#x, expected D3DERR_INVALIDCALL (%#x).\n", - hret, D3DERR_INVALIDCALL); - hret = IDirect3DDevice9_CreateVertexShader(device_ptr, simple_vs, &shader_ptr); ok(hret == D3D_OK && shader_ptr != NULL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p. " "Expected hret 0x%x, shader_ptr != %p. Aborting.\n", hret, shader_ptr, D3D_OK, NULL); @@ -159,10 +155,6 @@ static void test_get_set_pixel_shader(IDirect3DDevice9 *device_ptr) int shader_refcount = 0; int i = 0; - hret = IDirect3DDevice9_CreatePixelShader(device_ptr, NULL, &shader_ptr); - ok(hret == D3DERR_INVALIDCALL, "CreatePixelShader returned %#x, expected D3DERR_INVALIDCALL (%#x).\n", - hret, D3DERR_INVALIDCALL); - hret = IDirect3DDevice9_CreatePixelShader(device_ptr, simple_ps, &shader_ptr); ok(hret == D3D_OK && shader_ptr != NULL, "CreatePixelShader returned: hret 0x%x, shader_ptr %p. " "Expected hret 0x%x, shader_ptr != %p. Aborting.\n", hret, shader_ptr, D3D_OK, NULL);

1 0

Christian Costa : wineoss.drv: Initialize correctly the header before adding it to the queue.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: 671056055121d8d8e8a8e4d82cf48e610381bcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=671056055121d8d8e8a8e4d82… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Dec 22 10:22:23 2008 +0100 wineoss.drv: Initialize correctly the header before adding it to the queue. --- dlls/wineoss.drv/midi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 7d995c2..5f24f2f 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -848,7 +848,10 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; EnterCriticalSection(&crit_sect); + lpMidiHdr->dwFlags &= ~WHDR_DONE; lpMidiHdr->dwFlags |= MHDR_INQUEUE; + lpMidiHdr->dwBytesRecorded = 0; + lpMidiHdr->lpNext = 0; if (MidiInDev[wDevID].lpQueueHdr == 0) { MidiInDev[wDevID].lpQueueHdr = lpMidiHdr; } else {

1 0

Mike Ruprecht : wininet/tests: Add test for FtpFindFirstFile.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: e65195f874d98efbc9183da07ad1d492c944e1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65195f874d98efbc9183da07… Author: Mike Ruprecht <cmaiku(a)gmail.com> Date: Mon Dec 22 04:38:46 2008 -0600 wininet/tests: Add test for FtpFindFirstFile. --- dlls/wininet/tests/ftp.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index f7dc9c9..a785fa9 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -25,7 +25,6 @@ * TODO: * Add W-function tests. * Add missing function tests: - * FtpFindFirstFile * FtpGetFileSize * FtpSetCurrentDirectory */ @@ -723,6 +722,89 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) } } +static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) +{ + WIN32_FIND_DATA findData; + HINTERNET hSearch; + HINTERNET hSearch2; + HINTERNET hOpenFile; + + /* NULL as the search file ought to return the first file in the directory */ + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, NULL, &findData, 0, 0); + ok ( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); + + /* This should fail as the previous handle wasn't closed */ + SetLastError(0xdeadbeef); + hSearch2 = FtpFindFirstFileA(hFtp, "welcome.msg", &findData, 0, 0); + todo_wine ok ( hSearch2 == NULL, "Expected FtpFindFirstFileA to fail\n" ); + todo_wine ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError() ); + InternetCloseHandle(hSearch2); /* Just in case */ + + InternetCloseHandle(hSearch); + + /* Try a valid filename in a subdirectory search */ + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, "pub/wine", &findData, 0, 0); + todo_wine ok ( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); + InternetCloseHandle(hSearch); + + /* Try a valid filename in a subdirectory wildcard search */ + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, "pub/w*", &findData, 0, 0); + todo_wine ok ( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); + InternetCloseHandle(hSearch); + + /* Try an invalid wildcard search */ + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, "*/w*", &findData, 0, 0); + ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); + InternetCloseHandle(hSearch); /* Just in case */ + + /* Try FindFirstFile between FtpOpenFile and InternetCloseHandle */ + SetLastError(0xdeadbeef); + hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); + ok ( hOpenFile != NULL, "Expected FtpOpenFileA to succeed\n" ); + ok ( GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* Win98 */ + "Expected ERROR_SUCCESS, got %u\n", GetLastError() ); + + /* This should fail as the OpenFile handle wasn't closed */ + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, "welcome.msg", &findData, 0, 0); + ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); + ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError() ); + InternetCloseHandle(hSearch); /* Just in case */ + + InternetCloseHandle(hOpenFile); + + /* Test using a nonexistent filename */ + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, "this_file_should_not_exist", &findData, 0, 0); + ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); + todo_wine ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, + "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError() ); + InternetCloseHandle(hSearch); /* Just in case */ + + /* Test using a nonexistent filename and a wildcard */ + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, "this_file_should_not_exist*", &findData, 0, 0); + ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); + todo_wine ok ( GetLastError() == ERROR_NO_MORE_FILES, + "Expected ERROR_NO_MORE_FILES, got %d\n", GetLastError() ); + InternetCloseHandle(hSearch); /* Just in case */ + + /* Test using an invalid handle type */ + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hConnect, "welcome.msg", &findData, 0, 0); + ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); + ok ( GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, + "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError() ); + InternetCloseHandle(hSearch); /* Just in case */ +} + static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) { BOOL bRet; @@ -853,6 +935,7 @@ START_TEST(ftp) test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); test_command(hFtp, hHttp); + test_find_first_file(hFtp, hHttp); test_get_current_dir(hFtp, hHttp); InternetCloseHandle(hHttp);

1 0

Andrew Nguyen : winmm/tests: Refactor the mixerOpen and mixerClose tests and add a few additional test cases .
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: 64cf3062923b00f9ed8b175b676b17001f234239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64cf3062923b00f9ed8b175b6… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Dec 21 01:48:34 2008 -0600 winmm/tests: Refactor the mixerOpen and mixerClose tests and add a few additional test cases. --- dlls/winmm/tests/mixer.c | 93 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 65 insertions(+), 28 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 1827b29..d4227b4 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -174,6 +174,16 @@ static const char * control_flags(DWORD fdwControl) return flags; } +static void test_mixerClose(HMIXER mix) +{ + MMRESULT rc; + + rc = mixerClose(mix); + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_INVALHANDLE, + "mixerClose: MMSYSERR_NOERROR or MMSYSERR_INVALHANDLE expected, got %s\n", + mmsys_error(rc)); +} + static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control) { MMRESULT rc; @@ -378,11 +388,6 @@ static void mixer_test_deviceA(int device) ok(rc==MMSYSERR_NOERROR, "mixerOpen: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { - rc=mixerOpen(&mix, device, 0, 0, CALLBACK_FUNCTION); - ok(rc==MMSYSERR_INVALFLAG - || rc==MMSYSERR_NOTSUPPORTED, /* 98/ME */ - "mixerOpen: MMSYSERR_INVALFLAG or MMSYSERR_NOTSUPPORTED expected, got %s\n", mmsys_error(rc)); - for (d=0;d<capsA.cDestinations;d++) { MIXERLINEA mixerlineA; mixerlineA.cbStruct = 0; @@ -551,10 +556,7 @@ static void mixer_test_deviceA(int device) } } } - rc=mixerClose(mix); - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALHANDLE, - "mixerClose: MMSYSERR_NOERROR or MMSYSERR_INVALHANDLE expected, got %s\n", - mmsys_error(rc)); + test_mixerClose(mix); } } @@ -769,10 +771,6 @@ static void mixer_test_deviceW(int device) ok(rc==MMSYSERR_NOERROR, "mixerOpen: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { - rc=mixerOpen(&mix, device, 0, 0, CALLBACK_FUNCTION); - ok(rc==MMSYSERR_INVALFLAG, - "mixerOpen: MMSYSERR_INVALFLAG expected, got %s\n", mmsys_error(rc)); - for (d=0;d<capsW.cDestinations;d++) { MIXERLINEW mixerlineW; mixerlineW.cbStruct = 0; @@ -957,17 +955,13 @@ static void mixer_test_deviceW(int device) } } } - rc=mixerClose(mix); - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALHANDLE, - "mixerClose: MMSYSERR_NOERROR or MMSYSERR_INVALHANDLE expected, got %s\n", - mmsys_error(rc)); + test_mixerClose(mix); } } static void mixer_testsA(void) { MIXERCAPSA capsA; - HMIXER mix; MMRESULT rc; UINT ndev, d; @@ -981,11 +975,6 @@ static void mixer_testsA(void) "mixerGetDevCapsA: MMSYSERR_BADDEVICEID expected, got %s\n", mmsys_error(rc)); - rc=mixerOpen(&mix, ndev+1, 0, 0, 0); - ok(rc==MMSYSERR_BADDEVICEID, - "mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n", - mmsys_error(rc)); - for (d=0;d<ndev;d++) mixer_test_deviceA(d); } @@ -993,7 +982,6 @@ static void mixer_testsA(void) static void mixer_testsW(void) { MIXERCAPSW capsW; - HMIXER mix; MMRESULT rc; UINT ndev, d; @@ -1009,17 +997,66 @@ static void mixer_testsW(void) if (rc==MMSYSERR_NOTSUPPORTED) return; - rc=mixerOpen(&mix, ndev+1, 0, 0, 0); - ok(rc==MMSYSERR_BADDEVICEID, + for (d=0;d<ndev;d++) + mixer_test_deviceW(d); +} + +static void test_mixerOpen() +{ + HMIXER mix; + MMRESULT rc; + UINT ndev, d; + + ndev = mixerGetNumDevs(); + + /* Test mixerOpen with invalid device ID values. */ + rc = mixerOpen(&mix, ndev + 1, 0, 0, 0); + ok(rc == MMSYSERR_BADDEVICEID, "mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n", mmsys_error(rc)); - for (d=0;d<ndev;d++) - mixer_test_deviceW(d); + rc = mixerOpen(&mix, -1, 0, 0, 0); + ok(rc == MMSYSERR_BADDEVICEID, + "mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n", + mmsys_error(rc)); + + for (d = 0; d < ndev; d++) { + /* Test mixerOpen with valid device ID values and invalid parameters. */ + rc = mixerOpen(&mix, d, 0, 0, CALLBACK_FUNCTION); + ok(rc == MMSYSERR_INVALFLAG + || rc == MMSYSERR_NOTSUPPORTED, /* 98/ME */ + "mixerOpen: MMSYSERR_INVALFLAG expected, got %s\n", + mmsys_error(rc)); + + rc = mixerOpen(&mix, d, 0xdeadbeef, 0, CALLBACK_WINDOW); + ok(rc == MMSYSERR_INVALPARAM, + "mixerOpen: MMSYSERR_INVALPARAM expected, got %s\n", + mmsys_error(rc)); + + /* Test mixerOpen with a NULL dwCallback and CALLBACK_WINDOW flag. */ + rc = mixerOpen(&mix, d, 0, 0, CALLBACK_WINDOW); + todo_wine + ok(rc == MMSYSERR_NOERROR, + "mixerOpen: MMSYSERR_NOERROR expected, got %s\n", + mmsys_error(rc)); + + if (rc == MMSYSERR_NOERROR) + test_mixerClose(mix); + + /* Test mixerOpen with normal parameters. */ + rc = mixerOpen(&mix, d, 0, 0, 0); + ok(rc == MMSYSERR_NOERROR, + "mixerOpen: MMSYSERR_NOERROR expected, got %s\n", + mmsys_error(rc)); + + if (rc == MMSYSERR_NOERROR) + test_mixerClose(mix); + } } START_TEST(mixer) { + test_mixerOpen(); mixer_testsA(); mixer_testsW(); }

1 0

Andrew Nguyen : winmm: mixerOpen should return success with NULL dwCallback and CALLBACK_WINDOW flag .
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: 0135bf8a0cfa61493de97ad3cc4c5e8844979348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0135bf8a0cfa61493de97ad3c… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Dec 21 01:48:40 2008 -0600 winmm: mixerOpen should return success with NULL dwCallback and CALLBACK_WINDOW flag. --- dlls/winmm/tests/mixer.c | 1 - dlls/winmm/winmm.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index d4227b4..6951621 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -1035,7 +1035,6 @@ static void test_mixerOpen() /* Test mixerOpen with a NULL dwCallback and CALLBACK_WINDOW flag. */ rc = mixerOpen(&mix, d, 0, 0, CALLBACK_WINDOW); - todo_wine ok(rc == MMSYSERR_NOERROR, "mixerOpen: MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 389fff8..d9bd190 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -355,7 +355,7 @@ UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, case CALLBACK_WINDOW: mod.dwInstance = dwCallback; - if (!IsWindow((HWND)dwCallback)) + if (dwCallback && !IsWindow((HWND)dwCallback)) return MMSYSERR_INVALPARAM; break; }

1 0

Andrew Nguyen : winmm/tests: Fix a mismatched failure message.
by Alexandre Julliard Dec. 22, 2008

Dec. 22, 2008

Module: wine Branch: master Commit: 81e37d19e39d0eb4d3e7b278c85c923664cf6064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e37d19e39d0eb4d3e7b278c… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Dec 21 01:48:27 2008 -0600 winmm/tests: Fix a mismatched failure message. --- dlls/winmm/tests/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index a31761a..1827b29 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -767,7 +767,7 @@ static void mixer_test_deviceW(int device) rc=mixerOpen(&mix, device, 0, 0, 0); ok(rc==MMSYSERR_NOERROR, - "mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n",mmsys_error(rc)); + "mixerOpen: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { rc=mixerOpen(&mix, device, 0, 0, CALLBACK_FUNCTION); ok(rc==MMSYSERR_INVALFLAG,

1 0