February 2021 - Wine-commits

Alexandre Julliard : d3dx9: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 64bdb9808f679615c4ff6701dea5c55d3425e407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bdb9808f679615c4ff6701… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:42 2021 +0100 d3dx9: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 2 +- dlls/d3dx9_25/Makefile.in | 2 +- dlls/d3dx9_26/Makefile.in | 2 +- dlls/d3dx9_27/Makefile.in | 2 +- dlls/d3dx9_28/Makefile.in | 2 +- dlls/d3dx9_29/Makefile.in | 2 +- dlls/d3dx9_30/Makefile.in | 2 +- dlls/d3dx9_31/Makefile.in | 2 +- dlls/d3dx9_32/Makefile.in | 2 +- dlls/d3dx9_33/Makefile.in | 2 +- dlls/d3dx9_34/Makefile.in | 2 +- dlls/d3dx9_35/Makefile.in | 2 +- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/main.c | 13 ------------- dlls/d3dx9_37/Makefile.in | 2 +- dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- dlls/d3dx9_41/Makefile.in | 2 +- dlls/d3dx9_42/Makefile.in | 2 +- dlls/d3dx9_43/Makefile.in | 2 +- 21 files changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index 7d35846957e..9e15e8117b3 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in index 8ea103442a2..fc75cccfbd5 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in index f7be6291b03..ae57b5934e7 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in index aaabcf2ffa3..9b6794c1964 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in index acfdcf12688..eb44563ac71 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in index f9c6136450b..1116409fe3c 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in index b97a9eeac91..674320fc2fe 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in index 07db3ecc68a..19052af6557 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in index e75f6395855..32ee6b49cfe 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in index 38b0c3fe322..2ec780b8d80 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in index fea154280b9..81f4dc5181e 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in index 50fd4c827e8..94a371c1597 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index c55e7566d1f..02d7d475bf0 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -4,7 +4,7 @@ IMPORTLIB = d3dx9 IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_36/main.c b/dlls/d3dx9_36/main.c index 01431f303bf..1ec0bc5d790 100644 --- a/dlls/d3dx9_36/main.c +++ b/dlls/d3dx9_36/main.c @@ -26,19 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - BOOL WINAPI D3DXCheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) { return d3d_sdk_ver == D3D_SDK_VERSION && d3dx_sdk_ver == D3DX_SDK_VERSION; diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in index d3e42f5cdf0..6291309c098 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in index 3b6bb6a55f8..67481133623 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in index 83e77276001..230e6710fa5 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in index 28ee388bca9..b896ba784f9 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index e4239d8ac63..8b9a8dd1a65 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index e771e5f14fe..8b06e67f5ad 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index 0c3177dcf49..1ef0179600c 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs usp10 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ animation.c \

1 0

Alexandre Julliard : davclnt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: fdd3217558c63125d50679f2b5964874dc50ed94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdd3217558c63125d50679f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:46 2021 +0100 davclnt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/davclnt/Makefile.in | 2 +- dlls/davclnt/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/davclnt/Makefile.in b/dlls/davclnt/Makefile.in index 70dea6f4e60..f15116f5b61 100644 --- a/dlls/davclnt/Makefile.in +++ b/dlls/davclnt/Makefile.in @@ -1,6 +1,6 @@ MODULE = davclnt.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c index 485de927a42..5859c3c06c5 100644 --- a/dlls/davclnt/main.c +++ b/dlls/davclnt/main.c @@ -29,20 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(davclnt); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - /*********************************************************************** * DavRegisterAuthCallback (davclnt.@) */

1 0

Alexandre Julliard : dhcpcsvc: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: a688df4d47eabc3dad0046a10a13c3fe9a430026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a688df4d47eabc3dad0046a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:50 2021 +0100 dhcpcsvc: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/Makefile.in | 2 +- dlls/dhcpcsvc/dhcpcsvc.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/dhcpcsvc/Makefile.in b/dlls/dhcpcsvc/Makefile.in index 47ab04c690c..d2d46a24f8a 100644 --- a/dlls/dhcpcsvc/Makefile.in +++ b/dlls/dhcpcsvc/Makefile.in @@ -1,6 +1,6 @@ MODULE = dhcpcsvc.dll IMPORTLIB = dhcpcsvc -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = dhcpcsvc.c diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index d5df635012b..59883bbc72e 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -30,21 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - void WINAPI DhcpCApiCleanup(void) { FIXME(": stub\n");

1 0

Alexandre Julliard : dpwsockx: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: f13dfc38f62b436f699f0563e908f2c82dd7a85a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f13dfc38f62b436f699f0563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:54 2021 +0100 dpwsockx: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpwsockx/Makefile.in | 2 +- dlls/dpwsockx/dpwsockx_main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index 5a386a7ac88..1fecc3cbbc0 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -1,7 +1,7 @@ MODULE = dpwsockx.dll IMPORTS = dxguid ws2_32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ dpwsockx_main.c diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index dec3d9e0300..2c73c17be21 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -30,25 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - /* TODO: Initialization */ - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - - static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data ) { FIXME( "(%p,%d,%p,%u) stub\n",

1 0

Alexandre Julliard : drmclien: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 7e33f3871b2f3f131907947381697b5dabff836e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e33f3871b2f3f1319079473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:58 2021 +0100 drmclien: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/drmclien/Makefile.in | 2 +- dlls/drmclien/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/drmclien/Makefile.in b/dlls/drmclien/Makefile.in index ebe2df62c28..f0644668bc8 100644 --- a/dlls/drmclien/Makefile.in +++ b/dlls/drmclien/Makefile.in @@ -1,6 +1,6 @@ MODULE = drmclien.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/drmclien/main.c b/dlls/drmclien/main.c index 8483f9fca93..f60b9cbf26f 100644 --- a/dlls/drmclien/main.c +++ b/dlls/drmclien/main.c @@ -26,20 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(drmclien); -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; -} - /*********************************************************************** * DllRegisterServer (drmclien.@) */

1 0

Alexandre Julliard : dwmapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: e701ce3afaab40696eaee46beb07b67838eacafd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e701ce3afaab40696eaee46b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:25:02 2021 +0100 dwmapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/Makefile.in | 2 +- dlls/dwmapi/dwmapi_main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index 3a3691326f8..682bf68b111 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = dwmapi.dll IMPORTLIB = dwmapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ dwmapi_main.c diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 45c33c2169a..b6c89f3a7f8 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -32,20 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hInstDLL ); - break; - } - return TRUE; -} - /********************************************************************** * DwmIsCompositionEnabled (DWMAPI.@) */

