April 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : ia2comproxy: Use fully interpreted IDL stubs.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 60726aa614d9675351c0d5c70535dd6ea7cd92a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/60726aa614d9675351c0d5c70535dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:31:52 2024 +0200 ia2comproxy: Use fully interpreted IDL stubs. --- dlls/ia2comproxy/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ia2comproxy/Makefile.in b/dlls/ia2comproxy/Makefile.in index 3e8380c6f7d..f7783098bb8 100644 --- a/dlls/ia2comproxy/Makefile.in +++ b/dlls/ia2comproxy/Makefile.in @@ -1,6 +1,8 @@ MODULE = ia2comproxy.dll IMPORTS = uuid oleacc oleaut32 ole32 rpcrt4 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ ia2_classes.idl \ oleacc_classes.idl

1 0

Alexandre Julliard : ieproxy: Use fully interpreted IDL stubs.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 86e2ff24053fb959f4054c31be9c1b094b051969 URL: https://gitlab.winehq.org/wine/wine/-/commit/86e2ff24053fb959f4054c31be9c1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:32:01 2024 +0200 ieproxy: Use fully interpreted IDL stubs. --- dlls/ieproxy/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieproxy/Makefile.in b/dlls/ieproxy/Makefile.in index 7b1db81a3d1..cdafc418a71 100644 --- a/dlls/ieproxy/Makefile.in +++ b/dlls/ieproxy/Makefile.in @@ -1,6 +1,8 @@ MODULE = ieproxy.dll IMPORTS = uuid ole32 rpcrt4 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ ieproxy_ieautomation.idl \ ieproxy_perhist.idl

1 0

Alexandre Julliard : mscftp: Use fully interpreted IDL stubs.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 89104ab88d70b9e1fb08860670d2d27451830531 URL: https://gitlab.winehq.org/wine/wine/-/commit/89104ab88d70b9e1fb08860670d2d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:32:15 2024 +0200 mscftp: Use fully interpreted IDL stubs. --- dlls/msctfp/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msctfp/Makefile.in b/dlls/msctfp/Makefile.in index b3d3f0ed932..9f338d2fc13 100644 --- a/dlls/msctfp/Makefile.in +++ b/dlls/msctfp/Makefile.in @@ -1,6 +1,8 @@ MODULE = msctfp.dll IMPORTS = rpcrt4 ole32 oleaut32 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ msctfp.idl

1 0

Dmitry Timoshkov : include: Add _Inout_cap_c_(count) macro.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 86b26a9eef5ad6b3b8c3184d9a558eb132aba1a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/86b26a9eef5ad6b3b8c3184d9a558e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 26 20:25:44 2024 +0300 include: Add _Inout_cap_c_(count) macro. This fixes Wine tests compilation with Visual Studio 10.0 CRT headers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 72803a1be39..d49f6308327 100644 --- a/include/sal.h +++ b/include/sal.h @@ -89,6 +89,7 @@ #define _Inout_ #define _Inout_bytecap_x_(count) #define _Inout_cap_(count) +#define _Inout_cap_c_(count) #define _Inout_opt_ #define _Inout_opt_cap_c_(count) #define _Inout_opt_z_

1 0

Dmitry Timoshkov : include: Move InterlockedExchangeAdd64() definition before its first usage.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: a113adedeaefb09dec4af25f007d2cfad1c10b3b URL: https://gitlab.winehq.org/wine/wine/-/commit/a113adedeaefb09dec4af25f007d2c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 26 20:30:12 2024 +0300 include: Move InterlockedExchangeAdd64() definition before its first usage. This fixes Wine tests compilation with Visual Studio 10.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/winnt.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1bf38616b87..b18d255a79c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6958,16 +6958,6 @@ static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val } #endif -#if !defined(__i386__) || __has_builtin(_InterlockedDecrement64) -#pragma intrinsic(_InterlockedDecrement64) -__int64 _InterlockedDecrement64(__int64 volatile *); -#else -static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) -{ - return InterlockedExchangeAdd64( dest, -1 ) - 1; -} -#endif - #if !defined(__i386__) || __has_builtin(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedExchangeAdd64) __int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64); @@ -6980,6 +6970,16 @@ static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __i } #endif +#if !defined(__i386__) || __has_builtin(_InterlockedDecrement64) +#pragma intrinsic(_InterlockedDecrement64) +__int64 _InterlockedDecrement64(__int64 volatile *); +#else +static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) +{ + return InterlockedExchangeAdd64( dest, -1 ) - 1; +} +#endif + #if !defined(__i386__) || __has_builtin(_InterlockedIncrement64) #pragma intrinsic(_InterlockedIncrement64) __int64 _InterlockedIncrement64(__int64 volatile *);

1 0

