wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Zebediah Figura : ole32: Always grab a reference to apt in CoGetClassObject().
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 6af0e50f3691e76d4d8b85e43561fb9e527a240e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6af0e50f3691e76d4d8b85e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 28 21:01:58 2018 -0500 ole32: Always grab a reference to apt in CoGetClassObject(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 26 +++++++++++++++++--------- dlls/ole32/compobj_private.h | 1 + 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fc8587b..50ac6d3 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1162,9 +1162,17 @@ DWORD apartment_release(struct apartment *apt) ret = InterlockedDecrement(&apt->refs); TRACE("%s: after = %d\n", wine_dbgstr_longlong(apt->oxid), ret); + + if (apt->being_destroyed) + { + LeaveCriticalSection(&csApartment); + return ret; + } + /* destruction stuff that needs to happen under csApartment CS */ if (ret == 0) { + apt->being_destroyed = TRUE; if (apt == MTA) MTA = NULL; else if (apt == MainApartment) MainApartment = NULL; list_remove(&apt->entry); @@ -2981,7 +2989,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( IUnknown *regClassObject; HRESULT hres = E_UNEXPECTED; APARTMENT *apt; - BOOL release_apt = FALSE; TRACE("CLSID: %s,IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); @@ -2990,14 +2997,15 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( *ppv = NULL; - if (!(apt = COM_CurrentApt())) + if ((apt = COM_CurrentApt())) + apartment_addref(apt); + else { if (!(apt = apartment_find_mta())) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; } - release_apt = TRUE; } if (pServerInfo) { @@ -3009,7 +3017,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( { if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) { - if (release_apt) apartment_release(apt); + apartment_release(apt); return FTMarshalCF_Create(iid, ppv); } if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) @@ -3035,7 +3043,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( hres = get_inproc_class_object(apt, &clsreg, &comclass->clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); ReleaseActCtx(data.hActCtx); - if (release_apt) apartment_release(apt); + apartment_release(apt); return hres; } } @@ -3056,7 +3064,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( * is good since we are not returning it in the "out" parameter. */ IUnknown_Release(regClassObject); - if (release_apt) apartment_release(apt); + apartment_release(apt); return hres; } @@ -3091,7 +3099,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( * other types */ if (SUCCEEDED(hres)) { - if (release_apt) apartment_release(apt); + apartment_release(apt); return hres; } } @@ -3127,11 +3135,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( * other types */ if (SUCCEEDED(hres)) { - if (release_apt) apartment_release(apt); + apartment_release(apt); return hres; } } - if (release_apt) apartment_release(apt); + apartment_release(apt); /* Next try out of process */ if (CLSCTX_LOCAL_SERVER & dwClsContext) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 9e65c3e..12413f7 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -142,6 +142,7 @@ struct apartment DWORD host_apt_tid; /* thread ID of apartment hosting objects of differing threading model (CS cs) */ HWND host_apt_hwnd; /* handle to apartment window of host apartment (CS cs) */ LocalServer *local_server; /* A marshallable object exposing local servers (CS cs) */ + BOOL being_destroyed; /* is currently being destroyed */ /* FIXME: OIDs should be given out by RPCSS */ OID oidc; /* object ID counter, starts at 1, zero is invalid OID (CS cs) */

1 0

Alistair Leslie-Hughes : ntoskrnl: Add ObGetObjectType stub.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: b0351a12b1f3a0816ec8d41be57042ae86400eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0351a12b1f3a0816ec8d41b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 4 23:18:21 2018 +0000 ntoskrnl: Add ObGetObjectType stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b6145d9..e464549 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2370,6 +2370,16 @@ USHORT WINAPI ObGetFilterVersion(void) } /*********************************************************************** + * ObGetObjectType (NTOSKRNL.EXE.@) + */ +POBJECT_TYPE WINAPI ObGetObjectType(void *object) +{ + FIXME("stub: %p\n", object); + + return NULL; +} + +/*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) */ DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c7913db..1b03233 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -808,6 +808,7 @@ @ stub ObFindHandleForObject @ stdcall ObGetFilterVersion() @ stub ObGetObjectSecurity +@ stdcall ObGetObjectType(ptr) @ stub ObInsertObject @ stub ObLogSecurityDescriptor @ stub ObMakeTemporaryObject

1 0

Alistair Leslie-Hughes : ntoskrnl: Add PsGetProcessId stub.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: d4c2759a1db39445572b42092277776080458358 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c2759a1db39445572b4209… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 4 23:18:19 2018 +0000 ntoskrnl: Add PsGetProcessId stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e716386..b6145d9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3468,3 +3468,13 @@ void WINAPI ExfUnblockPushLock( EX_PUSH_LOCK *lock, PEX_PUSH_LOCK_WAIT_BLOCK blo { FIXME( "stub: %p, %p\n", lock, block ); } + +/********************************************************************* + * PsGetProcessId (NTOSKRNL.@) + */ +HANDLE WINAPI PsGetProcessId(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + + return 0; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8aaca5b..c7913db 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -874,7 +874,7 @@ @ stub PsGetProcessExitProcessCalled @ stub PsGetProcessExitStatus @ stub PsGetProcessExitTime -@ stub PsGetProcessId +@ stdcall PsGetProcessId(ptr) @ stub PsGetProcessImageFileName @ stub PsGetProcessInheritedFromUniqueProcessId @ stub PsGetProcessJob

1 0

Alistair Leslie-Hughes : ntoskrnl: Add ExfUnblockPushLock stub.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: ccbefb818ac0d911250b2b67716e6e7692dd5557 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccbefb818ac0d911250b2b67… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 4 23:18:18 2018 +0000 ntoskrnl: Add ExfUnblockPushLock stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 80b7538..e716386 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3453,3 +3453,18 @@ void WINAPI PsReleaseProcessExitSynchronization(PEPROCESS process) { FIXME("stub: %p\n", process); } + +typedef struct _EX_PUSH_LOCK_WAIT_BLOCK *PEX_PUSH_LOCK_WAIT_BLOCK; +/********************************************************************* + * ExfUnblockPushLock (NTOSKRNL.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( ExfUnblockPushLock ) +void WINAPI DECLSPEC_HIDDEN __regs_ExfUnblockPushLock( EX_PUSH_LOCK *lock, + PEX_PUSH_LOCK_WAIT_BLOCK block) +#else +void WINAPI ExfUnblockPushLock( EX_PUSH_LOCK *lock, PEX_PUSH_LOCK_WAIT_BLOCK block ) +#endif +{ + FIXME( "stub: %p, %p\n", lock, block ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 54ca51f..8aaca5b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -133,6 +133,7 @@ @ stub ExEnumHandleTable @ stub ExEventObjectType @ stub ExExtendZone +@ stdcall -norelay ExfUnblockPushLock(ptr ptr) @ stdcall ExFreePool(ptr) @ stdcall ExFreePoolWithTag(ptr long) @ stub ExFreeToPagedLookasideList

1 0

Alistair Leslie-Hughes : ntoskrnl: Add PsAcquireProcessExitSynchronization /PsReleaseProcessExitSynchronization stub.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: dd7467cc4dc2e7cc71edbe1d551a0c3dd71bce36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd7467cc4dc2e7cc71edbe1d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 4 23:18:17 2018 +0000 ntoskrnl: Add PsAcquireProcessExitSynchronization/PsReleaseProcessExitSynchronization stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 20 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a9a73e3..80b7538 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3435,3 +3435,21 @@ __ASM_STDCALL_FUNC( _chkstk, 0, __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" "bx lr" ) #endif + +/********************************************************************* + * PsAcquireProcessExitSynchronization (NTOSKRNL.@) +*/ +NTSTATUS WINAPI PsAcquireProcessExitSynchronization(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + + return STATUS_NOT_IMPLEMENTED; +} + +/********************************************************************* + * PsReleaseProcessExitSynchronization (NTOSKRNL.@) + */ +void WINAPI PsReleaseProcessExitSynchronization(PEPROCESS process) +{ + FIXME("stub: %p\n", process); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5e983b1..54ca51f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -844,6 +844,7 @@ @ stub PoUnregisterSystemState @ stdcall ProbeForRead(ptr long long) @ stdcall ProbeForWrite(ptr long long) +@ stdcall PsAcquireProcessExitSynchronization(ptr) @ stub PsAssignImpersonationToken @ stub PsChargePoolQuota @ stub PsChargeProcessNonPagedPoolQuota @@ -905,6 +906,7 @@ @ stub PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken +@ stdcall PsReleaseProcessExitSynchronization(ptr) @ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) @ stdcall PsRemoveLoadImageNotifyRoutine(ptr) @ stub PsRestoreImpersonation

1 0

Gijs Vermeulen : ntoskrnl.exe: Improve IoCreateSynchronizationEvent stub.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 96e4ec81ece59853f038447fa15e9b391d5ab996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e4ec81ece59853f038447f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Apr 7 20:09:59 2018 +0200 ntoskrnl.exe: Improve IoCreateSynchronizationEvent stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f80207d..a9a73e3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2694,7 +2694,7 @@ BOOLEAN WINAPI Ke386SetIoAccessMap(ULONG flag, PVOID buffer) PKEVENT WINAPI IoCreateSynchronizationEvent(PUNICODE_STRING name, PHANDLE handle) { FIXME("(%p %p) stub\n", name, handle); - return NULL; + return (KEVENT *)0xdeadbeaf; } /*****************************************************

1 0

Gijs Vermeulen : ntoskrnl.exe: Improve ObReferenceObjectByHandle stub.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: db33beb090c9bc73b7fd586ff3cc6172b4ed85d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db33beb090c9bc73b7fd586f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Apr 7 20:09:58 2018 +0200 ntoskrnl.exe: Improve ObReferenceObjectByHandle stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7258c37..f80207d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2231,7 +2231,11 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE obj, ACCESS_MASK access, POBJECT_HANDLE_INFORMATION info) { FIXME( "stub: %p %x %p %d %p %p\n", obj, access, type, mode, ptr, info); - return STATUS_NOT_IMPLEMENTED; + + if(ptr) + *ptr = UlongToHandle(0xdeadbeaf); + + return STATUS_SUCCESS; } /***********************************************************************

1 0

Nikolay Sivov : user32/tests: Remove the rest of skips in menu tests.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 349d9fbdd76084bd0a3970a760245bbb5f1afef6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=349d9fbdd76084bd0a3970a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 9 08:56:29 2018 +0300 user32/tests: Remove the rest of skips in menu tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 77 +++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 6c5eeb8..0f6e861 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -580,7 +580,6 @@ static LRESULT WINAPI subpopuplocked_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam static void test_subpopup_locked_by_menu(void) { - DWORD gle; BOOL ret; HMENU hmenu, hsubmenu; MENUINFO mi = { sizeof( MENUINFO)}; @@ -613,44 +612,32 @@ static void test_subpopup_locked_by_menu(void) ok( ret , "GetMenuInfo returned 0 with error %d\n", GetLastError()); ret = IsMenu( hsubmenu); ok( ret , "Menu handle is not valid\n"); - SetLastError( 0xdeadbeef); + ret = TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); - if( ret == (itemid & 0xffff)) { - win_skip("not on 16 bit menu subsystem\n"); - DestroyMenu( hsubmenu); - } else { - gle = GetLastError(); - ok( ret == itemid , "TrackPopupMenu returned %d error is %d\n", ret, gle); - ok( gle == 0 || - broken( gle == 0xdeadbeef), /* win2k0 */ - "Last error is %d\n", gle); - /* then destroy the sub-popup */ - ret = DestroyMenu( hsubmenu); - ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); - /* and repeat the tests */ - mii.fMask = MIIM_SUBMENU; - ret = GetMenuItemInfoA( hmenu, 0, TRUE, &mii); - ok( ret, "GetMenuItemInfo failed error %d\n", GetLastError()); - /* GetMenuInfo fails now */ - ok( mii.hSubMenu == hsubmenu, "submenu is %p\n", mii.hSubMenu); - mi.fMask |= MIM_STYLE; - ret = GetMenuInfo( hsubmenu, &mi); - ok( !ret , "GetMenuInfo should have failed\n"); - /* IsMenu says it is not */ - ret = IsMenu( hsubmenu); - ok( !ret , "Menu handle should be invalid\n"); - /* but TrackPopupMenu still works! */ - SetLastError( 0xdeadbeef); - ret = TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); - gle = GetLastError(); - todo_wine { - ok( ret == itemid , "TrackPopupMenu returned %d error is %d\n", ret, gle); - } - ok( gle == 0 || - broken(gle == 0xdeadbeef) || /* wow64 */ - broken(gle == ERROR_INVALID_PARAMETER), /* win2k0 */ - "Last error is %d\n", gle); + ok( ret == itemid , "TrackPopupMenu returned %d error is %d\n", ret, GetLastError()); + + /* then destroy the sub-popup */ + ret = DestroyMenu( hsubmenu); + ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); + /* and repeat the tests */ + mii.fMask = MIIM_SUBMENU; + ret = GetMenuItemInfoA( hmenu, 0, TRUE, &mii); + ok( ret, "GetMenuItemInfo failed error %d\n", GetLastError()); + /* GetMenuInfo fails now */ + ok( mii.hSubMenu == hsubmenu, "submenu is %p\n", mii.hSubMenu); + mi.fMask |= MIM_STYLE; + ret = GetMenuInfo( hsubmenu, &mi); + ok( !ret , "GetMenuInfo should have failed\n"); + /* IsMenu says it is not */ + ret = IsMenu( hsubmenu); + ok( !ret , "Menu handle should be invalid\n"); + + /* but TrackPopupMenu still works! */ + ret = TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); + todo_wine { + ok( ret == itemid , "TrackPopupMenu returned %d error is %d\n", ret, GetLastError()); } + /* clean up */ DestroyMenu( hmenu); DestroyWindow(hwnd); @@ -1083,15 +1070,9 @@ static void test_menu_add_string( void ) ok (GetMenuStringA( hmenu, 0, strback, 99, MF_BYPOSITION), "GetMenuString on ownerdraw entry failed\n"); ok (!strcmp( strback, "Dummy string" ), "Menu text from Ansi version incorrect\n"); - SetLastError(0xdeadbeef); ret = GetMenuStringW( hmenu, 0, strbackW, 99, MF_BYPOSITION ); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - win_skip("GetMenuStringW is not implemented\n"); - else - { - ok (ret, "GetMenuStringW on ownerdraw entry failed\n"); - ok (!lstrcmpW( strbackW, expectedString ), "Menu text from Unicode version incorrect\n"); - } + ok (ret, "GetMenuStringW on ownerdraw entry failed\n"); + ok (!lstrcmpW( strbackW, expectedString ), "Menu text from Unicode version incorrect\n"); /* Just try some invalid parameter tests */ SetLastError(0xdeadbeef); @@ -1159,12 +1140,8 @@ static void test_menu_add_string( void ) ok (rc, "InsertMenuItem failed\n"); ok (!GetMenuStringA( hmenu, 0, NULL, 0, MF_BYPOSITION), "GetMenuString on ownerdraw entry succeeded.\n"); - SetLastError(0xdeadbeef); ret = GetMenuStringW( hmenu, 0, NULL, 0, MF_BYPOSITION); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - win_skip("GetMenuStringW is not implemented\n"); - else - ok (!ret, "GetMenuStringW on ownerdraw entry succeeded.\n"); + ok (!ret, "GetMenuStringW on ownerdraw entry succeeded.\n"); DestroyMenu( hmenu ); }

1 0

Nikolay Sivov : user32/tests: Remove menu tests workarounds.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 508e7a88f5f70b16463540ae4c515e83d688535c URL: https://source.winehq.org/git/wine.git/?a=commit;h=508e7a88f5f70b16463540ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 9 08:56:28 2018 +0300 user32/tests: Remove menu tests workarounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 273 +++++++++++++++-------------------------------- 1 file changed, 89 insertions(+), 184 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=508e7a88f5f70b164635…

1 0

Nikolay Sivov : comctl32/tests: Remove useless trace() message.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: be2bec72ac8117099cad992cb3becce4d8052836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be2bec72ac8117099cad992c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 9 08:53:38 2018 +0300 comctl32/tests: Remove useless trace() message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index b9d2663..05fa303 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -563,8 +563,8 @@ static void test_button_messages(void) DWORD style, state; HDC hdc; - trace("%d: button test sequence\n", i); hwnd = create_button(button[i].style, parent); + ok(hwnd != NULL, "Failed to create a button.\n"); style = GetWindowLongA(hwnd, GWL_STYLE); style &= ~(WS_CHILD | BS_NOTIFY);

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018