September 2021 - Wine-commits

Zebediah Figura : krnl386: Call generated 16-bit entry points from the snoop thunks.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: b035fe601dc61395c782f462d5072c9df87db7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b035fe601dc61395c782f462… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 28 20:39:05 2021 -0500 krnl386: Call generated 16-bit entry points from the snoop thunks. Instead of manually building a STACK16FRAME. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 4 +++ dlls/krnl386.exe16/snoop.c | 56 ++++++----------------------------- 2 files changed, 13 insertions(+), 47 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index c6ffd9df701..6a55aad78f8 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -747,3 +747,7 @@ # VxDs @ cdecl -arch=win32 -private __wine_vxd_open(wstr long ptr) @ cdecl -arch=win32 -private __wine_vxd_get_proc(long) + +# Snoop support +2001 pascal -register __wine_snoop_entry() +2002 pascal -register __wine_snoop_return() diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 170796da390..d5c528d3382 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -34,13 +34,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(snoop); #include "pshpack1.h" -static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT *context); -static void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT *context); - typedef struct tagSNOOP16_FUN { /* code part */ BYTE lcall; /* 0x9a call absolute with segment */ - DWORD snr; + FARPROC16 snoop_entry; /* unreached */ int nrofargs; FARPROC16 origfun; @@ -58,7 +55,7 @@ typedef struct tagSNOOP16_DLL { typedef struct tagSNOOP16_RETURNENTRY { /* code part */ BYTE lcall; /* 0x9a call absolute with segment */ - DWORD snr; + FARPROC16 snoop_return; /* unreached */ FARPROC16 origreturn; SNOOP16_DLL *dll; @@ -73,24 +70,10 @@ typedef struct tagSNOOP16_RETURNENTRIES { struct tagSNOOP16_RETURNENTRIES *next; } SNOOP16_RETURNENTRIES; -typedef struct tagSNOOP16_RELAY { - WORD pushbp; /* 0x5566 */ - BYTE pusheax; /* 0x50 */ - WORD pushax; /* 0x5066 */ - BYTE pushl; /* 0x68 */ - DWORD realfun; /* SNOOP16_Return */ - BYTE lcall; /* 0x9a call absolute with segment */ - DWORD callfromregs; - WORD seg; - WORD lret; /* 0xcb66 */ -} SNOOP16_RELAY; - #include "poppack.h" static SNOOP16_DLL *firstdll = NULL; static SNOOP16_RETURNENTRIES *firstrets = NULL; -static SNOOP16_RELAY *snr; -static HANDLE16 xsnr = 0; void SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { @@ -102,29 +85,6 @@ SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { TRACE("hmod=%x, name=%s\n", hModule, name); - if (!snr) { - xsnr=GLOBAL_Alloc(GMEM_ZEROINIT,2*sizeof(*snr),0,LDT_FLAGS_CODE | LDT_FLAGS_32BIT); - snr = GlobalLock16(xsnr); - snr[0].pushbp = 0x5566; - snr[0].pusheax = 0x50; - snr[0].pushax = 0x5066; - snr[0].pushl = 0x68; - snr[0].realfun = (DWORD)SNOOP16_Entry; - snr[0].lcall = 0x9a; - snr[0].callfromregs = (DWORD)__wine_call_from_16_regs; - snr[0].seg = get_cs(); - snr[0].lret = 0xcb66; - - snr[1].pushbp = 0x5566; - snr[1].pusheax = 0x50; - snr[1].pushax = 0x5066; - snr[1].pushl = 0x68; - snr[1].realfun = (DWORD)SNOOP16_Return; - snr[1].lcall = 0x9a; - snr[1].callfromregs = (DWORD)__wine_call_from_16_regs; - snr[1].seg = get_cs(); - snr[1].lret = 0xcb66; - } while (*dll) { if ((*dll)->hmod == hModule) { @@ -181,7 +141,7 @@ SNOOP16_GetProcAddress16(HMODULE16 hmod,DWORD ordinal,FARPROC16 origfun) { fun = dll->funs+ordinal; /* already done? */ fun->lcall = 0x9a; - fun->snr = MAKELONG(0,xsnr); + fun->snoop_entry = GetProcAddress16( GetModuleHandle16( "KERNEL" ), "__wine_snoop_entry" ); fun->origfun = origfun; if (fun->name) return (FARPROC16)(SEGPTR)MAKELONG(((char*)fun-(char*)dll->funs),dll->funhandle); @@ -227,14 +187,15 @@ SNOOP16_GetProcAddress16(HMODULE16 hmod,DWORD ordinal,FARPROC16 origfun) { } } fun->lcall = 0x9a; - fun->snr = MAKELONG(0,xsnr); + fun->snoop_entry = GetProcAddress16( GetModuleHandle16( "KERNEL" ), "__wine_snoop_entry" ); fun->origfun = origfun; fun->nrofargs = -1; return (FARPROC16)(SEGPTR)MAKELONG(((char*)fun-(char*)dll->funs),dll->funhandle); } #define CALLER1REF (*(DWORD*)(MapSL( MAKESEGPTR(context->SegSs,LOWORD(context->Esp)+4)))) -static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT *context) { +void WINAPI __wine_snoop_entry( CONTEXT *context ) +{ DWORD ordinal=0; DWORD entry=(DWORD)MapSL( MAKESEGPTR(context->SegCs,LOWORD(context->Eip)) )-5; WORD xcs = context->SegCs; @@ -273,7 +234,7 @@ static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT *context) { } ret = &((*rets)->entry[i]); ret->lcall = 0x9a; - ret->snr = MAKELONG(sizeof(SNOOP16_RELAY),xsnr); + ret->snoop_return = GetProcAddress16( GetModuleHandle16( "KERNEL" ), "__wine_snoop_return" ); ret->origreturn = (FARPROC16)CALLER1REF; CALLER1REF = MAKELONG((char*)&(ret->lcall)-(char*)((*rets)->entry),(*rets)->rethandle); ret->dll = dll; @@ -301,7 +262,8 @@ static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT *context) { TRACE(") ret=%04x:%04x\n",HIWORD(ret->origreturn),LOWORD(ret->origreturn)); } -static void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT *context) { +void WINAPI __wine_snoop_return( CONTEXT *context ) +{ SNOOP16_RETURNENTRY *ret = (SNOOP16_RETURNENTRY*)((char *) MapSL( MAKESEGPTR(context->SegCs,LOWORD(context->Eip)) )-5); /* We haven't found out the nrofargs yet. If we called a cdecl

