November 2008 - Wine-Commits

Henri Verbeet : d3d10core: Add a d3d10core dll.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 078fc191f83ac7a07ef65165c89e9d6b67524558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078fc191f83ac7a07ef65165c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 12 12:04:24 2008 +0100 d3d10core: Add a d3d10core dll. --- configure | 9 ++++++++ configure.ac | 1 + dlls/d3d10core/Makefile.in | 15 +++++++++++++ dlls/d3d10core/d3d10core.spec | 1 + dlls/d3d10core/d3d10core_main.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/d3d10core/d3d10core_private.h | 26 ++++++++++++++++++++++++ dlls/d3d10core/version.rc | 26 ++++++++++++++++++++++++ 7 files changed, 117 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 9c677ee..af1a5a2 100755 --- a/configure +++ b/configure @@ -24290,6 +24290,14 @@ dlls/d3d10/tests/Makefile: dlls/d3d10/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/d3d10/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/d3d10core/Makefile" +test "x$enable_d3d10core" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3d10core" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/d3d10core/Makefile: dlls/d3d10core/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/d3d10core/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3d8/Makefile" test "x$enable_d3d8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ d3d8" @@ -28087,6 +28095,7 @@ do "dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;; "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;; "dlls/d3d10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/tests/Makefile" ;; + "dlls/d3d10core/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10core/Makefile" ;; "dlls/d3d8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;; "dlls/d3d8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/tests/Makefile" ;; "dlls/d3d9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d9/Makefile" ;; diff --git a/configure.ac b/configure.ac index 00f2ddb..71c2a45 100644 --- a/configure.ac +++ b/configure.ac @@ -1776,6 +1776,7 @@ WINE_CONFIG_MAKEFILE([dlls/ctapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3d10core/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d9/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in new file mode 100644 index 0000000..605e453 --- /dev/null +++ b/dlls/d3d10core/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3d10core.dll +IMPORTS = kernel32 + +C_SRCS = \ + d3d10core_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/d3d10core/d3d10core.spec b/dlls/d3d10core/d3d10core.spec new file mode 100644 index 0000000..1143f78 --- /dev/null +++ b/dlls/d3d10core/d3d10core.spec @@ -0,0 +1 @@ +@ stub D3D10CoreRegisterLayers diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c new file mode 100644 index 0000000..14dd099 --- /dev/null +++ b/dlls/d3d10core/d3d10core_main.c @@ -0,0 +1,39 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("fdwReason %u\n", fdwReason); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h new file mode 100644 index 0000000..46d9eb7 --- /dev/null +++ b/dlls/d3d10core/d3d10core_private.h @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_D3D10CORE_PRIVATE_H +#define __WINE_D3D10CORE_PRIVATE_H + +#include "wine/debug.h" + +#include "winbase.h" + +#endif /* __WINE_D3D10CORE_PRIVATE_H */ diff --git a/dlls/d3d10core/version.rc b/dlls/d3d10core/version.rc new file mode 100644 index 0000000..d02e871 --- /dev/null +++ b/dlls/d3d10core/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3D10 Core" +#define WINE_FILENAME_STR "d3d10core.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc"

1 0

Paul Vriens : snmpapi/tests: Fix failures on NT4 and below.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: ad8efd93400984d121a7d0d30dfc01d58ed41935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad8efd93400984d121a7d0d30… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 12 12:20:11 2008 +0100 snmpapi/tests: Fix failures on NT4 and below. --- dlls/snmpapi/tests/util.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 780556c..f8067c2 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -71,6 +71,7 @@ static void test_SnmpUtilOidToA(void) static AsnObjectIdentifier oid4 = { 258, ids2 }; static AsnObjectIdentifier oid5 = { 1, ids3 }; static const char expect0[] = "<null oid>"; + static const char expect0_alt[] = "NUL"; static const char expect1[] = "1.3.6.1.4.1.311"; static const char expect2[] = "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." @@ -90,6 +91,15 @@ static void test_SnmpUtilOidToA(void) "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1"; + static const char expect3_alt[] = + "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." + "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." + "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." + "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." + "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." + "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." + "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1." + "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1"; static const char expect4[] = "-1"; /* This crashes under win98 */ @@ -103,7 +113,9 @@ static void test_SnmpUtilOidToA(void) ret = SnmpUtilOidToA(&oid0); ok(ret != NULL, "SnmpUtilOidToA failed\n"); - ok(!strcmp(ret, expect0), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", + ok(!strcmp(ret, expect0) || + broken(!strcmp(ret, expect0_alt)), /* Win98, WinMe, NT4 */ + "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", ret, expect0); ret = SnmpUtilOidToA(&oid1); @@ -123,7 +135,9 @@ static void test_SnmpUtilOidToA(void) ret = SnmpUtilOidToA(&oid4); ok(ret != NULL, "SnmpUtilOidToA failed\n"); - ok(!strcmp(ret, expect3), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", + ok(!strcmp(ret, expect3) || + broken(!strcmp(ret, expect3_alt)), /* Win98, WinMe, NT4 */ + "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", ret, expect3); ret = SnmpUtilOidToA(&oid5);

1 0

Paul Vriens : ddraw/tests: Skip tests when DirectDraw4 is not supported.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 902bee8f0995102aa3dfcd5e865d406a4db9bf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902bee8f0995102aa3dfcd5e8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 12 10:21:07 2008 +0100 ddraw/tests: Skip tests when DirectDraw4 is not supported. --- dlls/ddraw/tests/dsurface.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 25fe30a..d4626ad 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2750,8 +2750,21 @@ static void SurfaceCapsTest(void) START_TEST(dsurface) { + HRESULT ret; + IDirectDraw4 *dd4; + if (!CreateDirectDraw()) return; + + ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); + if (ret == E_NOINTERFACE) + { + win_skip("DirectDraw4 and higher are not supported\n"); + ReleaseDirectDraw(); + return; + } + IDirectDraw_Release(dd4); + MipMapCreationTest(); SrcColorKey32BlitTest(); QueryInterface();

1 0

Paul Vriens : ddraw/tests: Fix a typo.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 10e5d3aa12e704a8c4583f3c8ca236bb0e23d236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e5d3aa12e704a8c4583f3c8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 12 10:15:22 2008 +0100 ddraw/tests: Fix a typo. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ccd75e0..25fe30a 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2249,7 +2249,7 @@ static void PrivateDataTest(void) } hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **) &surface7); ok(hr == DD_OK, "IDirectDrawSurface_QueryInterface failed with %08x\n", hr); - if(!surface) + if(!surface7) { IDirectDrawSurface_Release(surface); return;

1 0

Alexandre Julliard : msvcrt/tests: Trace the timezone being used.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 1d9fa06aea07174bad0b19856f4542084b3053dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9fa06aea07174bad0b19856… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 12 12:54:11 2008 +0100 msvcrt/tests: Trace the timezone being used. --- dlls/msvcrt/tests/time.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 88564de..83bdc15 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include "winbase.h" +#include "winnls.h" #include "time.h" #include <stdlib.h> /*setenv*/ @@ -63,9 +64,13 @@ static void test_mktime(void) struct tm my_tm, sav_tm; time_t nulltime, local_time; char TZ_env[256]; + char buffer[64]; int secs; ok (res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n"); + WideCharToMultiByte( CP_ACP, 0, tzinfo.StandardName, -1, buffer, sizeof(buffer), NULL, NULL ); + trace( "bias %d std %d dst %d zone %s\n", + tzinfo.Bias, tzinfo.StandardBias, tzinfo.DaylightBias, buffer ); /* Bias may be positive or negative, to use offset of one day */ secs= SECSPERDAY - tzinfo.Bias * SECSPERMIN; my_tm.tm_mday = 1 + secs/SECSPERDAY;

1 0

Alistair Leslie-Hughes : mshtml: Add tests for supported interfaces.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 13eb73425134874fa360f85e643d0153c51dca8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13eb73425134874fa360f85e6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 12 16:08:17 2008 +1100 mshtml: Add tests for supported interfaces. --- dlls/mshtml/script.c | 3 +++ dlls/mshtml/tests/script.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 5df0616..4d10853 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -223,6 +223,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSiteDebug32, riid)) { TRACE("(%p)->(IID_IActiveScriptSiteDebug32 %p)\n", This, ppv); *ppv = ACTSCPDBG32(This); + }else if(IsEqualGUID(&IID_ICanHandleException, riid)) { + TRACE("(%p)->(IID_ICanHandleException not supported %p)\n", This, ppv); + return E_NOINTERFACE; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 90e5583..32f0974 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -767,6 +767,8 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc { IActiveScriptSiteInterruptPoll *poll; IActiveScriptSiteDebug *debug; + IServiceProvider *service; + ICanHandleException *canexpection; LCID lcid; HRESULT hres; @@ -790,6 +792,14 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc if(SUCCEEDED(hres)) IActiveScriptSiteDebug32_Release(debug); + hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); + ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); + + hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); + todo_wine ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); + if(SUCCEEDED(hres)) + IServiceProvider_Release(service); + site = pass; IActiveScriptSite_AddRef(site); return S_OK;

