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

Alexandre Julliard : include/msvcrt: Use setjmpex() instead of setjmp() on 64-bit.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: c0a54996e23a2eceb772a2814d3b077bc113502f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0a54996e23a2eceb772a281… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 12:48:49 2019 +0200 include/msvcrt: Use setjmpex() instead of setjmp() on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/setjmp.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 4038cbd..2a4af49 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -146,12 +146,18 @@ extern "C" { int __cdecl _setjmp(jmp_buf); void __cdecl longjmp(jmp_buf,int); +#if defined(_WIN64) && defined(__GNUC__) +int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); +# define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) +# define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0)) +#else +# define setjmp _setjmp +#endif + #ifdef __cplusplus } #endif -#define setjmp _setjmp - #include <poppack.h> #endif /* __WINE_SETJMP_H */

1 0

Alexandre Julliard : include: Make the Wine exception handlers cdecl.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 60df3b14b5e9c94c3b12f959cc71c492caedd647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60df3b14b5e9c94c3b12f959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 12:13:21 2019 +0200 include: Make the Wine exception handlers cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 8 +++---- dlls/winecrt0/exception.c | 48 ++++++++++++++++++++-------------------- include/wine/exception.h | 55 +++++++++++++++++++++++++--------------------- include/winnt.h | 4 ++-- tools/widl/typegen.c | 8 +++---- 5 files changed, 64 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60df3b14b5e9c94c3b12…

1 0

Alexandre Julliard : winecrt0: Make the main() and wmain() entry points cdecl.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: f2a7405a09c66e4b9adc15d4e9b7379ed4c78f54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a7405a09c66e4b9adc15d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 10:24:19 2019 +0200 winecrt0: Make the main() and wmain() entry points cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exe_entry.c | 2 +- dlls/winecrt0/exe_main.c | 2 +- dlls/winecrt0/exe_wentry.c | 2 +- dlls/winecrt0/exe_wmain.c | 2 +- programs/wineboot/wineboot.c | 2 +- programs/winebrowser/main.c | 2 +- programs/winedbg/winedbg.c | 2 +- programs/winepath/winepath.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 60c11aa..69ebb1b 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -27,7 +27,7 @@ #include "wine/library.h" #include "crt0_private.h" -extern int main( int argc, char *argv[] ); +extern int __cdecl main( int argc, char *argv[] ); DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) { diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index 94a96d1..f51deba 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -25,7 +25,7 @@ #include "winbase.h" #include "winuser.h" -int main( int argc, char *argv[] ) +int __cdecl main( int argc, char *argv[] ) { STARTUPINFOA info; char *cmdline = GetCommandLineA(); diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index ed1bd20..83606f2 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -27,7 +27,7 @@ #include "wine/library.h" #include "crt0_private.h" -extern int wmain( int argc, WCHAR *argv[] ); +extern int __cdecl wmain( int argc, WCHAR *argv[] ); DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) { diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index d697e90..f817462 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -27,7 +27,7 @@ int WINAPI wWinMain(HINSTANCE,HINSTANCE,LPWSTR,int); -int wmain( int argc, WCHAR *argv[] ) +int __cdecl wmain( int argc, WCHAR *argv[] ) { STARTUPINFOW info; WCHAR *cmdline = GetCommandLineW(); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index ac43f14..defd126 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1255,7 +1255,7 @@ static const struct option long_options[] = { NULL, 0, 0, 0 } }; -int main( int argc, char *argv[] ) +int __cdecl main( int argc, char *argv[] ) { static const WCHAR RunW[] = {'R','u','n',0}; static const WCHAR RunOnceW[] = {'R','u','n','O','n','c','e',0}; diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 7fcaba1..9cd6812 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -425,7 +425,7 @@ static WCHAR *convert_file_uri(IUri *uri) * Main entry point. This is a console application so we have a wmain() not a * winmain(). */ -int wmain(int argc, WCHAR *argv[]) +int __cdecl wmain(int argc, WCHAR *argv[]) { static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 8634c0f..5aeaa0d 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -662,7 +662,7 @@ static void restart_if_wow64(void) } } -int main(int argc, char** argv) +int __cdecl main(int argc, char** argv) { int retv = 0; HANDLE hFile = INVALID_HANDLE_VALUE; diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index ef11a5a..36881d3 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -144,7 +144,7 @@ static int parse_options(WCHAR *argv[]) /* * Main function */ -int wmain(int argc, WCHAR *argv[]) +int __cdecl wmain(int argc, WCHAR *argv[]) { LPSTR (*CDECL wine_get_unix_file_name_ptr)(LPCWSTR) = NULL; LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR) = NULL;

1 0

Alexandre Julliard : d2d1: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 239499a56df7d656de6833ba107337e130269e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=239499a56df7d656de6833ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:11:23 2019 +0200 d2d1: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 2 ++ dlls/d2d1/bitmap.c | 3 --- dlls/d2d1/bitmap_render_target.c | 3 --- dlls/d2d1/brush.c | 3 --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/dc_render_target.c | 3 --- dlls/d2d1/device.c | 3 --- dlls/d2d1/effect.c | 3 --- dlls/d2d1/factory.c | 3 --- dlls/d2d1/geometry.c | 5 ----- dlls/d2d1/hwnd_render_target.c | 3 --- dlls/d2d1/layer.c | 3 --- dlls/d2d1/mesh.c | 3 --- dlls/d2d1/state_block.c | 3 --- dlls/d2d1/stroke.c | 3 --- dlls/d2d1/wic_render_target.c | 3 --- 16 files changed, 3 insertions(+), 44 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 4135713..c3af08a 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = d2d1 IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 DELAYIMPORTS = dwrite +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ bitmap.c \ bitmap_render_target.c \ diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index c0aef3c..39e8119 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" #include "wincodec.h" diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index 11c3788..373c373 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index dd3da32..21abf14 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 70b841d..b07893a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,6 +24,7 @@ #include <assert.h> #include <limits.h> +#include <math.h> #define COBJMACROS #include "d2d1_2.h" #ifdef D2D1_INIT_GUID diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index b095008..310c541 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 7c39896..9e4acb6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index cfb8255..fb1e66a 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index c2a0405..48a2efb 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define D2D1_INIT_GUID #include "d2d1_private.h" diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 2728124..91ce32c 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -16,13 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" -#ifdef HAVE_FLOAT_H #include <float.h> -#endif WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index d0b9695..625f101 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 0f7ade2..3eb2f36 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index ee53c69..1e64a0e 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index b15384e..e317514 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 511c134..0ba44e0 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 21a1fa1..9b57a5d 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" #include "initguid.h" #include "wincodec.h"

1 0

Alexandre Julliard : d3d10: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 4caf450aa7693571f518417791a00e88a0c3474f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4caf450aa7693571f5184177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:13:25 2019 +0200 d3d10: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/Makefile.in | 2 ++ dlls/d3d10/d3d10_main.c | 3 --- dlls/d3d10/d3d10_private.h | 2 ++ dlls/d3d10/effect.c | 3 --- dlls/d3d10/shader.c | 3 --- dlls/d3d10/stateblock.c | 3 --- dlls/d3d10/utils.c | 3 --- 7 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 0e4cd6a..e76f3c5 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3d10.dll IMPORTLIB = d3d10 IMPORTS = dxguid uuid d3d10core d3dcompiler dxgi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3d10_main.c \ effect.c \ diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index bc90ff1..e3d1c57 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -20,9 +20,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d10_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10); diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e785b8b..f3fce9c 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -19,6 +19,8 @@ #ifndef __WINE_D3D10_PRIVATE_H #define __WINE_D3D10_PRIVATE_H +#include <math.h> + #include "wine/debug.h" #include "wine/rbtree.h" #include "wine/heap.h" diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd6f4a3..2390eee 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -18,9 +18,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d10_private.h" #include <float.h> diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index c97d8df..52e3cc0 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -18,9 +18,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d10_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10); diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index ebeebf7..e20a4e3 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d10_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10); diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 223b33a..3b51868 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d10_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10);

