Skip to content

Commit 29af355

Browse files
rbernonivyl
rbernon
authored and
ivyl
committed
user32: Move touch related functions to input.c.
CW-Bug-Id: #18214
1 parent 0b1b452 commit 29af355

File tree

5 files changed

+107
-79
lines changed

5 files changed

+107
-79
lines changed

‎dlls/user32/input.c

+103
Original file line numberDiff line numberDiff line change
@@ -1270,3 +1270,106 @@ BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle )
12701270

12711271
return I_ScUnregisterDeviceNotification( handle );
12721272
}
1273+
1274+
/*****************************************************************************
1275+
* CloseTouchInputHandle (USER32.@)
1276+
*/
1277+
BOOL WINAPI CloseTouchInputHandle( HTOUCHINPUT handle )
1278+
{
1279+
FIXME( "handle %p stub!\n", handle );
1280+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1281+
return FALSE;
1282+
}
1283+
1284+
/*****************************************************************************
1285+
* GetTouchInputInfo (USER32.@)
1286+
*/
1287+
BOOL WINAPI GetTouchInputInfo( HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, int size )
1288+
{
1289+
FIXME( "handle %p, count %u, ptr %p, size %u stub!\n", handle, count, ptr, size );
1290+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1291+
return FALSE;
1292+
}
1293+
1294+
/**********************************************************************
1295+
* IsTouchWindow (USER32.@)
1296+
*/
1297+
BOOL WINAPI IsTouchWindow( HWND hwnd, ULONG *flags )
1298+
{
1299+
FIXME( "hwnd %p, flags %p stub!\n", hwnd, flags );
1300+
return FALSE;
1301+
}
1302+
1303+
/*****************************************************************************
1304+
* RegisterTouchWindow (USER32.@)
1305+
*/
1306+
BOOL WINAPI RegisterTouchWindow( HWND hwnd, ULONG flags )
1307+
{
1308+
FIXME( "hwnd %p, flags %#x stub!\n", hwnd, flags );
1309+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1310+
return FALSE;
1311+
}
1312+
1313+
/*****************************************************************************
1314+
* UnregisterTouchWindow (USER32.@)
1315+
*/
1316+
BOOL WINAPI UnregisterTouchWindow( HWND hwnd )
1317+
{
1318+
FIXME( "hwnd %p stub!\n", hwnd );
1319+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1320+
return FALSE;
1321+
}
1322+
1323+
/*****************************************************************************
1324+
* GetGestureInfo (USER32.@)
1325+
*/
1326+
BOOL WINAPI CloseGestureInfoHandle( HGESTUREINFO handle )
1327+
{
1328+
FIXME( "handle %p stub!\n", handle );
1329+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1330+
return FALSE;
1331+
}
1332+
1333+
/*****************************************************************************
1334+
* GetGestureInfo (USER32.@)
1335+
*/
1336+
BOOL WINAPI GetGestureExtraArgs( HGESTUREINFO handle, UINT count, BYTE *args )
1337+
{
1338+
FIXME( "handle %p, count %u, args %p stub!\n", handle, count, args );
1339+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1340+
return FALSE;
1341+
}
1342+
1343+
/*****************************************************************************
1344+
* GetGestureInfo (USER32.@)
1345+
*/
1346+
BOOL WINAPI GetGestureInfo( HGESTUREINFO handle, GESTUREINFO *ptr )
1347+
{
1348+
FIXME( "handle %p, ptr %p stub!\n", handle, ptr );
1349+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1350+
return FALSE;
1351+
}
1352+
1353+
/*****************************************************************************
1354+
* GetGestureConfig (USER32.@)
1355+
*/
1356+
BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count,
1357+
GESTURECONFIG *config, UINT size )
1358+
{
1359+
FIXME( "handle %p, reserved %#x, flags %#x, count %p, config %p, size %u stub!\n",
1360+
hwnd, reserved, flags, count, config, size );
1361+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1362+
return FALSE;
1363+
}
1364+
1365+
/**********************************************************************
1366+
* SetGestureConfig (USER32.@)
1367+
*/
1368+
BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT count,
1369+
GESTURECONFIG *config, UINT size )
1370+
{
1371+
FIXME( "handle %p, reserved %#x, count %u, config %p, size %u stub!\n",
1372+
hwnd, reserved, count, config, size );
1373+
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
1374+
return FALSE;
1375+
}

‎dlls/user32/misc.c

-29
Original file line numberDiff line numberDiff line change
@@ -443,35 +443,6 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle)
443443
return TRUE;
444444
}
445445

446-
/*****************************************************************************
447-
* GetGestureConfig (USER32.@)
448-
*/
449-
BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, GESTURECONFIG *config, UINT size )
450-
{
451-
FIXME("(%p %08x %08x %p %p %u): stub\n", hwnd, reserved, flags, count, config, size);
452-
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
453-
return FALSE;
454-
}
455-
456-
/**********************************************************************
457-
* SetGestureConfig [USER32.@]
458-
*/
459-
BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size )
460-
{
461-
FIXME("(%p %08x %u %p %u): stub\n", hwnd, reserved, id, config, size);
462-
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
463-
return FALSE;
464-
}
465-
466-
/**********************************************************************
467-
* IsTouchWindow [USER32.@]
468-
*/
469-
BOOL WINAPI IsTouchWindow( HWND hwnd, PULONG flags )
470-
{
471-
FIXME("(%p %p): stub\n", hwnd, flags);
472-
return FALSE;
473-
}
474-
475446
/**********************************************************************
476447
* IsWindowRedirectedForPrint [USER32.@]
477448
*/