1 0

Alexandre Julliard : user32/tests: Make sure the message test doesn' t hang if the window doesn't have focus.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 466de4f429ae5b336bd7ee3a2f87bf00a00e20ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=466de4f429ae5b336bd7ee3a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 12 12:36:22 2008 +0100 user32/tests: Make sure the message test doesn't hang if the window doesn't have focus. --- dlls/user32/tests/msg.c | 93 ++++++++++++++++++++++++++++------------------- 1 files changed, 55 insertions(+), 38 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 84fda56..2c3dea5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9220,19 +9220,25 @@ todo_wine { qstatus = GetQueueStatus(qs_all_input); ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), "wrong qstatus %08x\n", qstatus); - ret = GetMessageA( &msg, 0, 0, 0 ); - ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', - "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", - ret, msg.message, msg.wParam); - qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == MAKELONG(0, QS_KEY), "wrong qstatus %08x\n", qstatus); + if (qstatus) + { + ret = GetMessageA( &msg, 0, 0, 0 ); + ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', + "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(0, QS_KEY), "wrong qstatus %08x\n", qstatus); + } - ret = GetMessageA( &msg, 0, 0, 0 ); - ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', - "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", - ret, msg.message, msg.wParam); - qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + if (qstatus) + { + ret = GetMessageA( &msg, 0, 0, 0 ); + ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', + "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + } keybd_event('N', 0, 0, 0); qstatus = GetQueueStatus(qs_all_input); @@ -9242,19 +9248,25 @@ todo_wine { qstatus = GetQueueStatus(qs_all_input); ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), "wrong qstatus %08x\n", qstatus); - ret = GetMessageA( &msg, 0, WM_KEYDOWN, WM_KEYUP ); - ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', - "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", - ret, msg.message, msg.wParam); - qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), "wrong qstatus %08x\n", qstatus); + if (qstatus & (QS_KEY << 16)) + { + ret = GetMessageA( &msg, 0, WM_KEYDOWN, WM_KEYUP ); + ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', + "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), "wrong qstatus %08x\n", qstatus); + } - ret = GetMessageA( &msg, 0, WM_CHAR, WM_CHAR ); - ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', - "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", - ret, msg.message, msg.wParam); - qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + if (qstatus) + { + ret = GetMessageA( &msg, 0, WM_CHAR, WM_CHAR ); + ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', + "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + } keybd_event('N', 0, KEYEVENTF_KEYUP, 0); qstatus = GetQueueStatus(qs_all_input); @@ -9271,21 +9283,26 @@ todo_wine { ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE|QS_KEY), "wrong qstatus %08x\n", qstatus); - ret = GetMessageA( &msg, 0, WM_KEYDOWN, WM_KEYUP ); - ok(ret && msg.message == WM_KEYUP && msg.wParam == 'N', - "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", - ret, msg.message, msg.wParam); - ok_sequence(WmUser, "WmUser", FALSE); - qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), "wrong qstatus %08x\n", qstatus); - - ret = GetMessageA( &msg, 0, WM_CHAR, WM_CHAR ); - ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', - "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", - ret, msg.message, msg.wParam); - qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + if (qstatus & (QS_KEY << 16)) + { + ret = GetMessageA( &msg, 0, WM_KEYDOWN, WM_KEYUP ); + ok(ret && msg.message == WM_KEYUP && msg.wParam == 'N', + "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", + ret, msg.message, msg.wParam); + ok_sequence(WmUser, "WmUser", FALSE); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), "wrong qstatus %08x\n", qstatus); + } + if (qstatus) + { + ret = GetMessageA( &msg, 0, WM_CHAR, WM_CHAR ); + ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', + "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + } done: trace("signalling to exit\n"); SetEvent(info.hevent[EV_STOP]);