1 0

Alexandre Julliard : d3d10_1: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 3efc315e2326fed91b6e84f5f92e8b13bb2b7cb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3efc315e2326fed91b6e84f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:13:38 2019 +0200 d3d10_1: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/Makefile.in | 2 ++ dlls/d3d10_1/d3d10_1_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10_1/Makefile.in b/dlls/d3d10_1/Makefile.in index 50ae038..acac14c 100644 --- a/dlls/d3d10_1/Makefile.in +++ b/dlls/d3d10_1/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3d10_1.dll IMPORTLIB = d3d10_1 IMPORTS = dxguid d3d10core dxgi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3d10_1_main.c diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index 8ee5aa7..77b5cac 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -17,8 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "wine/debug.h" #define COBJMACROS

1 0

Alexandre Julliard : d3d10core: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 69c95f3c09ce658db71fe9a219d5933066d8bda6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69c95f3c09ce658db71fe9a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:13:44 2019 +0200 d3d10core: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index bfa0a81..cf7efb2 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3d10core.dll IMPORTLIB = d3d10core IMPORTS = d3d11 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3d10core_main.c

1 0

Alexandre Julliard : d3dim: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: e007676c6a3bb3dc28caecbed40bb75fc9854fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=e007676c6a3bb3dc28caecbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:14:51 2019 +0200 d3dim: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dim/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in index d1334bb..1acc054 100644 --- a/dlls/d3dim/Makefile.in +++ b/dlls/d3dim/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dim.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = d3dim_main.c RC_SRCS = version.rc