Alexandre Julliard : dbghelp: Ignore a couple of Dwarf-3 opcodes.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 754f11a4adc2b7431837a92448b93bb845d99d61 URL: https://gitlab.winehq.org/wine/wine/-/commit/754f11a4adc2b7431837a92448b93b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 28 16:06:54 2024 +0200 dbghelp: Ignore a couple of Dwarf-3 opcodes. --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 332c3da1059..34c924f3cda 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2784,6 +2784,9 @@ static BOOL dwarf2_parse_line_numbers(dwarf2_parse_context_t* ctx, case DW_LNS_fixed_advance_pc: address += dwarf2_parse_u2(&traverse); break; + case DW_LNS_set_prologue_end: + case DW_LNS_set_epilogue_begin: + break; case DW_LNS_extended_op: dwarf2_leb128_as_unsigned(&traverse); extopcode = dwarf2_parse_byte(&traverse);

1 0

Alexandre Julliard : oleaut32: Fix IDispatch::Invoke for vararg functions with empty varargs.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: fbba581cf2aeeda169f6cc229c1a80da3eb40532 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbba581cf2aeeda169f6cc229c1a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 28 22:06:29 2024 +0200 oleaut32: Fix IDispatch::Invoke for vararg functions with empty varargs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56598 --- dlls/oleaut32/tests/tmarshal.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 11 +++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 5ffc103c7eb..4bcc15628f7 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -932,6 +932,10 @@ static HRESULT WINAPI Widget_VarArg( trace("VarArg(%p)\n", values); + ok( values->cDims == 1, "wrong cDims %u\n", values->cDims ); + ok( values->cbElements == (numexpect ? sizeof(VARIANT) : 0), + "wrong cbElements %lu\n", values->cbElements ); + hr = SafeArrayGetLBound(values, 1, &lbound); ok(hr == S_OK, "SafeArrayGetLBound failed with %lx\n", hr); ok(lbound == 0, "SafeArrayGetLBound returned %ld\n", lbound); @@ -1058,6 +1062,16 @@ static HRESULT WINAPI Widget_VarArg_Run( ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name)); + if (!params->cbElements) /* no varargs */ + { + hr = SafeArrayGetUBound(params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetUBound error %#lx\n", hr); + ok(bound == -1, "expected -1, got %ld\n", bound); + return S_OK; + } + + ok( params->cbElements == sizeof(VARIANT), "wrong cbElements %lu\n", params->cbElements ); + hr = SafeArrayGetLBound(params, 1, &bound); ok(hr == S_OK, "SafeArrayGetLBound error %#lx\n", hr); ok(bound == 0, "expected 0, got %ld\n", bound); @@ -1093,6 +1107,16 @@ static HRESULT WINAPI Widget_VarArg_Ref_Run( ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name)); + if (!(*params)->cbElements) /* no varargs */ + { + hr = SafeArrayGetUBound(*params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetUBound error %#lx\n", hr); + ok(bound == -1, "expected -1, got %ld\n", bound); + return S_OK; + } + + ok( (*params)->cbElements == sizeof(VARIANT), "wrong cbElements %lu\n", (*params)->cbElements ); + hr = SafeArrayGetLBound(*params, 1, &bound); ok(hr == S_OK, "SafeArrayGetLBound error %#lx\n", hr); ok(bound == 0, "expected 0, got %ld\n", bound); @@ -3231,6 +3255,12 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok_ole_success(hr, IDispatch_Invoke); + /* without any varargs */ + dispparams.cArgs = 1; + V_I4(&vararg[0]) = 0; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok_ole_success(hr, IDispatch_Invoke); + /* call VarArg, even one (non-optional, non-safearray) named argument is not allowed */ dispidNamed = 0; dispparams.cNamedArgs = 1; @@ -3252,6 +3282,11 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok_ole_success(hr, IDispatch_Invoke); + /* without any varargs */ + dispparams.cArgs = 1; + dispparams.rgvarg = vararg + 1; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok_ole_success(hr, IDispatch_Invoke); SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); @@ -3268,6 +3303,11 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_REF_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok_ole_success(hr, IDispatch_Invoke); + /* without any varargs */ + dispparams.cArgs = 1; + dispparams.rgvarg = vararg + 1; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_REF_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok_ole_success(hr, IDispatch_Invoke); SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 670938fb81c..6b4842b7e1a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7483,6 +7483,17 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } } } + else if (func_desc->cParamsOpt < 0 && ((rgvt[i] & ~VT_BYREF) == (VT_VARIANT | VT_ARRAY))) + { + hres = SafeArrayAllocDescriptorEx( VT_EMPTY, 1, &a ); + if (FAILED(hres)) break; + if (rgvt[i] & VT_BYREF) + V_BYREF(&rgvarg[i]) = &a; + else + V_ARRAY(&rgvarg[i]) = a; + V_VT(&rgvarg[i]) = rgvt[i]; + prgpvarg[i] = &rgvarg[i]; + } else { hres = DISP_E_BADPARAMCOUNT;

1 0

Matteo Bruni : d3d9/tests: Don't create a vertex shader in test_desktop_window() when unsupported.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: a9604de26cda44669a6ddb348a4d0ed147af7240 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9604de26cda44669a6ddb348a4d0e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jul 15 18:46:10 2023 +0200 d3d9/tests: Don't create a vertex shader in test_desktop_window() when unsupported. --- dlls/d3d9/tests/visual.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0d64081f7e0..5169d5da559 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26423,6 +26423,7 @@ static void test_desktop_window(void) unsigned int color; IDirect3D9 *d3d; ULONG refcount; + D3DCAPS9 caps; HWND window; HRESULT hr; @@ -26475,9 +26476,18 @@ static void test_desktop_window(void) device = create_device(d3d, NULL, NULL, TRUE); ok(device != NULL, "Failed to create a D3D device\n"); - hr = IDirect3DDevice9_CreateVertexShader(device, simple_vs, &shader); - ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#lx.\n", hr); - IDirect3DVertexShader9_Release(shader); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#lx.\n", hr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#lx.\n", hr); + IDirect3DVertexShader9_Release(shader); + } + else + { + skip("Vertex shaders not supported.\n"); + } IDirect3DDevice9_Release(device);

1 0

Matteo Bruni : d3d9/tests: Test creating a texture on a NULL HWND device.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: 17a687a12725bd9790275d135f034fa31065a92b URL: https://gitlab.winehq.org/wine/wine/-/commit/17a687a12725bd9790275d135f034f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jul 15 18:46:55 2023 +0200 d3d9/tests: Test creating a texture on a NULL HWND device. --- dlls/d3d9/tests/visual.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5169d5da559..005b86cdd09 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26419,6 +26419,7 @@ static void test_nrm_instruction(void) static void test_desktop_window(void) { IDirect3DVertexShader9 *shader; + IDirect3DTexture9 *texture; IDirect3DDevice9 *device; unsigned int color; IDirect3D9 *d3d; @@ -26476,6 +26477,10 @@ static void test_desktop_window(void) device = create_device(d3d, NULL, NULL, TRUE); ok(device != NULL, "Failed to create a D3D device\n"); + hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#lx.\n", hr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1))

1 0

Esme Povirk : user32/tests: Add a flag for messages incorrectly sent by Wine.
by Alexandre Julliard 26 Apr '24

26 Apr '24

Module: wine Branch: master Commit: ad22b0102f9a87d98919f65c2b556e6525d71201 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad22b0102f9a87d98919f65c2b556e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 22 16:04:42 2024 -0500 user32/tests: Add a flag for messages incorrectly sent by Wine. --- dlls/user32/tests/msg.c | 65 ++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8ed608c5d3b..21a72c6c9fd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -148,7 +148,8 @@ typedef enum { hook=0x100, winevent_hook=0x200, kbd_hook=0x400, - winevent_hook_todo=0x800 + winevent_hook_todo=0x800, + wine_only=0x1000 } msg_flags_t; struct message { @@ -1314,15 +1315,14 @@ static const struct message WmFirstDrawSetWindowPosSeq3[] = { { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, - /* These happen only on Wine: */ - { EVENT_OBJECT_SHOW, winevent_hook|optional }, - { HCBT_ACTIVATE, hook|optional }, - { WM_QUERYNEWPALETTE, sent|optional }, - { WM_ACTIVATEAPP, sent|optional }, - { WM_NCACTIVATE, sent|optional }, - { WM_ACTIVATE, sent|optional }, - { HCBT_SETFOCUS, hook|optional }, - { WM_SETFOCUS, sent|defwinproc|optional }, + { EVENT_OBJECT_SHOW, winevent_hook|wine_only }, + { HCBT_ACTIVATE, hook|wine_only }, + { WM_QUERYNEWPALETTE, sent|wine_only }, + { WM_ACTIVATEAPP, sent|wine_only }, + { WM_NCACTIVATE, sent|wine_only }, + { WM_ACTIVATE, sent|wine_only }, + { HCBT_SETFOCUS, hook|wine_only }, + { WM_SETFOCUS, sent|defwinproc|wine_only }, { 0 } }; static const struct message WmFirstDrawSetWindowPosSeq4[] = { @@ -1515,8 +1515,6 @@ static const struct message WmShowChildInvisibleParentSeq_1[] = { { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, - /* FIXME: Wine creates an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, { WM_GETTEXT, sent|optional }, { 0 } }; @@ -1555,8 +1553,6 @@ static const struct message WmShowChildInvisibleParentSeq_3[] = { { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, - /* FIXME: Wine creates an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, { WM_GETTEXT, sent|optional }, { 0 } }; @@ -1577,7 +1573,6 @@ static const struct message WmShowChildInvisibleParentSeq_4[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, { WM_GETTEXT, sent|optional }, { 0 } }; @@ -2655,16 +2650,23 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me BOOL expect_equal, const char* file, int line) { int todo = (expected->flags & winevent_hook_todo) != 0; + int msg_wine_only = (expected->flags & wine_only) != 0; const int message_type_flags = hook|winevent_hook|kbd_hook; static int todo_reported; if (!todo && can_skip_message(expected)) expect_equal = FALSE; + if (msg_wine_only && strcmp(winetest_platform, "wine")) + { + /* Ignore Wine-only message records on Windows. */ + return FALSE; + } + if (!expected->message || !actual->message) { if (expect_equal && (!todo || !todo_reported++)) - todo_wine_if(todo) - ok_( file, line) (FALSE, "the msg sequence is not complete: expected %s %04x - actual %s %04x\n", + todo_wine_if(todo || msg_wine_only) + ok_( file, line) (msg_wine_only, "the msg sequence is not complete: expected %s %04x - actual %s %04x\n", message_type_name(expected->flags), expected->message, message_type_name(actual->flags), actual->message); return FALSE; } @@ -2673,8 +2675,8 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me (expected->flags & message_type_flags) != (actual->flags & message_type_flags)) { if (expect_equal && (!todo || !todo_reported++)) - todo_wine_if(todo) - ok_( file, line) (FALSE, "the %s 0x%04x was expected, but got %s 0x%04x instead\n", + todo_wine_if(todo || msg_wine_only) + ok_( file, line) (msg_wine_only, "the %s 0x%04x was expected, but got %s 0x%04x instead\n", message_type_name(expected->flags), expected->message, message_type_name(actual->flags), actual->message); return FALSE; } @@ -2690,8 +2692,8 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me } if (expect_equal) - todo_wine_if(todo) - ok_( file, line) (TRUE, "got %s 0x%04x as expected\n", + todo_wine_if(todo || msg_wine_only) + ok_( file, line) (!msg_wine_only, "got %s 0x%04x as expected\n", message_type_name(expected->flags), expected->message); return TRUE; @@ -3245,8 +3247,6 @@ static const struct message WmDestroyMDIchildInvisibleSeq[] = { { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, - /* FIXME: Wine destroys an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|wparam|optional, WM_DESTROY }, /* MDI client */ { 0 } }; /* CreateWindow for the 1st MDI child window, initially visible and maximized */ @@ -3984,8 +3984,6 @@ static const struct message WmMinimizeMDIchildVisibleSeq[] = { { WM_CHILDACTIVATE, sent|wparam|lparam|defwinproc, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* MDI child */ { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* MDI child */ - /* FIXME: Wine creates an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, /* MDI client */ { 0 } }; /* ShowWindow(SW_RESTORE) for a not visible MDI child window */ @@ -6514,7 +6512,15 @@ static const struct message WmSetFontButtonSeq[] = { WM_PAINT, sent }, { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_CTLCOLORBTN, sent|defwinproc }, - { WM_CTLCOLORBTN, sent|defwinproc|optional }, /* FIXME: Wine sends it twice for BS_OWNERDRAW */ + { 0 } +}; +static const struct message WmSetFontOwnerdrawSeq[] = +{ + { WM_SETFONT, sent }, + { WM_PAINT, sent }, + { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_CTLCOLORBTN, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|defwinproc|wine_only }, /* FIXME: Wine sends it twice for BS_OWNERDRAW */ { 0 } }; static const struct message WmSetFontStaticSeq[] = @@ -6564,7 +6570,6 @@ static const struct message WmSetStyleButtonSeq[] = { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { 0 } @@ -6575,7 +6580,6 @@ static const struct message WmSetStyleStaticSeq[] = { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORSTATIC, sent|parent }, { 0 } @@ -6586,7 +6590,7 @@ static const struct message WmSetStyleUserSeq[] = { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ + { WM_NCPAINT, sent|defwinproc|wine_only }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_PAINT) }, @@ -6598,7 +6602,6 @@ static const struct message WmSetStyleOwnerdrawSeq[] = { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { WM_CTLCOLORBTN, sent|parent|optional }, /* Win9x doesn't send it */ @@ -6833,7 +6836,7 @@ static void test_button_messages(void) { BS_OWNERDRAW, DLGC_BUTTON, WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontOwnerdrawSeq, WmSetTextButtonSeq }, }; LOGFONTA logfont = { 0 };

1 0