wine-devel June 2019

73 participants
565 discussions

[PATCH] msrle32: Fix a memory leak (Valgrind).

by Sven Baars

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/msrle32/msrle32.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5bcfa86f97..5b17b25a0b 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1544,6 +1544,11 @@ static LRESULT CompressEnd(CodecInfo *pi) pi->pCurFrame = NULL; pi->nPrevFrame = -1; pi->bCompress = FALSE; + + if (pi->palette_map != NULL) { + LocalFree(pi->palette_map); + pi->palette_map = NULL; + } } return ICERR_OK; -- 2.17.1

4 years, 11 months

[PATCH 1/3] msscript: Cache state of IActiveScript in ScriptHost struct.

by Jactry Zeng

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 18 ++++-- dlls/msscript.ocx/tests/msscript.c | 91 +++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 7 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 9044c4988b..39e71b8b0c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -71,6 +71,7 @@ typedef struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + SCRIPTSTATE script_state; CLSID clsid; struct list named_items; @@ -568,6 +569,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) WARN("InitNew failed, %#x\n", hr); goto failed; } + host->script_state = SCRIPTSTATE_INITIALIZED; *ret = host; return S_OK; @@ -953,6 +955,7 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface); + HRESULT hr; TRACE("(%p)\n", This); @@ -960,7 +963,10 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return E_FAIL; clear_named_items(This->host); - return IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); + hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); + if (SUCCEEDED(hr)) + This->host->script_state = SCRIPTSTATE_INITIALIZED; + return hr; } static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) @@ -985,9 +991,13 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, if (!This->host || This->state != Initialized) return E_FAIL; - hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; + if (This->host->script_state != SCRIPTSTATE_STARTED) + { + hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + This->host->script_state = SCRIPTSTATE_STARTED; + } hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2d500d8308..8ed4af2e6f 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -95,6 +95,8 @@ DEFINE_EXPECT(Close); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); DEFINE_EXPECT(SetScriptState_INITIALIZED); +DEFINE_EXPECT(SetScriptState_STARTED); +DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(AddNamedItem); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) @@ -147,8 +149,8 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(ParseScriptText); + return S_OK; } static const IActiveScriptParseVtbl ActiveScriptParseVtbl = { @@ -304,6 +306,10 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST CHECK_EXPECT(SetScriptState_INITIALIZED); return S_OK; } + else if (ss == SCRIPTSTATE_STARTED) { + CHECK_EXPECT(SetScriptState_STARTED); + return S_OK; + } else ok(0, "unexpected call, state %u\n", ss); @@ -1381,7 +1387,7 @@ static void _check_error(IScriptControl *sc, LONG exp_num, int line) { error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); - ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.", hr); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", error_num, exp_num); IScriptError_Release(script_err); @@ -1485,6 +1491,85 @@ static void test_IScriptControl_Eval(void) SysFreeString(script_str); IScriptControl_Release(sc); + + /* custom script engine */ + if (register_script_engine()) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language= a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var1 = 1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "IScriptControl_Reset failed: 0x%08x.\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + init_registry(FALSE); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } + else + skip("Could not register TestScript engine.\n"); } START_TEST(msscript) -- 2.20.1

4 years, 11 months

[PATCH v2 2/2] msscript: Partially implement IScriptControl::AddCode().

by Jactry Zeng

