diff --git a/dlls/d3dx10_33/Makefile.in b/dlls/d3dx10_33/Makefile.in index e74bb229491..a1cbbf2c6cd 100644 --- a/dlls/d3dx10_33/Makefile.in +++ b/dlls/d3dx10_33/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_33.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_33_main.c diff --git a/dlls/d3dx10_33/d3dx10_33_main.c b/dlls/d3dx10_33/d3dx10_33_main.c index 68c52ffe33f..5635bc23197 100644 --- a/dlls/d3dx10_33/d3dx10_33_main.c +++ b/dlls/d3dx10_33/d3dx10_33_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_34/Makefile.in b/dlls/d3dx10_34/Makefile.in index 2ad26f828bd..28e971d95a5 100644 --- a/dlls/d3dx10_34/Makefile.in +++ b/dlls/d3dx10_34/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_34.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_34_main.c diff --git a/dlls/d3dx10_34/d3dx10_34_main.c b/dlls/d3dx10_34/d3dx10_34_main.c index 74224d5249a..b387dbdebcf 100644 --- a/dlls/d3dx10_34/d3dx10_34_main.c +++ b/dlls/d3dx10_34/d3dx10_34_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in index c7e52a4553b..419c221b324 100644 --- a/dlls/d3dx10_35/Makefile.in +++ b/dlls/d3dx10_35/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_35.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_35_main.c diff --git a/dlls/d3dx10_35/d3dx10_35_main.c b/dlls/d3dx10_35/d3dx10_35_main.c index 9f78e2296c7..228bdd90696 100644 --- a/dlls/d3dx10_35/d3dx10_35_main.c +++ b/dlls/d3dx10_35/d3dx10_35_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_36/Makefile.in b/dlls/d3dx10_36/Makefile.in index b3be0edc9c8..efd498f7e2c 100644 --- a/dlls/d3dx10_36/Makefile.in +++ b/dlls/d3dx10_36/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_36.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_36_main.c diff --git a/dlls/d3dx10_36/d3dx10_36_main.c b/dlls/d3dx10_36/d3dx10_36_main.c index 367755d53be..937872faa2f 100644 --- a/dlls/d3dx10_36/d3dx10_36_main.c +++ b/dlls/d3dx10_36/d3dx10_36_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in index 2d66b62717e..f4ea9ee460c 100644 --- a/dlls/d3dx10_37/Makefile.in +++ b/dlls/d3dx10_37/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_37.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_37_main.c diff --git a/dlls/d3dx10_37/d3dx10_37_main.c b/dlls/d3dx10_37/d3dx10_37_main.c index 6294d3b7370..ac7b20a7e12 100644 --- a/dlls/d3dx10_37/d3dx10_37_main.c +++ b/dlls/d3dx10_37/d3dx10_37_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in index 7c32ea45897..5942b7c7c42 100644 --- a/dlls/d3dx10_38/Makefile.in +++ b/dlls/d3dx10_38/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_38.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_38_main.c diff --git a/dlls/d3dx10_38/d3dx10_38_main.c b/dlls/d3dx10_38/d3dx10_38_main.c index 984aa717704..bd6bf110a21 100644 --- a/dlls/d3dx10_38/d3dx10_38_main.c +++ b/dlls/d3dx10_38/d3dx10_38_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_39/Makefile.in b/dlls/d3dx10_39/Makefile.in index 8df571456fc..c8267284e61 100644 --- a/dlls/d3dx10_39/Makefile.in +++ b/dlls/d3dx10_39/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_39.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_39_main.c diff --git a/dlls/d3dx10_39/d3dx10_39_main.c b/dlls/d3dx10_39/d3dx10_39_main.c index bf577293af2..5d4e050bf32 100644 --- a/dlls/d3dx10_39/d3dx10_39_main.c +++ b/dlls/d3dx10_39/d3dx10_39_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in index 760a3ac1233..af15cc5c921 100644 --- a/dlls/d3dx10_40/Makefile.in +++ b/dlls/d3dx10_40/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_40.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_40_main.c diff --git a/dlls/d3dx10_40/d3dx10_40_main.c b/dlls/d3dx10_40/d3dx10_40_main.c index 3a10f4d7a16..5eab5c00c8e 100644 --- a/dlls/d3dx10_40/d3dx10_40_main.c +++ b/dlls/d3dx10_40/d3dx10_40_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in index 0199bc01a77..41ebda9892c 100644 --- a/dlls/d3dx10_41/Makefile.in +++ b/dlls/d3dx10_41/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_41.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_41_main.c diff --git a/dlls/d3dx10_41/d3dx10_41_main.c b/dlls/d3dx10_41/d3dx10_41_main.c index 0162032c57d..15fe2f03b6b 100644 --- a/dlls/d3dx10_41/d3dx10_41_main.c +++ b/dlls/d3dx10_41/d3dx10_41_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_42/Makefile.in b/dlls/d3dx10_42/Makefile.in index ffdf7505516..105bf3d4c93 100644 --- a/dlls/d3dx10_42/Makefile.in +++ b/dlls/d3dx10_42/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_42.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3dx10_42_main.c diff --git a/dlls/d3dx10_42/d3dx10_42_main.c b/dlls/d3dx10_42/d3dx10_42_main.c index 81c400eea68..03fe8e7926c 100644 --- a/dlls/d3dx10_42/d3dx10_42_main.c +++ b/dlls/d3dx10_42/d3dx10_42_main.c @@ -30,20 +30,6 @@ #include "d3d10.h" -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion * diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 681527dae0e..1108dcb0948 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -3,7 +3,7 @@ IMPORTLIB = d3dx10 IMPORTS = d3d10_1 d3dcompiler dxguid DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ async.c \ diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index b1c13d9e8ab..181cf38687d 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -35,20 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * D3DX10CheckVersion *