Updated INF configurations on top of PR #533 (stability updates from @1revenge1)

.gitignore

@@ -1,3 +1,5 @@
+.idea
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

src/AmtPtpDevice.Settings/AmtPtpDevice.Settings.csproj

@@ -11,8 +11,8 @@
     <AssemblyName>AmtPtpDevice.Settings</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.15063.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

src/AmtPtpDeviceUniversalPkg/AmtPtpDevice.inf

@@ -25,9 +25,9 @@ AmtPtpDeviceSpiKm.sys = 1,,
 AmtPtpHidFilter.sys   = 1,,
 
 [Manufacturer]
-%ManufacturerName%=Standard,NT$ARCH$
+%ManufacturerName%=Standard,NT$ARCH$.10.0...18362
 
-[Standard.NT$ARCH$]
+[Standard.NT$ARCH$.10.0...18362]
 ; Apple T2
 %AmtPtpDeviceUsbKm.DeviceDesc%=AmtPtpDeviceUsbKm_Device, USB\Vid_05ac&Pid_0273&MI_02
 %AmtPtpDeviceUsbKm.DeviceDesc%=AmtPtpDeviceUsbKm_Device, USB\Vid_05ac&Pid_0274&MI_02
@@ -110,22 +110,21 @@ AmtPtpDeviceUsbUm.dll
 [SpiKmDrivers_Dir]
 AmtPtpDeviceSpiKm.sys
 
-; Microsoft HID KMDF driver install sections
-[mshidkmdf_Service_Inst]
-ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
-StartType      = 3                  ; SERVICE_DEMAND_START
-ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %10%\System32\Drivers\mshidkmdf.sys
-
 ; PTP filter
 [AmtPtpHidFilter_MiniPortDevice.NT]
 CopyFiles=FilterDriver_Payload
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf_LowerFilter.NT
 
 [AmtPtpHidFilter_MiniPortDevice.NT.Services]
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf_LowerFilter.NT.Services
 AddService = AmtPtpHidFilter,, AmtPtpHidFilter_Service_Inst
-AddService = mshidkmdf, %SPSVCINST_ASSOCSERVICE%, mshidkmdf_Service_Inst
+;AddService = mshidkmdf, %SPSVCINST_ASSOCSERVICE%, mshidkmdf_Service_Inst
 
 [AmtPtpHidFilter_MiniPortDevice.NT.HW]
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf_LowerFilter.NT.HW
 AddReg=AmtPtpHidFilter_AddReg
 
 [AmtPtpHidFilter_AddReg]
@@ -148,14 +147,25 @@ KmdfLibraryVersion = $KMDFVERSION$
 ; USB KM
 [AmtPtpDeviceUsbKm_Device.NT]
 CopyFiles=PtpKmDrivers_Dir
+Include=WUDFRD.inf
+Needs=WUDFRD_LowerFilter.NT
+
 
 [AmtPtpDeviceUsbKm_Device.NT.Services]
+Include=WUDFRD.inf
+Needs=WUDFRD_LowerFilter.NT.Services
 AddService = AmtPtpDeviceUsbKm,, AmtPtpDeviceUsbKm_Service_Inst
-AddService = mshidkmdf, %SPSVCINST_ASSOCSERVICE%, mshidkmdf_Service_Inst
+; AddService = mshidkmdf, %SPSVCINST_ASSOCSERVICE%, mshidkmdf_Service_Inst
 
 [AmtPtpDeviceUsbKm_Device.NT.HW]
+Include=WUDFRD.inf
+Needs=WUDFRD_LowerFilter.NT.HW
 AddReg=AmtPtpDeviceUsbKm_AddReg
 
+[AmtPtpDeviceUsbKm_Device.NT.Filters]
+Include=WUDFRD.inf
+Needs=WUDFRD_LowerFilter.NT.Filters
+
 [AmtPtpDeviceUsbKm_AddReg]
 HKR,,FriendlyName,,%AmtPtpDeviceUsbKm.DeviceDesc%
 HKR,,"LowerFilters",0x00010008,"AmtPtpDeviceUsbKm"
@@ -176,14 +186,20 @@ KmdfLibraryVersion = $KMDFVERSION$
 
 ; USB UM
 [AmtPtpDeviceUsbUm_Install.NT]
+Include=WUDFRD.inf
+Needs=WUDFRD_LowerFilter.NT
 CopyFiles=PtpUmDrivers_Dir
 
 [AmtPtpDeviceUsbUm_Install.NT.hw]
+Include=WUDFRD.inf
+Needs=WUDFRD_LowerFilter.NT.HW
 AddReg=AmtPtpDeviceUsbUm_AddReg
 
 [AmtPtpDeviceUsbUm_Install.NT.Services]
