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

Gabriel Ivăncescu : mshtml: Implement withCredentials for XMLHttpRequest.
by Alexandre Julliard June 6, 2022

June 6, 2022

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

Gabriel Ivăncescu : mshtml: Implement onloadend for XMLHttpRequest.
by Alexandre Julliard June 6, 2022

June 6, 2022

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 onprogress for XMLHttpRequest.
by Alexandre Julliard June 6, 2022

June 6, 2022

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 June 6, 2022

June 6, 2022

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 onabort for XMLHttpRequest.
by Alexandre Julliard June 6, 2022

June 6, 2022

Module: wine Branch: master Commit: 6e2a6cdcad871b4339d807584f01110bdbf6956a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e2a6cdcad871b4339d80758… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 6 15:24:10 2022 +0300 mshtml: Implement onabort 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/script.c | 2 ++ dlls/mshtml/tests/xhr.js | 20 ++++++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 9 +++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 401e130d7fd..e3688242715 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3079,6 +3079,8 @@ static void report_data(ProtocolHandler *This) hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate, &IID_IHttpNegotiate, (void**)&http_negotiate); IServiceProvider_Release(service_provider); + if(This->delay && hres == E_FAIL) /* aborted too quickly */ + return; ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08lx\n", hres); hres = IUri_GetDisplayUri(This->uri, &url); diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 6228f732c6d..dd86331872c 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -41,6 +41,25 @@ function test_xhr() { xhr.send("Testing..."); } +function test_abort() { + var xhr = new XMLHttpRequest(); + if(!("onabort" in xhr)) { next_test(); return; } + + xhr.onreadystatechange = function() { + if(xhr.readyState != 4) + return; + todo_wine_if(v < 10). + ok(v >= 10, "onreadystatechange called"); + } + xhr.onload = function() { ok(false, "onload called"); } + xhr.onabort = function(e) { next_test(); } + + xhr.open("POST", "echo.php?delay", true); + xhr.setRequestHeader("X-Test", "True"); + xhr.send("Abort Test"); + xhr.abort(); +} + function test_timeout() { var xhr = new XMLHttpRequest(); var v = document.documentMode; @@ -74,5 +93,6 @@ function test_timeout() { var tests = [ test_xhr, + test_abort, test_timeout ]; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 12356f1ccd2..54e84cf6121 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_ABORT, EVENTID_ERROR, EVENTID_TIMEOUT, }; @@ -982,18 +983,18 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onabort(IWineXMLHttpRequest { 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_ABORT, &v); } static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onabort(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_ABORT, p); } static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onprogress(IWineXMLHttpRequestPrivate *iface, VARIANT v)

1 0

Jacek Caban : wineandroid: Directly use ntdll for registry access.
by Alexandre Julliard June 6, 2022

June 6, 2022

Module: wine Branch: master Commit: a121c49af20e34f5cf889d8577112c209cf0ad7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a121c49af20e34f5cf889d85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 22:09:23 2022 +0200 wineandroid: Directly use ntdll for registry access. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/init.c | 69 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index e576b1d944b..59df461697a 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineandroid.drv -IMPORTS = user32 gdi32 advapi32 ntoskrnl win32u +IMPORTS = user32 gdi32 ntoskrnl win32u EXTRADLLFLAGS = -mcygwin diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 3daa41f28d1..dec53657ccb 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -27,6 +27,8 @@ #include <dlfcn.h> #include <link.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -84,19 +86,78 @@ void init_monitors( int width, int height ) } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ +static HKEY reg_create_key( const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, 0, NULL ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' }; + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (len > ARRAY_SIZE(registry_rootW) && + !memcmp( name, registry_rootW, sizeof(registry_rootW) )) + i += ARRAY_SIZE(registry_rootW); + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, 0, NULL ); + + if (attr.RootDirectory) NtClose( attr.RootDirectory ); + if (status) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } + return ret; +} + + /****************************************************************************** * set_screen_dpi */ void set_screen_dpi( DWORD dpi ) { - static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s',0}; + static const WCHAR dpi_key_name[] = + { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s', + '\\','C','u','r','r','e','n','t', + '\\','S','o','f','t','w','a','r','e', + '\\','F','o','n','t','s' + }; HKEY hkey; - if (!RegCreateKeyW( HKEY_CURRENT_CONFIG, dpi_key_name, &hkey )) + if ((hkey = reg_create_key( dpi_key_name, sizeof(dpi_key_name )))) { - RegSetValueExW( hkey, dpi_value_name, 0, REG_DWORD, (void *)&dpi, sizeof(DWORD) ); - RegCloseKey( hkey ); + UNICODE_STRING name; + RtlInitUnicodeString( &name, dpi_value_name ); + NtSetValueKey( hkey, &name, 0, REG_DWORD, &dpi, sizeof(dpi) ); + NtClose( hkey ); } }

