October 2006 - Wine-Commits

Francois Gouget : ddraw: Only perform the screen resolution changing tests in interactive mode.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 66300403c40e2f2a953017d8688a010466a715f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=66300403c40e2f2a953017d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 13:03:40 2006 +0200 ddraw: Only perform the screen resolution changing tests in interactive mode. --- dlls/ddraw/tests/ddrawmodes.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index fd00bb6..5020bec 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -1,6 +1,13 @@ /* * Unit tests for ddraw functions * + * + * Part of this test involves changing the screen resolution. But this is + * really disrupting if the user is doing something else and is not very nice + * to CRT screens. Plus, ideally it needs someone watching it to check that + * each mode displays correctly. + * So this is only done if the test is being run in interactive mode. + * * Copyright (C) 2003 Sami Aario * * This library is free software; you can redistribute it and/or @@ -342,7 +349,8 @@ START_TEST(ddrawmodes) if (!createdirectdraw()) return; enumdisplaymodes(); - testdisplaymodes(); + if (winetest_interactive) + testdisplaymodes(); flushdisplaymodes(); releasedirectdraw();

1 0

Francois Gouget : oleaut32: Fixed compilation in the nameless union case.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: b21526925decc2fbab4c2af9305017bd7b844867 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b21526925decc2fbab4c2af… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:52:22 2006 +0200 oleaut32: Fixed compilation in the nameless union case. --- dlls/oleaut32/tests/usrmarshal.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 0b30ff3..2010d04 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -27,6 +27,12 @@ #include "propidl.h" /* for LPSAFEARRAY_ #include "wine/test.h" +#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) +# define V_U2(A) ((A)->n1.n2) +#else +# define V_U2(A) (*(A)) +#endif + /* doesn't work on Windows due to needing more of the * MIDL_STUB_MESSAGE structure to be filled out */ #define LPSAFEARRAY_UNMARSHAL_WORKS 0 @@ -376,11 +382,11 @@ static void check_variant_header(DWORD * wp = (WORD*)wirev; ok(*wp == V_VT(v), "vt %04x expected %04x\n", *wp, V_VT(v)); wp++; - ok(*wp == v->n1.n2.wReserved1, "res1 %04x expected %04x\n", *wp, v->n1.n2.wReserved1); + ok(*wp == V_U2(v).wReserved1, "res1 %04x expected %04x\n", *wp, V_U2(v).wReserved1); wp++; - ok(*wp == v->n1.n2.wReserved2, "res2 %04x expected %04x\n", *wp, v->n1.n2.wReserved2); + ok(*wp == V_U2(v).wReserved2, "res2 %04x expected %04x\n", *wp, V_U2(v).wReserved2); wp++; - ok(*wp == v->n1.n2.wReserved3, "res3 %04x expected %04x\n", *wp, v->n1.n2.wReserved3); + ok(*wp == V_U2(v).wReserved3, "res3 %04x expected %04x\n", *wp, V_U2(v).wReserved3); wp++; wirev = (DWORD*)wp; switch_is = V_VT(v);

1 0

Francois Gouget : Add missing '\n's to ok() calls.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 68e84a7a53c0f6f8456b4c5bf8f4076fed226092 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68e84a7a53c0f6f8456b4c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:46:42 2006 +0200 Add missing '\n's to ok() calls. --- dlls/comctl32/tests/toolbar.c | 2 +- dlls/rpcrt4/tests/cstub.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index c9ff6e3..b71962b 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -269,7 +269,7 @@ static void test_add_bitmap(void) ok(himl != NULL, "failed to create imagelist\n"); ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); CHECK_IMAGELIST(4, 20, 15); - ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&bmp128) == 0, "TB_ADDBITMAP - unexpected return"); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&bmp128) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(10, 20, 15); /* however TB_SETBITMAPSIZE/add std bitmap won't change the image size (the button size does change!) */ ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(8, 8)) == TRUE, "TB_SETBITMAPSIZE failed\n"); diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 8848990..1438caa 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -610,7 +610,7 @@ static void test_CreateStub(IPSFactoryBu ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n"); ok(cstd_stub->RefCount == 1, "ref count %ld\n", cstd_stub->RefCount); /* 0xdeadbeef returned from create_stub_test_QI */ - ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p", cstd_stub->pvServerObject); + ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); ok(cstd_stub->pPSFactory == ppsf, "pPSFactory %p\n", cstd_stub->pPSFactory); vtbl = &create_stub_test_fail_vtbl;

1 0

