November 2010 - Wine-commits

Francois Gouget : msxml3/tests: Small spelling fix in a nonexistent resource.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: e71dac1ead9c9ba121356c9bf98d6cd34c3201ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71dac1ead9c9ba121356c9bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:50:11 2010 +0100 msxml3/tests: Small spelling fix in a nonexistent resource. --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0965989..e009829 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6550,8 +6550,8 @@ static void test_XSLPattern(void) if (len) expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); - /* set prefix foo to some non-existant namespace */ - ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:foo='urn:non-existant-foo'"))); + /* set prefix foo to some nonexistent namespace */ + ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:foo='urn:nonexistent-foo'"))); /* the registered prefix takes precedence */ ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:c"), &list));

1 0

Francois Gouget : xcopy: Remove a space before a '\n' in the Korean translation.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 6159f516fcbacaa3bcf8757b40201afdbcbe2ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6159f516fcbacaa3bcf8757b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 12:10:21 2010 +0100 xcopy: Remove a space before a '\n' in the Korean translation. --- programs/xcopy/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/Ko.rc b/programs/xcopy/Ko.rc index bb46a36..8a68ebe 100644 --- a/programs/xcopy/Ko.rc +++ b/programs/xcopy/Ko.rc @@ -56,7 +56,7 @@ XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \n\ Where:\n\ \n\ -[/I] 만약 대상이 존재하지 않는 경우 디렉토리로 가정하고 두개나 더 많은 파일을 \n\ +[/I] 만약 대상이 존재하지 않는 경우 디렉토리로 가정하고 두개나 더 많은 파일을\n\ \t복사\n\ [/S] 디렉토리하고 하위 디렉토리 복사\n\ [/E] 빈 디렉토리를 포함해서 디렉토리와 하위 디렉토리 복사\n\

1 0

