December 2018 - Wine-commits

Alexandre Julliard : makefiles: Add support for sharing resource files with parent dll.
by Alexandre Julliard 21 Dec '18

21 Dec '18

Module: wine Branch: master Commit: 00c57ad89a225b840225f83e34d98c9688516944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00c57ad89a225b840225f83e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 10:49:17 2018 +0100 makefiles: Add support for sharing resource files with parent dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/Makefile.in | 1 + tools/make_makefiles | 1 + tools/makedep.c | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 53cd0c3..0ede9f0 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -21,4 +21,5 @@ C_SRCS = \ IDL_SRCS = dinput8.idl RC_SRCS = \ + dinput.rc \ version.rc diff --git a/tools/make_makefiles b/tools/make_makefiles index d1fe7f5..455ff9e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -404,6 +404,7 @@ sub assign_sources_to_makefiles(@) my $parent = get_parent_makefile( $file ); next unless $parent; preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); + preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); diff --git a/tools/makedep.c b/tools/makedep.c index 6b631b6..532ef52 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -89,6 +89,7 @@ struct incl_file #define FLAG_GENERATED 0x000001 /* generated file */ #define FLAG_INSTALL 0x000002 /* file to install */ +#define FLAG_PARENTDIR 0x000004 /* file comes from parent dir */ #define FLAG_IDL_PROXY 0x000100 /* generates a proxy (_p.c) file */ #define FLAG_IDL_CLIENT 0x000200 /* generates a client (_c.c) file */ #define FLAG_IDL_SERVER 0x000400 /* generates a server (_s.c) file */ @@ -1351,6 +1352,7 @@ static struct file *open_local_file( const struct makefile *make, const char *pa path = strmake( "%s/%s", make->parent_dir, path ); src_path = root_dir_path( base_dir_path( make, path )); ret = load_file( src_path ); + if (ret) ret->flags |= FLAG_PARENTDIR; } if (ret) *filename = src_dir_path( make, path ); @@ -2447,6 +2449,7 @@ static void output_po_files( const struct makefile *make ) LIST_FOR_EACH_ENTRY( source, &submake->sources, struct incl_file, entry ) { + if (source->file->flags & FLAG_PARENTDIR) continue; if (strendswith( source->name, ".rc" ) && (source->file->flags & FLAG_RC_PO)) { char *pot_file = replace_extension( source->name, ".rc", ".pot" ); @@ -2567,7 +2570,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c output_filename( source->filename ); output( "\n" ); } - if (source->file->flags & FLAG_RC_PO) + if (source->file->flags & FLAG_RC_PO && !(source->file->flags & FLAG_PARENTDIR)) { strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename );

1 0

Alistair Leslie-Hughes : include: Wrap exported function in extern C.
by Alexandre Julliard 21 Dec '18

21 Dec '18

Module: wine Branch: master Commit: 0805783df313ed9fef2e4588811fd5f90a3507f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0805783df313ed9fef2e4588… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 21 00:24:21 2018 +0000 include: Wrap exported function in extern C. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 4697f50..b0d8e43 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -23,6 +23,10 @@ #include <mmreg.h> #include <avrt.h> +#if defined(__cplusplus) +extern "C" { +#endif + #if !defined(MF_VERSION) /* Default to Windows XP */ #define MF_SDK_VERSION 0x0001 @@ -95,4 +99,8 @@ HRESULT WINAPI MFTUnregister(CLSID clsid); HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); +#if defined(__cplusplus) +} +#endif + #endif /* __WINE_MFAPI_H */

1 0

Sven Baars : propsys/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 21 Dec '18

21 Dec '18

Module: wine Branch: master Commit: 61a1dae39885d20de1da321ff742697e7634f0fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=61a1dae39885d20de1da321f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Dec 20 21:18:29 2018 +0100 propsys/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propstore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 01500dd..3fe8613 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -214,6 +214,7 @@ static void test_persistserialized(void) if (FAILED(hr)) { + IPropertyStore_Release(propstore); skip("IPersistSerializedPropStorage not supported\n"); return; }

1 0

Piotr Caban : msvcrt: Use _timezone in _ftime64.
by Alexandre Julliard 21 Dec '18

21 Dec '18