1 0

Alexandre Julliard : dxva2: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: f24ac09ae6d94e4f2841ed304a2f39a633c299fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f24ac09ae6d94e4f2841ed30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:25:06 2021 +0100 dxva2: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 2 +- dlls/dxva2/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index d331512f019..efa37464a9b 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -2,7 +2,7 @@ MODULE = dxva2.dll IMPORTS = uuid ole32 IMPORTLIB = dxva2 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index d784e1b46ab..069f03d8077 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -1212,18 +1212,3 @@ BOOL WINAPI SetVCPFeature( HMONITOR monitor, BYTE vcpCode, DWORD value ) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Zhiyi Zhang : ntoskrnl.exe: Exclude large integer APIs from relay tracing.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: d7a4d757ce576c13ed68194e75f16a10e1f94cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7a4d757ce576c13ed68194e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 18:05:05 2021 +0800 ntoskrnl.exe: Exclude large integer APIs from relay tracing. Similar to 8d7ec7968df1750c9c525817f1366b57fa72d839 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 22968913300..145ea3099d7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1527,16 +1527,16 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ cdecl -private _abnormal_termination() -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() -@ cdecl -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)

1 0

Zebediah Figura : winegstreamer: Use ULONGLONG instead of uint64_t in Unix library interface structures.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 9638a5092e366181896b596507682d70519c9440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9638a5092e366181896b5965… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 19 20:34:58 2021 -0600 winegstreamer: Use ULONGLONG instead of uint64_t in Unix library interface structures. The latter has inconsistent alignment between the Unix and Win32 sides. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 03d19af1031..d2f6fee8971 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -150,17 +150,18 @@ struct wg_parser_event struct { /* pts and duration are in 100-nanosecond units. */ - uint64_t pts, duration; + ULONGLONG pts, duration; uint32_t size; bool discontinuity, preroll, delta, has_pts, has_duration; } buffer; struct { - uint64_t position, stop; - double rate; + ULONGLONG position, stop; + DOUBLE rate; } segment; } u; }; +C_ASSERT(sizeof(struct wg_parser_event) == 40); struct unix_funcs {

1 0

Zebediah Figura : winegstreamer: Build with msvcrt.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 8abcae547501809d1cbf01b14669707c0bd66714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abcae547501809d1cbf01b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 19 20:34:59 2021 -0600 winegstreamer: Build with msvcrt. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 2 ++ dlls/winegstreamer/audioconvert.c | 3 --- dlls/winegstreamer/gst_private.h | 3 --- dlls/winegstreamer/gstdemux.c | 7 +++---- dlls/winegstreamer/main.c | 2 +- dlls/winegstreamer/media_source.c | 6 +----- dlls/winegstreamer/mfplat.c | 3 --- dlls/winegstreamer/wg_parser.c | 4 ++++ 8 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index debdae2d4bb..996818fa457 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -5,6 +5,8 @@ EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ audioconvert.c \ filter.c \ diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index f4e841fe3e4..3b6571ab60d 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <gst/gst.h> - #include "gst_private.h" #include "mfapi.h" diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index d2f6fee8971..ef84d611a09 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -25,9 +25,6 @@ #include <stdbool.h> #include <stdint.h> #include <stdio.h> -#include <gst/gst.h> -#include <gst/video/video.h> -#include <gst/audio/audio.h> #define COBJMACROS #define NONAMELESSSTRUCT diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 910abada48c..84e6bcd61e4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -20,17 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "gst_private.h" #include "gst_guids.h" #include "vfwmsgs.h" #include "amvideo.h" -#include "wine/unicode.h" #include "wine/debug.h" #include <assert.h> +#include <limits.h> #include "dvdmedia.h" #include "mmreg.h" @@ -1016,7 +1015,7 @@ static BOOL decodebin_parser_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - sprintfW(source_name, formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1677,7 +1676,7 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - sprintfW(source_name, formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index ee9f57b6c57..6f3be9095d6 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -19,9 +19,9 @@ */ #include "gst_private.h" +#include "winternl.h" #include "rpcproxy.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "initguid.h" #include "gst_guids.h" diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 32b4477ad88..e69370d2513 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <gst/gst.h> - #include "gst_private.h" #include <assert.h> @@ -1083,7 +1079,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ { IMFStreamDescriptor **descriptors = NULL; struct media_source *object; - gint64 total_pres_time = 0; + UINT64 total_pres_time = 0; struct wg_parser *parser; DWORD bytestream_caps; uint64_t file_size; diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 8891facdffe..439fc2ee5ed 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <gst/gst.h> - #include "gst_private.h" #include <assert.h> diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 257da2538af..a7b3e6348cf 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -29,7 +29,11 @@ #define WIN32_NO_STATUS #include "gst_private.h" #include "winternl.h" + #include <assert.h> +#include <gst/gst.h> +#include <gst/video/video.h> +#include <gst/audio/audio.h> WINE_DEFAULT_DEBUG_CHANNEL(gstreamer);

1 0