March 2010 - Wine-commits - list.winehq.org

Francois Gouget : kernel32/tests: Remove a space after a '\n' in a skip().
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 891b1ce3de192d43fab28670f28fc88226808450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891b1ce3de192d43fab28670f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:24:08 2010 +0100 kernel32/tests: Remove a space after a '\n' in a skip(). --- dlls/kernel32/tests/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 43db787..f7e985d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -529,7 +529,7 @@ static void test_heap_checks( DWORD flags ) ok( p[15] == 0, "wrong padding %x\n", p[15] ); } } - else skip( "realloc in place failed\n "); + else skip( "realloc in place failed\n"); ret = HeapFree( GetProcessHeap(), 0, p ); ok( ret, "HeapFree failed\n" );

1 0

Francois Gouget : d3dx9_36: Add a trailing '\n' to a TRACE().
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 381d73e42305a4457c6b8b04ee9bf3e3b8ce78a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=381d73e42305a4457c6b8b04e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:25:25 2010 +0100 d3dx9_36: Add a trailing '\n' to a TRACE(). --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 23c3cdd..9e74a42 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -139,7 +139,7 @@ HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVO { CONST DWORD *ptr = byte_code; - TRACE("(%p, %x, %p, %p)", byte_code, fourcc, data, size); + TRACE("(%p, %x, %p, %p)\n", byte_code, fourcc, data, size); if (!byte_code) return D3DERR_INVALIDCALL;

1 0

Francois Gouget : avifil32/tests: Add or fix the trailing '\n' of ok() calls.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 219eaf6ce4044a283c22e7252e0142a86cb0f2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219eaf6ce4044a283c22e7252… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:25:05 2010 +0100 avifil32/tests: Add or fix the trailing '\n' of ok() calls. --- dlls/avifil32/tests/api.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index f5945c2..fe295bf 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -319,7 +319,7 @@ static void test_default_data(void) ok(asi0.rcFrame.right == 8, "got %u (expected 8)\n", asi0.rcFrame.right); /* these are based on the values in the mah and not */ ok(asi0.rcFrame.bottom == 6, "got %u (expected 6)\n", asi0.rcFrame.bottom);/* on the ones in the ash which are 0 here */ ok(asi0.dwEditCount == 0, "got %u (expected 0)\n", asi0.dwEditCount); - ok(asi0.dwFormatChangeCount == 0, "got %u (expected 0)\n)", asi0.dwFormatChangeCount); + ok(asi0.dwFormatChangeCount == 0, "got %u (expected 0)\n", asi0.dwFormatChangeCount); ok(asi1.fccType == streamtypeAUDIO, "got 0x%x (expected streamtypeVIDEO)\n", asi1.fccType); ok(asi1.fccHandler == 0x1, "got 0x%x (expected 0x1)\n", asi1.fccHandler); @@ -339,7 +339,7 @@ static void test_default_data(void) ok(asi1.rcFrame.right == 0, "got %u (expected 0)\n", asi1.rcFrame.right); ok(asi1.rcFrame.bottom == 0, "got %u (expected 0)\n", asi1.rcFrame.bottom); ok(asi1.dwEditCount == 0, "got %u (expected 0)\n", asi1.dwEditCount); - ok(asi1.dwFormatChangeCount == 0, "got %u (expected 0)\n)", asi1.dwFormatChangeCount); + ok(asi1.dwFormatChangeCount == 0, "got %u (expected 0)\n", asi1.dwFormatChangeCount); ok(wfx.wFormatTag == 1, "got %u (expected 1)\n",wfx.wFormatTag); ok(wfx.nChannels == 2, "got %u (expected 2)\n",wfx.nChannels); @@ -351,7 +351,7 @@ static void test_default_data(void) AVIStreamRelease(pStream0); AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed", filename); + ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); } static void test_amh_corruption(void) @@ -408,7 +408,7 @@ static void test_ash1_corruption(void) AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed", filename); + ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); } static void test_ash1_corruption2(void) @@ -442,7 +442,7 @@ static void test_ash1_corruption2(void) AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed", filename); + ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); } /* ########################### */

1 0

Francois Gouget : dxdiagn/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: f096b023c41a51c3cf32da0a9f20c73483362b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f096b023c41a51c3cf32da0a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:25:20 2010 +0100 dxdiagn/tests: Add a trailing '\n' to an ok() call. --- dlls/dxdiagn/tests/container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index e525709..6557e37 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -279,7 +279,7 @@ static void test_GetChildContainer(void) ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); if (SUCCEEDED(hr)) - todo_wine ok(ptr != child, "Expected the two pointers (%p vs. %p) to be unequal", child, ptr); + todo_wine ok(ptr != child, "Expected the two pointers (%p vs. %p) to be unequal\n", child, ptr); IDxDiagContainer_Release(ptr); IDxDiagContainer_Release(child);

1 0

