June 2008 - Wine-Commits - list.winehq.org

Maarten Lankhorst : quartz: Remove dead code from DSoundRender.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 33294331d2a6b35ad834a110d7dfd57e3540b276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33294331d2a6b35ad834a110d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jun 23 13:52:51 2008 -0700 quartz: Remove dead code from DSoundRender. --- dlls/quartz/dsoundrender.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 49dd4b1..915f8b4 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -42,7 +42,6 @@ static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IBaseFilterVtbl DSoundRender_Vtbl; static const IPinVtbl DSoundRender_InputPin_Vtbl; -static const IMemInputPinVtbl MemInputPin_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; static const IMediaSeekingVtbl IMediaSeeking_Vtbl; @@ -894,19 +893,6 @@ static const IPinVtbl DSoundRender_InputPin_Vtbl = InputPin_NewSegment }; -static const IMemInputPinVtbl MemInputPin_Vtbl = -{ - MemInputPin_QueryInterface, - MemInputPin_AddRef, - MemInputPin_Release, - MemInputPin_GetAllocator, - MemInputPin_NotifyAllocator, - MemInputPin_GetAllocatorRequirements, - MemInputPin_Receive, - MemInputPin_ReceiveMultiple, - MemInputPin_ReceiveCanBlock -}; - /*** IUnknown methods ***/ static HRESULT WINAPI Basicaudio_QueryInterface(IBasicAudio *iface, REFIID riid,

1 0

Paul Vriens : shlwapi/tests: Fix another test on Vista.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 99deb5ca2c8e2d272a66c03b34d7c9cc1f8dbb6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99deb5ca2c8e2d272a66c03b3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 24 19:09:57 2008 +0200 shlwapi/tests: Fix another test on Vista. --- dlls/shlwapi/tests/path.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 6f55395..e6b6548 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -810,10 +810,8 @@ static void test_PathCanonicalizeA(void) ok(!res, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - todo_wine - { - ok(!lstrcmp(dest, "test"), "Expected test, got %s\n", dest); - } + ok(dest[0] == 0 || !lstrcmp(dest, "test"), + "Expected either an empty string (Vista) or test, got %s\n", dest); /* try an empty source */ lstrcpy(dest, "test");

1 0

Kai Blin : advapi32: Fix lsa tests for domain members.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: c7ffd4fab9ed93380c37a4f6fbe286ab19225ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ffd4fab9ed93380c37a4f6f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Jun 24 15:32:34 2008 +0200 advapi32: Fix lsa tests for domain members. For a domain member, the domain info contains meaningful implementation. It makes no sense to check for the standalone case only. --- dlls/advapi32/tests/lsa.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 4035416..7f53907 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -95,7 +95,6 @@ static void test_lsa(void) status = pLsaQueryInformationPolicy(handle, PolicyPrimaryDomainInformation, (PVOID*)&primary_domain_info); ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyPrimaryDomainInformation) failed, returned 0x%08x\n", status); if (status == STATUS_SUCCESS) { - ok(primary_domain_info->Sid==0,"Sid should be NULL on the local computer\n"); if (primary_domain_info->Sid) { LPSTR strsid; if (pConvertSidToStringSidA(primary_domain_info->Sid, &strsid)) @@ -115,6 +114,8 @@ static void test_lsa(void) else trace("invalid sid\n"); } + else + trace("Running on a standalone system.\n"); pLsaFreeMemory((LPVOID)primary_domain_info); } @@ -129,8 +130,6 @@ static void test_lsa(void) ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "LsaQueryInformationPolicy(PolicyDnsDomainInformation) failed, returned 0x%08x\n", status); if (status == STATUS_SUCCESS) { - ok(IsEqualGUID(&dns_domain_info->DomainGuid, &GUID_NULL), "DomainGUID should be GUID_NULL on local computer\n"); - ok(dns_domain_info->Sid==0,"Sid should be NULL on the local computer\n"); if (dns_domain_info->Sid || !IsEqualGUID(&dns_domain_info->DomainGuid, &GUID_NULL)) { LPSTR strsid = NULL; LPSTR name = NULL; @@ -169,6 +168,8 @@ static void test_lsa(void) LocalFree( guidstr ); LocalFree( strsid ); } + else + trace("Running on a standalone system.\n"); pLsaFreeMemory((LPVOID)dns_domain_info); }

1 0

Dmitry Timoshkov : include: Undefine a custom DECL_WINELIB_DBT_TYPE_AW macro at the end of the file.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 6f16f813407b02cf94df1089a9de7381cd76562d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f16f813407b02cf94df1089a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 22:10:19 2008 +0900 include: Undefine a custom DECL_WINELIB_DBT_TYPE_AW macro at the end of the file. --- include/dbt.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/dbt.h b/include/dbt.h index 0110e6c..88a1df4 100644 --- a/include/dbt.h +++ b/include/dbt.h @@ -142,4 +142,6 @@ typedef struct _DEV_BROADCAST_HANDLE BYTE dbch_data[1]; } DEV_BROADCAST_HANDLE, *PDEV_BROADCAST_HANDLE; +#undef DECL_WINELIB_DBT_TYPE_AW + #endif /* __WINE_DBT_H */