-AddService=mshidumdf, 0x000001fa, MSHIDUMDF_ServiceInstall ; flag 0x2 sets this as the service for the device
-AddService=WUDFRd,0x000001f8,WUDFRD_ServiceInstall         ; this service is installed because its a filter.
+Include=WUDFRD.inf
+Needs=WUDFRD_LowerFilter.NT.Services
+;AddService=mshidumdf, 0x000001fa, MSHIDUMDF_ServiceInstall ; flag 0x2 sets this as the service for the device
+;AddService=WUDFRd,0x000001f8,WUDFRD_ServiceInstall         ; this service is installed because its a filter.
 
 [AmtPtpDeviceUsbUm_Install.NT.Wdf]
 UmdfDispatcher=NativeUSB
@@ -219,12 +235,18 @@ ServiceBinary = %12%\WUDFRd.sys
 ; SPI KM
 [AmtPtpDeviceSpiKm_Device.NT]
 CopyFiles=SpiKmDrivers_Dir
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf_LowerFilter.NT
 
 [AmtPtpDeviceSpiKm_Device.NT.Services]
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf_LowerFilter.NT.Services
 AddService = AmtPtpDeviceSpiKm,, AmtPtpDeviceSpiKm_Service_Inst
-AddService = mshidkmdf, %SPSVCINST_ASSOCSERVICE%, mshidkmdf_Service_Inst ;flag 0x2 sets this as the service for the device
+;AddService = mshidkmdf, %SPSVCINST_ASSOCSERVICE%, mshidkmdf_Service_Inst ;flag 0x2 sets this as the service for the device
 
 [AmtPtpDeviceSpiKm_Device.NT.HW]
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf_LowerFilter.NT.HW
 AddReg = AmtPtpDeviceSpiKm_Device.NT.AddReg
 
 [AmtPtpDeviceSpiKm_Device.NT.AddReg]

src/AmtPtpDeviceUsbUm/InputInterrupt.c