Francois Gouget : comctl32/tests: fix an ok() call's trailing '\n'.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 2659ac14f89f77c02d8b531f9b28e585f4a3260e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2659ac14f89f77c02d8b531f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:25:31 2010 +0100 comctl32/tests: fix an ok() call's trailing '\n'. --- dlls/comctl32/tests/status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 06e7b87..839b138 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -541,7 +541,7 @@ static void test_notify(void) wclass.lpszClassName = "TestNotifyParentClass"; wclass.lpfnWndProc = test_notify_parent_proc; atom = RegisterClassA(&wclass); - ok(atom, "RegisterClass failed!n"); + ok(atom, "RegisterClass failed\n"); /* create parent */ hwndParent = CreateWindow(wclass.lpszClassName, "parent", WS_OVERLAPPEDWINDOW,

1 0

Francois Gouget : msxml3: Add a trailing '\n' to a TRACE().
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 3127501f86962d5466c0848af1373e327f9354bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3127501f86962d5466c0848af… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:24:04 2010 +0100 msxml3: Add a trailing '\n' to a TRACE(). --- dlls/msxml3/element.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index b6caf73..617c008 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -594,7 +594,7 @@ static HRESULT WINAPI domelem_removeAttribute( IXMLDOMNamedNodeMap *attr; HRESULT hr; - TRACE("(%p)->(%s)", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); hr = IXMLDOMElement_get_attributes(iface, &attr); if (hr != S_OK) return hr;

1 0

Alexandre Julliard : makefiles: Define the variables that are used by aclocal macros in aclocal too.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 7d8311551261ad648e371a01c3470bde72efc163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8311551261ad648e371a01c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 15:07:45 2010 +0100 makefiles: Define the variables that are used by aclocal macros in aclocal too. --- aclocal.m4 | 24 +++++++++++++++++++++--- configure | 18 +++++++++--------- configure.ac | 18 ------------------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ac03af2..328a345 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -140,7 +140,25 @@ dnl dnl Usage: AC_REQUIRE([WINE_CONFIG_HELPERS]) dnl AC_DEFUN([WINE_CONFIG_HELPERS], -[wine_fn_append_file () +[AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) +AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) + +AC_SUBST(ALL_MAKERULES,"") +AC_SUBST(ALL_SYMLINKS,"") +AC_SUBST(ALL_DIRS,"") +AC_SUBST(ALL_TOP_DIRS,"") +AC_SUBST(ALL_DLL_DIRS,"") +AC_SUBST(ALL_TOOL_DIRS,"") +AC_SUBST(ALL_STATICLIB_DIRS,"") +AC_SUBST(ALL_STATIC_LIBS,"") +AC_SUBST(ALL_IMPORT_LIBS,"") +AC_SUBST(ALL_INSTALL_DIRS,"") +AC_SUBST(ALL_TEST_DIRS,"") +AC_SUBST(ALL_TEST_BINARIES,"") +AC_SUBST(ALL_PROGRAM_DIRS,"") +AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") + +wine_fn_append_file () { AS_VAR_APPEND($[1]," \\$as_nl $[2]") } @@ -318,8 +336,8 @@ dnl **** Create a make rules file from config.status **** dnl dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps) dnl -AC_DEFUN([WINE_CONFIG_MAKERULES], -[WINE_APPEND_FILE(ALL_MAKERULES,[$1]) +AC_DEFUN([WINE_CONFIG_MAKERULES],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +WINE_APPEND_FILE(ALL_MAKERULES,[$1]) WINE_APPEND_RULE(ALL_MAKEFILE_DEPENDS,[$1: m4_ifval([$3],[$1.in $3],[$1.in]) config.status]) $2=$1 AC_SUBST_FILE([$2])dnl diff --git a/configure b/configure index 1ee7db2..346ec70 100755 --- a/configure +++ b/configure @@ -608,10 +608,10 @@ ALL_TOOL_DIRS ALL_DLL_DIRS ALL_TOP_DIRS ALL_DIRS -ALL_WINETEST_DEPENDS -ALL_MAKEFILE_DEPENDS ALL_SYMLINKS ALL_MAKERULES +ALL_WINETEST_DEPENDS +ALL_MAKEFILE_DEPENDS LDAPLIBS LIBPOLL LIBDL @@ -13778,15 +13778,20 @@ fi ;; esac -ALL_MAKERULES="" -ALL_SYMLINKS="" + +ac_config_commands="$ac_config_commands include/stamp-h" + ALL_MAKEFILE_DEPENDS="# Makefile dependencies" ALL_WINETEST_DEPENDS="# Test binaries" +ALL_MAKERULES="" + +ALL_SYMLINKS="" + ALL_DIRS="" ALL_TOP_DIRS="" @@ -13812,11 +13817,6 @@ ALL_PROGRAM_DIRS="" ALL_PROGRAM_BIN_INSTALL_DIRS="" - - -ac_config_commands="$ac_config_commands include/stamp-h" - - wine_fn_append_file () { as_fn_append $1 " \\$as_nl $2" diff --git a/configure.ac b/configure.ac index 55edefc..a22b984 100644 --- a/configure.ac +++ b/configure.ac @@ -2118,24 +2118,6 @@ esac dnl **** Generate output files **** -AC_SUBST(ALL_MAKERULES,"") -AC_SUBST(ALL_SYMLINKS,"") -AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) -AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) - -AC_SUBST(ALL_DIRS,"") -AC_SUBST(ALL_TOP_DIRS,"") -AC_SUBST(ALL_DLL_DIRS,"") -AC_SUBST(ALL_TOOL_DIRS,"") -AC_SUBST(ALL_STATICLIB_DIRS,"") -AC_SUBST(ALL_STATIC_LIBS,"") -AC_SUBST(ALL_IMPORT_LIBS,"") -AC_SUBST(ALL_INSTALL_DIRS,"") -AC_SUBST(ALL_TEST_DIRS,"") -AC_SUBST(ALL_TEST_BINARIES,"") -AC_SUBST(ALL_PROGRAM_DIRS,"") -AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") - AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])

1 0

Alexandre Julliard : makefiles: Generate all the top-level make rules inside the corresponding shell function .
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 03642414a84a14d9cd0efe143b2de9cf35a693a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03642414a84a14d9cd0efe143… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 15:24:22 2010 +0100 makefiles: Generate all the top-level make rules inside the corresponding shell function. --- aclocal.m4 | 26 +++++++++---------- configure | 68 ++++++++++++++++++------------------------------- configure.ac | 20 +++++++------- tools/make_makefiles | 9 ++---- 4 files changed, 50 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03642414a84a14d9cd0ef…

1 0

Alexandre Julliard : winex11: Don' t make the owner window managed if its popup isn't.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: b6ef8a5944e36daabb30c0b14dd77d707093cec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ef8a5944e36daabb30c0b14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 20:16:42 2010 +0100 winex11: Don't make the owner window managed if its popup isn't. --- dlls/winex11.drv/window.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 46f677b..09820d3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -997,7 +997,7 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data * * Retrieve an owner's window, creating it if necessary. */ -static Window get_owner_whole_window( HWND owner ) +static Window get_owner_whole_window( HWND owner, BOOL force_managed ) { struct x11drv_win_data *data; @@ -1009,7 +1009,7 @@ static Window get_owner_whole_window( HWND owner ) !(data = X11DRV_create_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); } - else if (!data->managed) /* make it managed */ + else if (!data->managed && force_managed) /* make it managed */ { SetWindowPos( owner, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | @@ -1045,7 +1045,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); owner = get_window_owner( data->hwnd ); - if ((owner_win = get_owner_whole_window( owner ))) group_leader = owner_win; + if ((owner_win = get_owner_whole_window( owner, data->managed ))) group_leader = owner_win; } wine_tsx11_lock();

1 0

Vincent Povirk : oleaut32: Allow named args to be combined with positional args in fnInvoke.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 8ff7238adeff518fced37159a4b5a17b9551f4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff7238adeff518fced37159a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 19 11:53:26 2010 -0500 oleaut32: Allow named args to be combined with positional args in fnInvoke. --- dlls/oleaut32/tests/tmarshal.c | 26 ++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + dlls/oleaut32/typelib.c | 8 +++++--- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 64b6633..f7df82f 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -603,6 +603,15 @@ static HRESULT WINAPI Widget_put_prop_opt_arg( return S_OK; } +static HRESULT WINAPI Widget_put_prop_req_arg( + IWidget* iface, INT req, INT i) +{ + trace("put_prop_req_arg(%08x, %08x)\n", req, i); + ok(req == 0x5678, "got req=%08x\n", req); + ok(i == 0x1234, "got i=%08x\n", i); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -637,6 +646,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_get_prop_uint, Widget_ByRefUInt, Widget_put_prop_opt_arg, + Widget_put_prop_req_arg, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1410,6 +1420,22 @@ static void test_typelibmarshal(void) ok_ole_success(hr, ITypeInfo_Invoke); VariantClear(&varresult); + /* test propput with required argument. */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = 0x1234; + V_VT(&vararg[1]) = VT_I4; + V_I4(&vararg[1]) = 0x5678; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispidNamed; + dispparams.cArgs = 2; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_REQ_ARG, &IID_NULL, 0x40c, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, ITypeInfo_Invoke); + VariantClear(&varresult); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 077fb59..7616789 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -143,6 +143,9 @@ library TestTypelib [id(DISPID_TM_PROP_OPT_ARG), propput] HRESULT prop_opt_arg([in,optional] INT opt, [in] INT i); + + [id(DISPID_TM_PROP_REQ_ARG), propput] + HRESULT prop_req_arg([in] INT req, [in] INT i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index a4f467e..376162b 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -39,6 +39,7 @@ #define DISPID_TM_PROP_UINT 20 #define DISPID_TM_BYREF_UINT 21 #define DISPID_TM_PROP_OPT_ARG 22 +#define DISPID_TM_PROP_REQ_ARG 23 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2 diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b09f7ab..c1fa321 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6102,10 +6102,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( continue; } + src_arg = NULL; + if (cNamedArgs) { USHORT j; - src_arg = NULL; for (j = 0; j < cNamedArgs; j++) if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) { @@ -6113,9 +6114,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - else + + if (!src_arg && vargs_converted + cNamedArgs < pDispParams->cArgs) { - src_arg = vargs_converted < pDispParams->cArgs ? &pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted] : NULL; + src_arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted]; vargs_converted++; }

1 0