1 0

Nikolay Sivov : ole32/filemoniker: Fix argument handling in Reduce().
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 246b3002a4fc6778e5f739ab9e29115f4e8d4c4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=246b3002a4fc6778e5f739ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 28 15:56:31 2021 +0300 ole32/filemoniker: Fix argument handling in Reduce(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 17 ++++++----------- dlls/ole32/tests/moniker.c | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index f52881108c7..213971ea96b 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -608,21 +608,16 @@ FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef return E_NOTIMPL; } -/****************************************************************************** - * FileMoniker_Reduce - ******************************************************************************/ -static HRESULT WINAPI -FileMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, IMoniker** ppmkReduced) +static HRESULT WINAPI FileMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD howfar, + IMoniker **toleft, IMoniker **reduced) { - TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, howfar, toleft, reduced); - if (ppmkReduced==NULL) - return E_POINTER; + if (!pbc || !reduced) + return E_INVALIDARG; IMoniker_AddRef(iface); - - *ppmkReduced=iface; + *reduced = iface; return MK_S_REDUCED_TO_SELF; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 91382da6a02..2c257dcff50 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2098,7 +2098,7 @@ todo_wine static void test_file_moniker(WCHAR* path) { - IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced, *anti; + IMoniker *moniker1 = NULL, *moniker2 = NULL, *m3, *inverse, *reduced, *anti; IEnumMoniker *enummoniker; IBindCtx *bind_ctx; IStream *stream; @@ -2142,9 +2142,19 @@ static void test_file_moniker(WCHAR* path) ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); hr = IMoniker_Reduce(moniker1, NULL, MKRREDUCE_ALL, NULL, &reduced); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Reduce(moniker1, bind_ctx, MKRREDUCE_ALL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + m3 = anti = create_antimoniker(1); + hr = IMoniker_Reduce(moniker1, bind_ctx, MKRREDUCE_ALL, &m3, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker1, "Unexpected moniker.\n"); + ok(m3 == anti, "Unexpected pointer.\n"); + IMoniker_Release(reduced); + IMoniker_Release(anti); + hr = IMoniker_Reduce(moniker1, bind_ctx, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); ok(reduced == moniker1, "Unexpected moniker.\n");

1 0

Nikolay Sivov : ole32/composite: Improve handling of BindToObject() when left side moniker is specified.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: fbceeff26b0cc329018931b789813174f0e54d69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbceeff26b0cc329018931b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 28 15:56:32 2021 +0300 ole32/composite: Improve handling of BindToObject() when left side moniker is specified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 50 +++++++++++++++++++++---------------------- dlls/ole32/tests/moniker.c | 39 +++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index b2ec02e1150..4451f0daae6 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -315,23 +315,30 @@ CompositeMonikerImpl_GetSizeMax(IMoniker* iface,ULARGE_INTEGER* pcbSize) return S_OK; } +static HRESULT compose_with(IMoniker *left, IMoniker *right, IMoniker **c) +{ + HRESULT hr = IMoniker_ComposeWith(left, right, TRUE, c); + if (FAILED(hr) && hr != MK_E_NEEDGENERIC) return hr; + return CreateGenericComposite(left, right, c); +} + static HRESULT WINAPI CompositeMonikerImpl_BindToObject(IMoniker *iface, IBindCtx *pbc, - IMoniker *pmkToLeft, REFIID riid, void **result) + IMoniker *toleft, REFIID riid, void **result) { + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); + IMoniker *left, *rightmost, *c; IRunningObjectTable *rot; IUnknown *object; HRESULT hr; - IMoniker *tempMk,*antiMk,*rightMostMk; - IEnumMoniker *enumMoniker; - TRACE("(%p,%p,%p,%s,%p)\n", iface, pbc, pmkToLeft, debugstr_guid(riid), result); + TRACE("%p, %p, %p, %s, %p.\n", iface, pbc, toleft, debugstr_guid(riid), result); if (!result) return E_POINTER; *result = NULL; - if (!pmkToLeft) + if (!toleft) { hr = IBindCtx_GetRunningObjectTable(pbc, &rot); if (SUCCEEDED(hr)) @@ -343,25 +350,25 @@ static HRESULT WINAPI CompositeMonikerImpl_BindToObject(IMoniker *iface, IBindCt hr = IUnknown_QueryInterface(object, riid, result); IUnknown_Release(object); } - } - else{ - /* If pmkToLeft is not NULL, the method recursively calls IMoniker::BindToObject on the rightmost */ - /* component of the composite, passing the rest of the composite as the pmkToLeft parameter for that call */ - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); - IEnumMoniker_Release(enumMoniker); + return hr; + } - hr = CreateAntiMoniker(&antiMk); - hr = IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); + /* Try to bind rightmost component with (toleft, composite->left) composite at its left side */ + if (FAILED(hr = composite_get_rightmost(moniker, &left, &rightmost))) + return hr; - hr = IMoniker_BindToObject(rightMostMk,pbc,tempMk,riid,result); + hr = compose_with(toleft, left, &c); + IMoniker_Release(left); - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); + if (SUCCEEDED(hr)) + { + hr = IMoniker_BindToObject(rightmost, pbc, c, riid, result); + IMoniker_Release(c); } + IMoniker_Release(rightmost); + return hr; } @@ -683,13 +690,6 @@ CompositeMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, } } -static HRESULT compose_with(IMoniker *left, IMoniker *right, IMoniker **c) -{ - HRESULT hr = IMoniker_ComposeWith(left, right, TRUE, c); - if (FAILED(hr) && hr != MK_E_NEEDGENERIC) return hr; - return CreateGenericComposite(left, right, c); -} - static HRESULT WINAPI CompositeMonikerImpl_GetTimeOfLastChange(IMoniker *iface, IBindCtx *pbc, IMoniker *toleft, FILETIME *changetime) { diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 2c257dcff50..795d8750d05 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3108,7 +3108,7 @@ static void test_generic_composite_moniker(void) { "CI1I2", "A3", MKSYS_ANTIMONIKER, L"\\.." }, { "CI1I3", "CA1I2", MKSYS_GENERICCOMPOSITE, L"!I1!I2" }, }; - IMoniker *moniker, *inverse, *moniker1, *moniker2, *moniker3; + IMoniker *moniker, *inverse, *moniker1, *moniker2, *moniker3, *moniker4; struct test_moniker *m, *m2; IEnumMoniker *enummoniker; IRunningObjectTable *rot; @@ -3267,10 +3267,45 @@ todo_wine hr = IRunningObjectTable_Revoke(rot, cookie); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IRunningObjectTable_Release(rot); + IMoniker_Release(moniker); + + /* BindToObject() with moniker at left */ + hr = CreatePointerMoniker((IUnknown *)rot, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* (I1,P) */ + hr = create_moniker_from_desc("I1", &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CreateGenericComposite(moniker2, moniker, &moniker3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_BindToObject(moniker3, bindctx, moniker2, &IID_IMoniker, (void **)&unknown); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + /* Register (I1,I1,P), check if ROT is used for left != NULL case */ + hr = CreateGenericComposite(moniker2, moniker3, &moniker4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + cookie = 0; + hr = IRunningObjectTable_Register(rot, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)moniker4, + moniker4, &cookie); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_BindToObject(moniker3, bindctx, moniker2, &IID_IMoniker, (void **)&unknown); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IRunningObjectTable_Revoke(rot, cookie); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker3); + IMoniker_Release(moniker2); IMoniker_Release(moniker); + IRunningObjectTable_Release(rot); + /* Uninitialized composite */ hr = CoCreateInstance(&CLSID_CompositeMoniker, NULL, CLSCTX_SERVER, &IID_IMoniker, (void **)&moniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Connor McAdams : user32/tests: Store thread ID of thread we're watching for winevents.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 5d48747eca66ac7d5b101a54e5b26463940c98ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d48747eca66ac7d5b101a54… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 18:28:09 2021 -0400 user32/tests: Store thread ID of thread we're watching for winevents. Since we're watching a specific thread ID for winevents, check that the thread ID passed in the winevent callback function matches the thread we're watching, instead of the thread currently executing. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 66e6069da54..e47bf83c254 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -110,6 +110,7 @@ static HWINEVENTHOOK hEvent_hook; static HHOOK hKBD_hook; static HHOOK hCBT_hook; static DWORD cbt_hook_thread_id; +static DWORD winevent_hook_thread_id; static const WCHAR testWindowClassW[] = { 'T','e','s','t','W','i','n','d','o','w','C','l','a','s','s','W',0 }; @@ -10378,7 +10379,7 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, DWORD thread_id, DWORD event_time) { - ok(thread_id == GetCurrentThreadId(), "we didn't ask for events from other threads\n"); + ok(thread_id == winevent_hook_thread_id, "we didn't ask for events from other threads\n"); /* ignore mouse cursor events */ if (object_id == OBJID_CURSOR) return; @@ -18607,7 +18608,7 @@ START_TEST(msg) } if (!hEvent_hook) win_skip( "no win event hook support\n" ); - cbt_hook_thread_id = GetCurrentThreadId(); + cbt_hook_thread_id = winevent_hook_thread_id = GetCurrentThreadId(); hCBT_hook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); if (!hCBT_hook) win_skip( "cannot set global hook, will skip hook tests\n" );

1 0

Connor McAdams : user32/tests: Add missing winevents to test_layered_window() message sequences.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: e2b130e44f29d8a372c52ddf4309c31d22bcbc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2b130e44f29d8a372c52ddf… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 18:28:10 2021 -0400 user32/tests: Add missing winevents to test_layered_window() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e47bf83c254..fa528c86a79 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17817,6 +17817,7 @@ todo_wine static const struct message WmSetLayeredStyle[] = { { WM_STYLECHANGING, sent }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_STYLECHANGED, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { 0 } @@ -17827,9 +17828,16 @@ static const struct message WmSetLayeredStyle2[] = { { WM_STYLECHANGED, sent }, { WM_WINDOWPOSCHANGING, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCCALCSIZE, sent|optional|wparam|defwinproc, 1 }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { WM_MOVE, sent|optional|defwinproc|wparam, 0 }, { WM_SIZE, sent|optional|defwinproc|wparam, SIZE_RESTORED }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, + { 0 } +}; + +static const struct message WmLayeredWinEmptySeq[] = { + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; @@ -17901,7 +17909,7 @@ static void test_layered_window(void) ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); - ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + ok_sequence( WmLayeredWinEmptySeq, "UpdateLayeredWindow", FALSE ); GetWindowRect( hwnd, &rect ); ok( rect.left == 300 && rect.top == 300 && rect.right == 550 && rect.bottom == 550, "wrong window rect %s\n", wine_dbgstr_rect( &rect )); @@ -17913,7 +17921,7 @@ static void test_layered_window(void) pos.y = 200; ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); - ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + ok_sequence( WmLayeredWinEmptySeq, "UpdateLayeredWindow", FALSE ); GetWindowRect( hwnd, &rect ); ok( rect.left == 300 && rect.top == 200 && rect.right == 450 && rect.bottom == 450, "wrong window rect %s\n", wine_dbgstr_rect( &rect )); @@ -17929,7 +17937,7 @@ static void test_layered_window(void) pos.x = 200; ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); - ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + ok_sequence( WmLayeredWinEmptySeq, "UpdateLayeredWindow", FALSE ); GetWindowRect( hwnd, &rect ); ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, "wrong window rect %s\n", wine_dbgstr_rect( &rect )); @@ -18681,6 +18689,7 @@ START_TEST(msg) test_clipboard_viewers(); test_keyflags(); test_hotkey(); + test_layered_window(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18691,7 +18700,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_layered_window(); test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); test_DoubleSetCapture();