1 0

Alexandre Julliard : ntdll/tests: Add tests for high Unicode planes.
by Alexandre Julliard June 6, 2022

June 6, 2022

Module: wine Branch: master Commit: 8d0b3b08986bdee53061e168e36c186fdf9ee11f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d0b3b08986bdee53061e168… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 6 14:44:20 2022 +0200 ntdll/tests: Add tests for high Unicode planes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 23 ++++++++++++++++++++++- dlls/ntdll/tests/rtlstr.c | 21 ++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index d7380ebb1be..2c158be17b4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -342,7 +342,7 @@ static void test_RtlQueryRegistryValues(void) static void test_NtOpenKey(void) { - HANDLE key; + HANDLE key, subkey; NTSTATUS status; OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_READ; @@ -456,6 +456,27 @@ static void test_NtOpenKey(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_WRITE|KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status); + + /* keys are case insensitive even without OBJ_CASE_INSENSITIVE */ + InitializeObjectAttributes( &attr, &str, 0, key, 0 ); + pRtlInitUnicodeString( &str, L"\xf6\xf3\x14d\x371\xd801\xdc00" ); + status = pNtCreateKey( &subkey, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0); + ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status); + pNtClose( subkey ); + pRtlInitUnicodeString( &str, L"\xd6\xd3\x14c\x370\xd801\xdc28" ); /* surrogates not supported */ + status = pNtOpenKeyEx(&subkey, KEY_ALL_ACCESS, &attr, 0); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKeyEx failed: 0x%08lx\n", status); + pRtlInitUnicodeString( &str, L"\xd6\xd3\x14c\x370\xd801\xdc00" ); + status = pNtOpenKeyEx(&subkey, KEY_ALL_ACCESS, &attr, 0); + ok(status == STATUS_SUCCESS, "NtOpenKeyEx failed: 0x%08lx\n", status); + + pNtDeleteKey( subkey ); + pNtClose( subkey ); + pNtClose( key ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 1bce812ff13..49f6ef65785 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -608,7 +608,7 @@ static void test_RtlUpcaseUnicodeChar(void) static void test_RtlUpcaseUnicodeString(void) { - int i; + int i, j; WCHAR ch; WCHAR upper_ch; WCHAR ascii_buf[257]; @@ -654,6 +654,25 @@ static void test_RtlUpcaseUnicodeString(void) result_str.Buffer[i], result_str.Buffer[i], upper_str.Buffer[i], upper_str.Buffer[i]); } + + /* test surrogates */ + for (i = 0x100; i < 0x1100; i++) + { + WCHAR src[512], dst[512]; + for (j = 0; j < 256; j++) + { + unsigned int ch = ((i << 8) + j) - 0x10000; + src[2 * j] = 0xd800 | (ch >> 10); + src[2 * j + 1] = 0xdc00 | (ch & 0x3ff); + } + upper_str.Length = upper_str.MaximumLength = 512 * sizeof(WCHAR); + upper_str.Buffer = src; + result_str.Length = result_str.MaximumLength = 512 * sizeof(WCHAR); + result_str.Buffer = dst; + pRtlUpcaseUnicodeString(&result_str, &upper_str, 0); + ok( !memcmp(src, dst, sizeof(dst)), + "string compare mismatch in %04x-%04x\n", i << 8, (i << 8) + 255 ); + } }

1 0

Alexandre Julliard : kernel32/tests: Add tests for high Unicode planes.
by Alexandre Julliard June 6, 2022

June 6, 2022

Module: wine Branch: master Commit: d2c225524fb7ba19e69f2fa19f6c83f45aac0b94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c225524fb7ba19e69f2fa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 6 14:40:34 2022 +0200 kernel32/tests: Add tests for high Unicode planes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 639 +++++++++++++++++++++++-------------------- 1 file changed, 346 insertions(+), 293 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2c225524fb7ba19e69f…

1 0

Alexandre Julliard : kernelbase: Add support for high Unicode planes in LCMapStringEx().
by Alexandre Julliard June 6, 2022

June 6, 2022

