mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against 788fd4ee44fc9877b01888fdd3cd72b9ac88228e.
This commit is contained in:
Alistair Leslie-Hughes
parent
33d85bda8a
commit
39f66ddd9f
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "06ab0677587fbbb83ef73efa7ed22bf85dcb6836"
|
||||
echo "788fd4ee44fc9877b01888fdd3cd72b9ac88228e"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -293,7 +293,6 @@ patch_enable_all ()
|
||||
enable_ws2_32_getsockopt="$1"
|
||||
enable_wtsapi32_EnumerateProcesses="$1"
|
||||
enable_xactengine_initial="$1"
|
||||
enable_xactengine2_dll="$1"
|
||||
enable_xactengine3_7_Notification="$1"
|
||||
enable_xactengine3_7_PrepareWave="$1"
|
||||
}
|
||||
@ -935,9 +934,6 @@ patch_enable ()
|
||||
xactengine-initial)
|
||||
enable_xactengine_initial="$2"
|
||||
;;
|
||||
xactengine2-dll)
|
||||
enable_xactengine2_dll="$2"
|
||||
;;
|
||||
xactengine3_7-Notification)
|
||||
enable_xactengine3_7_Notification="$2"
|
||||
;;
|
||||
@ -4507,50 +4503,6 @@ if test "$enable_xactengine_initial" -eq 1; then
|
||||
patch_apply xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch
|
||||
fi
|
||||
|
||||
# Patchset xactengine2-dll
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#41048] xactengine2_0: Roller Coaster Rampage
|
||||
# | * [#49671] xactengine2_4: Supreme Commander demo
|
||||
# | * [#49668] xactengine2_7: Two Worlds Epic Edition
|
||||
# | * [#41468] xactengine2_9: Supreme Commander Forged Alliance
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure, configure.ac, dlls/xactengine2_0/Makefile.in, dlls/xactengine2_0/xactengine2_0.spec,
|
||||
# | dlls/xactengine2_1/Makefile.in, dlls/xactengine2_1/xactengine2_1.spec, dlls/xactengine2_10/Makefile.in,
|
||||
# | dlls/xactengine2_10/xact2_classes.idl, dlls/xactengine2_10/xact2_dll.c, dlls/xactengine2_10/xactengine2_10.spec,
|
||||
# | dlls/xactengine2_2/Makefile.in, dlls/xactengine2_2/xactengine2_2.spec, dlls/xactengine2_3/Makefile.in,
|
||||
# | dlls/xactengine2_3/xactengine2_3.spec, dlls/xactengine2_4/Makefile.in, dlls/xactengine2_4/xactengine2_4.spec,
|
||||
# | dlls/xactengine2_5/Makefile.in, dlls/xactengine2_5/xactengine2_5.spec, dlls/xactengine2_6/Makefile.in,
|
||||
# | dlls/xactengine2_6/xactengine2_6.spec, dlls/xactengine2_7/Makefile.in, dlls/xactengine2_7/xactengine2_7.spec,
|
||||
# | dlls/xactengine2_8/Makefile.in, dlls/xactengine2_8/xactengine2_8.spec, dlls/xactengine2_9/Makefile.in,
|
||||
# | dlls/xactengine2_9/xactengine2_9.spec, include/Makefile.in, include/xact.h, include/xact2wb.h
|
||||
# |
|
||||
if test "$enable_xactengine2_dll" -eq 1; then
|
||||
patch_apply xactengine2-dll/0001-include-Add-xact2wb.h.patch
|
||||
patch_apply xactengine2-dll/0002-include-Add-xact.h.patch
|
||||
patch_apply xactengine2-dll/0003-xactengine2_10-Add-new-dll.patch
|
||||
patch_apply xactengine2-dll/0004-xactengine2_10-Implement-IXACTEngine-interface.patch
|
||||
patch_apply xactengine2-dll/0005-xactengine2_10-Implement-IXACTSoundBank-interface.patch
|
||||
patch_apply xactengine2-dll/0006-xactengine2_10-Implement-IXACTCue-Interface.patch
|
||||
patch_apply xactengine2-dll/0007-xactengine2_10-Implement-IXACTWaveBank-interface.patch
|
||||
patch_apply xactengine2-dll/0008-xactengine2_10-Implement-IXACTEngine-CreateStreaming.patch
|
||||
patch_apply xactengine2-dll/0009-xactengine2_10-Implement-IXACTWave-interface.patch
|
||||
patch_apply xactengine2-dll/0010-xactengine2_10-Implement-IXACTSoundBank-Play-functio.patch
|
||||
patch_apply xactengine2-dll/0011-xactengine2_10-Implement-IXACTWaveBank-Play-function.patch
|
||||
patch_apply xactengine2-dll/0012-xactengine2_10-Implement-IXACTEngine-Un-RegisterNoti.patch
|
||||
patch_apply xactengine2-dll/0013-xactengine2_9-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0014-xactengine2_8-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0015-xactengine2_7-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0016-xactengine2_6-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0017-xactengine2_5-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0018-xactengine2_4-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0019-xactengine2_3-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0020-xactengine2_2-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0021-xactengine2_1-New-Dll.patch
|
||||
patch_apply xactengine2-dll/0022-xactengine2_0-New-Dll.patch
|
||||
fi
|
||||
|
||||
# Patchset xactengine3_7-Notification
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 4dc9c869816207037ba5031ccd41c0ac98c3f199 Mon Sep 17 00:00:00 2001
|
||||
From db0ad0a517ca74f0b166d515eb9fdb15d06d695a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
||||
Date: Fri, 19 Mar 2021 14:16:16 +0100
|
||||
Subject: [PATCH] hidclass.sys: Use __wine_send_input to send device
|
||||
@ -23,8 +23,8 @@ with INPUT_HARDWARE type / WM_INPUT uMsg instead).
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506
|
||||
---
|
||||
dlls/hidclass.sys/Makefile.in | 2 +-
|
||||
dlls/hidclass.sys/pnp.c | 36 +++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 37 insertions(+), 1 deletion(-)
|
||||
dlls/hidclass.sys/pnp.c | 38 +++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 39 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in
|
||||
index 4b1e9338eb4..09281c118b4 100644
|
||||
@ -39,7 +39,7 @@ index 4b1e9338eb4..09281c118b4 100644
|
||||
EXTRADLLFLAGS = -mno-cygwin
|
||||
|
||||
diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c
|
||||
index 7b365d267ed..1d82215bbfe 100644
|
||||
index de6f409a16b..9a1dcee192b 100644
|
||||
--- a/dlls/hidclass.sys/pnp.c
|
||||
+++ b/dlls/hidclass.sys/pnp.c
|
||||
@@ -26,6 +26,7 @@
|
||||
@ -59,20 +59,21 @@ index 7b365d267ed..1d82215bbfe 100644
|
||||
+
|
||||
static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_pdo)
|
||||
{
|
||||
WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN], pdo_name[255];
|
||||
@@ -109,6 +113,8 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b
|
||||
minidriver *minidriver;
|
||||
HID_DESCRIPTOR descriptor;
|
||||
BYTE *reportDescriptor;
|
||||
WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN];
|
||||
@@ -159,6 +163,8 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo)
|
||||
WCHAR pdo_name[255];
|
||||
USAGE page, usage;
|
||||
NTSTATUS status;
|
||||
+ RAWINPUT rawinput;
|
||||
+ INPUT input;
|
||||
INT i;
|
||||
|
||||
if ((status = get_device_id(bus_pdo, BusQueryDeviceID, device_id)))
|
||||
@@ -242,6 +248,21 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b
|
||||
status = call_minidriver(IOCTL_HID_GET_DEVICE_ATTRIBUTES, fdo, NULL, 0, &attr, sizeof(attr));
|
||||
@@ -247,6 +253,23 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo)
|
||||
sizeof(HID_XFER_PACKET) + pdo_ext->u.pdo.preparsed_data->caps.InputReportByteLength);
|
||||
|
||||
HID_StartDeviceThread(child_pdo);
|
||||
|
||||
+
|
||||
+ rawinput.header.dwType = RIM_TYPEHID;
|
||||
+ rawinput.header.dwSize = offsetof(RAWINPUT, data.hid.bRawData[2]);
|
||||
+ rawinput.header.hDevice = ULongToHandle(pdo_ext->u.pdo.rawinput_handle);
|
||||
@ -88,10 +89,11 @@ index 7b365d267ed..1d82215bbfe 100644
|
||||
+ input.u.hi.wParamL = (WORD)(rawinput.header.dwSize >> 0);
|
||||
+ __wine_send_input(0, &input, &rawinput);
|
||||
+
|
||||
fdo->Flags &= ~DO_DEVICE_INITIALIZING;
|
||||
return STATUS_SUCCESS;
|
||||
+ fdo->Flags &= ~DO_DEVICE_INITIALIZING;
|
||||
}
|
||||
@@ -388,6 +409,21 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp)
|
||||
|
||||
static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp)
|
||||
@@ -409,6 +432,21 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp)
|
||||
case IRP_MN_REMOVE_DEVICE:
|
||||
{
|
||||
IRP *queued_irp;
|
||||
|
||||
@ -1,182 +0,0 @@
|
||||
From 05cdff3abe82f3b79473df940c407881f5b09eea Mon Sep 17 00:00:00 2001
|
||||
From: Vijay Kiran Kamuju <infyquest@gmail.com>
|
||||
Date: Wed, 12 Aug 2020 11:06:30 +0200
|
||||
Subject: [PATCH 01/23] include: Add xact2wb.h
|
||||
|
||||
Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
|
||||
---
|
||||
include/Makefile.in | 1 +
|
||||
include/xact2wb.h | 149 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 150 insertions(+)
|
||||
create mode 100644 include/xact2wb.h
|
||||
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
index d32b0a225c1..9983d1151ca 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -818,6 +818,7 @@ SOURCES = \
|
||||
wuapi.idl \
|
||||
x3daudio.h \
|
||||
xact3.h \
|
||||
+ xact2wb.h \
|
||||
xact3wb.h \
|
||||
xapo.idl \
|
||||
xapofx.h \
|
||||
diff --git a/include/xact2wb.h b/include/xact2wb.h
|
||||
new file mode 100644
|
||||
index 00000000000..2bdc7f5c0dd
|
||||
--- /dev/null
|
||||
+++ b/include/xact2wb.h
|
||||
@@ -0,0 +1,149 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2020 Vijay Kiran Kamuju
|
||||
+ *
|
||||
+ * 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
|
||||
+ */
|
||||
+#ifndef __XACT2WB_H__
|
||||
+#define __XACT2WB_H__
|
||||
+
|
||||
+#include <pshpack1.h>
|
||||
+
|
||||
+typedef DWORD WAVEBANKOFFSET;
|
||||
+
|
||||
+#define WAVEBANK_HEADER_SIGNATURE 0x444e4257 /* DNBW */
|
||||
+#define WAVEBANK_HEADER_VERSION 42
|
||||
+#define WAVEBANK_BANKNAME_LENGTH 64
|
||||
+#define WAVEBANK_ENTRYNAME_LENGTH 64
|
||||
+
|
||||
+#define WAVEBANK_TYPE_BUFFER 0x00000000
|
||||
+#define WAVEBANK_TYPE_STREAMING 0x00000001
|
||||
+#define WAVEBANK_TYPE_MASK 0x00000001
|
||||
+
|
||||
+#define WAVEBANK_FLAGS_ENTRYNAMES 0x00010000
|
||||
+#define WAVEBANK_FLAGS_COMPACT 0x00020000
|
||||
+#define WAVEBANK_FLAGS_SYNC_DISABLED 0x00040000
|
||||
+#define WAVEBANK_FLAGS_SEEKTABLES 0x00080000
|
||||
+#define WAVEBANK_FLAGS_MASK 0x000f0000
|
||||
+
|
||||
+#define WAVEBANK_DVD_SECTOR_SIZE 2048
|
||||
+#define WAVEBANK_DVD_BLOCK_SIZE (WAVEBANK_DVD_SECTOR_SIZE * 16)
|
||||
+#define WAVEBANK_ALIGNMENT_MIN 4
|
||||
+#define WAVEBANK_ALIGNMENT_DVD WAVEBANK_DVD_SECTOR_SIZE
|
||||
+
|
||||
+typedef enum WAVEBANKSEGIDX
|
||||
+{
|
||||
+ WAVEBANK_SEGIDX_BANKDATA = 0,
|
||||
+ WAVEBANK_SEGIDX_ENTRYMETADATA,
|
||||
+ WAVEBANK_SEGIDX_SEEKTABLES,
|
||||
+ WAVEBANK_SEGIDX_ENTRYNAMES,
|
||||
+ WAVEBANK_SEGIDX_ENTRYWAVEDATA,
|
||||
+ WAVEBANK_SEGIDX_COUNT
|
||||
+} WAVEBANKSEGIDX, *LPWAVEBANKSEGIDX;
|
||||
+typedef const WAVEBANKSEGIDX *LPCWAVEBANKSEGIDX;
|
||||
+
|
||||
+#define WAVEBANKMINIFORMAT_TAG_PCM 0x0
|
||||
+#define WAVEBANKMINIFORMAT_TAG_XMA 0x1
|
||||
+#define WAVEBANKMINIFORMAT_TAG_ADPCM 0x2
|
||||
+
|
||||
+#define WAVEBANKMINIFORMAT_BITDEPTH_8 0x0
|
||||
+#define WAVEBANKMINIFORMAT_BITDEPTH_16 0x1
|
||||
+
|
||||
+typedef union WAVEBANKMINIWAVEFORMAT
|
||||
+{
|
||||
+ struct
|
||||
+ {
|
||||
+ DWORD wFormatTag : 2;
|
||||
+ DWORD nChannels : 3;
|
||||
+ DWORD nSamplesPerSec : 18;
|
||||
+ DWORD wBlockAlign : 8;
|
||||
+ DWORD wBitsPerSample : 1;
|
||||
+ } DUMMYSTRUCTNAME;
|
||||
+ DWORD dwValue;
|
||||
+} WAVEBANKMINIWAVEFORMAT, *LPWAVEBANKMINIWAVEFORMAT;
|
||||
+typedef const WAVEBANKMINIWAVEFORMAT *LPCWAVEBANKMINIWAVEFORMAT;
|
||||
+
|
||||
+typedef struct WAVEBANKREGION
|
||||
+{
|
||||
+ DWORD dwOffset;
|
||||
+ DWORD dwLength;
|
||||
+} WAVEBANKREGION, *LPWAVEBANKREGION;
|
||||
+typedef const WAVEBANKREGION *LPCWAVEBANKREGION;
|
||||
+
|
||||
+typedef struct WAVEBANKSAMPLEREGION
|
||||
+{
|
||||
+ DWORD dwStartSample;
|
||||
+ DWORD dwTotalSamples;
|
||||
+} WAVEBANKSAMPLEREGION, *LPWAVEBANKSAMPLEREGION;
|
||||
+typedef const WAVEBANKSAMPLEREGION *LPCWAVEBANKSAMPLEREGION;
|
||||
+
|
||||
+typedef struct WAVEBANKHEADER
|
||||
+{
|
||||
+ DWORD dwSignature;
|
||||
+ DWORD dwVersion;
|
||||
+ DWORD dwHeaderVersion;
|
||||
+ WAVEBANKREGION Segments[WAVEBANK_SEGIDX_COUNT];
|
||||
+} WAVEBANKHEADER, *LPWAVEBANKHEADER;
|
||||
+typedef const WAVEBANKHEADER *LPCWAVEBANKHEADER;
|
||||
+
|
||||
+#define WAVEBANKENTRY_XMASTREAMS_MAX 3
|
||||
+#define WAVEBANKENTRY_XMACHANNELS_MAX 6
|
||||
+
|
||||
+#define WAVEBANKENTRY_FLAGS_READAHEAD 0x00000001
|
||||
+#define WAVEBANKENTRY_FLAGS_LOOPCACHE 0x00000002
|
||||
+#define WAVEBANKENTRY_FLAGS_REMOVELOOPTAIL 0x00000004
|
||||
+#define WAVEBANKENTRY_FLAGS_IGNORELOOP 0x00000008
|
||||
+#define WAVEBANKENTRY_FLAGS_MASK 0x00000008
|
||||
+
|
||||
+typedef struct WAVEBANKENTRY
|
||||
+{
|
||||
+ union
|
||||
+ {
|
||||
+ struct
|
||||
+ {
|
||||
+ DWORD dwFlags : 4;
|
||||
+ DWORD Duration : 28;
|
||||
+ } DUMMYSTRUCTNAME;
|
||||
+ DWORD dwFlagsAndDuration;
|
||||
+ } DUMMYUNIONNAME;
|
||||
+
|
||||
+ WAVEBANKMINIWAVEFORMAT Format;
|
||||
+ WAVEBANKREGION PlayRegion;
|
||||
+ WAVEBANKSAMPLEREGION LoopRegion;
|
||||
+} WAVEBANKENTRY, *LPWAVEBANKENTRY;
|
||||
+typedef const WAVEBANKENTRY *LPCWAVEBANKENTRY;
|
||||
+
|
||||
+typedef struct WAVEBANKENTRYCOMPACT
|
||||
+{
|
||||
+ DWORD dwOffset : 21;
|
||||
+ DWORD dwLengthDeviation : 11;
|
||||
+} WAVEBANKENTRYCOMPACT, *LPWAVEBANKENTRYCOMPACT;
|
||||
+typedef const WAVEBANKENTRYCOMPACT *LPCWAVEBANKENTRYCOMPACT;
|
||||
+
|
||||
+typedef struct WAVEBANKDATA
|
||||
+{
|
||||
+ DWORD dwFlags;
|
||||
+ DWORD dwEntryCount;
|
||||
+ CHAR szBankName[WAVEBANK_BANKNAME_LENGTH];
|
||||
+ DWORD dwEntryMetaDataElementSize;
|
||||
+ DWORD dwEntryNameElementSize;
|
||||
+ DWORD dwAlignment;
|
||||
+ WAVEBANKMINIWAVEFORMAT CompactFormat;
|
||||
+ FILETIME BuildTime;
|
||||
+} WAVEBANKDATA, *LPWAVEBANKDATA;
|
||||
+typedef const WAVEBANKDATA *LPCWAVEBANKDATA;
|
||||
+
|
||||
+#include <poppack.h>
|
||||
+
|
||||
+#endif /* __XACT2WB_H__ */
|
||||
--
|
||||
2.28.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,3 +2,4 @@ Fixes: [41048] xactengine2_0: Roller Coaster Rampage
|
||||
Fixes: [49671] xactengine2_4: Supreme Commander demo
|
||||
Fixes: [49668] xactengine2_7: Two Worlds Epic Edition
|
||||
Fixes: [41468] xactengine2_9: Supreme Commander Forged Alliance
|
||||
Disabled: True
|
||||
|
||||
@ -1 +1 @@
|
||||
06ab0677587fbbb83ef73efa7ed22bf85dcb6836
|
||||
788fd4ee44fc9877b01888fdd3cd72b9ac88228e
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user