Francois Gouget : ws2_32: Add a trailing '\n' to a FIXME() call.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 76039b37289215120ea3a1c986b2f3c72b7e253e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76039b37289215120ea3a1c98… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 13:03:36 2010 +0100 ws2_32: Add a trailing '\n' to a FIXME() call. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c51ac35..cb58015 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1565,7 +1565,7 @@ static NTSTATUS WS2_async_accept( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS sta if (status == STATUS_INVALID_HANDLE) { - FIXME("AcceptEx accepting socket closed but request was not cancelled"); + FIXME("AcceptEx accepting socket closed but request was not cancelled\n"); status = STATUS_CANCELLED; } }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: b990617a952654e8e6350ce6318953cf9ee25fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b990617a952654e8e6350ce63… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 13:03:16 2010 +0100 Assorted spelling fixes. --- dlls/gameux/gameexplorer.c | 6 +++--- dlls/gameux/gamestatistics.c | 2 +- dlls/gameux/gameux_private.h | 2 +- dlls/gameux/tests/gameexplorer.c | 4 ++-- dlls/kernel32/tests/path.c | 2 +- dlls/msxml3/tests/schema.c | 2 +- dlls/oleaut32/olepropframe.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/usp10/tests/usp10.c | 4 ++-- dlls/wined3d/directx.c | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1715ad9..bddc131 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -381,7 +381,7 @@ static HRESULT GAMEUX_ParseGameDefinition( /******************************************************************************* * GAMEUX_ParseGDFBinary * - * Helper funtion, loads given binary and parses embed GDF if there's any. + * Helper function, loads given binary and parses embed GDF if there's any. * * Parameters: * GameData [I/O] Structure with game's data. Content of field @@ -534,7 +534,7 @@ HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, hr = GAMEUX_WriteRegistryRecord(&GameData); GAMEUX_uninitGameData(&GameData); - TRACE("returing 0x%08x\n", hr); + TRACE("returning 0x%08x\n", hr); return hr; } /******************************************************************************* @@ -574,7 +574,7 @@ static HRESULT GAMEUX_IsGameKeyExist(GAME_INSTALL_SCOPE installScope, RegCloseKey(hKey); else { - /* if key does not exist or other error occured, do not return the path */ + /* if the key does not exist or another error occurred, do not return the path */ HeapFree(GetProcessHeap(), 0, *lpRegistryPath); *lpRegistryPath = NULL; } diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 0cce059..bedcfd2 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -696,7 +696,7 @@ HRESULT create_IGameStatistics(GameStatisticsImpl** ppStats) (*ppStats)->lpVtbl = &GameStatisticsImplVtbl; (*ppStats)->ref = 1; - TRACE("returing coclass: %p\n", *ppStats); + TRACE("returning coclass: %p\n", *ppStats); return S_OK; } diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h index 86532e2..c8923b5 100644 --- a/dlls/gameux/gameux_private.h +++ b/dlls/gameux/gameux_private.h @@ -89,7 +89,7 @@ HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, /******************************************************************************* * GAMEUX_FindGameInstanceId * - * Helper funtion. Searches for instance identifier of given game in given + * Helper function. Searches for instance identifier of given game in given * installation scope. Implemented in gameexplorer.c * * Parameters: diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index ba22256..e078172 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -414,7 +414,7 @@ static HRESULT _LoadRegistryString(HKEY hRootKey, /******************************************************************************* * _findGameInstanceId * - * Helper funtion. Searches for instance identifier of given game in given + * Helper function. Searches for instance identifier of given game in given * installation scope. * * Parameters: @@ -638,7 +638,7 @@ static void test_install_uninstall_game(void) hr = IGameExplorer2_InstallGame(ge2, sExeName, sExePath, GIS_CURRENT_USER); ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); - /* in comparision to AddGame, InstallGame does not return instance ID, + /* in comparison to AddGame, InstallGame does not return instance ID, * so we need to find it manually */ _findGameInstanceId(__LINE__, sExeName, GIS_CURRENT_USER, &guid); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3d32767..55d62aa 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -361,7 +361,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) } for(unique=0;unique<3;unique++) { - /* Non-existent path */ + /* Nonexistent path */ sprintf(invalid_dir, "%s\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); SetLastError(0xdeadbeef); ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index b457f0e..189451e 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -476,7 +476,7 @@ static void test_length(void) ole_expect(IXMLDOMSchemaCollection_get_length(cache, NULL), E_POINTER); - /* MSDN lies; removing a non-existant entry produces no error */ + /* MSDN lies; removing a nonexistent entry produces no error */ ole_check(IXMLDOMSchemaCollection_remove(cache, NULL)); ole_check(IXMLDOMSchemaCollection_remove(cache, _bstr_(xdr_schema1_uri))); diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 4772ba7..011fde1 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -2,7 +2,7 @@ * Copyright 1999 Corel Corporation * Sean Langley * Copyright 2010 Geoffrey Hausheer - * Copyright 2010 Piotr Caban for Codeweavers + * Copyright 2010 Piotr Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index eb5a3f7..cb1ad6f 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3918,7 +3918,7 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, - /* Dot segements aren't removed. */ + /* Dot segments aren't removed. */ { "file://c:\\dir\\../..\\./index.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH |Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 56385c6..06e9289 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1421,7 +1421,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) } } - /* Check beyond the leading boundry of the whole string */ + /* Check beyond the leading boundary of the whole string */ if (rtl[0]) { /* having a leading rtl character seems to confuse usp */ @@ -1445,7 +1445,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) iTrailing); } - /* Check beyond the end boundry of the whole string */ + /* Check beyond the end boundary of the whole string */ if (rtl[String_len-1]) hr = ScriptStringCPtoX(ssa, String_len-1, FALSE, &X); else diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 326c64b..b25e399 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -997,9 +997,9 @@ static const struct driver_version_information driver_version_table[] = { /* ATI * - Radeon HD2x00 (R600) and up supported by current drivers. - * - Radeon 9500 (R300) - X1*00 (R5xx) supported upto Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) - * - Radeon 7xxx (R100) - 9250 (RV250) supported upto Catalyst 6.11 (XP) - * - Rage 128 supported upto XP, latest official build 6.13.3279 dated October 2001 */ + * - Radeon 9500 (R300) - X1*00 (R5xx) supported up to Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) + * - Radeon 7xxx (R100) - 9250 (RV250) supported up to Catalyst 6.11 (XP) + * - Rage 128 supported up to XP, latest official build 6.13.3279 dated October 2001 */ {DRIVER_ATI_RAGE_128PRO, DRIVER_MODEL_NT5X, "ati2dvaa.dll", 13, 3279, 0}, {DRIVER_ATI_R100, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6614}, {DRIVER_ATI_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764},

1 0

Henri Verbeet : ddraw: Fix some TRACEs.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: cb3a133b281c0d869cdc9c90746c008eda55c675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3a133b281c0d869cdc9c907… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 2 12:02:46 2010 +0100 ddraw: Fix some TRACEs. --- dlls/ddraw/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6a12cdf..5d0a8e6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -853,7 +853,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR IDirectDrawSurfaceImpl *Src = (IDirectDrawSurfaceImpl *)SrcSurface; HRESULT hr; - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %p, flags %#x, fx %p.\n", + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(DestRect), SrcSurface, wine_dbgstr_rect(SrcRect), Flags, DDBltFx); /* Check for validity of the flags here. WineD3D Has the software-opengl selection path and would have @@ -919,7 +919,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %p, flags %#x, fx %p.\n", + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); return ddraw_surface7_Blt((IDirectDrawSurface7 *)surface_from_surface3(iface), dst_rect,

1 0

Jörg Höhle : winmm: MCI_SYSINFO doesn' t change the output buffer in case of error.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: a9f9b34e17149f110d048e9f9cb7cbc9fc79bf81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f9b34e17149f110d048e9f9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 22 21:17:32 2010 +0200 winmm: MCI_SYSINFO doesn't change the output buffer in case of error. --- dlls/winmm/mci.c | 2 -- dlls/winmm/tests/mci.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 455a733..3558d2b 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1843,7 +1843,6 @@ static DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr) if (lpSrcStr) { if (dstSize <= strlenW(lpSrcStr)) { - lstrcpynW(lpDstStr, lpSrcStr, dstSize - 1); ret = MCIERR_PARAM_OVERFLOW; } else { strcpyW(lpDstStr, lpSrcStr); @@ -1931,7 +1930,6 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm ret = MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, wmd->lpstrDeviceType); } else { - *lpParms->lpstrReturn = 0; ret = (uDevID == MCI_ALL_DEVICE_ID) ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ebd393f..1672433 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -162,6 +162,13 @@ static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, i else ok_(__FILE__,line)(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); + return lstrcmpA(buf, stra); +} + static void test_mciParser(HWND hwnd) { MCIERROR err; @@ -385,6 +392,9 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"mci close shareable returned %s\n", dbg_mcierr(err)); } + err = mciGetDeviceID("waveaudio"); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendString(command_open, buf, sizeof(buf), hwnd); ok(!err,"mci %s returned %s\n", command_open, dbg_mcierr(err)); ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); @@ -427,24 +437,27 @@ static void test_openCloseWAVE(HWND hwnd) /* MCI_..._PARMSA and PARMSW share the same layout, use one for both tests. */ err = mciSendCommandW(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); ok(!err || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommandW MCI_SYSINFO all name 1 open buffer[8]: %s\n", dbg_mcierr(err)); - /* TODO strcmpW((LPWSTR)buf,"mysound") */ + if(!err) ok(!strcmp_wa((LPWSTR)buf,"mysound"), "sysinfo name 1 open contents\n"); + buf[0] = 'Y'; parm.sys.dwNumber = 1; parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ parm.sys.lpstrReturn = buf; parm.sys.dwRetSize = 7; /* too short for mysound\0 */ err = mciSendCommandW(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); ok(err==MCIERR_PARAM_OVERFLOW || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommandW MCI_SYSINFO all name 1 open too small: %s\n", dbg_mcierr(err)); + ok(!strcmp(buf,"Y"), "output buffer %s\n", buf); /* Win9x overwrites the tiny buffer and returns success, newer versions signal overflow. */ memset(buf, 0, sizeof(buf)); + buf[0] = 'Y'; parm.sys.dwNumber = 1; parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ parm.sys.lpstrReturn = buf; parm.sys.dwRetSize = 2; /* too short for mysound\0 */ err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); ok(err==MCIERR_PARAM_OVERFLOW || broken(!err /* Win9x */),"mciCommand MCI_SYSINFO all name 1 open too small: %s\n", dbg_mcierr(err)); - if(!err) ok(!strcmp(buf,"mysound"), "sysinfo short name returned %s\n", buf); + ok(!strcmp(buf, err ? "Y" : "mysound"), "sysinfo short name returned %s\n", buf); err = mciSendString("sysinfo mysound quantity open", buf, sizeof(buf), hwnd); ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity: %s\n", dbg_mcierr(err)); @@ -455,12 +468,26 @@ static void test_openCloseWAVE(HWND hwnd) err = mciSendString("sysinfo all installname", buf, sizeof(buf), hwnd); ok(err==MCIERR_CANNOT_USE_ALL,"sysinfo all installname: %s\n", dbg_mcierr(err)); + buf[0] = 'M'; buf[1] = 0; + parm.sys.lpstrReturn = buf; + parm.sys.dwRetSize = sizeof(buf); + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&parm); + ok(err==MCIERR_CANNOT_USE_ALL,"mciCommand MCI_SYSINFO all installname: %s\n", dbg_mcierr(err)); + ok(!strcmp(buf,"M"), "output buffer %s\n", buf); + err = mciSendString("sysinfo nodev installname", buf, sizeof(buf), hwnd); ok(err==MCIERR_INVALID_DEVICE_NAME,"sysinfo nodev installname: %s\n", dbg_mcierr(err)); ok(!buf[0], "sysinfo error buffer %s\n", buf); + buf[0] = 'K'; + parm.sys.lpstrReturn = buf; + parm.sys.dwRetSize = sizeof(buf); + err = mciSendCommandW(24000, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&parm); + ok(err==MCIERR_INVALID_DEVICE_NAME || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommand MCI_SYSINFO nodev installname: %s\n", dbg_mcierr(err)); + ok(!strcmp(buf,"K"), "output buffer %s\n", buf); + err = mciGetDeviceID("all"); - ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID); + ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(WORD)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID); err = mciSendString(command_close_my, NULL, 0, hwnd); ok(!err,"mci %s returned %s\n", command_close_my, dbg_mcierr(err));