Module: wine Branch: master Commit: b8bafa2c58f69043debe9c7a962eb5f04dee0ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8bafa2c58f69043debe9c7a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 12:44:26 2018 +0100 msvcrt: Use _timezone in _ftime64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 861b2ed..1fee0a9 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -769,17 +769,16 @@ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf) FILETIME ft; ULONGLONG time; - DWORD tzid = GetTimeZoneInformation(&tzinfo); + _tzset_init(); + GetSystemTimeAsFileTime(&ft); time = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; buf->time = time / TICKSPERSEC - SECS_1601_TO_1970; buf->millitm = (time % TICKSPERSEC) / TICKSPERMSEC; - buf->timezone = tzinfo.Bias + - ( tzid == TIME_ZONE_ID_STANDARD ? tzinfo.StandardBias : - ( tzid == TIME_ZONE_ID_DAYLIGHT ? tzinfo.DaylightBias : 0 )); - buf->dstflag = (tzid == TIME_ZONE_ID_DAYLIGHT?1:0); + buf->timezone = MSVCRT___timezone / 60; + buf->dstflag = GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Use GetDaylightFlag() to set dstflag value in _ftime64.
by Alexandre Julliard 21 Dec '18

21 Dec '18

Module: wine Branch: master Commit: 2efc73b96811330be34ef81ff9e35054bcbb5679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2efc73b96811330be34ef81f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 12:44:39 2018 +0100 msvcrt: Use GetDaylightFlag() to set dstflag value in _ftime64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 1fee0a9..14f4ba0 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +BOOL WINAPI GetDaylightFlag(void); + static const int MonthLengths[2][12] = { { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, @@ -765,7 +767,6 @@ double CDECL MSVCRT_difftime(MSVCRT___time32_t time1, MSVCRT___time32_t time2) */ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf) { - TIME_ZONE_INFORMATION tzinfo; FILETIME ft; ULONGLONG time; @@ -778,7 +779,7 @@ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf) buf->time = time / TICKSPERSEC - SECS_1601_TO_1970; buf->millitm = (time % TICKSPERSEC) / TICKSPERMSEC; buf->timezone = MSVCRT___timezone / 60; - buf->dstflag = GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT; + buf->dstflag = GetDaylightFlag(); } /*********************************************************************

1 0

Andrey Gusev : windowscodecs: Remove redundant comparison.
by Alexandre Julliard 21 Dec '18

21 Dec '18

Module: wine Branch: master Commit: af8d3d366ca7cd98b00e5e1462663cb8f206f9dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8d3d366ca7cd98b00e5e14… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 12 16:04:36 2018 +0200 windowscodecs: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/imgfactory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 40f3ed5..e7c61cf 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -507,7 +507,7 @@ static HRESULT create_bitmap_from_source_rect(IWICBitmapSource *piBitmapSource, IWICPixelFormatInfo2 *formatinfo; WICPixelFormatNumericRepresentation format_type; - assert(!rect || (rect && option == WICBitmapCacheOnLoad)); + assert(!rect || option == WICBitmapCacheOnLoad); if (!piBitmapSource || !ppIBitmap) return E_INVALIDARG;

1 0

Alexandre Julliard : Release 4.0-rc3.
by Alexandre Julliard 21 Dec '18

21 Dec '18

Module: wine Branch: master Commit: 2d16e6e59c910ba0a5e7c1c104b290731a8f1ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d16e6e59c910ba0a5e7c1c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 18:42:31 2018 +0100 Release 4.0-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 221 +++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 ++--- 3 files changed, 136 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d16e6e59c910ba0a5e7…

1 0

Tag wine-4.0-rc3 : Alexandre Julliard : Release 4.0-rc3
by Alexandre Julliard 21 Dec '18

21 Dec '18

Module: wine Branch: refs/tags/wine-4.0-rc3 Tag: 251d70e7d17db5b1aba16d48a52710e51faf22b8 URL: https://source.winehq.org/git/wine.git/?a=tag;h=251d70e7d17db5b1aba16d48a52… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 18:42:31 2018 +0100 Release 4.0-rc3

1 0

Paul Gofman : d3d9: Fix crash in d3d9_vertexbuffer_Release().
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: e6c6be1cf75db1cf58f39d170ab6a7f3d7bc5663 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6c6be1cf75db1cf58f39d17… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 18 19:57:22 2018 +0300 d3d9: Fix crash in d3d9_vertexbuffer_Release(). If there is no draw buffer then buffer pointer gets freed in wined3d_buffer_decref() via d3d9_vertexbuffer_wined3d_parent_ops and consequent check for buffer->draw_buffer results in freed memory access. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 1533a84..7e178f2 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -76,12 +76,13 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */

1 0

Paul Gofman : d3d9: Fix crash in d3d9_indexbuffer_Release().
by Alexandre Julliard 20 Dec '18

20 Dec '18

Module: wine Branch: master Commit: a878b0fae82962da017c56fdde564d15b8b4d4c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a878b0fae82962da017c56fd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 18 19:57:23 2018 +0300 d3d9: Fix crash in d3d9_indexbuffer_Release(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 7e178f2..840d7e9 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -402,12 +402,13 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */

1 0