August 2019 - Wine-commits - list.winehq.org

Jacek Caban : winegcc: Use imported crt DLL instead of msvcrt if specified.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: b64187c99823156af6ff76fb74455c024fe521e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b64187c99823156af6ff76fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:24:19 2019 +0200 winegcc: Use imported crt DLL instead of msvcrt if specified. Makes winecrt0 use specified crt DLL instead of msvcrt.dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3d1817a..222c750 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -897,6 +897,7 @@ static void build(struct options* opts) const char *spec_o_name; const char *output_name, *spec_file, *lang; int generate_app_loader = 1; + const char* crt_lib = NULL; int fake_module = 0; int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN); unsigned int j; @@ -982,8 +983,15 @@ static void build(struct options* opts) strarray_add(files, strmake("-o%s", file)); break; case file_arh: - strarray_add(files, strmake("-a%s", file)); - break; + if (opts->use_msvcrt) + { + const char *p = strrchr(file, '/'); + if (p) p++; + else p = file; + if (!strncmp(p, "libmsvcr", 8) || !strncmp(p, "libucrt", 7)) crt_lib = file; + } + strarray_add(files, strmake("-a%s", file)); + break; case file_so: strarray_add(files, strmake("-s%s", file)); break; @@ -1018,8 +1026,12 @@ static void build(struct options* opts) if (!opts->nodefaultlibs) { - if (opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); add_library(opts, lib_dirs, files, "winecrt0"); + if (opts->use_msvcrt) + { + if (!crt_lib) add_library(opts, lib_dirs, files, "msvcrt"); + else strarray_add(files, strmake("-a%s", crt_lib)); + } if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel"); add_library(opts, lib_dirs, files, "kernel32"); add_library(opts, lib_dirs, files, "ntdll");

1 0

Jacek Caban : d3d9x: Build with ucrtbase.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: c2e5f09281334653475e47f0be6006f9870db120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e5f09281334653475e47f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:25:52 2019 +0200 d3d9x: Build with ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> 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_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 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index 99db5f3..a327292 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=24 MODULE = d3dx9_24.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in index 9e54aba..ccf3748 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=25 MODULE = d3dx9_25.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in index 104f7c1..21ef9e0 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=26 MODULE = d3dx9_26.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in index db04c83..3adea19 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=27 MODULE = d3dx9_27.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in index 8a2b9c6..bd75a23 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=28 MODULE = d3dx9_28.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in index 6e1f45c..491c105 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=29 MODULE = d3dx9_29.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in index 092a6b1..44e28b7 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=30 MODULE = d3dx9_30.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in index 48c67e6..0f16d27 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=31 MODULE = d3dx9_31.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in index d51d6a0..99357dc 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=32 MODULE = d3dx9_32.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in index 52cdde1..5a92dca 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=33 MODULE = d3dx9_33.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in index 37f4312..84cca56 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=34 MODULE = d3dx9_34.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in index 4441b5f..640f306 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=35 MODULE = d3dx9_35.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 5e76ab7..b8a173c 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=36 MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in index ea0a048..d16a0ce 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=37 MODULE = d3dx9_37.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in index af62f82..4a02ab4 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=38 MODULE = d3dx9_38.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in index ab71712..5a38405 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=39 MODULE = d3dx9_39.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in index 76428d2..581e18d 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=40 MODULE = d3dx9_40.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index d3647f8..63a0be7 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=41 MODULE = d3dx9_41.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index 88bd746..ff391a2 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=42 MODULE = d3dx9_42.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index 2f6b863..e009a41 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=43 MODULE = d3dx9_43.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs

1 0

Jacek Caban : gdiplus: Build with ucrtbase.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: d9fb92c8640bb7996473401b85ac32d0e617d894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9fb92c8640bb7996473401b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:25:58 2019 +0200 gdiplus: Build with ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index e73e7d4..7fcafc8 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -1,6 +1,6 @@ MODULE = gdiplus.dll IMPORTLIB = gdiplus -IMPORTS = uuid shlwapi ole32 user32 gdi32 +IMPORTS = uuid shlwapi ole32 user32 gdi32 ucrtbase DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin

1 0

Jacek Caban : vbscript: Build with ucrtbase.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 0359583718e66527d9ff41ef84257e97c0e3c47f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0359583718e66527d9ff41ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:26:05 2019 +0200 vbscript: Build with ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 50c464f..d1bd6d4 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,5 +1,5 @@ MODULE = vbscript.dll -IMPORTS = oleaut32 ole32 user32 +IMPORTS = oleaut32 ole32 user32 ucrtbase EXTRADLLFLAGS = -mno-cygwin

1 0

Jacek Caban : dsound: Build with ucrtbase.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: d0bf94bf2d7a7e01c1266ca47eeab730bf8fe3cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0bf94bf2d7a7e01c1266ca4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:26:11 2019 +0200 dsound: Build with ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index 909b38c..a42637e 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -1,6 +1,6 @@ MODULE = dsound.dll IMPORTLIB = dsound -IMPORTS = dxguid uuid winmm ole32 advapi32 user32 +IMPORTS = dxguid uuid winmm ole32 advapi32 user32 ucrtbase EXTRADLLFLAGS = -mno-cygwin

1 0

Jacek Caban : winecrt0: Add __delayLoadHelper2.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 2afb86337288d320969a5d16bd9d7243122a1051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2afb86337288d320969a5d16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:26:23 2019 +0200 winecrt0: Add __delayLoadHelper2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/delay_load.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 0589b62..8c8a9cc 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -18,13 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if 0 -#pragma makedep unix -#endif - #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "delayloadhandler.h" + +void *WINAPI ResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, + PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, + IMAGE_THUNK_DATA* addr, ULONG flags ); +void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ); + +#ifdef _WIN32 + +extern IMAGE_DOS_HEADER __ImageBase; + +FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAGE_THUNK_DATA *addr ) +{ + return ResolveDelayLoadedAPI( &__ImageBase, descr, NULL, DelayLoadFailureHook, addr, 0 ); +} + +#else /* _WIN32 */ struct ImgDelayDescr { @@ -40,8 +54,6 @@ struct ImgDelayDescr extern struct ImgDelayDescr __wine_spec_delay_imports[]; -extern FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ); - FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( unsigned int id ) { struct ImgDelayDescr *descr = __wine_spec_delay_imports + HIWORD(id); @@ -65,3 +77,5 @@ static void free_delay_imports(void) if (*descr->phmod) FreeLibrary( *descr->phmod ); } #endif + +#endif /* _WIN32 */

1 0

Jacek Caban : winecrt0: Add DllMainCRTStartup.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 4013056a67b3819a96e61a53281c3b027829bc57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4013056a67b3819a96e61a53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:26:35 2019 +0200 winecrt0: Add DllMainCRTStartup. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/crt_dllmain.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 79ba92f..675002e 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,6 +1,7 @@ MODULE = libwinecrt0.a C_SRCS = \ + crt_dllmain.c \ debug.c \ delay_load.c \ dll_entry.c \ diff --git a/dlls/winecrt0/crt_dllmain.c b/dlls/winecrt0/crt_dllmain.c new file mode 100644 index 0000000..b8b22eb --- /dev/null +++ b/dlls/winecrt0/crt_dllmain.c @@ -0,0 +1,33 @@ +/* + * DllMainCRTStartup default entry point + * + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef _WIN32 + +#include <stdarg.h> +#include <stdio.h> +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMainCRTStartup( HINSTANCE inst, DWORD reason, void *reserved ) +{ + return DllMain( inst, reason, reserved ); +} + +#endif

1 0

Jacek Caban : msvcr70: Provide floating point function wrappers in importlib.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 9246fca3127cc6bd2365765bbcdd195802a1006d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9246fca3127cc6bd2365765b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:27:45 2019 +0200 msvcr70: Provide floating point function wrappers in importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcrt/mathf.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index c7d3edf..670b0b8 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ onexit.c \ diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index d7606cc..3c71942 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ onexit.c \ diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c new file mode 100644 index 0000000..781df2b --- /dev/null +++ b/dlls/msvcrt/mathf.c @@ -0,0 +1,37 @@ +/* + * msvcrt float functions + * + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* this function is part of the import lib to provide floating */ +#if 0 +#pragma makedep implib +#endif + +#include <math.h> + +#if !defined(__i386__) && _MSVCR_VER > 0 && _MSVCR_VER < 80 +float sinf(float x) { return sin(x); } +float cosf(float x) { return cos(x); } +float tanf(float x) { return tan(x); } +float atan2f(float x, float y) { return atan2(x, y); } +float expf(float x) { return exp(x); } +float logf(float x) { return log(x); } +float powf(float x, float y) { return pow(x, y); } +float sqrtf(float x) { return sqrt(x); } +#endif

1 0

Jacek Caban : winegcc: Use -nodefaultlibs -nostartfiles for builtin DLLs.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 90bed22eb715201de3ddde0b08d4d6b9357c7635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bed22eb715201de3ddde0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:28:53 2019 +0200 winegcc: Use -nodefaultlibs -nostartfiles for builtin DLLs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 222c750..a7476dd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -383,6 +383,7 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch static strarray *get_link_args( struct options *opts, const char *output_name ) { + int use_wine_crt = opts->wine_builtin && opts->shared; const strarray *link_tool = get_translator( opts ); strarray *flags = strarray_alloc(); unsigned int i; @@ -437,8 +438,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) else strarray_add( flags, opts->gui_app ? "-mwindows" : "-mconsole" ); if (opts->unicode_app) strarray_add( flags, "-municode" ); - if (opts->nodefaultlibs) strarray_add( flags, "-nodefaultlibs" ); - if (opts->nostartfiles) strarray_add( flags, "-nostartfiles" ); + if (opts->nodefaultlibs || use_wine_crt) strarray_add( flags, "-nodefaultlibs" ); + if (opts->nostartfiles || use_wine_crt) strarray_add( flags, "-nostartfiles" ); if (opts->subsystem) { @@ -1172,7 +1173,7 @@ static void build(struct options* opts) strarray_add(link_args, "-lc"); } - if (opts->nodefaultlibs && is_pe) strarray_add( link_args, "-lgcc" ); + if ((opts->nodefaultlibs || opts->shared) && is_pe) strarray_add( link_args, "-lgcc" ); spawn(opts->prefix, link_args, 0); strarray_free (link_args);

1 0

Jacek Caban : kernel32/tests: Improve timeout handling in debugger tests.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 6b46a4d24aa6030724a74ec5e21f7299af416ec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b46a4d24aa6030724a74ec5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 15:05:17 2019 +0200 kernel32/tests: Improve timeout handling in debugger tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index bc12ea8..7594b25 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -226,6 +226,9 @@ struct debugger_context void *image_base; }; +#define WAIT_EVENT_TIMEOUT 20000 +#define POLL_EVENT_TIMEOUT 200 + #define next_event(a,b) next_event_(__LINE__,a,b) static void next_event_(unsigned line, struct debugger_context *ctx, unsigned timeout) { @@ -301,7 +304,7 @@ static void process_attach_events(struct debugger_context *ctx) do { - next_event(ctx, 2000); + next_event(ctx, WAIT_EVENT_TIMEOUT); if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) ok(ctx->ev.u.LoadDll.lpBaseOfDll != ntdll, "ntdll.dll reported out of order\n"); } while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT); @@ -312,7 +315,7 @@ static void process_attach_events(struct debugger_context *ctx) if (ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT) { DWORD last_thread = ctx->ev.dwThreadId; - next_event(ctx, 2000); + next_event(ctx, WAIT_EVENT_TIMEOUT); ok(ctx->ev.dwThreadId == last_thread, "unexpected thread\n"); } @@ -322,7 +325,7 @@ static void process_attach_events(struct debugger_context *ctx) ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddres != DbgBreakPoint\n"); /* flush debug events */ - do next_event(ctx, 200); + do next_event(ctx, POLL_EVENT_TIMEOUT); while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT || ctx->ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT); ok(ctx->ev.dwDebugEventCode == -1, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); @@ -370,7 +373,7 @@ static void doDebugger(int argc, char** argv) if (strstr(myARGV[2], "process")) { - next_event(&ctx, 2000); + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == STATUS_ACCESS_VIOLATION, "ExceptionCode = %x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); @@ -958,7 +961,7 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) if (flag) { - next_event(&ctx, 2000); + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid);

1 0