Francois Gouget : dsound: Don't use state. buffer_size before it has been initialized.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: be87fe8c7c0719e7c3a11a2ee29a9d9a987ae18f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be87fe8c7c0719e7c3a11a2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:45:02 2006 +0200 dsound: Don't use state.buffer_size before it has been initialized. --- dlls/dsound/tests/ds3d.c | 4 ++-- dlls/dsound/tests/ds3d8.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 5dc0a2e..db0ddfe 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -562,14 +562,14 @@ void test_buffer(LPDIRECTSOUND dso, LPDI } /* try an offset past the end of the buffer */ - rc = IDirectSoundBuffer_Lock(*dsbo, state.buffer_size, 0, &buffer1, + rc = IDirectSoundBuffer_Lock(*dsbo, dsbcaps.dwBufferBytes, 0, &buffer1, &length1, NULL, NULL, DSBLOCK_ENTIREBUFFER); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " "returned DSERR_INVALIDPARAM, returned %s\n", DXGetErrorString8(rc)); /* try a size larger than the buffer */ - rc = IDirectSoundBuffer_Lock(*dsbo, 0, state.buffer_size + 1, + rc = IDirectSoundBuffer_Lock(*dsbo, 0, dsbcaps.dwBufferBytes + 1, &buffer1, &length1, NULL, NULL, DSBLOCK_FROMWRITECURSOR); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 9208582..ef02a45 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -448,14 +448,14 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP } /* try an offset past the end of the buffer */ - rc = IDirectSoundBuffer_Lock(*dsbo, state.buffer_size, 0, &buffer1, + rc = IDirectSoundBuffer_Lock(*dsbo, dsbcaps.dwBufferBytes, 0, &buffer1, &length1, NULL, NULL, DSBLOCK_ENTIREBUFFER); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " "returned DSERR_INVALIDPARAM, returned %s\n", DXGetErrorString8(rc)); /* try a size larger than the buffer */ - rc = IDirectSoundBuffer_Lock(*dsbo, 0, state.buffer_size + 1, + rc = IDirectSoundBuffer_Lock(*dsbo, 0, dsbcaps.dwBufferBytes + 1, &buffer1, &length1, NULL, NULL, DSBLOCK_FROMWRITECURSOR); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have "

1 0

Francois Gouget : urlmon: Fix the case of the BINDINFO.cbstgmedData field. Fixes the htmldoc test compilation on Windows.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: dc0cfe772980c51b5ddcb78ec643033bc89d7dae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc0cfe772980c51b5ddcb78… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:42:10 2006 +0200 urlmon: Fix the case of the BINDINFO.cbstgmedData field. Fixes the htmldoc test compilation on Windows. --- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/shdocvw/navigate.c | 6 +++--- dlls/urlmon/binding.c | 2 +- include/urlmon.idl | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index efa5ff7..1f7c560 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -364,7 +364,7 @@ static HRESULT WINAPI BindStatusCallback memset(pbindinfo, 0, size); pbindinfo->cbSize = size; - pbindinfo->cbStgmedData = This->post_data_len; + pbindinfo->cbstgmedData = This->post_data_len; pbindinfo->dwCodePage = CP_UTF8; pbindinfo->dwOptions = 0x80000; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 9d82301..d9eb099 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -118,7 +118,7 @@ static nsIInputStream *get_post_data_str hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); if(SUCCEEDED(hres) && bindinfo.dwBindVerb == BINDVERB_POST) - post_len = bindinfo.cbStgmedData; + post_len = bindinfo.cbstgmedData; if(headers_len || post_len) { int len = headers_len ? headers_len-1 : 0; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bc8df91..c6fb288 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -447,7 +447,7 @@ static HRESULT WINAPI Moniker_BindToStor ok(bindinfo.grfBindInfoF == 0, "bindinfo.grfBinfInfoF=%08lx\n", bindinfo.grfBindInfoF); ok(bindinfo.dwBindVerb == 0, "bindinfo.dwBindVerb=%ld\n", bindinfo.dwBindVerb); ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); - ok(bindinfo.cbStgmedData == 0, "bindinfo.cbStgmedData=%ld\n", bindinfo.cbStgmedData); + ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%ld\n", bindinfo.cbstgmedData); ok(bindinfo.dwOptions == 0x80000, "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%ld\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 5d4ad0f..3ff6ae9 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -79,7 +79,7 @@ static void dump_BINDINFO(BINDINFO *bi) bi->dwBindVerb > BINDVERB_CUSTOM ? "unknown" : BINDVERB_str[bi->dwBindVerb], debugstr_w(bi->szCustomVerb), - bi->cbStgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage, + bi->cbstgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage, bi->securityAttributes.nLength, bi->securityAttributes.lpSecurityDescriptor, bi->securityAttributes.bInheritHandle, @@ -195,7 +195,7 @@ static HRESULT WINAPI BindStatusCallback memset(pbindinfo, 0, sizeof(BINDINFO)); pbindinfo->cbSize = sizeof(BINDINFO); - pbindinfo->cbStgmedData = This->post_data_len; + pbindinfo->cbstgmedData = This->post_data_len; if(This->post_data) { pbindinfo->dwBindVerb = BINDVERB_POST; @@ -539,7 +539,7 @@ HRESULT navigate_hlink(DocHost *This, IM hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); dump_BINDINFO(&bindinfo); if(bindinfo.dwBindVerb == BINDVERB_POST) { - post_data_len = bindinfo.cbStgmedData; + post_data_len = bindinfo.cbstgmedData; if(post_data_len) post_data = bindinfo.stgmedData.u.hGlobal; } diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 4277cb2..e5c2c00 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -339,7 +339,7 @@ static void dump_BINDINFO(BINDINFO *bi) bi->dwBindVerb > BINDVERB_CUSTOM ? "unknown" : BINDVERB_str[bi->dwBindVerb], debugstr_w(bi->szCustomVerb), - bi->cbStgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage, + bi->cbstgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage, bi->securityAttributes.nLength, bi->securityAttributes.lpSecurityDescriptor, bi->securityAttributes.bInheritHandle, diff --git a/include/urlmon.idl b/include/urlmon.idl index 85df342..da06868 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -131,7 +131,7 @@ interface IBindStatusCallback : IUnknown DWORD grfBindInfoF; DWORD dwBindVerb; LPWSTR szCustomVerb; - DWORD cbStgmedData; + DWORD cbstgmedData; DWORD dwOptions; DWORD dwOptionsFlags; DWORD dwCodePage;

1 0

Francois Gouget : ddraw: Fix comparefloat() so it compiles with Visual C++ when given a negative value.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: ceb06a2f00040d5a91469b0acf6e83dcf3a49d88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ceb06a2f00040d5a91469b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:51:58 2006 +0200 ddraw: Fix comparefloat() so it compiles with Visual C++ when given a negative value. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0409dce..55dc772 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -34,7 +34,7 @@ static LPDIRECT3DVERTEXBUFFER7 lpVBufDes /* To compare bad floating point numbers. Not the ideal way to do it, * but it should be enough for here */ -#define comparefloat(a, b) ( ((a - b) < 0.0001) && ((a-b) > -0.0001) ) +#define comparefloat(a, b) ( (((a) - (b)) < 0.0001) && (((a) - (b)) > -0.0001) ) static HRESULT (WINAPI *pDirectDrawCreateEx)(LPGUID,LPVOID*,REFIID,LPUNKNOWN);

1 0

Francois Gouget : msvcmaker: The msvcrt tests need '..' in the include path .
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 77fd5aa23b0c85906b403f9523bb13d38c247fde URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77fd5aa23b0c85906b403f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:53:54 2006 +0200 msvcmaker: The msvcrt tests need '..' in the include path. --- tools/winapi/msvcmaker | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 2e247e4..16a01a6 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -631,7 +631,7 @@ sub _generate_dsp($$) { push @defines2, "__WINETEST_OUTPUT_DIR=\\\"$output_dir\\\""; push @defines2, qw(__i386__ _X86_); - if($project =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) { + if($project eq "msvcrt_test") { push @includes, ".."; } @@ -646,11 +646,7 @@ sub _generate_dsp($$) { if($wine) { foreach my $include (@includes) { - if ($include !~ /[\\\"]/) { - print OUT " /I \"$include\""; - } else { - print OUT " /I $include"; - } + print OUT " /I \"$include\""; } }

1 0

Francois Gouget : ole32: Fix invalid macro usage.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: d0b322b00f06951ed40c23a6531eee8c7b628720 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0b322b00f06951ed40c23a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:53:19 2006 +0200 ole32: Fix invalid macro usage. --- dlls/ole32/tests/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 3b22ae3..48b9850 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -343,7 +343,7 @@ static void test_moniker( /* IROTData::GetComparisonData test */ hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); - ok_ole_success(hr, IMoniker_QueryInterface(IID_IROTData)); + ok_ole_success(hr, IMoniker_QueryInterface_IID_IROTData); hr = IROTData_GetComparisonData(rotdata, buffer, sizeof(buffer), &moniker_size); ok_ole_success(hr, IROTData_GetComparisonData);

1 0

Francois Gouget : wincrypt: Fix the CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME declaration in the MSVC case .
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: e4024a67dd9c35b22f47d54253d546a8e1b4c9b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4024a67dd9c35b22f47d54… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:50:21 2006 +0200 wincrypt: Fix the CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME declaration in the MSVC case. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 7b84570..e5cc031 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1897,7 +1897,7 @@ #define CERT_TRUST_PUB_AUTHENTICODE_FLAG #elif defined(_MSC_VER) #define CERT_TRUST_PUB_SAFER_LOCAL_MACHINE_REGPATH \ CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH L"\\TrustedPublisher\\Safer" -#define CERT_TRUST_PUB_SAFER_LOCAL_MACHINE_REGPATH L"AuthenticodeFlags" +#define CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME L"AuthenticodeFlags" #else static const WCHAR CERT_TRUST_PUB_SAFER_LOCAL_MACHINE_REGPATH[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',

1 0

Francois Gouget : secur32: Only include secext.h when asked to.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: f16e250a2227826514a6d6953d8afbe1bae05e78 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f16e250a2227826514a6d69… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:45:59 2006 +0200 secur32: Only include secext.h when asked to. --- include/security.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/security.h b/include/security.h index 69f026b..11ff6f7 100644 --- a/include/security.h +++ b/include/security.h @@ -18,6 +18,9 @@ #ifndef _SECURITY_H #define _SECURITY_H #include <sspi.h> + +#if defined(SECURITY_WIN32) || defined(SECURITY_KERNEL) #include <secext.h> +#endif #endif /* _SECURITY_H */

1 0