January 2010 - Wine-Commits

Nikolay Sivov : msxml3/xmldoc: IPersistStreamInit::InitNew() seems to do nothing for IXMLDocument.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: 6c1275a57cef4c5a03ff9df2c346a349e095397d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1275a57cef4c5a03ff9df2c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 13 00:30:46 2010 +0300 msxml3/xmldoc: IPersistStreamInit::InitNew() seems to do nothing for IXMLDocument. --- dlls/msxml3/tests/xmldoc.c | 25 +++++++++++++++++++++++-- dlls/msxml3/xmldoc.c | 5 +++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 426ef6f..9611f7c 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -355,6 +355,7 @@ static void test_createElement(void) static void test_persiststreaminit(void) { IXMLDocument *doc = NULL; + IXMLElement *element = NULL; IPersistStreamInit *psi = NULL; IStream *stream = NULL; STATSTG stat; @@ -362,6 +363,8 @@ static void test_persiststreaminit(void) ULARGE_INTEGER size; CHAR path[MAX_PATH]; CLSID id; + BSTR str; + static const WCHAR testW[] = {'t','e','s','t',0}; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); @@ -382,7 +385,10 @@ static void test_persiststreaminit(void) todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); hr = IPersistStreamInit_GetClassID(psi, NULL); - ok(hr == E_POINTER, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %08x\n", hr); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); create_xml_file("bank.xml"); GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); @@ -400,6 +406,9 @@ static void test_persiststreaminit(void) if(hr == XML_E_INVALIDATROOTLEVEL) goto cleanup; + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + /* try to save document */ stream = NULL; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); @@ -413,9 +422,21 @@ static void test_persiststreaminit(void) todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); IStream_Release(stream); + str = SysAllocString(testW); + hr = IXMLDocument_get_root(doc, &element); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXMLElement_put_text(element, str); + SysFreeString(str); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + /* reset internal stream */ hr = IPersistStreamInit_InitNew(psi); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); stream = NULL; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 7f5e41d..2ca874b 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -670,8 +670,9 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( IPersistStreamInit *iface) { - FIXME("(%p): stub!\n", iface); - return E_NOTIMPL; + xmldoc *This = impl_from_IPersistStreamInit(iface); + TRACE("(%p)\n", This); + return S_OK; } static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable =

1 0

Andrew Nguyen : ntdll/tests: Allow native crashing code to be compiled.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: d8ba75473a76184c9766eaf8da9be710b64be850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ba75473a76184c9766eaf8d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jan 13 06:44:53 2010 -0600 ntdll/tests: Allow native crashing code to be compiled. --- dlls/ntdll/tests/rtl.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 37479a7..6bc12bb 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -990,9 +990,12 @@ static void test_RtlAllocateAndInitializeSid(void) ret = pRtlFreeSid(psid); ok(!ret, "RtlFreeSid error %08x\n", ret); - /* these tests crash on XP - ret = pRtlAllocateAndInitializeSid(NULL, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); - ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, NULL);*/ + /* these tests crash on XP */ + if (0) + { + ret = pRtlAllocateAndInitializeSid(NULL, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, NULL); + } ret = pRtlAllocateAndInitializeSid(&sia, 9, 1, 2, 3, 4, 5, 6, 7, 8, &psid); ok(ret == STATUS_INVALID_SID, "wrong error %08x\n", ret);

1 0

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

Jan. 14, 2010

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

Jeff Zaroyko : msvcrt: Check if argument passed to _dup2 is positive.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: c2459deefffaef80ea78faadeb9ab7fa66a67ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2459deefffaef80ea78faade… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Jan 12 14:14:33 2010 +1100 msvcrt: Check if argument passed to _dup2 is positive. --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index cbaa04e..df42d47 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -705,7 +705,7 @@ int CDECL MSVCRT__dup2(int od, int nd) TRACE("(od=%d, nd=%d)\n", od, nd); LOCK_FILES(); - if (nd < MSVCRT_MAX_FILES && msvcrt_is_valid_fd(od)) + if (nd < MSVCRT_MAX_FILES && nd >= 0 && msvcrt_is_valid_fd(od)) { HANDLE handle; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 27d64bd..042a82e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1363,7 +1363,7 @@ static void test_unlink(void) void test_dup2(void) { - todo_wine ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); + ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); } START_TEST(file)

1 0

Jeff Zaroyko : msvcrt/tests: Test _dup2 for failure when second arg is negative.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: f4e5ab4892b91e5937069ebae45f5f717cfe2c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e5ab4892b91e5937069ebae… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Jan 12 14:13:10 2010 +1100 msvcrt/tests: Test _dup2 for failure when second arg is negative. --- dlls/msvcrt/tests/file.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index da3d16c..27d64bd 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1361,6 +1361,11 @@ static void test_unlink(void) rmdir("test_unlink"); } +void test_dup2(void) +{ + todo_wine ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); +} + START_TEST(file) { int arg_c; @@ -1381,6 +1386,7 @@ START_TEST(file) ok(0, "invalid argument '%s'\n", arg_v[2]); return; } + test_dup2(); test_file_inherit(arg_v[0]); test_file_write_read(); test_chsize();

1 0

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

Jan. 14, 2010

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 : rsaenh/tests: Don't check result twice (Coccinelle).
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

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 Jan. 14, 2010

Jan. 14, 2010

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 : dxdiagn/tests: Fix some test failures on a clean W2K3.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

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 : shell32: Remove some unneeded parameter setting.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

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