Superseded patch 165832. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 43 +++++++----- dlls/msscript.ocx/tests/msscript.c | 105 +++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 18 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 7df5bd6f2f..4bc745c84b 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -977,18 +977,39 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } +static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +{ + EXCEPINFO excepinfo; + HRESULT hr; + + if (!control->host || control->state != Initialized) + return E_FAIL; + + if (control->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + } + + hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + NULL, NULL, 0, 1, flag, res, &excepinfo); + /* FIXME: more error hanlding */ + return hr; +} + static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) { ScriptControl *This = impl_from_IScriptControl(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(code)); - return E_NOTIMPL; + + return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); - EXCEPINFO excepinfo; - HRESULT hr; FIXME("(%p)->(%s %p)\n", This, debugstr_w(expression), res); @@ -996,21 +1017,7 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, return E_POINTER; V_VT(res) = VT_EMPTY; - if (!This->host || This->state != Initialized) - return E_FAIL; - - if (This->host->script_state != SCRIPTSTATE_STARTED) - { - hr = set_script_state(This->host, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; - } - - hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, - 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); - /* FIXME: more error hanlding */ - - return hr; + return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 8ed4af2e6f..0bdca22f43 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1572,6 +1572,110 @@ static void test_IScriptControl_Eval(void) skip("Could not register TestScript engine.\n"); } +static void test_IScriptControl_AddCode(void) +{ + BSTR code_str, language; + IScriptControl *sc; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + + hr = IScriptControl_AddCode(sc, NULL); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + + language = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 0); + + code_str = a2bstr("invalid syntax"); + hr = IScriptControl_AddCode(sc, code_str); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 1004); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (register_script_engine()) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + code_str = a2bstr("0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + /* Call Eval() after AddCode() for checking if it will call SetScriptState() again. */ + SET_EXPECT(ParseScriptText); + code_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, code_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + init_registry(FALSE); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } + else + skip("Could not register TestScript engine.\n"); +} + START_TEST(msscript) { IUnknown *unk; @@ -1602,6 +1706,7 @@ START_TEST(msscript) test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); + test_IScriptControl_AddCode(); CoUninitialize(); } -- 2.20.1

4 years, 11 months

[PATCH] dinput/linuxinput: Remap wheel axes to X, Y, and Z.

by Tim Schumacher

Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- dlls/dinput/joystick_linuxinput.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 8d80b34812..fdfbc7f372 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -502,14 +502,18 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig /* Count number of available axes - supported Axis & POVs */ for (i = 0; i < ABS_MAX; i++) { - if (i < WINE_JOYSTICK_MAX_AXES && + if (idx < WINE_JOYSTICK_MAX_AXES && + i < ABS_HAT0X && test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx; newDevice->generic.props[idx].lDevMin = newDevice->joydev->axes[i].minimum; newDevice->generic.props[idx].lDevMax = newDevice->joydev->axes[i].maximum; - default_axis_map[idx] = i; + if (i >= 8 && i <= 10) /* If it's a wheel axis... */ + default_axis_map[idx] = i - 8; /* ... remap to X/Y/Z */ + else + default_axis_map[idx] = i; idx++; } else -- 2.21.0

4 years, 11 months

[PATCH v6 1/7] ntdll/tests: Move NtAllocateVirtualMemory tests that were in kernel32

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 47 ------------------- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/virtual.c | 88 +++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 48 deletions(-) create mode 100644 dlls/ntdll/tests/virtual.c diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 474955630fd..0b718606d0e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -52,8 +52,6 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); -static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); -static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); /* ############################### */ @@ -230,8 +228,6 @@ static void test_VirtualAlloc(void) void *addr1, *addr2; DWORD old_prot; MEMORY_BASIC_INFORMATION info; - NTSTATUS status; - SIZE_T size; SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS); @@ -440,53 +436,12 @@ static void test_VirtualAlloc(void) addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr2 == addr1, "VirtualAlloc returned %p, expected %p\n", addr2, addr1); - /* allocation conflicts because of 64k align */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - - /* it should conflict, even when zero_bits is explicitly set */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 12, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - - /* 21 zero bits is valid */ - size = 0x1000; - addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, - "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - - /* 22 zero bits is invalid */ - size = 0x1000; - addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); ok(!addr2, "VirtualAlloc unexpectedly succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | - MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status); - ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } @@ -4436,8 +4391,6 @@ START_TEST(virtual) pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); - pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" ); - pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" ); GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 5c70f3f01a0..ed15c51339f 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -22,4 +22,5 @@ C_SRCS = \ rtlstr.c \ string.c \ threadpool.c \ - time.c + time.c \ + virtual.c diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c new file mode 100644 index 00000000000..63300ac9460 --- /dev/null +++ b/dlls/ntdll/tests/virtual.c @@ -0,0 +1,88 @@ +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "winerror.h" +#include "winuser.h" +#include "excpt.h" +#include "wine/test.h" + +static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); +static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); + +static void test_AllocateVirtualMemory(void) +{ + void *addr1, *addr2; + NTSTATUS status; + SIZE_T size; + + /* simple allocation should success */ + size = 0x1000; + addr1 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr1, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemory returned %08x\n", status); + + /* allocation conflicts because of 64k align */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); + + /* it should conflict, even when zero_bits is explicitly set */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 12, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* 21 zero bits is valid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* 22 zero bits is invalid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | + MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status); + + ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); +} + +START_TEST(virtual) +{ + SYSTEM_INFO si; + HMODULE hntdll; + + hntdll = GetModuleHandleA("ntdll.dll"); + + pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" ); + pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" ); + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + test_AllocateVirtualMemory(); +} -- 2.20.1

4 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2019