mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 3139727a97a91b91e74d57ec97a8c19b0093b68e
This commit is contained in:
Alistair Leslie-Hughes
parent
e1259ef094
commit
b9204d93c9
@ -1,26 +1,26 @@
|
||||
From 7f05362e86a285551a5694e98fa9abecb99018a0 Mon Sep 17 00:00:00 2001
|
||||
From 19efcf925a49a5d7e0b82eb6e4797b0ac725f2dc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 17:07:35 +0100
|
||||
Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
|
||||
XamlBehaviorEnabled.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in | 4 +++
|
||||
.../ext-ms-win-xaml-pal-l1-1-0.spec | 6 ++++
|
||||
dlls/ext-ms-win-xaml-pal-l1-1-0/main.c | 35 +++++++++++++++++++
|
||||
configure.ac | 1 +
|
||||
dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in | 4 +++
|
||||
.../ext-ms-win-xaml-pal-l1-1-0.spec | 6 ++++
|
||||
dlls/ext-ms-win-xaml-pal-l1-1-0/main.c | 35 ++++++++++++++++++++++
|
||||
4 files changed, 46 insertions(+)
|
||||
create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
|
||||
create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
|
||||
create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 420f6311db3..30718491bb8 100644
|
||||
index 8484c83..a9b51d2 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3289,6 +3289,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0)
|
||||
@@ -3255,6 +3255,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comdlg32-l1-1-0)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-shell32-l1-2-0)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0)
|
||||
+WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0)
|
||||
WINE_CONFIG_MAKEFILE(dlls/faultrep)
|
||||
@ -28,7 +28,7 @@ index 420f6311db3..30718491bb8 100644
|
||||
WINE_CONFIG_MAKEFILE(dlls/feclient)
|
||||
diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 00000000000..6382d85272b
|
||||
index 0000000..6382d85
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
|
||||
@@ -0,0 +1,4 @@
|
||||
@ -38,7 +38,7 @@ index 00000000000..6382d85272b
|
||||
+ main.c
|
||||
diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
|
||||
new file mode 100644
|
||||
index 00000000000..c167f5e753e
|
||||
index 0000000..c167f5e
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
|
||||
@@ -0,0 +1,6 @@
|
||||
@ -50,7 +50,7 @@ index 00000000000..c167f5e753e
|
||||
+@ stub XamlPalUninitialize
|
||||
diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
|
||||
new file mode 100644
|
||||
index 00000000000..3e282758f41
|
||||
index 0000000..3e28275
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
|
||||
@@ -0,0 +1,35 @@
|
||||
@ -90,5 +90,5 @@ index 00000000000..3e282758f41
|
||||
+ return TRUE;
|
||||
+}
|
||||
--
|
||||
2.17.0
|
||||
1.9.1
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "fc8174a36483d9ddbcc1a82c1c7d1334b2efc702"
|
||||
echo "3139727a97a91b91e74d57ec97a8c19b0093b68e"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 457588a8b59ec77c1078692176e8eea160f8a5d5 Mon Sep 17 00:00:00 2001
|
||||
From 51438c7eb7bf3b04dd70c50ea860a3ce8b1628d0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 8 May 2017 23:01:28 +0200
|
||||
Subject: aclui: Add basic ACE viewer.
|
||||
Subject: [PATCH] aclui: Add basic ACE viewer.
|
||||
|
||||
---
|
||||
dlls/aclui/Makefile.in | 3 +
|
||||
@ -15,14 +15,16 @@ Subject: aclui: Add basic ACE viewer.
|
||||
create mode 100644 dlls/aclui/user_icons.bmp
|
||||
|
||||
diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in
|
||||
index f5b401c..9d6d0cf 100644
|
||||
index 83bd379..dc6a5e0 100644
|
||||
--- a/dlls/aclui/Makefile.in
|
||||
+++ b/dlls/aclui/Makefile.in
|
||||
@@ -1,4 +1,7 @@
|
||||
@@ -1,6 +1,9 @@
|
||||
MODULE = aclui.dll
|
||||
IMPORTLIB = aclui
|
||||
+IMPORTS = comctl32 user32 advapi32 gdi32
|
||||
|
||||
EXTRADLLFLAGS = -mno-cygwin
|
||||
|
||||
C_SRCS = aclui_main.c
|
||||
+
|
||||
+RC_SRCS = aclui.rc
|
||||
@ -91,10 +93,10 @@ index 0000000..08f8b56
|
||||
+/* @makedep: user_icons.bmp */
|
||||
+IDB_USER_ICONS BITMAP user_icons.bmp
|
||||
diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c
|
||||
index 808f1f0..12e4374 100644
|
||||
index 033a471..ea35bba 100644
|
||||
--- a/dlls/aclui/aclui_main.c
|
||||
+++ b/dlls/aclui/aclui_main.c
|
||||
@@ -22,17 +22,53 @@
|
||||
@@ -20,17 +20,53 @@
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
@ -148,7 +150,7 @@ index 808f1f0..12e4374 100644
|
||||
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||
{
|
||||
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
|
||||
@@ -42,20 +78,489 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||
@@ -40,20 +76,489 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||
case DLL_WINE_PREATTACH:
|
||||
return FALSE; /* prefer native version */
|
||||
case DLL_PROCESS_ATTACH:
|
||||
@ -722,5 +724,5 @@ literal 0
|
||||
HcmV?d00001
|
||||
|
||||
--
|
||||
2.7.4
|
||||
1.9.1
|
||||
|
||||
|
||||
@ -1,28 +1,27 @@
|
||||
From 913dada333cd12aae0080bfe3919467fcf709621 Mon Sep 17 00:00:00 2001
|
||||
From c21d5b2c6ac912a4bc4f4dff281f275b971796bc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 8 Jun 2017 23:50:03 +0200
|
||||
Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr
|
||||
order.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/tests/driver.c | 52 ++++++++++++++++++++++++++++++++++++++++
|
||||
programs/winedevice/device.c | 26 ++++++++++++++++++++
|
||||
2 files changed, 78 insertions(+)
|
||||
dlls/ntoskrnl.exe/tests/driver.c | 50 ++++++++++++++++++++++++++++++++++++++++
|
||||
programs/winedevice/device.c | 26 +++++++++++++++++++++
|
||||
2 files changed, 76 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
|
||||
index ac31a4d..a4456ae 100644
|
||||
index 73fc2fb..ed3fece 100644
|
||||
--- a/dlls/ntoskrnl.exe/tests/driver.c
|
||||
+++ b/dlls/ntoskrnl.exe/tests/driver.c
|
||||
@@ -39,6 +39,8 @@ static const WCHAR driver_device[] = {'\\','D','e','v','i','c','e',
|
||||
static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s',
|
||||
@@ -40,6 +40,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
|
||||
'\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0};
|
||||
|
||||
static DRIVER_OBJECT *driver_obj;
|
||||
+static LDR_MODULE *ldr_module;
|
||||
+
|
||||
|
||||
static HANDLE okfile;
|
||||
static LONG successes;
|
||||
static LONG failures;
|
||||
@@ -1203,6 +1205,7 @@ static void test_resource(void)
|
||||
@@ -1411,6 +1412,7 @@ static void test_resource(void)
|
||||
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
|
||||
}
|
||||
|
||||
@ -30,7 +29,7 @@ index ac31a4d..a4456ae 100644
|
||||
static void test_lookup_thread(void)
|
||||
{
|
||||
NTSTATUS status;
|
||||
@@ -1246,6 +1249,52 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context)
|
||||
@@ -1509,6 +1511,52 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context)
|
||||
IoCompleteRequest(irp, IO_NO_INCREMENT);
|
||||
}
|
||||
|
||||
@ -83,28 +82,27 @@ index ac31a4d..a4456ae 100644
|
||||
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
|
||||
{
|
||||
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
|
||||
@@ -1291,6 +1340,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
|
||||
@@ -1554,6 +1602,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
|
||||
test_stack_callout();
|
||||
test_lookaside_list();
|
||||
test_ob_reference(test_input->path);
|
||||
+ test_default_modules();
|
||||
test_resource();
|
||||
test_lookup_thread();
|
||||
|
||||
@@ -1404,6 +1454,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
|
||||
|
||||
test_IoAttachDeviceToDeviceStack();
|
||||
@@ -1704,6 +1753,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
|
||||
DbgPrint("loading driver\n");
|
||||
|
||||
driver_obj = driver;
|
||||
+ ldr_module = (LDR_MODULE *)driver->DriverSection;
|
||||
+
|
||||
|
||||
/* Allow unloading of the driver */
|
||||
driver->DriverUnload = driver_Unload;
|
||||
|
||||
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
|
||||
index 201a041..33b332d 100644
|
||||
index f4ebad2..b8ed745 100644
|
||||
--- a/programs/winedevice/device.c
|
||||
+++ b/programs/winedevice/device.c
|
||||
@@ -124,7 +124,33 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
|
||||
@@ -120,7 +120,33 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
|
||||
|
||||
static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user