1 0

Connor McAdams : user32/tests: Add missing winevents to test_TrackPopupMenu() message sequences.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 0bf1b6f5c691e0ff3e63c1b526d406ae14ea1e6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf1b6f5c691e0ff3e63c1b5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 18:28:11 2021 -0400 user32/tests: Add missing winevents to test_TrackPopupMenu() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fa528c86a79..633bd19dc46 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2134,30 +2134,47 @@ static const struct message WmSHOWNATopInvisible[] = { static const struct message WmTrackPopupMenuMinimizeWindow[] = { { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENU, sent|lparam, 0, 0 }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, { 0x0093, sent|optional }, { 0x0094, sent|optional }, { 0x0094, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_ENTERIDLE, sent|wparam, 2 }, { HCBT_MINMAX, hook }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, { WM_GETTEXT, sent|optional }, { WM_WINDOWPOSCHANGING, sent }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, { WM_GETTEXT, sent|optional }, { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CANCELMODE, sent }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|defwinproc|lparam, 0, 0 }, { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 1, 0 }, { WM_NCACTIVATE, sent }, { WM_GETTEXT, sent|defwinproc|optional }, @@ -2169,17 +2186,29 @@ static const struct message WmTrackPopupMenuMinimizeWindow[] = { static const struct message WmTrackPopupMenu[] = { { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENU, sent|lparam, 0, 0 }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, { 0x0093, sent|optional }, { 0x0094, sent|optional }, { 0x0094, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_ENTERIDLE, sent|wparam, 2 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, { 0 } }; @@ -2190,18 +2219,31 @@ static const struct message WmTrackPopupMenuEsc[] = { static const struct message WmTrackPopupMenuCapture[] = { { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent }, { WM_INITMENU, sent|lparam, 0, 0 }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, { 0x0093, sent|optional }, { 0x0094, sent|optional }, { 0x0094, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_ENTERIDLE, sent|wparam, 2 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, { 0 } }; @@ -2223,16 +2265,28 @@ static const struct message WmTrackPopupMenuEmpty[] = { static const struct message WmTrackPopupMenuAbort[] = { { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENU, sent|lparam, 0, 0 }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, { 0x0093, sent|optional }, { 0x0094, sent|optional }, { 0x0094, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, + { EVENT_SYSTEM_MENUPOPUPSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent }, + { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, { 0 } }; @@ -18690,6 +18744,7 @@ START_TEST(msg) test_keyflags(); test_hotkey(); test_layered_window(); + test_TrackPopupMenu(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18700,7 +18755,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); test_DoubleSetCapture(); /* keep it the last test, under Windows it tends to break the tests

1 0

Connor McAdams : user32/tests: Add missing winevents to test_TrackPopupMenuEmpty() message sequences.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 16444944a224838c9392f869408a06f53bb61a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=16444944a224838c9392f869… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 18:28:12 2021 -0400 user32/tests: Add missing winevents to test_TrackPopupMenuEmpty() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 633bd19dc46..abb0dc1d97f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2250,15 +2250,22 @@ static const struct message WmTrackPopupMenuCapture[] = { static const struct message WmTrackPopupMenuEmpty[] = { { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENU, sent|lparam, 0, 0 }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, { 0x0093, sent|optional }, { 0x0094, sent|optional }, { 0x0094, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent }, { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, { HCBT_DESTROYWND, hook }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { 0 } }; @@ -18745,6 +18752,7 @@ START_TEST(msg) test_hotkey(); test_layered_window(); test_TrackPopupMenu(); + test_TrackPopupMenuEmpty(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18755,7 +18763,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_TrackPopupMenuEmpty(); test_DoubleSetCapture(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct.

1 0

Connor McAdams : user32/tests: Add missing winevents to test_DoubleSetCapture() message sequences.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 4deaed0fd4e9feb6e9288d1f2cab0b486b508487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4deaed0fd4e9feb6e9288d1f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 18:28:13 2021 -0400 user32/tests: Add missing winevents to test_DoubleSetCapture() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index abb0dc1d97f..9602649600f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18458,6 +18458,9 @@ static void test_InSendMessage(void) static const struct message DoubleSetCaptureSeq[] = { + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent }, { 0 } }; @@ -18753,16 +18756,6 @@ START_TEST(msg) test_layered_window(); test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); - - /* Fix message sequences before removing 4 lines below */ - if (pUnhookWinEvent && hEvent_hook) - { - ret = pUnhookWinEvent(hEvent_hook); - ok( ret, "UnhookWinEvent error %d\n", GetLastError()); - pUnhookWinEvent = 0; - } - hEvent_hook = 0; - test_DoubleSetCapture(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct.

1 0

Paul Gofman : ntdll: Factor out get_vprot_range_size() function.
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: b7fafabc77b58fb33a5a543d423232f18f9d5f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7fafabc77b58fb33a5a543d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 23 18:20:04 2021 +0300 ntdll: Factor out get_vprot_range_size() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..41d878546bb 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -943,6 +943,24 @@ static BYTE get_page_vprot( const void *addr ) } +/*********************************************************************** + * get_vprot_range_size + * + * Return the size of the region with equal masked vprot byte. + * Also return the protections for the first page. + * The function assumes that base and size are page aligned and + * base + size does not wrap around. */ +static SIZE_T get_vprot_range_size( char *base, SIZE_T size, BYTE mask, BYTE *vprot ) +{ + char *addr; + + *vprot = get_page_vprot( base ); + for (addr = base + page_size; addr != base + size; addr += page_size) + if ((*vprot ^ get_page_vprot( addr )) & mask) break; + + return addr - base; +} + /*********************************************************************** * set_page_vprot * @@ -2047,18 +2065,21 @@ done: */ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot ) { - SIZE_T i, start; + SIZE_T offset; - start = ((char *)base - (char *)view->base) >> page_shift; - *vprot = get_page_vprot( base ); + base = ROUND_ADDR( base, page_mask ); + offset = (char *)base - (char *)view->base; if (view->protect & SEC_RESERVE) { SIZE_T ret = 0; + + *vprot = get_page_vprot( base ); + SERVER_START_REQ( get_mapping_committed_range ) { req->base = wine_server_client_ptr( view->base ); - req->offset = start << page_shift; + req->offset = offset; if (!wine_server_call( req )) { ret = reply->size; @@ -2072,9 +2093,8 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro SERVER_END_REQ; return ret; } - for (i = start + 1; i < view->size >> page_shift; i++) - if ((*vprot ^ get_page_vprot( (char *)view->base + (i << page_shift) )) & VPROT_COMMITTED) break; - return (i - start) << page_shift; + + return get_vprot_range_size( base, view->size - offset, VPROT_COMMITTED, vprot ); } @@ -4196,7 +4216,6 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, else { BYTE vprot; - char *ptr; SIZE_T range_size = get_committed_size( view, base, &vprot ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; @@ -4205,9 +4224,8 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; else info->Type = MEM_PRIVATE; - for (ptr = base; ptr < base + range_size; ptr += page_size) - if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; - info->RegionSize = ptr - base; + + info->RegionSize = get_vprot_range_size( base, range_size, ~VPROT_WRITEWATCH, &vprot ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Paul Gofman : ntdll: Scan pages only once in get_basic_memory_info().
by Alexandre Julliard 28 Sep '21

28 Sep '21

Module: wine Branch: master Commit: 1f28e92e7c47944c6cef8cf0ec40fac7353e7cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f28e92e7c47944c6cef8cf0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 23 18:20:05 2021 +0300 ntdll: Scan pages only once in get_basic_memory_info(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 41d878546bb..8a55abfd15a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2060,19 +2060,19 @@ done: /*********************************************************************** * get_committed_size * - * Get the size of the committed range starting at base. + * Get the size of the committed range with equal masked vprot bytes starting at base. * Also return the protections for the first page. */ -static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot ) +static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot, BYTE vprot_mask ) { - SIZE_T offset; + SIZE_T offset, size; base = ROUND_ADDR( base, page_mask ); offset = (char *)base - (char *)view->base; if (view->protect & SEC_RESERVE) { - SIZE_T ret = 0; + size = 0; *vprot = get_page_vprot( base ); @@ -2082,19 +2082,21 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro req->offset = offset; if (!wine_server_call( req )) { - ret = reply->size; + size = reply->size; if (reply->committed) { *vprot |= VPROT_COMMITTED; - set_page_vprot_bits( base, ret, VPROT_COMMITTED, 0 ); + set_page_vprot_bits( base, size, VPROT_COMMITTED, 0 ); } } } SERVER_END_REQ; - return ret; + + if (!size || !(vprot_mask & ~VPROT_COMMITTED)) return size; } + else size = view->size - offset; - return get_vprot_range_size( base, view->size - offset, VPROT_COMMITTED, vprot ); + return get_vprot_range_size( base, size, vprot_mask, vprot ); } @@ -4045,7 +4047,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T if ((view = find_view( base, size ))) { /* Make sure all the pages are committed */ - if (get_committed_size( view, base, &vprot ) >= size && (vprot & VPROT_COMMITTED)) + if (get_committed_size( view, base, &vprot, VPROT_COMMITTED ) >= size && (vprot & VPROT_COMMITTED)) { old = get_win32_prot( vprot, view->protect ); status = set_protection( view, base, size, new_prot ); @@ -4216,16 +4218,14 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, else { BYTE vprot; - SIZE_T range_size = get_committed_size( view, base, &vprot ); + info->RegionSize = get_committed_size( view, base, &vprot, ~VPROT_WRITEWATCH ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; info->Protect = (vprot & VPROT_COMMITTED) ? get_win32_prot( vprot, view->protect ) : 0; info->AllocationProtect = get_win32_prot( view->protect, view->protect ); if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; else info->Type = MEM_PRIVATE; - - info->RegionSize = get_vprot_range_size( base, range_size, ~VPROT_WRITEWATCH, &vprot ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -4271,8 +4271,8 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, } if ((view = find_view( p->VirtualAddress, 0 )) && - get_committed_size( view, p->VirtualAddress, &vprot ) && - (vprot & VPROT_COMMITTED)) + get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) && + (vprot & VPROT_COMMITTED)) { p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && (pagemap >> 63); p->VirtualAttributes.Shared = !is_view_valloc( view ) && ((pagemap >> 61) & 1);

1 0