1 0

Alexandre Julliard : d3drm: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: c70e8b64ab9169409b8e977b01de71b1404cd5ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70e8b64ab9169409b8e977b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:15:21 2019 +0200 d3drm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/Makefile.in | 2 ++ dlls/d3drm/d3drm.c | 3 --- dlls/d3drm/d3drm_main.c | 3 --- dlls/d3drm/device.c | 3 --- dlls/d3drm/face.c | 3 --- dlls/d3drm/frame.c | 3 --- dlls/d3drm/light.c | 3 --- dlls/d3drm/material.c | 3 --- dlls/d3drm/math.c | 3 --- dlls/d3drm/meshbuilder.c | 3 --- dlls/d3drm/texture.c | 3 --- dlls/d3drm/viewport.c | 3 --- 12 files changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index f75a14b..1c2cbf4 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3drm.dll IMPORTLIB = d3drm IMPORTS = d3dxof ddraw +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3drm.c \ d3drm_main.c \ diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index d0f2023..e649bad 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 1abfe6f..075b331 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "initguid.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 2aa7e48..2e1b5f2 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 324b1de..1799ad9 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 11105db..8bed50b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index e31c026..2f53f20 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 62acb5a..e402ea6 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index a6c0c85..01d596b 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" /* Create a RGB color from its components */ diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 0090555..9b85c2d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 7741718..07f0896 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 5c0e24b..81d3af4 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm);

1 0