1 0

Dmitry Timoshkov : include: Remove a semicolon from a DECL_WINELIB_TYPE_AW use.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 3ead12bb84b00d5f303cb66185fcc138dd2f6eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ead12bb84b00d5f303cb6618… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 22:09:48 2008 +0900 include: Remove a semicolon from a DECL_WINELIB_TYPE_AW use. --- include/dsound.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dsound.h b/include/dsound.h index b14229e..e1bd668 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -396,7 +396,7 @@ typedef const GUID *LPCGUID; typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID,LPCWSTR,LPCWSTR,LPVOID); typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID,LPCSTR,LPCSTR,LPVOID); -DECL_WINELIB_TYPE_AW(LPDSENUMCALLBACK); +DECL_WINELIB_TYPE_AW(LPDSENUMCALLBACK) extern HRESULT WINAPI DirectSoundCreate(LPCGUID lpGUID,LPDIRECTSOUND *ppDS,LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA, LPVOID);

1 0

Zac Brown : mshtml: Initialize variables in a couple structs.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 332733a43bccc5a48ccda12b9a8c20eea7438e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=332733a43bccc5a48ccda12b9… Author: Zac Brown <zac(a)zacbrown.org> Date: Mon Jun 23 17:41:18 2008 -0700 mshtml: Initialize variables in a couple structs. --- dlls/mshtml/txtrange.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 841d971..9d96405 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -611,6 +611,7 @@ static WCHAR next_char(const dompos_t *pos, dompos_t *new_pos) case TEXT_NODE: tmp_pos.node = iter; tmp_pos.type = TEXT_NODE; + tmp_pos.off = 0; dompos_addref(&tmp_pos); p = tmp_pos.p; @@ -726,6 +727,7 @@ static WCHAR prev_char(HTMLTxtRange *This, const dompos_t *pos, dompos_t *new_po tmp_pos.node = iter; tmp_pos.type = TEXT_NODE; + tmp_pos.off = 0; dompos_addref(&tmp_pos); p = tmp_pos.p + strlenW(tmp_pos.p)-1;

1 0

Paul Vriens : shlwapi/tests: Fix a test on Vista.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: f88a3c569e446cde3b4ec5e0987d5171487ed26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88a3c569e446cde3b4ec5e09… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 24 19:01:33 2008 +0200 shlwapi/tests: Fix a test on Vista. --- dlls/shlwapi/tests/path.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index b2d2a9e..6f55395 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -537,9 +537,13 @@ static void test_PathCombineA(void) SetLastError(0xdeadbeef); lstrcpyA(dest, "control"); str = PathCombineA(dest, "relative\\dir", "\\one\\two\\three\\"); - ok(str == dest, "Expected str == dest, got %p\n", str); - ok(!lstrcmp(str, "one\\two\\three\\"), "Expected one\\two\\three\\, got %s\n", str); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + /* Vista fails which probably makes sense as PathCombineA expects an absolute dir */ + if (str) + { + ok(str == dest, "Expected str == dest, got %p\n", str); + ok(!lstrcmp(str, "one\\two\\three\\"), "Expected one\\two\\three\\, got %s\n", str); + } /* try forward slashes */ SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : winetest: Make 'vista' lower-case again.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: tools Branch: master Commit: 7fe8468c3b80b5362cfe3f69ac6aa9412fce84ea URL: http://source.winehq.org/git/tools.git/?a=commit;h=7fe8468c3b80b5362cfe3f69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 24 17:17:34 2008 +0200 winetest: Make 'vista' lower-case again. --- winetest/dissect | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e3a702a..a8ad596 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -168,7 +168,7 @@ if ($plid==1 && $major==4) { } } elsif ($major==6) { if ($product==1) { - $version = "Vista"; + $version = "vista"; } elsif ($product==3) { $version = "2008"; }

1 0

Paul Vriens : kernel32: Fix return values of GetConsoleCursorInfo.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: dd01d39f3b8aac237a332a153af8bebf5015d6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd01d39f3b8aac237a332a153… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 24 12:23:07 2008 +0200 kernel32: Fix return values of GetConsoleCursorInfo. --- dlls/kernel32/console.c | 10 +++++++++- dlls/kernel32/tests/console.c | 3 --- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 21ce10a..a04ff26 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2239,7 +2239,15 @@ BOOL WINAPI GetConsoleCursorInfo(HANDLE hCon, LPCONSOLE_CURSOR_INFO cinfo) } SERVER_END_REQ; - TRACE("(%p) returning (%d,%d)\n", hCon, cinfo->dwSize, cinfo->bVisible); + if (!ret) return FALSE; + + if (!cinfo) + { + SetLastError(ERROR_INVALID_ACCESS); + ret = FALSE; + } + else TRACE("(%p) returning (%d,%d)\n", hCon, cinfo->dwSize, cinfo->bVisible); + return ret; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2e0a78d..6eed56b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -168,12 +168,9 @@ static void testCursorInfo(HANDLE hCon) SetLastError(0xdeadbeef); ret = GetConsoleCursorInfo(hCon, NULL); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_ACCESS, "GetLastError: expecting %u got %u\n", ERROR_INVALID_ACCESS, GetLastError()); - } } static void testWriteSimple(HANDLE hCon, COORD sbSize)

