June 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : wineandroid: Store the actual screen DPI on startup.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: wine Branch: master Commit: f254aec4498e9926200ea9fd9cd2acf914747d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f254aec4498e9926200ea9fd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 19:12:30 2017 +0200 wineandroid: Store the actual screen DPI on startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/WineActivity.java | 2 ++ dlls/wineandroid.drv/android.h | 8 ++++++++ dlls/wineandroid.drv/init.c | 18 ++++++++++++++++++ dlls/wineandroid.drv/window.c | 22 ++++++++++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 55eba97..07082dc 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = wineandroid.drv -IMPORTS = user32 gdi32 ntoskrnl +IMPORTS = user32 gdi32 advapi32 ntoskrnl C_SRCS = \ device.c \ diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 1b99b18..ea1ab85 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -53,6 +53,7 @@ public class WineActivity extends Activity { private native String wine_init( String[] cmdline, String[] env ); public native void wine_desktop_changed( int width, int height ); + public native void wine_config_changed( int dpi ); public native void wine_surface_changed( int hwnd, Surface surface ); public native boolean wine_motion_event( int hwnd, int action, int x, int y, int state, int vscroll ); public native boolean wine_keyboard_event( int hwnd, int action, int keycode, int state ); @@ -508,6 +509,7 @@ public class WineActivity extends Activity top_view = new TopView( this, hwnd ); setContentView( top_view ); progress_dialog.dismiss(); + wine_config_changed( getResources().getConfiguration().densityDpi ); } public void create_window( int hwnd, int parent, int pid ) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 0c3f35f..5ef7668 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -81,10 +81,12 @@ enum android_window_messages extern HWND get_capture_window(void) DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; +extern void set_screen_dpi( DWORD dpi ) DECLSPEC_HIDDEN; extern void update_keyboard_lock_state( WORD vkey, UINT state ) DECLSPEC_HIDDEN; /* JNI entry points */ extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; +extern void config_changed( JNIEnv *env, jobject obj, jint dpi ) DECLSPEC_HIDDEN; extern void surface_changed( JNIEnv *env, jobject obj, jint win, jobject surface ) DECLSPEC_HIDDEN; extern jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, jint x, jint y, jint state, jint vscroll ) DECLSPEC_HIDDEN; @@ -94,6 +96,7 @@ extern jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, enum event_type { DESKTOP_CHANGED, + CONFIG_CHANGED, SURFACE_CHANGED, MOTION_EVENT, KEYBOARD_EVENT, @@ -111,6 +114,11 @@ union event_data struct { enum event_type type; + unsigned int dpi; + } cfg; + struct + { + enum event_type type; HWND hwnd; ANativeWindow *window; unsigned int width; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 14aa239..871e41d 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "android.h" #include "wine/server.h" #include "wine/library.h" @@ -82,6 +83,22 @@ void init_monitors( int width, int height ) } +/****************************************************************************** + * set_screen_dpi + */ +void set_screen_dpi( DWORD dpi ) +{ + static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; + static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s',0}; + HKEY hkey; + + if (!RegCreateKeyW( HKEY_CURRENT_CONFIG, dpi_key_name, &hkey )) + { + RegSetValueExW( hkey, dpi_value_name, 0, REG_DWORD, (void *)&dpi, sizeof(DWORD) ); + RegCloseKey( hkey ); + } +} + /********************************************************************** * fetch_display_metrics */ @@ -390,6 +407,7 @@ const struct gdi_dc_funcs * CDECL ANDROID_get_gdi_driver( unsigned int version ) static const JNINativeMethod methods[] = { { "wine_desktop_changed", "(II)V", desktop_changed }, + { "wine_config_changed", "(I)V", config_changed }, { "wine_surface_changed", "(ILandroid/view/Surface;)V", surface_changed }, { "wine_motion_event", "(IIIIII)Z", motion_event }, { "wine_keyboard_event", "(IIII)Z", keyboard_event }, diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 33f2240..3bde739 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -224,6 +224,23 @@ void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) /*********************************************************************** + * config_changed + * + * JNI callback, runs in the context of the Java thread. + */ +void config_changed( JNIEnv *env, jobject obj, jint dpi ) +{ + union event_data data; + + memset( &data, 0, sizeof(data) ); + data.type = CONFIG_CHANGED; + data.cfg.dpi = dpi; + p__android_log_print( ANDROID_LOG_INFO, "wine", "config_changed: %u dpi", dpi ); + send_event( &data ); +} + + +/*********************************************************************** * surface_changed * * JNI callback, runs in the context of the Java thread. @@ -428,6 +445,11 @@ static int process_events( DWORD mask ) SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); break; + case CONFIG_CHANGED: + TRACE( "CONFIG_CHANGED dpi %u\n", event->data.cfg.dpi ); + set_screen_dpi( event->data.cfg.dpi ); + break; + case SURFACE_CHANGED: TRACE("SURFACE_CHANGED %p %p size %ux%u\n", event->data.surface.hwnd, event->data.surface.window, event->data.surface.width, event->data.surface.height );

1 0

Alistair Leslie-Hughes : include/windocdec.idl: Add interface IWICImagingFactory2.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: wine Branch: master Commit: 28ea560b7a935e9652906d2dbf3460aa0cb927b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ea560b7a935e9652906d2db… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 6 01:51:05 2017 +0000 include/windocdec.idl: Add interface IWICImagingFactory2. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 962a6fd..1ea6e0e 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -20,6 +20,8 @@ import "wtypes.idl"; import "propidl.idl"; import "ocidl.idl"; +cpp_quote ("#include \"dcommon.h\"") + cpp_quote("#define WINCODEC_SDK_VERSION 0x0236") #define CODEC_FORCE_DWORD 0x7fffffff @@ -215,6 +217,15 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") +cpp_quote("#if 0") +typedef DWORD *ID2D1Device; +typedef DWORD *ID2D1Image; +typedef DWORD *D2D1_PIXEL_FORMAT; +cpp_quote ("#endif") + +cpp_quote ("typedef interface ID2D1Device ID2D1Device;") +cpp_quote ("typedef interface ID2D1Image ID2D1Image;") + typedef struct WICRect { INT X; INT Y; @@ -230,6 +241,17 @@ typedef struct WICBitmapPattern { BOOL EndOfStream; } WICBitmapPattern; +typedef struct WICImageParameters +{ + D2D1_PIXEL_FORMAT PixelFormat; + FLOAT DpiX; + FLOAT DpiY; + FLOAT Top; + FLOAT Left; + UINT32 PixelWidth; + UINT32 PixelHeight; +} WICImageParameters; + typedef UINT32 WICColor; interface IWICPalette; @@ -842,7 +864,32 @@ interface IWICFastMetadataEncoder : IUnknown [out] IWICMetadataQueryWriter **ppIMetadataQueryWriter); } -cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") +[ + object, + uuid(04c75bf8-3ce1-473b-acc5-3cc4f5e94999), + local +] +interface IWICImageEncoder : IUnknown +{ + HRESULT WriteFrame( + [in] ID2D1Image *image, + [in] IWICBitmapFrameEncode *encode, + [in, unique] const WICImageParameters *parameters); + + HRESULT WriteFrameThumbnail( + [in] ID2D1Image *image, + [in] IWICBitmapFrameEncode *encode, + [in, unique] const WICImageParameters *parameters); + + HRESULT WriteThumbnail( + [in] ID2D1Image *image, + [in] IWICBitmapEncoder *encoder, + [in, unique] const WICImageParameters *parameters); +}; + +cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") +cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory1, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") +cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory2, 0x317d06e8,0x5f24,0x433d,0xbd,0xf7,0x79,0xce,0x68,0xd8,0xab,0xc2);") [ object, @@ -971,6 +1018,18 @@ interface IWICImagingFactory : IUnknown } [ + object, + uuid(7b816b45-1996-4476-b132-de9e247c8af0), + local +] +interface IWICImagingFactory2 : IWICImagingFactory +{ + HRESULT CreateImageEncoder( + [in] ID2D1Device *device, + [out] IWICImageEncoder **encoder); +}; + +[ local, object, uuid(dc2bb46d-3f07-481e-8625-220c4aedbb33)

1 0

Nikolay Sivov : d3drm/tests: Add helpers to test vectors.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: wine Branch: master Commit: ee89ee91ecb60aa93b9d4d0e0706a8acedee84b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee89ee91ecb60aa93b9d4d0e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:24 2017 +0300 d3drm/tests: Add helpers to test vectors. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 144 +++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee89ee91ecb60aa93b9d4…

1 0

Jacek Caban : wininet/tests: Silence noisy traces.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: wine Branch: master Commit: a0af1eba27f744a2cfc7fd085558ca8cd2431294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0af1eba27f744a2cfc7fd085… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 12 08:53:53 2017 +0200 wininet/tests: Silence noisy traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 147 +++++++++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0af1eba27f744a2cfc7f…

1 0

Matteo Bruni : d3dx9: Move set_number() into d3dx9_private.h.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: wine Branch: master Commit: 4569cbe8e98c074398aefea47eaa1d63ec96caae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4569cbe8e98c074398aefea47… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:35 2017 +0200 d3dx9: Move set_number() into d3dx9_private.h. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 84 +++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/util.c | 89 ------------------------------------------- 2 files changed, 82 insertions(+), 91 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 8eb12b7..c2f4977 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -123,8 +123,88 @@ const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; /* parameter type conversion helpers */ -void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, - const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +static inline BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_INT: + case D3DXPT_BOOL: + return !!*(DWORD *)data; + + case D3DXPT_VOID: + return *(BOOL *)data; + + default: + return FALSE; + } +} + +static inline int get_int(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + return (int)(*(float *)data); + + case D3DXPT_INT: + case D3DXPT_VOID: + return *(int *)data; + + case D3DXPT_BOOL: + return get_bool(type, data); + + default: + return 0; + } +} + +static inline float get_float(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_VOID: + return *(float *)data; + + case D3DXPT_INT: + return (float)(*(int *)data); + + case D3DXPT_BOOL: + return (float)get_bool(type, data); + + default: + return 0.0f; + } +} + +static inline void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) +{ + if (outtype == intype) + { + *(DWORD *)outdata = *(DWORD *)indata; + return; + } + + switch (outtype) + { + case D3DXPT_FLOAT: + *(float *)outdata = get_float(intype, indata); + break; + + case D3DXPT_BOOL: + *(BOOL *)outdata = get_bool(intype, indata); + break; + + case D3DXPT_INT: + *(int *)outdata = get_int(intype, indata); + break; + + default: + *(DWORD *)outdata = 0; + break; + } +} static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) { diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 8f9b0b3..9e4bbbf 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -291,95 +291,6 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR -/* parameter type conversion helpers */ -static BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - case D3DXPT_INT: - case D3DXPT_BOOL: - return *(DWORD *)data != 0; - - case D3DXPT_VOID: - return *(BOOL *)data; - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return FALSE; - } -} - -static INT get_int(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - return (INT)(*(FLOAT *)data); - - case D3DXPT_INT: - case D3DXPT_VOID: - return *(INT *)data; - - case D3DXPT_BOOL: - return get_bool(type, data); - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return 0; - } -} - -static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - case D3DXPT_VOID: - return *(FLOAT *)data; - - case D3DXPT_INT: - return (FLOAT)(*(INT *)data); - - case D3DXPT_BOOL: - return (FLOAT)get_bool(type, data); - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return 0.0f; - } -} - -void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) -{ - if (outtype == intype) - { - *(DWORD *)outdata = *(DWORD *)indata; - return; - } - - switch (outtype) - { - case D3DXPT_FLOAT: - *(FLOAT *)outdata = get_float(intype, indata); - break; - - case D3DXPT_BOOL: - *(BOOL *)outdata = get_bool(intype, indata); - break; - - case D3DXPT_INT: - *(INT *)outdata = get_int(intype, indata); - break; - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(outtype)); - *(DWORD *)outdata = 0; - break; - } -} - - /*********************************************************************** * D3DXDebugMute * Returns always FALSE for us.

1 0

Francois Gouget : winetest: Add proper command line options.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: tools Branch: master Commit: 889251094365fb255d169d47a0d9f50ee93702d4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=889251094365fb255d169d47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:41:40 2017 +0200 winetest: Add proper command line options. This makes it possible to specify the workdir or which report or build directory to work on. The latter make it possible to manually update the generated files for the reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 75 +++++++++++++++++++++++++++++++- winetest/build-index | 80 +++++++++++++++++++++++++++++++++- winetest/dissect | 96 +++++++++++++++++++++++++++++++++++++--- winetest/gather | 118 ++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 347 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=889251094365fb255d16…

1 0

Francois Gouget : winetest/gather: Don' t issue an error if outdated is already gone.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: tools Branch: master Commit: be316759900f806c0cf164df1ea3278a49129578 URL: http://source.winehq.org/git/tools.git/?a=commit;h=be316759900f806c0cf164df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:15:12 2017 +0200 winetest/gather: Don't issue an error if outdated is already gone. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index 2886bc5..fe1dfb4 100755 --- a/winetest/gather +++ b/winetest/gather @@ -821,7 +821,8 @@ if (!rename "$filename.new", "$filename") write_totals(\@groups); DONE: -if (!unlink $outdated) { +if (!unlink $outdated and !$!{ENOENT}) +{ error("unable to unlink '$outdated': $!\n"); exit 3; }

1 0

Francois Gouget : testbot/TestLauncher: Compress the TestLauncher binaries.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: tools Branch: master Commit: b70fbe6405e0c0d53065bbf67b79079035ff6896 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b70fbe6405e0c0d53065bbf6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 18:26:51 2017 +0200 testbot/TestLauncher: Compress the TestLauncher binaries. They are sent to the VMs for every test so we want them to be as small as possible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 06b3729..6b41e01 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -4,16 +4,25 @@ CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc CROSSSTRIP64 = x86_64-w64-mingw32-strip +CROSSZIPEXE = upx-ucl all: TestLauncher32.exe TestLauncher64.exe TestLauncher32.exe: TestLauncher.c $(CROSSCC32) -Wall -o $@ $< $(CROSSSTRIP32) $@ + if which $(CROSSZIPEXE); \ + then \ + $(CROSSZIPEXE) --best -q -q $@; \ + fi TestLauncher64.exe: TestLauncher.c $(CROSSCC64) -Wall -o $@ $< $(CROSSSTRIP64) $@ + if which $(CROSSZIPEXE); \ + then \ + $(CROSSZIPEXE) --best -q -q $@; \ + fi clean: rm -f TestLauncher32.exe TestLauncher64.exe

1 0

Francois Gouget : testbot: Rebuild TestLauncher as part of the Reconfig.
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: tools Branch: master Commit: e1fb1b57a7adacb6c3eb48d9f1ed5b7af70e1acf URL: http://source.winehq.org/git/tools.git/?a=commit;h=e1fb1b57a7adacb6c3eb48d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 18:26:45 2017 +0200 testbot: Rebuild TestLauncher as part of the Reconfig. Currently the TestLauncher binaries are checked into Git which is wrong and means they are effectively never updated. Now that Reconfig.pl rebuilds them the TestBot server will be able to retrive the up-to-date binaries and use them. Modify the TestLauncher makefile so it does not overwrite the checked-in TestLauncher binaries. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 30 +++++++++++++++++++----------- testbot/src/TestLauncher/Makefile | 9 ++++++--- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index e522e94..dfc338b 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -115,6 +115,20 @@ sub BuildTestAgentd() return 1; } +sub BuildTestLauncher() +{ + system("( cd $::RootDir/src/TestLauncher && set -x && " . + " time make -j$ncpus" . + ") >>$LogDir/Reconfig.log 2>&1"); + if ($? != 0) + { + LogMsg "Build TestLauncher failed\n"; + return !1; + } + + return 1; +} + sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); @@ -173,17 +187,11 @@ if (! GitPull()) CountCPUs(); -if (! BuildTestAgentd()) -{ - exit(1); -} - -if (! BuildNative()) -{ - exit(1); -} - -if (! BuildCross(32) || ! BuildCross(64)) +if (!BuildTestAgentd() || + !BuildTestLauncher() || + !BuildNative() || + !BuildCross(32) || + !BuildCross(64)) { exit(1); } diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 2bce2a1..06b3729 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -5,12 +5,15 @@ CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc CROSSSTRIP64 = x86_64-w64-mingw32-strip -all: $(bindir)/TestLauncher32.exe $(bindir)/TestLauncher64.exe +all: TestLauncher32.exe TestLauncher64.exe -$(bindir)/TestLauncher32.exe: TestLauncher.c +TestLauncher32.exe: TestLauncher.c $(CROSSCC32) -Wall -o $@ $< $(CROSSSTRIP32) $@ -$(bindir)/TestLauncher64.exe: TestLauncher.c +TestLauncher64.exe: TestLauncher.c $(CROSSCC64) -Wall -o $@ $< $(CROSSSTRIP64) $@ + +clean: + rm -f TestLauncher32.exe TestLauncher64.exe

1 0

Francois Gouget : winetest: Use relative paths in get_build_info().
by Alexandre Julliard June 12, 2017

June 12, 2017

Module: tools Branch: master Commit: a35fe43d2392f77d8c43e20cef571e702ef5898f URL: http://source.winehq.org/git/tools.git/?a=commit;h=a35fe43d2392f77d8c43e20c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:14:47 2017 +0200 winetest: Use relative paths in get_build_info(). It is meant to be called from the work directory anyway, just like the rest of the scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 4 ++-- winetest/dissect | 4 ++-- winetest/gather | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index dcd9795..fb949b1 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -62,11 +62,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); diff --git a/winetest/dissect b/winetest/dissect index 99e50fb..ae8a0e5 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -81,11 +81,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); diff --git a/winetest/gather b/winetest/gather index 94f3541..2886bc5 100755 --- a/winetest/gather +++ b/winetest/gather @@ -76,11 +76,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject);

1 0