June 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Implement onprogress for XMLHttpRequest.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 7c45b742b149444d1eff5fcb01a877bf04085436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c45b742b149444d1eff5fcb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 6 15:24:11 2022 +0300 mshtml: Implement onprogress for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/xmlhttprequest.c | 9 +++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 49392bfddd4..cf0de222f80 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -175,6 +175,8 @@ static const event_info_t event_info[] = { EVENT_FIXME}, {L"paste", EVENT_TYPE_CLIPBOARD, DISPID_EVMETH_ONPASTE, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, + {L"progress", EVENT_TYPE_PROGRESS, DISPID_EVPROP_PROGRESS, + EVENT_BIND_TO_TARGET}, {L"readystatechange", EVENT_TYPE_EVENT, DISPID_EVMETH_ONREADYSTATECHANGE, 0}, {L"resize", EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONRESIZE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 58dbc43a462..3f399da6bca 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -50,6 +50,7 @@ typedef enum { EVENTID_MOUSEWHEEL, EVENTID_MSTHUMBNAILCLICK, EVENTID_PASTE, + EVENTID_PROGRESS, EVENTID_READYSTATECHANGE, EVENTID_RESIZE, EVENTID_SCROLL, diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 54e84cf6121..b5973c3d1e2 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -97,6 +97,7 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) static const eventid_t events[] = { EVENTID_READYSTATECHANGE, EVENTID_LOAD, + EVENTID_PROGRESS, EVENTID_ABORT, EVENTID_ERROR, EVENTID_TIMEOUT, @@ -1001,18 +1002,18 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onprogress(IWineXMLHttpRequ { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return set_event_handler(&This->event_target, EVENTID_PROGRESS, &v); } static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onprogress(IWineXMLHttpRequestPrivate *iface, VARIANT *p) { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + return get_event_handler(&This->event_target, EVENTID_PROGRESS, p); } static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onloadstart(IWineXMLHttpRequestPrivate *iface, VARIANT v)

1 0

Gabriel Ivăncescu : mshtml: Implement onloadstart for XMLHttpRequest.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 51e0deefa50c619837b9a61120118d84b4a9d270 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e0deefa50c619837b9a611… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 6 15:24:12 2022 +0300 mshtml: Implement onloadstart for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/xhr.js | 13 ++++++++++++- dlls/mshtml/xmlhttprequest.c | 9 +++++---- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cf0de222f80..a718ad45057 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -157,6 +157,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"load", EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONLOAD, EVENT_BIND_TO_TARGET}, + {L"loadstart", EVENT_TYPE_PROGRESS, DISPID_EVPROP_LOADSTART, + EVENT_BIND_TO_TARGET}, {L"message", EVENT_TYPE_MESSAGE, DISPID_EVMETH_ONMESSAGE, 0}, {L"mousedown", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 3f399da6bca..6af81197b20 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -41,6 +41,7 @@ typedef enum { EVENTID_KEYPRESS, EVENTID_KEYUP, EVENTID_LOAD, + EVENTID_LOADSTART, EVENTID_MESSAGE, EVENTID_MOUSEDOWN, EVENTID_MOUSEMOVE, diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index dd86331872c..d7068978f2c 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -18,7 +18,7 @@ function test_xhr() { var xhr = new XMLHttpRequest(); - var complete_cnt = 0; + var complete_cnt = 0, loadstart = false; xhr.onreadystatechange = function() { if(xhr.readyState != 4) @@ -31,10 +31,21 @@ function test_xhr() { xhr.ontimeout = function() { ok(false, "ontimeout called"); } var onload_func = xhr.onload = function() { ok(xhr.statusText === "OK", "statusText = " + xhr.statusText); + if("onloadstart" in xhr) + ok(loadstart, "onloadstart not fired"); if(complete_cnt++) next_test(); }; ok(xhr.onload === onload_func, "xhr.onload != onload_func"); + if("onloadstart" in xhr) { + xhr.onloadstart = function(e) { + ok(complete_cnt == 0, "onloadstart fired after onload"); + var props = [ "initProgressEvent", "lengthComputable", "loaded", "total" ]; + for(var i = 0; i < props.length; i++) + ok(props[i] in e, props[i] + " not available in loadstart"); + loadstart = true; + }; + } xhr.open("POST", "echo.php", true); xhr.setRequestHeader("X-Test", "True"); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index b5973c3d1e2..b783d04059f 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -97,6 +97,7 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) static const eventid_t events[] = { EVENTID_READYSTATECHANGE, EVENTID_LOAD, + EVENTID_LOADSTART, EVENTID_PROGRESS, EVENTID_ABORT, EVENTID_ERROR, @@ -1020,18 +1021,18 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onloadstart(IWineXMLHttpReq { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return set_event_handler(&This->event_target, EVENTID_LOADSTART, &v); } static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onloadstart(IWineXMLHttpRequestPrivate *iface, VARIANT *p) { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + return get_event_handler(&This->event_target, EVENTID_LOADSTART, p); } static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onloadend(IWineXMLHttpRequestPrivate *iface, VARIANT v)

1 0

Gabriel Ivăncescu : mshtml: Implement onloadend for XMLHttpRequest.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 8f91723a9070c0dc096c78717f40d7f382904b7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f91723a9070c0dc096c7871… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 6 15:24:13 2022 +0300 mshtml: Implement onloadend for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/xhr.js | 12 ++++++++++-- dlls/mshtml/xmlhttprequest.c | 9 +++++---- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a718ad45057..0f6525af86a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -157,6 +157,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"load", EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONLOAD, EVENT_BIND_TO_TARGET}, + {L"loadend", EVENT_TYPE_PROGRESS, DISPID_EVPROP_LOADEND, + EVENT_BIND_TO_TARGET}, {L"loadstart", EVENT_TYPE_PROGRESS, DISPID_EVPROP_LOADSTART, EVENT_BIND_TO_TARGET}, {L"message", EVENT_TYPE_MESSAGE, DISPID_EVMETH_ONMESSAGE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 6af81197b20..615387cc252 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -41,6 +41,7 @@ typedef enum { EVENTID_KEYPRESS, EVENTID_KEYUP, EVENTID_LOAD, + EVENTID_LOADEND, EVENTID_LOADSTART, EVENTID_MESSAGE, EVENTID_MOUSEDOWN, diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index d7068978f2c..0f11b786555 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -25,7 +25,7 @@ function test_xhr() { return; ok(xhr.responseText === "Testing...", "unexpected responseText " + xhr.responseText); - if(complete_cnt++) + if(complete_cnt++ && !("onloadend" in xhr)) next_test(); } xhr.ontimeout = function() { ok(false, "ontimeout called"); } @@ -33,7 +33,7 @@ function test_xhr() { ok(xhr.statusText === "OK", "statusText = " + xhr.statusText); if("onloadstart" in xhr) ok(loadstart, "onloadstart not fired"); - if(complete_cnt++) + if(complete_cnt++ && !("onloadend" in xhr)) next_test(); }; ok(xhr.onload === onload_func, "xhr.onload != onload_func"); @@ -45,6 +45,14 @@ function test_xhr() { ok(props[i] in e, props[i] + " not available in loadstart"); loadstart = true; }; + xhr.onloadend = function(e) { + ok(complete_cnt == 2, "onloadend not fired after onload and onreadystatechange"); + ok(loadstart, "onloadstart not fired before onloadend"); + var props = [ "initProgressEvent", "lengthComputable", "loaded", "total" ]; + for(var i = 0; i < props.length; i++) + ok(props[i] in e, props[i] + " not available in loadstart"); + next_test(); + }; } xhr.open("POST", "echo.php", true); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index b783d04059f..d12a98d5615 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -98,6 +98,7 @@ static const eventid_t events[] = { EVENTID_READYSTATECHANGE, EVENTID_LOAD, EVENTID_LOADSTART, + EVENTID_LOADEND, EVENTID_PROGRESS, EVENTID_ABORT, EVENTID_ERROR, @@ -1039,18 +1040,18 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onloadend(IWineXMLHttpReque { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return set_event_handler(&This->event_target, EVENTID_LOADEND, &v); } static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onloadend(IWineXMLHttpRequestPrivate *iface, VARIANT *p) { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + return get_event_handler(&This->event_target, EVENTID_LOADEND, p); } static const IWineXMLHttpRequestPrivateVtbl WineXMLHttpRequestPrivateVtbl = {

1 0

Gabriel Ivăncescu : mshtml: Implement withCredentials for XMLHttpRequest.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: dd4a92bc259c5bddcf5265d608231646215496fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd4a92bc259c5bddcf5265d6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 6 15:24:14 2022 +0300 mshtml: Implement withCredentials for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xhr.js | 6 ++++++ dlls/mshtml/xmlhttprequest.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 0f11b786555..c450384e931 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -57,6 +57,12 @@ function test_xhr() { xhr.open("POST", "echo.php", true); xhr.setRequestHeader("X-Test", "True"); + if("withCredentials" in xhr) { + ok(xhr.withCredentials === false, "default withCredentials = " + xhr.withCredentials); + xhr.withCredentials = true; + ok(xhr.withCredentials === true, "withCredentials = " + xhr.withCredentials); + xhr.withCredentials = false; + } xhr.send("Testing..."); } diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index d12a98d5615..8fa91e9960b 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -941,18 +941,24 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_put_withCredentials(IWineXMLHtt { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%x)\n", This, v); + TRACE("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + return map_nsresult(nsIXMLHttpRequest_SetWithCredentials(This->nsxhr, !!v)); } static HRESULT WINAPI HTMLXMLHttpRequest_private_get_withCredentials(IWineXMLHttpRequestPrivate *iface, VARIANT_BOOL *p) { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + nsresult nsres; + cpp_bool b; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsres = nsIXMLHttpRequest_GetWithCredentials(This->nsxhr, &b); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + *p = b ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLXMLHttpRequest_private_overrideMimeType(IWineXMLHttpRequestPrivate *iface, BSTR mimeType)

1 0

Nikolay Sivov : kernelbase: Implement VirtualAlloc2FromApp().
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 03fde5c002c7cb4a7a8aa26a5d64bf8516352542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03fde5c002c7cb4a7a8aa26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 13:36:37 2022 +0300 kernelbase: Implement VirtualAlloc2FromApp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/memory.c | 32 +++++++++++++++++++-- dlls/kernelbase/tests/process.c | 63 +++++++++++++++++++++++++++++++++-------- include/winbase.h | 1 + 4 files changed, 83 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7109628a678..d4b5b5d3eb8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1707,6 +1707,7 @@ # @ stub VerifyPackageRelativeApplicationId # @ stub VerifyScripts @ stdcall VirtualAlloc2(long ptr long long long ptr long) +@ stdcall VirtualAlloc2FromApp(long ptr long long long ptr long) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stdcall VirtualAllocExNuma(long ptr long long long long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index cac456d01be..736d3642995 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -358,6 +358,35 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2( HANDLE process, void *addr, SIZE_ return ret; } +static BOOL is_exec_prot( DWORD protect ) +{ + return protect == PAGE_EXECUTE || protect == PAGE_EXECUTE_READ || protect == PAGE_EXECUTE_READWRITE + || protect == PAGE_EXECUTE_WRITECOPY; +} + +/*********************************************************************** + * VirtualAlloc2FromApp (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2FromApp( HANDLE process, void *addr, SIZE_T size, + DWORD type, DWORD protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count ) +{ + LPVOID ret = addr; + + TRACE_(virtual)( "addr %p, size %p, type %#lx, protect %#lx, params %p, count %lu.\n", addr, (void *)size, type, protect, + parameters, count ); + + if (is_exec_prot( protect )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + if (!process) process = GetCurrentProcess(); + if (!set_ntstatus( NtAllocateVirtualMemoryEx( process, &ret, &size, type, protect, parameters, count ))) + return NULL; + return ret; +} + /*********************************************************************** * VirtualAllocFromApp (kernelbase.@) @@ -369,8 +398,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocFromApp( void *addr, SIZE_T size, TRACE_(virtual)( "addr %p, size %p, type %#lx, protect %#lx.\n", addr, (void *)size, type, protect ); - if (protect == PAGE_EXECUTE || protect == PAGE_EXECUTE_READ || protect == PAGE_EXECUTE_READWRITE - || protect == PAGE_EXECUTE_WRITECOPY) + if (is_exec_prot( protect )) { SetLastError( ERROR_INVALID_PARAMETER ); return NULL; diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index 90c4c4c26e1..bb1de49049d 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -34,6 +34,7 @@ static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE); static LPVOID (WINAPI *pMapViewOfFile3)(HANDLE, HANDLE, PVOID, ULONG64 offset, SIZE_T size, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static LPVOID (WINAPI *pVirtualAlloc2)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); +static LPVOID (WINAPI *pVirtualAlloc2FromApp)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); static void test_CompareObjectHandles(void) @@ -197,6 +198,14 @@ static void test_VirtualAlloc2(void) static void test_VirtualAllocFromApp(void) { + static const DWORD prot[] = + { + PAGE_EXECUTE, + PAGE_EXECUTE_READ, + PAGE_EXECUTE_READWRITE, + PAGE_EXECUTE_WRITECOPY, + }; + unsigned int i; BOOL ret; void *p; @@ -212,18 +221,46 @@ static void test_VirtualAllocFromApp(void) ret = VirtualFree(p, 0, MEM_RELEASE); ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READ); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READWRITE); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); + for (i = 0; i < ARRAY_SIZE(prot); ++i) + { + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, prot[i]); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + p, GetLastError()); + } +} + +static void test_VirtualAlloc2FromApp(void) +{ + static const DWORD prot[] = + { + PAGE_EXECUTE, + PAGE_EXECUTE_READ, + PAGE_EXECUTE_READWRITE, + PAGE_EXECUTE_WRITECOPY, + }; + unsigned int i; + void *addr; + BOOL ret; + + if (!pVirtualAlloc2FromApp) + { + win_skip("VirtualAlloc2FromApp is not available.\n"); + return; + } + + addr = pVirtualAlloc2FromApp(NULL, NULL, 0x1000, MEM_COMMIT, PAGE_READWRITE, NULL, 0); + ok(!!addr, "Failed to allocate, error %lu.\n", GetLastError()); + ret = VirtualFree(addr, 0, MEM_RELEASE); + ok(ret, "Unexpected return value %d, error %lu.\n", ret, GetLastError()); + + for (i = 0; i < ARRAY_SIZE(prot); ++i) + { + SetLastError(0xdeadbeef); + addr = pVirtualAlloc2FromApp(NULL, NULL, 0x1000, MEM_COMMIT, prot[i], NULL, 0); + ok(!addr && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + addr, GetLastError()); + } } static void init_funcs(void) @@ -234,6 +271,7 @@ static void init_funcs(void) X(CompareObjectHandles); X(MapViewOfFile3); X(VirtualAlloc2); + X(VirtualAlloc2FromApp); X(VirtualAllocFromApp); #undef X } @@ -246,4 +284,5 @@ START_TEST(process) test_MapViewOfFile3(); test_VirtualAlloc2(); test_VirtualAllocFromApp(); + test_VirtualAlloc2FromApp(); } diff --git a/include/winbase.h b/include/winbase.h index a400816c4d3..bf191153ddc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2756,6 +2756,7 @@ WINBASEAPI BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDL #define VerifyVersionInfo WINELIB_NAME_AW(VerifyVersionInfo) WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAlloc2(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); +WINBASEAPI LPVOID WINAPI VirtualAlloc2FromApp(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocFromApp(LPVOID,SIZE_T,DWORD,DWORD);

1 0

Nikolay Sivov : kernelbase/tests: Add some more tests for region splitting.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: f98d4f3ef1a6e3d60dc09256d38cfdb513063231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98d4f3ef1a6e3d60dc09256… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 14:36:53 2022 +0300 kernelbase/tests: Add some more tests for region splitting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/tests/process.c | 61 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index bb1de49049d..62debfb9861 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -128,10 +128,23 @@ static void test_MapViewOfFile3(void) ok(ret, "Failed to delete a test file.\n"); } +#define check_region_size(p, s) check_region_size_(p, s, __LINE__) +static void check_region_size_(void *p, SIZE_T s, unsigned int line) +{ + MEMORY_BASIC_INFORMATION info; + SIZE_T ret; + + memset(&info, 0, sizeof(info)); + ret = VirtualQuery(p, &info, sizeof(info)); + ok_(__FILE__,line)(ret == sizeof(info), "Unexpected return value.\n"); + ok_(__FILE__,line)(info.RegionSize == s, "Unexpected size %Iu, expected %Iu.\n", info.RegionSize, s); +} + static void test_VirtualAlloc2(void) { void *placeholder1, *placeholder2, *view1, *view2, *addr; MEMORY_BASIC_INFORMATION info; + char *p, *p1, *p2; HANDLE section; SIZE_T size; BOOL ret; @@ -194,6 +207,54 @@ static void test_VirtualAlloc2(void) VirtualFree(placeholder1, 0, MEM_RELEASE); VirtualFree(placeholder2, 0, MEM_RELEASE); + + /* Split in three regions. */ + p = pVirtualAlloc2(NULL, NULL, 2 * size, MEM_RESERVE_PLACEHOLDER | MEM_RESERVE, PAGE_NOACCESS, NULL, 0); + ok(!!p, "Failed to create a placeholder range.\n"); + + p1 = p + size / 2; + p2 = p1 + size / 4; + ret = VirtualFree(p1, size / 4, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p, size / 2); + check_region_size(p1, size / 4); + check_region_size(p2, 2 * size - size / 2 - size / 4); + ret = VirtualFree(p, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + ret = VirtualFree(p1, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + ret = VirtualFree(p2, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + + /* Split in two regions, specifying lower part. */ + p = pVirtualAlloc2(NULL, NULL, 2 * size, MEM_RESERVE_PLACEHOLDER | MEM_RESERVE, PAGE_NOACCESS, NULL, 0); + ok(!!p, "Failed to create a placeholder range.\n"); + + p1 = p; + p2 = p + size / 2; + ret = VirtualFree(p1, size / 2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p1, size / 2); + check_region_size(p2, 2 * size - size / 2); + ret = VirtualFree(p1, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + ret = VirtualFree(p2, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + + /* Split in two regions, specifying second half. */ + p = pVirtualAlloc2(NULL, NULL, 2 * size, MEM_RESERVE_PLACEHOLDER | MEM_RESERVE, PAGE_NOACCESS, NULL, 0); + ok(!!p, "Failed to create a placeholder range.\n"); + + p1 = p; + p2 = p + size; + ret = VirtualFree(p2, size, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p1, size); + check_region_size(p2, size); + ret = VirtualFree(p1, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + ret = VirtualFree(p2, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); } static void test_VirtualAllocFromApp(void)

1 0

Nikolay Sivov : ntdll/tests: Add some tests for VM regions splitting.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: afdfb382d8f196473bcafc5a9f0268bdc0b7284a URL: https://source.winehq.org/git/wine.git/?a=commit;h=afdfb382d8f196473bcafc5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 15:05:21 2022 +0300 ntdll/tests: Add some tests for VM regions splitting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 102 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index f8bb3e97c86..24c87c46d26 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -272,12 +272,27 @@ static void test_NtAllocateVirtualMemory(void) ok(!!status, "Unexpected status %08lx.\n", status); } -static void test_NtAllocateVirtualMemoryEx(void) +#define check_region_size(p, s) check_region_size_(p, s, __LINE__) +static void check_region_size_(void *p, SIZE_T s, unsigned int line) { - void *addr1, *addr2; + MEMORY_BASIC_INFORMATION mbi; NTSTATUS status; SIZE_T size; + memset(&mbi, 0, sizeof(mbi)); + status = NtQueryVirtualMemory( NtCurrentProcess(), p, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok_(__FILE__,line)( !status, "Unexpected return value %08lx\n", status ); + ok_(__FILE__,line)( size == sizeof(mbi), "Unexpected return value.\n"); + ok_(__FILE__,line)( mbi.RegionSize == s, "Unexpected size %Iu, expected %Iu.\n", mbi.RegionSize, s); +} + +static void test_NtAllocateVirtualMemoryEx(void) +{ + SIZE_T size, size2; + char *p, *p1, *p2; + NTSTATUS status; + void *addr1; + if (!pNtAllocateVirtualMemoryEx) { win_skip("NtAllocateVirtualMemoryEx() is missing\n"); @@ -291,7 +306,7 @@ static void test_NtAllocateVirtualMemoryEx(void) ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); size = 0; - status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); /* specifying a count of >0 with NULL parameters should fail */ @@ -322,6 +337,87 @@ static void test_NtAllocateVirtualMemoryEx(void) status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); } + + /* Placeholder region splitting. */ + + /* Split in three regions. */ + addr1 = NULL; + size = 0x10000; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, + PAGE_NOACCESS, NULL, 0); + todo_wine + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + if (status == STATUS_SUCCESS) + { + p = addr1; + p1 = p + size / 2; + p2 = p1 + size / 4; + size2 = size / 4; + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + check_region_size(p, size / 2); + check_region_size(p1, size / 4); + check_region_size(p2, size - size / 2 - size / 4); + + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + } + + /* Split in two regions, specifying lower part. */ + addr1 = NULL; + size = 0x10000; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, + PAGE_NOACCESS, NULL, 0); + todo_wine + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + if (status == STATUS_SUCCESS) + { + p1 = addr1; + p2 = p1 + size / 4; + size2 = size / 4; + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + ok(p1 == addr1, "Unexpected address.\n"); + + check_region_size(p1, size / 4); + check_region_size(p2, size - size / 4); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + } + + /* Split in two regions, specifying second half. */ + addr1 = NULL; + size = 0x10000; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, + PAGE_NOACCESS, NULL, 0); + todo_wine + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + if (status == STATUS_SUCCESS) + { + p1 = addr1; + p2 = p1 + size / 2; + + size2 = size / 2; + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + ok(p2 == p1 + size / 2, "Unexpected address.\n"); + check_region_size(p1, size / 2); + check_region_size(p2, size / 2); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + } } struct test_stack_size_thread_args

1 0

Nikolay Sivov : d2d1: Use d3d11 constants for constant buffer description.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: cdb80abc60b621d9c10d21d14f777bcf72c1f1a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb80abc60b621d9c10d21d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 4 15:52:37 2022 +0300 d2d1: Use d3d11 constants for constant buffer description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 12aa2acc331..8f71a85a3f6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -4011,8 +4011,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, buffer_desc.ByteWidth = sizeof(struct d2d_vs_cb); buffer_desc.Usage = D3D11_USAGE_DYNAMIC; - buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; - buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; buffer_desc.MiscFlags = 0; if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, NULL, @@ -4031,8 +4031,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, buffer_desc.ByteWidth = sizeof(struct d2d_ps_cb); buffer_desc.Usage = D3D11_USAGE_DYNAMIC; - buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; - buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; buffer_desc.MiscFlags = 0; if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, NULL,

1 0

Torge Matthies : cryptnet: Resolve object id to algorithm id when verifying OCSP response.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 16e6067dbfbf64016fc95a6723782e3596800fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e6067dbfbf64016fc95a67… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jun 6 02:53:07 2022 +0200 cryptnet: Resolve object id to algorithm id when verifying OCSP response. Instead of only allowing the SHA256RSA algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53102 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e8c17407a9b..ac282f5aa82 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1918,6 +1918,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ HCRYPTPROV prov = 0; HCRYPTHASH hash = 0; HCRYPTKEY key = 0; + DWORD algid; if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); @@ -1925,7 +1926,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done; alg = &info->SignatureInfo.SignatureAlgorithm; - if (!alg->pszObjId || strcmp(alg->pszObjId, szOID_RSA_SHA256RSA)) + if (!alg->pszObjId || !(algid = CertOIDToAlgId(alg->pszObjId))) { FIXME("unhandled signature algorithm %s\n", debugstr_a(alg->pszObjId)); error = CRYPT_E_NO_REVOCATION_CHECK; @@ -1933,7 +1934,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ } if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) goto done; - if (!CryptCreateHash(prov, CALG_SHA_256, 0, 0, &hash)) goto done; + if (!CryptCreateHash(prov, algid, 0, 0, &hash)) goto done; if (!CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0)) goto done; sig = &info->SignatureInfo.Signature;

1 0

Alexandre Julliard : make_unicode: Add data for high Unicode planes in case mapping tables.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: b956620d816ab607e39c042896db3b16b3563795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b956620d816ab607e39c0428… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 6 13:38:37 2022 +0200 make_unicode: Add data for high Unicode planes in case mapping tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/locale.nls | Bin 730506 -> 739542 bytes nls/sortdefault.nls | Bin 3357452 -> 3378116 bytes tools/make_unicode | 127 ++++++++++++++++++++++++++++++++++----------------- tools/winedump/nls.c | 32 +++++++++++++ 4 files changed, 118 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b956620d816ab607e39c…

1 0