1 0

Paul Vriens : kernel32/tests: Add some tests for GetConsoleCursorInfo.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: 296bbde1c127354eddcf39b6ab437510bf3db913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296bbde1c127354eddcf39b6a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 24 12:21:57 2008 +0200 kernel32/tests: Add some tests for GetConsoleCursorInfo. --- dlls/kernel32/tests/console.c | 48 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index aacae9c..2e0a78d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -130,6 +130,52 @@ static void testCursor(HANDLE hCon, COORD sbSize) ERROR_INVALID_PARAMETER, GetLastError()); } +static void testCursorInfo(HANDLE hCon) +{ + BOOL ret; + CONSOLE_CURSOR_INFO info; + + SetLastError(0xdeadbeef); + ret = GetConsoleCursorInfo(NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + SetLastError(0xdeadbeef); + info.dwSize = -1; + ret = GetConsoleCursorInfo(NULL, &info); + ok(!ret, "Expected failure\n"); + ok(info.dwSize == -1, "Expected no change for dwSize\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + /* Test the correct call first to distinguish between win9x and the rest */ + SetLastError(0xdeadbeef); + ret = GetConsoleCursorInfo(hCon, &info); + ok(ret, "Expected success\n"); + ok(info.dwSize == 25 || + info.dwSize == 12 /* win9x */, + "Expected 12 or 25, got %d\n", info.dwSize); + ok(info.bVisible, "Expected the cursor to be visible\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError: expecting %u got %u\n", + 0xdeadbeef, GetLastError()); + + if (info.dwSize == 12) + { + skip("NULL CONSOLE_CURSOR_INFO will crash on win9x\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = GetConsoleCursorInfo(hCon, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_ACCESS, "GetLastError: expecting %u got %u\n", + ERROR_INVALID_ACCESS, GetLastError()); + } +} + static void testWriteSimple(HANDLE hCon, COORD sbSize) { COORD c; @@ -863,6 +909,8 @@ START_TEST(console) /* Non interactive tests */ testCursor(hConOut, sbi.dwSize); + /* test parameters (FIXME: test functionality) */ + testCursorInfo(hConOut); /* will test wrapped (on/off) & processed (on/off) strings output */ testWrite(hConOut, sbi.dwSize); /* will test line scrolling at the bottom of the screen */

1 0