Module: wine Branch: master Commit: 91cd07310607b12a0b2dd7b47cf59ac566b3fc7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=91cd07310607b12a0b2dd7b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 6 14:38:47 2022 +0200 kernelbase: Add support for high Unicode planes in LCMapStringEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 103 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 84 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index ac4dc188345..4b00ed90408 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1992,6 +1992,36 @@ static inline WCHAR casemap( const USHORT *table, WCHAR ch ) } +static inline unsigned int casemap_high( const USHORT *table, WCHAR high, WCHAR low ) +{ + unsigned int off = table[table[256 + (high - 0xd800)] + ((low >> 5) & 0x1f)] + 2 * (low & 0x1f); + return 0x10000 + ((high - 0xd800) << 10) + (low - 0xdc00) + MAKELONG( table[off], table[off+1] ); +} + + +static inline BOOL table_has_high_planes( const USHORT *table ) +{ + return table[0] >= 0x500; +} + + +static inline int put_utf16( WCHAR *dst, int pos, int dstlen, unsigned int ch ) +{ + if (ch >= 0x10000) + { + if (pos < dstlen - 1) + { + ch -= 0x10000; + dst[pos] = 0xd800 | (ch >> 10); + dst[pos + 1] = 0xdc00 | (ch & 0x3ff); + } + return 2; + } + if (pos < dstlen) dst[pos] = ch; + return 1; +} + + static inline WORD get_char_type( DWORD type, WCHAR ch ) { const BYTE *ptr = sort.ctype_idx + ((const WORD *)sort.ctype_idx)[ch >> 8]; @@ -2008,11 +2038,37 @@ static inline void map_byterev( const WCHAR *src, int len, WCHAR *dst ) static int casemap_string( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { - int pos, ret = srclen; + if (table_has_high_planes( table )) + { + unsigned int ch; + int pos = 0; - for (pos = 0; pos < dstlen && srclen; pos++, src++, srclen--) - dst[pos] = casemap( table, *src ); - return ret; + while (srclen) + { + if (srclen > 1 && IS_SURROGATE_PAIR( src[0], src[1] )) + { + ch = casemap_high( table, src[0], src[1] ); + src += 2; + srclen -= 2; + } + else + { + ch = casemap( table, *src ); + src++; + srclen--; + } + pos += put_utf16( dst, pos, dstlen, ch ); + } + return pos; + } + else + { + int pos, ret = srclen; + + for (pos = 0; pos < dstlen && srclen; pos++, src++, srclen--) + dst[pos] = casemap( table, *src ); + return ret; + } } @@ -3912,16 +3968,29 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH /* map buffer to full-width katakana */ static int map_to_fullwidth( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { - int pos; + int pos, len; - for (pos = 0; srclen; pos++, src++, srclen--) + for (pos = 0; srclen; pos++, src += len, srclen -= len) { - WCHAR wch = casemap( charmaps[CHARMAP_FULLWIDTH], *src ); + unsigned int wch = casemap( charmaps[CHARMAP_FULLWIDTH], *src ); + + len = 1; if (srclen > 1) { - switch (src[1]) + if (table_has_high_planes( charmaps[CHARMAP_FULLWIDTH] ) && IS_SURROGATE_PAIR( src[0], src[1] )) + { + len = 2; + wch = casemap_high( charmaps[CHARMAP_FULLWIDTH], src[0], src[1] ); + if (wch >= 0x10000) + { + put_utf16( dst, pos, dstlen, wch ); + pos++; + continue; + } + } + else if (src[1] == 0xff9e) /* dakuten (voiced sound) */ { - case 0xff9e: /* dakuten (voiced sound) */ + len = 2; if ((*src >= 0xff76 && *src <= 0xff84) || (*src >= 0xff8a && *src <= 0xff8e) || *src == 0x30fd) @@ -3937,22 +4006,18 @@ static int map_to_fullwidth( const USHORT *table, const WCHAR *src, int srclen, else if (*src == 0xff66) wch = 0x30fa; /* KATAKANA LETTER VO */ else - break; - src++; - srclen--; - break; - case 0xff9f: /* handakuten (semi-voiced sound) */ + len = 1; + } + else if (src[1] == 0xff9f) /* handakuten (semi-voiced sound) */ + { if (*src >= 0xff8a && *src <= 0xff8e) { wch += 2; - src++; - srclen--; + len = 2; } - break; - default: - break; } } + if (pos < dstlen) dst[pos] = table ? casemap( table, wch ) : wch; } return pos;

1 0

Nikolay Sivov : kernelbase: Implement VirtualAlloc2FromApp().
by Alexandre Julliard June 6, 2022

June 6, 2022

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