ninput: Implement CreateInteractionContext().

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-06-21 16:19:42 +02:00 committed by Alexandre Julliard
parent 6acc2309d5
commit 99d68bc0de
7 changed files with 100 additions and 5 deletions

1
configure vendored
View File

@ -19023,6 +19023,7 @@ wine_fn_config_makefile dlls/netprofm enable_netprofm
wine_fn_config_makefile dlls/netprofm/tests enable_tests wine_fn_config_makefile dlls/netprofm/tests enable_tests
wine_fn_config_makefile dlls/newdev enable_newdev wine_fn_config_makefile dlls/newdev enable_newdev
wine_fn_config_makefile dlls/ninput enable_ninput wine_fn_config_makefile dlls/ninput enable_ninput
wine_fn_config_makefile dlls/ninput/tests enable_tests
wine_fn_config_makefile dlls/normaliz enable_normaliz wine_fn_config_makefile dlls/normaliz enable_normaliz
wine_fn_config_makefile dlls/npmshtml enable_npmshtml wine_fn_config_makefile dlls/npmshtml enable_npmshtml
wine_fn_config_makefile dlls/npptools enable_npptools wine_fn_config_makefile dlls/npptools enable_npptools

View File

@ -3522,6 +3522,7 @@ WINE_CONFIG_MAKEFILE(dlls/netprofm)
WINE_CONFIG_MAKEFILE(dlls/netprofm/tests) WINE_CONFIG_MAKEFILE(dlls/netprofm/tests)
WINE_CONFIG_MAKEFILE(dlls/newdev) WINE_CONFIG_MAKEFILE(dlls/newdev)
WINE_CONFIG_MAKEFILE(dlls/ninput) WINE_CONFIG_MAKEFILE(dlls/ninput)
WINE_CONFIG_MAKEFILE(dlls/ninput/tests)
WINE_CONFIG_MAKEFILE(dlls/normaliz) WINE_CONFIG_MAKEFILE(dlls/normaliz)
WINE_CONFIG_MAKEFILE(dlls/npmshtml) WINE_CONFIG_MAKEFILE(dlls/npmshtml)
WINE_CONFIG_MAKEFILE(dlls/npptools) WINE_CONFIG_MAKEFILE(dlls/npptools)

View File

@ -1,4 +1,5 @@
MODULE = ninput.dll MODULE = ninput.dll
IMPORTLIB = ninput
C_SRCS = \ C_SRCS = \
main.c main.c

View File

@ -22,19 +22,66 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/heap.h"
#include "interactioncontext.h"
WINE_DEFAULT_DEBUG_CHANNEL(ninput); WINE_DEFAULT_DEBUG_CHANNEL(ninput);
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) struct interaction_context
{ {
TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); BOOL filter_pointers;
};
static struct interaction_context *context_from_handle(HINTERACTIONCONTEXT handle)
{
return (struct interaction_context *)handle;
}
HRESULT WINAPI CreateInteractionContext(HINTERACTIONCONTEXT *handle)
{
struct interaction_context *context;
TRACE("handle %p.\n", handle);
if (!handle)
return E_POINTER;
if (!(context = heap_alloc(sizeof(*context))))
return E_OUTOFMEMORY;
context->filter_pointers = TRUE;
TRACE("Created context %p.\n", context);
*handle = (HINTERACTIONCONTEXT)context;
return S_OK;
}
HRESULT WINAPI DestroyInteractionContext(HINTERACTIONCONTEXT handle)
{
struct interaction_context *context = context_from_handle(handle);
TRACE("context %p.\n", context);
if (!context)
return E_HANDLE;
heap_free(context);
return S_OK;
}
BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{
TRACE("(%p, %d, %p)\n", inst, reason, reserved);
switch (reason) switch (reason)
{ {
case DLL_WINE_PREATTACH: case DLL_WINE_PREATTACH:
return FALSE; /* prefer native version */ return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hInstDLL); DisableThreadLibraryCalls(inst);
break; break;
} }
return TRUE; return TRUE;

View File

@ -1,8 +1,8 @@
@ stub DefaultInputHandler @ stub DefaultInputHandler
@ stub AddPointerInteractionContext @ stub AddPointerInteractionContext
@ stub BufferPointerPacketsInteractionContext @ stub BufferPointerPacketsInteractionContext
@ stub CreateInteractionContext @ stdcall CreateInteractionContext(ptr)
@ stub DestroyInteractionContext @ stdcall DestroyInteractionContext(ptr)
@ stub GetCrossSlideParameterInteractionContext @ stub GetCrossSlideParameterInteractionContext
@ stub GetInertiaParameterInteractionContext @ stub GetInertiaParameterInteractionContext
@ stub GetInteractionConfigurationInteractionContext @ stub GetInteractionConfigurationInteractionContext

View File

@ -0,0 +1,4 @@
TESTDLL = ninput.dll
IMPORTS = ninput
C_SRCS = ninput.c

View File

@ -0,0 +1,41 @@
/*
* Copyright 2018 Józef Kucia
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "interactioncontext.h"
#include "wine/test.h"
static void test_context(void)
{
HINTERACTIONCONTEXT context;
HRESULT hr;
hr = CreateInteractionContext(&context);
ok(hr == S_OK, "Failed to create context, hr %#x.\n", hr);
hr = DestroyInteractionContext(context);
ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr);
hr = CreateInteractionContext(NULL);
ok(hr == E_POINTER, "Got hr %#x.\n", hr);
hr = DestroyInteractionContext(NULL);
ok(hr == E_HANDLE, "Got hr %#x.\n", hr);
}
START_TEST(ninput)
{
test_context();
}