1 0

Jörg Höhle : winmm: MCI_INFO doesn' t change the output buffer in case of error.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 22055590f612994c1dceef1911cfd972747f218a URL: http://source.winehq.org/git/wine.git/?a=commit;h=22055590f612994c1dceef191… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Oct 5 21:09:11 2010 +0200 winmm: MCI_INFO doesn't change the output buffer in case of error. --- dlls/mciavi32/info.c | 13 ++++--------- dlls/mcicda/mcicda.c | 19 ++++++++----------- dlls/mciseq/mcimidi.c | 16 +++++++--------- dlls/mciwave/mciwave.c | 21 ++++++++++----------- dlls/winmm/tests/mci.c | 14 ++++++++++++++ 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index b2ec030..668464c 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -211,16 +211,11 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) WARN("Don't know this info command (%u)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_COMMAND; } - if (str) { - if (strlenW(str) + 1 > lpParms->dwRetSize) { - ret = MCIERR_PARAM_OVERFLOW; - } else { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize); - } - } else { - lpParms->lpstrReturn[0] = 0; + if (!ret) { + WCHAR zero = 0; + /* Only mciwave, mciseq and mcicda set dwRetSize (since NT). */ + lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); } - LeaveCriticalSection(&wma->cs); return ret; } diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 4c67085..3ec8307 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -650,18 +650,15 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) WARN("Don't know this info command (%u)\n", dwFlags); ret = MCIERR_MISSING_PARAMETER; } - if (str) { - if (lpParms->dwRetSize <= strlenW(str)) { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); - ret = MCIERR_PARAM_OVERFLOW; - } else { - strcpyW(lpParms->lpstrReturn, str); - } - } else { - *lpParms->lpstrReturn = 0; + if (!ret) { + TRACE("=> %s\n", debugstr_w(str)); + if (lpParms->dwRetSize) { + WCHAR zero = 0; + /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize + * to the number of characters written, excluding \0. */ + lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + } else ret = MCIERR_PARAM_OVERFLOW; } - TRACE("=> %s (%d)\n", debugstr_w(lpParms->lpstrReturn), ret); - if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY)) MCICDA_Notify(lpParms->dwCallback, wmcda, MCI_NOTIFY_SUCCESSFUL); return ret; diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index ec9a24a..5d15874 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1600,15 +1600,13 @@ static DWORD MIDI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) WARN("Don't know this info command (%u)\n", dwFlags); return MCIERR_UNRECOGNIZED_COMMAND; } - if (str) { - if (lpParms->dwRetSize <= strlenW(str)) { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); - ret = MCIERR_PARAM_OVERFLOW; - } else { - strcpyW(lpParms->lpstrReturn, str); - } - } else { - *lpParms->lpstrReturn = 0; + if (!ret) { + if (lpParms->dwRetSize) { + WCHAR zero = 0; + /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize + * to the number of characters written, excluding \0. */ + lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + } else ret = MCIERR_PARAM_OVERFLOW; } return ret; } diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index b2dc1a1..edd63ce 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1665,6 +1665,8 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l if (!lpParms || !lpParms->lpstrReturn) return MCIERR_NULL_PARAMETER_BLOCK; + TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); + if (wmw == NULL) { ret = MCIERR_INVALID_DEVICE_ID; } else { @@ -1672,8 +1674,6 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l static const WCHAR wszWaveIn [] = {'W','i','n','e',' ','W','a','v','e',' ','I','n',0}; static const WCHAR wszWaveOut[] = {'W','i','n','e',' ','W','a','v','e',' ','O','u','t',0}; - TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); - switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { case MCI_INFO_PRODUCT: str = wszAudio; break; case MCI_INFO_FILE: str = wmw->lpFileName; break; @@ -1681,17 +1681,16 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l case MCI_WAVE_OUTPUT: str = wszWaveOut; break; default: WARN("Don't know this info command (%u)\n", dwFlags); - ret = MCIERR_UNRECOGNIZED_COMMAND; + ret = MCIERR_UNRECOGNIZED_KEYWORD; } } - if (str) { - if (strlenW(str) + 1 > lpParms->dwRetSize) { - ret = MCIERR_PARAM_OVERFLOW; - } else { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize); - } - } else { - lpParms->lpstrReturn[0] = 0; + if (!ret) { + if (lpParms->dwRetSize) { + WCHAR zero = 0; + /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize + * to the number of characters written, excluding \0. */ + lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY)) WAVE_mciNotify(lpParms->dwCallback, wmw, MCI_NOTIFY_SUCCESSFUL); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 1672433..4f89b82 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -30,6 +30,7 @@ static MCIERROR ok_saved = MCIERR_FILE_NOT_FOUND; typedef union { + MCI_INFO_PARMS info; MCI_STATUS_PARMS status; MCI_WAVE_SET_PARMS set; MCI_WAVE_OPEN_PARMS open; @@ -486,6 +487,19 @@ static void test_openCloseWAVE(HWND hwnd) ok(err==MCIERR_INVALID_DEVICE_NAME || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommand MCI_SYSINFO nodev installname: %s\n", dbg_mcierr(err)); ok(!strcmp(buf,"K"), "output buffer %s\n", buf); + buf[1] = 'L'; + parm.info.lpstrReturn = buf; + parm.info.dwRetSize = 2; + err = mciSendCommand(1, MCI_INFO, MCI_INFO_PRODUCT, (DWORD_PTR)&parm); + ok(!err, "mciCommand MCI_INFO product: %s\n", dbg_mcierr(err)); + ok(buf[0] && !buf[1], "info product output buffer %s\n", buf); + + buf[0] = 'K'; + parm.info.dwRetSize = sizeof(buf); + err = mciSendCommandW(1, MCI_INFO, 0x07000000, (DWORD_PTR)&parm); + ok(err==MCIERR_UNRECOGNIZED_KEYWORD, "mciCommand MCI_INFO other: %s\n", dbg_mcierr(err)); + ok(!strcmp(buf,"K"), "info output buffer %s\n", buf); + err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(WORD)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID);

1 0

Adam Martinson : configure: Add a check/ define for xmlSchemaSetValidStructuredErrors().
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: be4d0e9d0785d7c94882b086ba3e067a06a29f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4d0e9d0785d7c94882b086b… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 1 14:11:16 2010 -0500 configure: Add a check/define for xmlSchemaSetValidStructuredErrors(). --- configure | 42 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ include/config.h.in | 3 +++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fe73100..20fff98 100755 --- a/configure +++ b/configure @@ -9202,6 +9202,48 @@ $as_echo "#define HAVE_XMLNEWDOCPI 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5 +$as_echo_n "checking for xmlSchemaSetValidStructuredErrors in -lxml2... " >&6; } +if test "${ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $ac_xml_libs $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmlSchemaSetValidStructuredErrors (); +int +main () +{ +return xmlSchemaSetValidStructuredErrors (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors=yes +else + ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" >&5 +$as_echo "$ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" >&6; } +if test "x$ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" = x""yes; then : + +$as_echo "#define HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS 1" >>confdefs.h + +fi + fi diff --git a/configure.ac b/configure.ac index eb3285a..f38aca4 100644 --- a/configure.ac +++ b/configure.ac @@ -1119,6 +1119,8 @@ then [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlNewDocPI, [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlSchemaSetValidStructuredErrors, + [AC_DEFINE(HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetValidStructuredErrors function])],,$ac_xml_libs) ]) CPPFLAGS="$ac_save_CPPFLAGS" fi diff --git a/include/config.h.in b/include/config.h.in index 0bb6be2..1c82e75 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1111,6 +1111,9 @@ /* Define if libxml2 has the xmlReadMemory function */ #undef HAVE_XMLREADMEMORY +/* Define if libxml2 has the xmlSchemaSetValidStructuredErrors function */ +#undef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS + /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM

1 0

Adam Martinson : msxml3: Add a function to validate a tree against a schema cache.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: bf11a93b05142e005f3e9e0909823c0d80cdcea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf11a93b05142e005f3e9e090… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 1 14:11:46 2010 -0500 msxml3: Add a function to validate a tree against a schema cache. --- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3d7903c..9dd02cb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -197,6 +197,7 @@ extern HRESULT node_get_prefix(xmlnode*,BSTR*); extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); +extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); static inline BSTR bstr_from_xmlChar(const xmlChar *str) { diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 0120333..1ff4566 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -611,6 +611,85 @@ static const struct IXMLDOMSchemaCollection2Vtbl schema_cache_vtbl = schema_cache_getDeclaration }; +static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_ERR(SchemaCache_validate_tree, msg, ap); + va_end(ap); +} + +static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_WARN(SchemaCache_validate_tree, msg, ap); + va_end(ap); +} + +#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS +static void validate_serror(void* ctx, xmlErrorPtr err) +{ + LIBXML2_CALLBACK_SERROR(SchemaCache_validate_tree, err); +} +#endif + +HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree) +{ + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + cache_entry* entry; + xmlChar const* ns = NULL; + TRACE("(%p, %p)\n", This, tree); + + if (!tree) + return E_POINTER; + + if ((xmlNodePtr)tree->doc == tree) + { + xmlNodePtr root = xmlDocGetRootElement(tree->doc); + if (root && root->ns) + ns = root->ns->href; + } + else if (tree->ns) + { + ns = tree->ns->href; + } + + entry = xmlHashLookup(This->cache, ns); + /* TODO: if the ns is not in the cache, and it's a URL, + * do we try to load from that? */ + if (entry) + { + if (entry->type == SCHEMA_TYPE_XDR) + { + FIXME("partial stub: XDR schema support not implemented\n"); + return S_OK; + } + else if (entry->type == SCHEMA_TYPE_XSD) + { + xmlSchemaValidCtxtPtr svctx; + int err; + /* TODO: if validateOnLoad property is false, + * we probably need to validate the schema here. */ + svctx = xmlSchemaNewValidCtxt(entry->schema); + xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); +#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS + xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); +#endif + + if ((xmlNodePtr)tree->doc == tree) + err = xmlSchemaValidateDoc(svctx, (xmlDocPtr)tree); + else + err = xmlSchemaValidateOneElement(svctx, tree); + + xmlSchemaFreeValidCtxt(svctx); + return err? S_FALSE : S_OK; + } + } + + return E_FAIL; +} + HRESULT SchemaCache_create(IUnknown* pUnkOuter, void** ppObj) { schema_cache* This = heap_alloc(sizeof(schema_cache));