1 0

Andrew Nguyen : imagehlp: Rectify and add a forward.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 3999069562025c990af5e889cc9f741bcf019668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3999069562025c990af5e889c… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Nov 11 21:41:26 2008 -0600 imagehlp: Rectify and add a forward. --- dlls/imagehlp/imagehlp.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index dee6a59..061d6a9 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -13,8 +13,8 @@ @ stdcall GetImageUnusedHeaderBytes(ptr ptr) @ stdcall GetTimestampForLoadedLibrary(long) dbghelp.GetTimestampForLoadedLibrary @ stdcall ImageAddCertificate(long ptr ptr) -@ stdcall ImageDirectoryEntryToData(ptr long long ptr) ntdll.RtlImageDirectoryEntryToData -@ stub ImageDirectoryEntryToDataEx +@ stdcall ImageDirectoryEntryToData(ptr long long ptr) dbghelp.ImageDirectoryEntryToData +@ stdcall ImageDirectoryEntryToDataEx(ptr long long ptr ptr) dbghelp.ImageDirectoryEntryToDataEx @ stdcall ImageEnumerateCertificates(long long ptr ptr long) @ stdcall ImageGetCertificateData(long long ptr ptr) @ stdcall ImageGetCertificateHeader(long long ptr)

1 0

David Adam : quartz: Check for NULL condition in FilterGraph2_Disconnect.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 6ed258e220b29a1c14dcaebebd6123889c308019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed258e220b29a1c14dcaebeb… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Nov 12 07:55:38 2008 +0100 quartz: Check for NULL condition in FilterGraph2_Disconnect. --- dlls/quartz/filtergraph.c | 3 +++ dlls/quartz/tests/filtergraph.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index eec0e44..7b773ef 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -744,6 +744,9 @@ static HRESULT WINAPI FilterGraph2_Disconnect(IFilterGraph2 *iface, IPin *ppin) TRACE("(%p/%p)->(%p)\n", This, iface, ppin); + if (!ppin) + return E_POINTER; + return IPin_Disconnect(ppin); } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 37c1c1f..e273136 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1593,6 +1593,9 @@ static void test_render_filter_priority(void) hr = IFilterGraph2_Render(pgraph2, ((TestFilterImpl*)ptestfilter)->ppPins[0]); ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); + hr = IFilterGraph2_Disconnect(pgraph2, NULL); + ok(hr == E_POINTER, "IFilterGraph2_Disconnect failed. Expected E_POINTER, received %08x\n", hr); + get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName2); ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), "expected connected filters to be different but got %s both times\n", ConnectedFilterName1);

1 0

Alistair Leslie-Hughes : winmm: Increase tolerance range.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: aa50cd316c58638c834a7bf68aa6eae67c5e9d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa50cd316c58638c834a7bf68… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 5 22:03:45 2008 +1100 winmm: Increase tolerance range. --- dlls/winmm/tests/wave.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 09b0f46..fc6f0ff 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -789,13 +789,13 @@ static void wave_out_test_deviceOut(int device, double duration, } } - /* Check the sound duration was between -2% and +10% of the expected value */ + /* Check the sound duration was between -10% and +25% of the expected value */ end=GetTickCount(); actual = (end - start) / 1000.0; if (winetest_debug > 1) trace("sound duration=%g ms\n",1000*actual); - ok((actual > (0.97 * (duration+paused))) && - (actual < (1.1 * (duration+paused))), + ok((actual > (0.9 * (duration+paused))) && + (actual < (1.25 * (duration+paused))), "The sound played for %g ms instead of %g ms\n", 1000*actual,1000*(duration+paused)); for (i = 0; i < headers; i++) {

1 0