@@ -418,11 +418,10 @@ AmtPtpServiceTouchInputInterruptType5(
 	WDFREQUEST Request;
 	WDFMEMORY  RequestMemory;
 	PTP_REPORT PtpReport;
-	LARGE_INTEGER CurrentPerfCounter;
-	LONGLONG PerfCounterDelta;
 
-	const struct TRACKPAD_FINGER *f;
-	const struct TRACKPAD_FINGER_TYPE5 *f_type5;
+	const struct TRACKPAD_FINGER_TYPE5* f;
+	const struct TRACKPAD_REPORT_TYPE5* mt_report;
+	const struct TRACKPAD_COMBINED_REPORT_TYPE5* full_report;
 
 	TraceEvents(
 		TRACE_LEVEL_INFORMATION, 
@@ -434,10 +433,9 @@ AmtPtpServiceTouchInputInterruptType5(
 	PtpReport.ReportID = REPORTID_MULTITOUCH;
 	PtpReport.IsButtonClicked = 0;
 
+	UINT timestamp;
 	INT x, y = 0;
 	size_t raw_n, i = 0;
-	size_t headerSize = (unsigned int) DeviceContext->DeviceInfo->tp_header;
-	size_t fingerprintSize = (unsigned int) DeviceContext->DeviceInfo->tp_fsize;
 
 	Status = WdfIoQueueRetrieveNextRequest(
 		DeviceContext->InputQueue,
@@ -467,23 +465,16 @@ AmtPtpServiceTouchInputInterruptType5(
 		goto exit;
 	}
 
-	QueryPerformanceCounter(
-		&CurrentPerfCounter
-	);
+	full_report = (const struct TRACKPAD_COMBINED_REPORT_TYPE5 *) Buffer;
+	mt_report = &full_report->MTReport;
 
-	// Scan time is in 100us
-	PerfCounterDelta = (CurrentPerfCounter.QuadPart - DeviceContext->PerfCounter.QuadPart) / 100;
-	// Only two bytes allocated
-	if (PerfCounterDelta > 0xFF)
-	{
-		PerfCounterDelta = 0xFF;
-	}
-
-	PtpReport.ScanTime = (USHORT) PerfCounterDelta;
+	timestamp = (mt_report->TimestampHigh << 5) | mt_report->TimestampLow;
+	PtpReport.ScanTime = (USHORT) timestamp * 10;
+	PtpReport.IsButtonClicked = (UCHAR) mt_report->Button;
 
 	// Type 5 finger report
 	if (DeviceContext->IsSurfaceReportOn) {
-		raw_n = (NumBytesTransferred - headerSize) / fingerprintSize;
+		raw_n = (NumBytesTransferred - sizeof(struct TRACKPAD_REPORT_TYPE5)) / sizeof(struct TRACKPAD_FINGER_TYPE5);
 		if (raw_n >= PTP_MAX_CONTACT_POINTS) raw_n = PTP_MAX_CONTACT_POINTS;
 		PtpReport.ContactCount = (UCHAR)raw_n;
 
@@ -498,56 +489,55 @@ AmtPtpServiceTouchInputInterruptType5(
 
 		// Fingers to array
 		for (i = 0; i < raw_n; i++) {
+			f = &mt_report->Fingers[i];
 
-			UCHAR *f_base = Buffer + headerSize + DeviceContext->DeviceInfo->tp_delta;
-			f = (const struct TRACKPAD_FINGER*) (f_base + i * fingerprintSize);
-			f_type5 = (const struct TRACKPAD_FINGER_TYPE5*) f;
-
-			USHORT tmp_x = (*((USHORT*)f_type5)) & 0x1fff;
-			UINT tmp_y = (INT)(*((UINT*)f_type5));
-
-			x = (SHORT) (tmp_x << 3) >> 3;
-			y = -(INT) (tmp_y << 6) >> 19;
+			// Sign extend
+			x = (SHORT) (f->AbsoluteX << 3) >> 3;
+			y = -(SHORT) (f->AbsoluteY << 3) >> 3;
 
 			x = (x - DeviceContext->DeviceInfo->x.min) > 0 ? (x - DeviceContext->DeviceInfo->x.min) : 0;
 			y = (y - DeviceContext->DeviceInfo->y.min) > 0 ? (y - DeviceContext->DeviceInfo->y.min) : 0;
 
-			PtpReport.Contacts[i].ContactID = f_type5->ContactIdentifier.Id;
+			PtpReport.Contacts[i].ContactID = f->Id;
 			PtpReport.Contacts[i].X = (USHORT) x;
 			PtpReport.Contacts[i].Y = (USHORT) y;
-			PtpReport.Contacts[i].TipSwitch = (AmtRawToInteger(f_type5->TouchMajor) << 1) > 0;
+			// 0x1 = Transition between states
+			// 0x2 = Floating finger
+			// 0x4 = Contact/Valid
+			// I've gotten 0x6 if I press on the trackpad and then keep my finger close
+			// Note: These values come from my MBP9,2. These also are valid on my MT2
+			PtpReport.Contacts[i].TipSwitch = (f->State & 0x4) && !(f->State & 0x2);
 
 			// The Microsoft spec says reject any input larger than 25mm. This is not ideal
 			// for Magic Trackpad 2 - so we raised the threshold a bit higher.
 			// Or maybe I used the wrong unit? IDK
-			PtpReport.Contacts[i].Confidence = (AmtRawToInteger(f_type5->TouchMinor) << 1) < 345 && 
-				(AmtRawToInteger(f_type5->TouchMinor) << 1) < 345;
+			BOOL valid_size = (AmtRawToInteger(f->TouchMinor) << 1) < 345 &&
+				(AmtRawToInteger(f->TouchMinor) << 1) < 345;
+
+			// 1 = thumb, 2 = index, etc etc
+			// 6 = palm on MT2, 7 = palm on my MBP9,2 (why are these different?)
+			BOOL valid_finger = f->Finger != 6;
+			PtpReport.Contacts[i].Confidence = valid_size && valid_finger;
 
 #ifdef INPUT_CONTENT_TRACE
 			TraceEvents(
 				TRACE_LEVEL_INFORMATION,
 				TRACE_INPUT,
-				"%!FUNC!: Point %llu, X = %d, Y = %d, TipSwitch = %d, Confidence = %d, tMajor = %d, tMinor = %d, origin = %d",
+				"%!FUNC!: Point %llu, X = %d, Y = %d, TipSwitch = %d, Confidence = %d, tMajor = %d, tMinor = %d, finger type = %d, rotate = %d",
 				i,
 				PtpReport.Contacts[i].X,
 				PtpReport.Contacts[i].Y,
 				PtpReport.Contacts[i].TipSwitch,
 				PtpReport.Contacts[i].Confidence,
-				AmtRawToInteger(f_type5->TouchMajor) << 1,
-				AmtRawToInteger(f_type5->TouchMinor) << 1,
-				f_type5->ContactIdentifier.Id
+				AmtRawToInteger(f->TouchMajor) << 1,
+				AmtRawToInteger(f->TouchMinor) << 1,
+				f->Finger,
+				f->Orientation
 			);
 #endif
 		}
 	}
 
-	// Button
-	if (DeviceContext->IsButtonReportOn) {
-		if (Buffer[DeviceContext->DeviceInfo->tp_button]) {
-			PtpReport.IsButtonClicked = TRUE;
-		}
-	}
-
 	// Write output
 	Status = WdfMemoryCopyFromBuffer(
 		RequestMemory, 

src/AmtPtpDeviceUsbUm/include/AppleDefinition.h

@@ -141,27 +141,57 @@ __declspec(align(2)) struct TRACKPAD_FINGER {
 	USHORT multi;		/* one finger: varies, more fingers: constant */
 };
 
-/* Trackpad finger structure for type5 (magic trackpad), le16-aligned */
-__declspec(align(2)) struct TRACKPAD_FINGER_TYPE5 
+#pragma pack( push, 1 )
+#pragma warning( push )
+#pragma warning( disable : 4200 )
+
+/* Trackpad finger structure for type5 (magic trackpad) */
+struct TRACKPAD_FINGER_TYPE5 
 {
-	UCHAR AbsoluteX;			/* absolute x coodinate */
-	UCHAR AbsoluteXY;			/* absolute x,y coodinate */
-	UCHAR AbsoluteY[2];			/* absolute y coodinate */
+	UINT32 AbsoluteX : 13;		/* absolute x coordinate */
+	UINT32 AbsoluteY : 13;		/* absolute y coordinate */
+	UINT32 Finger : 3;			/* finger type */
+	UINT32 State : 3;			/* finger State */
 	UCHAR TouchMajor;			/* touch area, major axis */
 	UCHAR TouchMinor;			/* touch area, minor axis */
 	UCHAR Size;					/* tool area, size */
 	UCHAR Pressure;				/* pressure on forcetouch touchpad */
-	union 
-	{
-		struct 
-		{
-			UCHAR Id : 4;
-			UCHAR Orientation : 4;
-		} ContactIdentifier;
-		UCHAR RawOrientationAndOrigin;
-	};
+	UCHAR Id : 4;				/* slot id */
+	UCHAR _ : 1;
+	UCHAR Orientation : 3;		/* contact angle */
+};
+
+/* Appended Mouse report on front of MT2 USB reports */
+struct MOUSE_REPORT
+{
+	UCHAR ReportId;
+	UCHAR Button;
+	UCHAR X;
+	UCHAR Y;
+	UCHAR _[4];
+};
+
+/* Multitouch report from MT2 */
+ struct TRACKPAD_REPORT_TYPE5
+{
+	UCHAR ReportId;
+	UINT8 Button : 1;
+	UINT8 _ : 2;
+	UINT8 TimestampLow : 5;
+	UINT16 TimestampHigh;
+	struct TRACKPAD_FINGER_TYPE5 Fingers[];
+};
+
+/* Full trackpad report for mt2 over USB */
+struct TRACKPAD_COMBINED_REPORT_TYPE5
+{
+	struct MOUSE_REPORT Mouse;
+	struct TRACKPAD_REPORT_TYPE5 MTReport;
 };
 
+#pragma warning( pop )
+#pragma pack( pop )
+
 /* device-specific parameters */
 struct BCM5974_PARAM {
 	int snratio;		/* signal-to-noise ratio */

src/AmtPtpHidFilter/AmtPtpHidFilter.inf

@@ -29,9 +29,9 @@ AmtPtpHidFilter.sys  = 1,,
 ;*****************************************
 
 [Manufacturer]
-%ManufacturerName%=Standard,NT$ARCH$.10.0
+%ManufacturerName%=Standard,NT$ARCH$.10.0...17134
 
-[Standard.NT$ARCH$.10.0]
+[Standard.NT$ARCH$.10.0...17134]
 ; Driver migration: if this user installed the old Precision Touch Driver, install the generic HID USB driver for them
 %AmtPtpHidRootDevice.DeviceDesc%=StandardUsbHid_Device, USB\Vid_05ac&Pid_0265&MI_01
 

src/AmtPtpHidFilter/Device.c

@@ -320,11 +320,6 @@ PtpFilterConfigureMultiTouch(
     pHidPacket = (PHID_XFER_PACKET) &hidPacketBuffer;
 
     if (deviceContext->VendorID == HID_VID_APPLE_USB) {
-        deviceContext->InputFingerSize = FSIZE_TYPE5;
-        deviceContext->InputHeaderSize = HOFFSET_TYPE_USB_5;
-        deviceContext->InputFingerDelta = FDELTA_TYPE5;
-        deviceContext->InputButtonDelta = BOFFSET_TYPE5;
-
         deviceContext->X.snratio = 250;
         deviceContext->X.min = -3678;
         deviceContext->X.max = 3934;
@@ -341,11 +336,6 @@ PtpFilterConfigureMultiTouch(
         pHidPacket->reportBuffer[3] = 0x00;
     }
     else if (deviceContext->VendorID == HID_VID_APPLE_BT) {
-        deviceContext->InputFingerSize = FSIZE_TYPE5;
-        deviceContext->InputHeaderSize = HOFFSET_TYPE_BTH_5;
-        deviceContext->InputFingerDelta = FDELTA_TYPE5;
-        deviceContext->InputButtonDelta = BOFFSET_TYPE5;
-
         deviceContext->X.snratio = 250;
         deviceContext->X.min = -3678;
         deviceContext->X.max = 3934;