mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
api-ms-win-Stub_DLLs: Use --prefer-native instead of DLL_WINE_PREATTACH.
This commit is contained in:
parent
3486cceeba
commit
29ce68fa31
@ -1,23 +1,23 @@
|
||||
From 19683a27eaaed9c23635e9b5fa768a6c120a2ace Mon Sep 17 00:00:00 2001
|
||||
From 9fd9267d77aadec039115b994898d2e6849ead94 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 01:11:46 +0100
|
||||
Subject: [PATCH] iertutil: Add dll and add stub for ordinal 811.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/iertutil/Makefile.in | 4 +
|
||||
dlls/iertutil/iertutil.spec | 521 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/iertutil/main.c | 48 ++++
|
||||
4 files changed, 574 insertions(+)
|
||||
dlls/iertutil/Makefile.in | 6 +
|
||||
dlls/iertutil/iertutil.spec | 521 ++++++++++++++++++++++++++++++++++++
|
||||
dlls/iertutil/main.c | 32 +++
|
||||
4 files changed, 560 insertions(+)
|
||||
create mode 100644 dlls/iertutil/Makefile.in
|
||||
create mode 100644 dlls/iertutil/iertutil.spec
|
||||
create mode 100644 dlls/iertutil/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5c97c1c..d70dcea 100644
|
||||
index 67f4376f9aa..3b705e29fac 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3286,6 +3286,7 @@ WINE_CONFIG_MAKEFILE(dlls/icmp)
|
||||
@@ -3342,6 +3342,7 @@ WINE_CONFIG_MAKEFILE(dlls/icmp)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ieframe)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ieframe/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ieproxy)
|
||||
@ -27,17 +27,19 @@ index 5c97c1c..d70dcea 100644
|
||||
WINE_CONFIG_MAKEFILE(dlls/imagehlp)
|
||||
diff --git a/dlls/iertutil/Makefile.in b/dlls/iertutil/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..268026e
|
||||
index 00000000000..f61ec141d1a
|
||||
--- /dev/null
|
||||
+++ b/dlls/iertutil/Makefile.in
|
||||
@@ -0,0 +1,4 @@
|
||||
@@ -0,0 +1,6 @@
|
||||
+MODULE = iertutil.dll
|
||||
+
|
||||
+EXTRADLLFLAGS = -Wb,--prefer-native
|
||||
+
|
||||
+C_SRCS = \
|
||||
+ main.c
|
||||
diff --git a/dlls/iertutil/iertutil.spec b/dlls/iertutil/iertutil.spec
|
||||
new file mode 100644
|
||||
index 0000000..a13779b
|
||||
index 00000000000..a13779bebbd
|
||||
--- /dev/null
|
||||
+++ b/dlls/iertutil/iertutil.spec
|
||||
@@ -0,0 +1,521 @@
|
||||
@ -564,10 +566,10 @@ index 0000000..a13779b
|
||||
+@ stub UriFromHostAndScheme
|
||||
diff --git a/dlls/iertutil/main.c b/dlls/iertutil/main.c
|
||||
new file mode 100644
|
||||
index 0000000..2b993a4
|
||||
index 00000000000..188bf81d1e1
|
||||
--- /dev/null
|
||||
+++ b/dlls/iertutil/main.c
|
||||
@@ -0,0 +1,48 @@
|
||||
@@ -0,0 +1,32 @@
|
||||
+/*
|
||||
+ * Copyright 2016 Michael Müller
|
||||
+ *
|
||||
@ -595,27 +597,11 @@ index 0000000..2b993a4
|
||||
+
|
||||
+WINE_DEFAULT_DEBUG_CHANNEL(iertutil);
|
||||
+
|
||||
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
|
||||
+{
|
||||
+ TRACE("(%p, %u, %p)\n", instance, reason, reserved);
|
||||
+
|
||||
+ switch (reason)
|
||||
+ {
|
||||
+ case DLL_WINE_PREATTACH:
|
||||
+ return FALSE; /* prefer native version */
|
||||
+ case DLL_PROCESS_ATTACH:
|
||||
+ DisableThreadLibraryCalls(instance);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+BOOL WINAPI IERTUTIL_811(void *unknown)
|
||||
+{
|
||||
+ FIXME("(%p): stub\n", unknown);
|
||||
+ return FALSE;
|
||||
+}
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user