‎dlls/user32/user32.spec

+2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
@ stdcall CloseClipboard()
7777
@ stdcall CloseDesktop(long) NtUserCloseDesktop
7878
@ stdcall CloseTouchInputHandle(long)
79+
@ stdcall CloseGestureInfoHandle(long)
7980
@ stdcall CloseWindow(long)
8081
@ stdcall CloseWindowStation(long) NtUserCloseWindowStation
8182
@ stdcall CopyAcceleratorTableA(long ptr long)
@@ -304,6 +305,7 @@
304305
@ stdcall GetFocus()
305306
@ stdcall GetForegroundWindow()
306307
@ stdcall GetGestureConfig(long long long ptr ptr long)
308+
@ stdcall GetGestureExtraArgs(long long ptr)
307309
@ stdcall GetGestureInfo(long ptr)
308310
@ stdcall GetGUIThreadInfo(long ptr)
309311
@ stdcall GetGuiResources(long long)

‎dlls/user32/win.c

-50
Original file line numberDiff line numberDiff line change
@@ -4302,56 +4302,6 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval )
43024302
return WIN_SetWindowLong( hwnd, offset, sizeof(LONG_PTR), newval, FALSE );
43034303
}
43044304

4305-
/*****************************************************************************
4306-
* RegisterTouchWindow (USER32.@)
4307-
*/
4308-
BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags)
4309-
{
4310-
FIXME("(%p %08x): stub\n", hwnd, flags);
4311-
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
4312-
return FALSE;
4313-
}
4314-
4315-
/*****************************************************************************
4316-
* UnregisterTouchWindow (USER32.@)
4317-
*/
4318-
BOOL WINAPI UnregisterTouchWindow(HWND hwnd)
4319-
{
4320-
FIXME("(%p): stub\n", hwnd);
4321-
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
4322-
return FALSE;
4323-
}
4324-
4325-
/*****************************************************************************
4326-
* CloseTouchInputHandle (USER32.@)
4327-
*/
4328-
BOOL WINAPI CloseTouchInputHandle(HTOUCHINPUT handle)
4329-
{
4330-
FIXME("(%p): stub\n", handle);
4331-
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
4332-
return FALSE;
4333-
}
4334-
4335-
/*****************************************************************************
4336-
* GetTouchInputInfo (USER32.@)
4337-
*/
4338-
BOOL WINAPI GetTouchInputInfo(HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, int size)
4339-
{
4340-
FIXME("(%p %u %p %u): stub\n", handle, count, ptr, size);
4341-
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
4342-
return FALSE;
4343-
}
4344-
4345-
/*****************************************************************************
4346-
* GetGestureInfo (USER32.@)
4347-
*/
4348-
BOOL WINAPI GetGestureInfo(HGESTUREINFO handle, PGESTUREINFO ptr)
4349-
{
4350-
FIXME("(%p %p): stub\n", handle, ptr);
4351-
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
4352-
return FALSE;
4353-
}
4354-
43554305
/*****************************************************************************
43564306
* GetWindowDisplayAffinity (USER32.@)
43574307
*/

‎include/winuser.h

+2
Original file line numberDiff line numberDiff line change
@@ -3622,6 +3622,7 @@ WINUSERAPI BOOL WINAPI ClipCursor(const RECT*);
36223622
WINUSERAPI BOOL WINAPI CloseClipboard(void);
36233623
WINUSERAPI BOOL WINAPI CloseDesktop(HDESK);
36243624
WINUSERAPI BOOL WINAPI CloseTouchInputHandle(HTOUCHINPUT);
3625+
WINUSERAPI BOOL WINAPI CloseGestureInfoHandle(HGESTUREINFO);
36253626
WINUSERAPI BOOL WINAPI CloseWindow(HWND);
36263627
WINUSERAPI BOOL WINAPI CloseWindowStation(HWINSTA);
36273628
WINUSERAPI INT WINAPI CopyAcceleratorTableA(HACCEL,LPACCEL,INT);
@@ -3847,6 +3848,7 @@ WINUSERAPI UINT WINAPI GetDpiForSystem(void);
38473848
WINUSERAPI HWND WINAPI GetFocus(void);
38483849
WINUSERAPI HWND WINAPI GetForegroundWindow(void);
38493850
WINUSERAPI BOOL WINAPI GetGestureConfig(HWND,DWORD,DWORD,UINT*,GESTURECONFIG*,UINT);
3851+
WINUSERAPI BOOL WINAPI GetGestureExtraArgs(HGESTUREINFO,UINT,BYTE*);
38503852
WINUSERAPI BOOL WINAPI GetGestureInfo(HGESTUREINFO,PGESTUREINFO);
38513853
WINUSERAPI BOOL WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*);
38523854
WINUSERAPI DWORD WINAPI GetGuiResources(HANDLE,DWORD);

0 commit comments

Comments
 (0)