Alexandre Julliard : d3dx10: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 7f2be06f931de32cc0de1db48aa77cef0aade52f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f2be06f931de32cc0de1db4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:16:24 2019 +0200 d3dx10: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_33/Makefile.in | 2 ++ dlls/d3dx10_33/d3dx10_33_main.c | 3 --- dlls/d3dx10_34/Makefile.in | 2 ++ dlls/d3dx10_34/d3dx10_34_main.c | 3 --- dlls/d3dx10_35/Makefile.in | 2 ++ dlls/d3dx10_35/d3dx10_35_main.c | 3 --- dlls/d3dx10_36/Makefile.in | 2 ++ dlls/d3dx10_36/d3dx10_36_main.c | 3 --- dlls/d3dx10_37/Makefile.in | 2 ++ dlls/d3dx10_37/d3dx10_37_main.c | 3 --- dlls/d3dx10_38/Makefile.in | 2 ++ dlls/d3dx10_38/d3dx10_38_main.c | 3 --- dlls/d3dx10_39/Makefile.in | 2 ++ dlls/d3dx10_39/d3dx10_39_main.c | 3 --- dlls/d3dx10_40/Makefile.in | 2 ++ dlls/d3dx10_40/d3dx10_40_main.c | 3 --- dlls/d3dx10_41/Makefile.in | 2 ++ dlls/d3dx10_41/d3dx10_41_main.c | 3 --- dlls/d3dx10_42/Makefile.in | 2 ++ dlls/d3dx10_42/d3dx10_42_main.c | 3 --- dlls/d3dx10_43/Makefile.in | 2 ++ dlls/d3dx10_43/async.c | 7 ++----- dlls/d3dx10_43/d3dx10_43_main.c | 3 --- 23 files changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/d3dx10_33/Makefile.in b/dlls/d3dx10_33/Makefile.in index 7080752..e74bb22 100644 --- a/dlls/d3dx10_33/Makefile.in +++ b/dlls/d3dx10_33/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_33.dll +EXTRADLLFLAGS = -mno-cygwin + 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 3aaf41a..68c52ff 100644 --- a/dlls/d3dx10_33/d3dx10_33_main.c +++ b/dlls/d3dx10_33/d3dx10_33_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_34/Makefile.in b/dlls/d3dx10_34/Makefile.in index ab5ac6c..2ad26f8 100644 --- a/dlls/d3dx10_34/Makefile.in +++ b/dlls/d3dx10_34/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_34.dll +EXTRADLLFLAGS = -mno-cygwin + 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 0c50efa..74224d5 100644 --- a/dlls/d3dx10_34/d3dx10_34_main.c +++ b/dlls/d3dx10_34/d3dx10_34_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in index 8a24ab5..c7e52a4 100644 --- a/dlls/d3dx10_35/Makefile.in +++ b/dlls/d3dx10_35/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_35.dll +EXTRADLLFLAGS = -mno-cygwin + 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 d92c56a..9f78e22 100644 --- a/dlls/d3dx10_35/d3dx10_35_main.c +++ b/dlls/d3dx10_35/d3dx10_35_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_36/Makefile.in b/dlls/d3dx10_36/Makefile.in index d6c5c31..b3be0ed 100644 --- a/dlls/d3dx10_36/Makefile.in +++ b/dlls/d3dx10_36/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_36.dll +EXTRADLLFLAGS = -mno-cygwin + 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 06de8c3..367755d 100644 --- a/dlls/d3dx10_36/d3dx10_36_main.c +++ b/dlls/d3dx10_36/d3dx10_36_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in index 047edee..2d66b62 100644 --- a/dlls/d3dx10_37/Makefile.in +++ b/dlls/d3dx10_37/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_37.dll +EXTRADLLFLAGS = -mno-cygwin + 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 6b03681..6294d3b 100644 --- a/dlls/d3dx10_37/d3dx10_37_main.c +++ b/dlls/d3dx10_37/d3dx10_37_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in index 47005a6..7c32ea4 100644 --- a/dlls/d3dx10_38/Makefile.in +++ b/dlls/d3dx10_38/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_38.dll +EXTRADLLFLAGS = -mno-cygwin + 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 5a5ba23..984aa71 100644 --- a/dlls/d3dx10_38/d3dx10_38_main.c +++ b/dlls/d3dx10_38/d3dx10_38_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_39/Makefile.in b/dlls/d3dx10_39/Makefile.in index cac7d28..8df5714 100644 --- a/dlls/d3dx10_39/Makefile.in +++ b/dlls/d3dx10_39/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_39.dll +EXTRADLLFLAGS = -mno-cygwin + 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 33daa9a..bf57729 100644 --- a/dlls/d3dx10_39/d3dx10_39_main.c +++ b/dlls/d3dx10_39/d3dx10_39_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in index 7be8758..760a3ac 100644 --- a/dlls/d3dx10_40/Makefile.in +++ b/dlls/d3dx10_40/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_40.dll +EXTRADLLFLAGS = -mno-cygwin + 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 0725871..3a10f4d 100644 --- a/dlls/d3dx10_40/d3dx10_40_main.c +++ b/dlls/d3dx10_40/d3dx10_40_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in index 8335269..0199bc0 100644 --- a/dlls/d3dx10_41/Makefile.in +++ b/dlls/d3dx10_41/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_41.dll +EXTRADLLFLAGS = -mno-cygwin + 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 e8680d8..0162032 100644 --- a/dlls/d3dx10_41/d3dx10_41_main.c +++ b/dlls/d3dx10_41/d3dx10_41_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_42/Makefile.in b/dlls/d3dx10_42/Makefile.in index 1050d9b..ffdf750 100644 --- a/dlls/d3dx10_42/Makefile.in +++ b/dlls/d3dx10_42/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_42.dll +EXTRADLLFLAGS = -mno-cygwin + 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 6c11678..81c400e 100644 --- a/dlls/d3dx10_42/d3dx10_42_main.c +++ b/dlls/d3dx10_42/d3dx10_42_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 5f1eccb..2d0343f 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 IMPORTS = d3d10_1 d3dcompiler dxguid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ async.c \ d3dx10_43_main.c diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index c7d80c9..062a04d 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -16,14 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d10_1.h" #include "d3dx10.h" #include "d3dcompiler.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -318,13 +315,13 @@ HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLo return E_OUTOFMEMORY; object->ID3DX10DataLoader_iface.lpVtbl = &filedataloadervtbl; - object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (strlenW(filename) + 1) * sizeof(WCHAR)); + object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!object->u.file.path) { HeapFree(GetProcessHeap(), 0, object); return E_OUTOFMEMORY; } - strcpyW(object->u.file.path, filename); + lstrcpyW(object->u.file.path, filename); object->data = NULL; object->size = 0; diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 0edb3a9..b0295cc 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -19,10 +19,7 @@ * */ -#include "config.h" -#include "wine/port.h" #include "wine/debug.h" -#include "wine/unicode.h" #include <stdarg.h>

1 0