Module: wine Branch: master Commit: ff8c49eec33ab2688d0fe50960e08075a908f139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8c49eec33ab2688d0fe50960...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed Sep 20 19:12:04 2017 +0200
xinput1_1: Avoid DLL forwarding.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/xinput1_1/Makefile.in | 4 ++++ dlls/xinput1_1/xinput1_1.spec | 10 +++++----- dlls/xinput1_3/Makefile.in | 2 +- dlls/xinput1_3/{xinput1_3_main.c => xinput_main.c} | 0 4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index fc341d1..e08b999 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput1_1.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c
RC_SRCS = version.rc diff --git a/dlls/xinput1_1/xinput1_1.spec b/dlls/xinput1_1/xinput1_1.spec index 95759c3..5a55370 100644 --- a/dlls/xinput1_1/xinput1_1.spec +++ b/dlls/xinput1_1/xinput1_1.spec @@ -1,5 +1,5 @@ -@ stdcall XInputEnable(long) xinput1_3.XInputEnable -@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids -@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +@ stdcall XInputEnable(long) +@ stdcall XInputGetCapabilities(long long ptr) +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +@ stdcall XInputSetState(long ptr) +@ stdcall XInputGetState(long ptr) diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index cf8f730..0fe3f6d 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -2,6 +2,6 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput
C_SRCS = \ - xinput1_3_main.c + xinput_main.c
RC_SRCS = version.rc diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput_main.c similarity index 100% rename from dlls/xinput1_3/xinput1_3_main.c rename to dlls/xinput1_3/xinput_main.c