1 0

Adam Martinson : msxml3: Add error code defines.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 5c7bcdadcffee1f3697e2382085ac081c9b9ee2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7bcdadcffee1f3697e23820… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 1 14:12:04 2010 -0500 msxml3: Add error code defines. --- dlls/msxml3/msxml_private.h | 15 +++++++++++++++ dlls/msxml3/tests/domdoc.c | 4 ++-- include/msxml2.idl | 7 +++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 9dd02cb..8af73a1 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -336,4 +336,19 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +/* Error Codes - not defined anywhere in the public headers */ +#define E_XML_ELEMENT_UNDECLARED 0xC00CE00D +#define E_XML_ELEMENT_ID_NOT_FOUND 0xC00CE00E +/* ... */ +#define E_XML_EMPTY_NOT_ALLOWED 0xC00CE011 +#define E_XML_ELEMENT_NOT_COMPLETE 0xC00CE012 +#define E_XML_ROOT_NAME_MISMATCH 0xC00CE013 +#define E_XML_INVALID_CONTENT 0xC00CE014 +#define E_XML_ATTRIBUTE_NOT_DEFINED 0xC00CE015 +#define E_XML_ATTRIBUTE_FIXED 0xC00CE016 +#define E_XML_ATTRIBUTE_VALUE 0xC00CE017 +#define E_XML_ILLEGAL_TEXT 0xC00CE018 +/* ... */ +#define E_XML_REQUIRED_ATTRIBUTE_MISSING 0xC00CE020 + #endif /* __MSXML_PRIVATE__ */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fb5c4ac..0965989 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3486,7 +3486,7 @@ static void test_IXMLDOMDocument2(void) res = 0; ole_check(IXMLDOMParseError_get_errorCode(err, &res)); /* XML_E_NOTWF */ - ok(res == 0xC00CE223, "got %08x\n", res); + ok(res == E_XML_NOTWF, "got %08x\n", res); IXMLDOMParseError_Release(err); } @@ -3507,7 +3507,7 @@ static void test_IXMLDOMDocument2(void) res = 0; ole_check(IXMLDOMParseError_get_errorCode(err, &res)); /* XML_E_NODTD */ - todo_wine ok(res == 0xC00CE224, "got %08x\n", res); + todo_wine ok(res == E_XML_NODTD, "got %08x\n", res); IXMLDOMParseError_Release(err); } diff --git a/include/msxml2.idl b/include/msxml2.idl index da520d2..9a5fe1d 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -2815,5 +2815,12 @@ coclass SAXAttributes40 interface ISAXAttributes; }; +/* + * Error Codes + */ +cpp_quote("#define E_XML_NOTWF 0xC00CE223") +cpp_quote("#define E_XML_NODTD 0xC00CE224") +cpp_quote("#define E_XML_INVALID 0xC00CE225") +cpp_quote("#define E_XML_BUFFERTOOSMALL 0xC00CE226") } /* Library MSXML */

1 0