October 2008 - Wine-commits

Reece Dunn : kernel32: Be more verbose when reporting the sync test failures.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 4193d78029873c8b336fc8ec4bc1f36a294222da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4193d78029873c8b336fc8ec4… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Sep 28 20:09:21 2008 +0100 kernel32: Be more verbose when reporting the sync test failures. --- dlls/kernel32/tests/sync.c | 54 +++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40ee4bb..dbf7929 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -658,8 +658,10 @@ static void test_timer_queue(void) SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); /* Test synchronous deletion of the queue and running timers. */ q = pCreateTimerQueue(); @@ -771,32 +773,42 @@ static void test_timer_queue(void) even if the timer is finished. */ SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t1, NULL); - ok(!ret, "DeleteTimerQueueTimer\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer\n"); + ok(!ret, "DeleteTimerQueueTimer call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueTimer, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t2, NULL); - ok(!ret, "DeleteTimerQueueTimer\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer\n"); + ok(!ret, "DeleteTimerQueueTimer call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueTimer, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t3, et1); - ok(ret, "DeleteTimerQueueTimer\n"); - ok(GetLastError() == 0xdeadbeef, "DeleteTimerQueueTimer\n"); + ok(ret, "DeleteTimerQueueTimer call was expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, + "DeleteTimerQueueTimer, GetLastError: expected 0xdeadbeef, got %d\n", + GetLastError()); ok(WaitForSingleObject(et1, 250) == WAIT_OBJECT_0, "Timer destruction event not triggered\n"); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t4, et2); - ok(!ret, "DeleteTimerQueueTimer\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer\n"); + ok(!ret, "DeleteTimerQueueTimer call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueTimer, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); ok(WaitForSingleObject(et2, 1000) == WAIT_OBJECT_0, "Timer destruction event not triggered\n"); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, e); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); ok(WaitForSingleObject(e, 250) == WAIT_OBJECT_0, "Queue destruction event not triggered\n"); CloseHandle(e); @@ -871,8 +883,10 @@ static void test_timer_queue(void) SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); ok(d1.num_calls == 1, "DeleteTimerQueueTimer\n"); /* Test functions on the default timer queue. */ @@ -922,13 +936,17 @@ static void test_timer_queue(void) /* Try to delete the default queue? In any case: not allowed. */ SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(NULL, NULL); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "DeleteTimerQueueEx, GetLastError: expected ERROR_INVALID_HANDLE, got %d\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx\n"); - ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, + "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", + GetLastError()); } START_TEST(sync)

1 0

Hans Leidekker : inetcomm: Add a stub implementation of IIMAPTransport.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: b0a069dcfbf189b6ac0e00d299e216878f3a475a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a069dcfbf189b6ac0e00d29… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 25 13:56:09 2008 +0200 inetcomm: Add a stub implementation of IIMAPTransport. --- dlls/inetcomm/Makefile.in | 1 + dlls/inetcomm/imaptransport.c | 498 ++++++++++++++++++++++++++++++++++++++ dlls/inetcomm/inetcomm_main.c | 3 + dlls/inetcomm/inetcomm_private.h | 3 + 4 files changed, 505 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0a069dcfbf189b6ac0e0…

1 0

Ulrich Czekalla : shell32: Revert c1f2824429286dd60fac723611b801e67eb745b1. It caused poor performance.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 32a4ac1629409031c91bdf162298a3cc4ae58ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a4ac1629409031c91bdf162… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Wed Sep 24 14:21:47 2008 -0400 shell32: Revert c1f2824429286dd60fac723611b801e67eb745b1. It caused poor performance. Patch c1f2824429286dd60fac723611b801e67eb745b1 causes poor performance when browsing a directory. In fact it has a side affect that when you browse the root folder off of My Computer it will enumerate not only the root's contents but each subfolder's contents as well in order to get a more likely correct value for SFGAO_HASSUBFOLDER. --- dlls/shell32/shlfolder.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index cff924f..19ab6e1 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -466,22 +466,6 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) *pdwAttributes &= ~SFGAO_LINK; } - - if (SFGAO_HASSUBFOLDER & *pdwAttributes) - { - IShellFolder *psf2; - if (SUCCEEDED(IShellFolder_BindToObject(psf, pidl, 0, (REFIID)&IID_IShellFolder, (LPVOID *)&psf2))) - { - IEnumIDList *pEnumIL = NULL; - if (SUCCEEDED(IShellFolder_EnumObjects(psf2, 0, SHCONTF_FOLDERS, &pEnumIL))) - { - if (IEnumIDList_Skip(pEnumIL, 1) != S_OK) - *pdwAttributes &= ~SFGAO_HASSUBFOLDER; - IEnumIDList_Release(pEnumIL); - } - IShellFolder_Release(psf2); - } - } } else { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; }

1 0

Roderick Colenbrander : opengl32: Merge recent opengl extensions and prepare for opengl 3.0.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: ad89d9a2b83deaf96b24e2635382a4698aa08be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad89d9a2b83deaf96b24e2635… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Sep 25 17:57:52 2008 +0000 opengl32: Merge recent opengl extensions and prepare for opengl 3.0. --- dlls/opengl32/opengl_ext.c | 4986 +++++++++++++++++++++++++++++++++----------- 1 files changed, 3798 insertions(+), 1188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad89d9a2b83deaf96b24e…

1 0

Hans Leidekker : include: Define IRangeList, IIMAPCallback and IIMAPTransport.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 181d2fb65ea702dd143a859c23c45adbe077c193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181d2fb65ea702dd143a859c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 25 13:55:37 2008 +0200 include: Define IRangeList, IIMAPCallback and IIMAPTransport. --- include/imnxport.idl | 422 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 418 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=181d2fb65ea702dd143a8…

1 0

Jeremy Newman : title should be wineconf 2008, and offer a download link
by Jeremy Newman 01 Oct '08

01 Oct '08

Module: website Branch: master Commit: 7301ab2759d442e3c67eb34f77794be080799f3c URL: http://source.winehq.org/git/website.git/?a=commit;h=7301ab2759d442e3c67eb3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Oct 1 10:17:36 2008 -0500 title should be wineconf 2008, and offer a download link --- templates/en/wineconf/media.template | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/en/wineconf/media.template b/templates/en/wineconf/media.template index 49f5cd8..740e39c 100644 --- a/templates/en/wineconf/media.template +++ b/templates/en/wineconf/media.template @@ -1,4 +1,4 @@ - + <p><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></p> @@ -21,7 +21,8 @@ </script> <p>The following is the keynote address from Alexandre Julliard given during WineConf 2008. To view the video you will need -to have <a href="http://www.macromedia.com/go/getflashplayer">Adobe Flash Player</a> installed.</p> +to have <a href="http://www.macromedia.com/go/getflashplayer">Adobe Flash Player</a> installed. If you want to download the source +flash video file, <a href="http://media.codeweavers.com/pub/other/wineconf2008.flv">right click here</a> and choose "Save Link As".</p> <div style="margin-left: 25px;"> <div id="winehqvid">

1 0