January 2016 - Wine-commits

Nikolay Sivov : ole2: Implement ReadClassStm().
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 1053b4d4faed52756429c9813c9f3d4e087ed632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1053b4d4faed52756429c9813… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:45:49 2016 +0300 ole2: Implement ReadClassStm(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 63 +++++++++++++++++++++++++++++++++++++---- dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 422469d..bd9cf45 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -274,6 +274,9 @@ HRESULT WINAPI OleFlushClipboard16(void) return OleFlushClipboard(); } +#define GET_SEGPTR_METHOD_ADDR(ifacename,segptr,methodname) \ + ((SEGPTR)((const ifacename##Vtbl*)MapSL((SEGPTR)((ifacename*)MapSL(segptr))->lpVtbl))->methodname) + /*********************************************************************** * ReadClassStg (OLE2.18) * @@ -308,17 +311,15 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) /* * read a STATSTG structure (contains the clsid) from the storage */ - args[0] = (DWORD)pstg; /* iface */ + args[0] = pstg; /* iface */ args[1] = WOWGlobalAllocLock16( 0, sizeof(STATSTG16), &hstatstg ); args[2] = STATFLAG_DEFAULT; if (!WOWCallback16Ex( - (DWORD)((const IStorage16Vtbl*)MapSL( - (SEGPTR)((LPSTORAGE16)MapSL(pstg))->lpVtbl) - )->Stat, + GET_SEGPTR_METHOD_ADDR(IStorage16, pstg, Stat), WCB16_PASCAL, 3*sizeof(DWORD), - (LPVOID)args, + args, (LPDWORD)&hres )) { WOWGlobalUnlockFree16(args[1]); @@ -336,6 +337,58 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) } /*********************************************************************** + * ReadClassStm (OLE2.20) + */ +HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid) +{ + HANDLE16 hclsid, hread; + HRESULT hres; + DWORD args[4]; + + TRACE("(0x%x, %p)\n", stream, clsid); + + if (!clsid) + return E_INVALIDARG16; + + memset(clsid, 0, sizeof(*clsid)); + + if (!stream) + return E_INVALIDARG16; + + args[0] = stream; /* iface */ + args[1] = WOWGlobalAllocLock16( 0, sizeof(CLSID), &hclsid ); + args[2] = sizeof(CLSID); + args[3] = WOWGlobalAllocLock16( 0, sizeof(ULONG), &hread ); + + if (WOWCallback16Ex( + GET_SEGPTR_METHOD_ADDR(IStream16, stream, Read), + WCB16_PASCAL, + 4*sizeof(DWORD), + args, + (DWORD*)&hres)) + { + ULONG readlen; + + memcpy(&readlen, MapSL(args[3]), sizeof(readlen)); + if (readlen == sizeof(CLSID)) + memcpy(clsid, MapSL(args[1]), sizeof(CLSID)); + else + hres = STG_E_READFAULT; + + TRACE("clsid is %s\n", debugstr_guid(clsid)); + } + else + { + ERR("CallTo16 IStream16::Read() failed, hres %x\n", hres); + hres = E_FAIL; + } + WOWGlobalUnlockFree16(args[1]); + WOWGlobalUnlockFree16(args[3]); + + return hres; +} + +/*********************************************************************** * GetConvertStg (OLE2.82) */ HRESULT WINAPI GetConvertStg16(LPSTORAGE stg) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index cb6b1ec..ed5e917 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -17,7 +17,7 @@ 17 stub OLELOCKRUNNING 18 pascal ReadClassStg(segptr ptr) ReadClassStg16 19 pascal WriteClassStg(segptr ptr) WriteClassStg16 -20 stub READCLASSSTM +20 pascal ReadClassStm(segptr ptr) ReadClassStm16 21 stub WRITECLASSSTM 22 stub BINDMONIKER 23 stub MKPARSEDISPLAYNAME

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayAllocDescriptor().
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: d8287b55009890c63adf15f7809b527a5c5885c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8287b55009890c63adf15f78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:47:06 2016 +0300 ole2disp: Implement SafeArrayAllocDescriptor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 51 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 43336c4..1774211 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "oleauto.h" #include "winerror.h" +#include "wownt32.h" #include "wine/windef16.h" #include "wine/winbase16.h" @@ -39,6 +40,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +#define E_OUTOFMEMORY16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 2) +#define E_INVALIDARG16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 3) + +/* 16-bit SAFEARRAY implementation */ +typedef struct tagSAFEARRAYBOUND16 +{ + ULONG cElements; + LONG lLbound; +} SAFEARRAYBOUND16; + +typedef struct tagSAFEARRAY16 +{ + USHORT cDims; + USHORT fFeatures; + USHORT cbElements; + USHORT cLocks; + ULONG handle; + SEGPTR pvData; + SAFEARRAYBOUND16 rgsabound[1]; +} SAFEARRAY16; + +static SEGPTR safearray_alloc(ULONG size) +{ + HANDLE16 h; + return WOWGlobalAllocLock16(GPTR, size, &h); +} + +/****************************************************************************** + * SafeArrayAllocDescriptor [OLE2DISP.38] + */ +HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) +{ + SAFEARRAY16 *sa; + ULONG size; + + TRACE("%u, %p\n", dims, ret); + + if (!dims) + return E_INVALIDARG16; + + size = sizeof(SAFEARRAY16) + sizeof(SAFEARRAYBOUND16) * (dims - 1); + *ret = safearray_alloc(size); + if (!*ret) + return E_OUTOFMEMORY16; + + sa = MapSL(*ret); + sa->cDims = dims; + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index e4655f0..08372c5 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -35,7 +35,7 @@ 35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject16 36 stub REVOKEACTIVEOBJECT 37 stub GETACTIVEOBJECT -38 stub SAFEARRAYALLOCDESCRIPTOR +38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 stub SAFEARRAYALLOCDATA 40 stub SAFEARRAYDESTROYDESCRIPTOR 41 stub SAFEARRAYDESTROYDATA

1 0

Michael Stefaniuc : dmime: Don' t set DSBCAPS_CTRLPAN together with DSBCAPS_CTRL3D.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 5433a2c0549b71160534be9e52afe987028b1c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5433a2c0549b71160534be9e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 10 23:37:12 2016 +0100 dmime: Don't set DSBCAPS_CTRLPAN together with DSBCAPS_CTRL3D. Troubleshooted by Michael Müller. Fixes a regression caused by 0e5dcc2c841be0a4311d1915d073d2775fe436b4. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 38f68db..8b5d3e2 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1035,7 +1035,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); - desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS; + desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS; desc.dwBufferBytes = DSBSIZE_MIN; desc.dwReserved = 0; desc.lpwfxFormat = &format; @@ -1046,14 +1046,14 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire desc.dwFlags |= DSBCAPS_CTRL3D | DSBCAPS_CTRLFREQUENCY | DSBCAPS_MUTE3DATMAXDISTANCE; break; case DMUS_APATH_DYNAMIC_MONO: - desc.dwFlags |= DSBCAPS_CTRLFREQUENCY; + desc.dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; break; case DMUS_APATH_SHARED_STEREOPLUSREVERB: /* normally we have to create 2 buffers (one for music other for reverb) * in this case. See msdn */ case DMUS_APATH_DYNAMIC_STEREO: - desc.dwFlags |= DSBCAPS_CTRLFREQUENCY; + desc.dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; format.nChannels = 2; format.nBlockAlign *= 2; format.nAvgBytesPerSec *=2;

1 0

André Hentschel : configure: Detect MinGW-w64 ARM toolchains.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: fad6dc66df5eeca940e474b0fc0582a83c4982a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad6dc66df5eeca940e474b0f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 9 15:15:15 2016 +0100 configure: Detect MinGW-w64 ARM toolchains. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 ++ configure | 2 ++ 2 files changed, 4 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 0769077..ded8ec6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -175,6 +175,8 @@ dnl Usage: WINE_CHECK_MINGW_PROG(variable,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in + arm*) + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ])) diff --git a/configure b/configure index 55442e3..ed87ea5 100755 --- a/configure +++ b/configure @@ -8765,6 +8765,8 @@ CROSSTARGET="" if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" then case "$host_cpu" in + arm*) + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[3456789]86*) ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-w64-mingw32-clang i586-w64-mingw32-clang i486-w64-mingw32-clang i386-w64-mingw32-clang

1 0

Alexandre Julliard : makefiles: Generate all makefiles at once.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 8f57dfedf8a01351a8824eb57d39912d90fa768a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f57dfedf8a01351a8824eb57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 16:05:51 2016 +0900 makefiles: Generate all makefiles at once. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + aclocal.m4 | 57 +++++++++++++++++++++++++------------------------- configure | 65 ++++++++++++++++++++++++++++++--------------------------- configure.ac | 6 ++++-- tools/makedep.c | 62 +++++++++++++++++++++++++++++++++++------------------- 5 files changed, 107 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f57dfedf8a01351a8824…

1 0

Alexandre Julliard : makedep: Generate testlist.c directly from the makefile data.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: da9381cea5fe8b1477ddbad7572921302b9202e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9381cea5fe8b1477ddbad75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 18:19:18 2016 +0900 makedep: Generate testlist.c directly from the makefile data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index aa6e161..fd661b2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2025,7 +2025,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct /******************************************************************* * output_sources */ -static struct strarray output_sources( const struct makefile *make, struct strarray *testlist_files ) +static struct strarray output_sources( const struct makefile *make ) { struct incl_file *source; unsigned int i, j; @@ -2736,7 +2736,6 @@ static struct strarray output_sources( const struct makefile *make, struct strar strarray_add( &phony_targets, "check" ); strarray_add( &phony_targets, "test" ); strarray_add( &phony_targets, "testclean" ); - *testlist_files = strarray_replace_extension( &ok_files, ".ok", "" ); } for (i = 0; i < make->programs.count; i++) @@ -2947,9 +2946,19 @@ static void rename_temp_file_if_changed( const char *dest ) /******************************************************************* * output_testlist */ -static void output_testlist( const char *dest, struct strarray files ) +static void output_testlist( const struct makefile *make ) { - int i; + const char *dest = base_dir_path( make, "testlist.c" ); + struct strarray files = empty_strarray; + struct incl_file *source; + unsigned int i; + + LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) + { + if (source->file->flags & FLAG_GENERATED) continue; + if (!strendswith( source->name, ".c" )) continue; + strarray_add( &files, replace_extension( source->name, ".c", "" )); + } output_file = create_temp_file( dest ); @@ -3022,7 +3031,7 @@ static void output_top_variables( const struct makefile *make ) static void output_dependencies( const struct makefile *make ) { static const char separator[] = "### Dependencies"; - struct strarray targets, testlist_files = empty_strarray, ignore_files = empty_strarray; + struct strarray targets, ignore_files = empty_strarray; char buffer[1024]; FILE *src_file; int found = 0; @@ -3042,7 +3051,7 @@ static void output_dependencies( const struct makefile *make ) input_file_name = NULL; if (!found) output( "\n%s (everything below this line is auto-generated; DO NOT EDIT!!)\n", separator ); - targets = output_sources( make, &testlist_files ); + targets = output_sources( make ); fclose( output_file ); output_file = NULL; @@ -3050,11 +3059,12 @@ static void output_dependencies( const struct makefile *make ) strarray_add( &ignore_files, ".gitignore" ); strarray_add( &ignore_files, "Makefile" ); - if (testlist_files.count) strarray_add( &ignore_files, "testlist.c" ); + if (make->testdll) + { + output_testlist( make ); + strarray_add( &ignore_files, "testlist.c" ); + } strarray_addall( &ignore_files, targets ); - - if (testlist_files.count) - output_testlist( base_dir_path( make, "testlist.c" ), testlist_files ); if (!make->src_dir && make->base_dir) output_gitignore( base_dir_path( make, ".gitignore" ), ignore_files );

1 0

Alexandre Julliard : makefiles: Generate distclean rules from makedep.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: ba416a57810ca4571968ff9fef6808f5ca88d99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba416a57810ca4571968ff9fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 18:41:18 2016 +0900 makefiles: Generate distclean rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 15 ++------------- configure | 15 ++------------- tools/makedep.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 406f3b4..7fa79ff 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -302,11 +302,6 @@ install-dev:: $ac_dir/install-dev" wine_fn_clean_rules () { ac_clean=$[@] - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - case $ac_dir in - */tests) ac_extraclean="$ac_extraclean $ac_dir/testlist.c" ;; - esac if wine_fn_has_flag clean then @@ -320,24 +315,18 @@ wine_fn_clean_rules () fi wine_fn_append_rule \ "__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -distclean:: - \$(RM) $ac_extraclean" +.PHONY: $ac_dir/clean" } wine_fn_disabled_rules () { ac_clean=$[@] - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" wine_fn_append_rule \ "__clean__: $ac_dir/clean .PHONY: $ac_dir/clean $ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean -distclean:: - \$(RM) $ac_extraclean" + \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean" } wine_fn_config_makefile () diff --git a/configure b/configure index 4100005..7ed6963 100755 --- a/configure +++ b/configure @@ -7497,11 +7497,6 @@ install-dev:: $ac_dir/install-dev" wine_fn_clean_rules () { ac_clean=$@ - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - case $ac_dir in - */tests) ac_extraclean="$ac_extraclean $ac_dir/testlist.c" ;; - esac if wine_fn_has_flag clean then @@ -7515,24 +7510,18 @@ wine_fn_clean_rules () fi wine_fn_append_rule \ "__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -distclean:: - \$(RM) $ac_extraclean" +.PHONY: $ac_dir/clean" } wine_fn_disabled_rules () { ac_clean=$@ - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" wine_fn_append_rule \ "__clean__: $ac_dir/clean .PHONY: $ac_dir/clean $ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean -distclean:: - \$(RM) $ac_extraclean" + \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean" } wine_fn_config_makefile () diff --git a/tools/makedep.c b/tools/makedep.c index fd661b2..d46c715 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2843,6 +2843,24 @@ static struct strarray output_sources( const struct makefile *make ) strarray_add( &phony_targets, obj_dir_path( make, "clean" )); } + if (make->subdirs.count) + { + struct strarray distclean_files = empty_strarray; + for (i = 0; i < make->subdirs.count; i++) + { + strarray_add( &distclean_files, base_dir_path( make->submakes[i], output_makefile_name )); + if (!make->src_dir) + strarray_add( &distclean_files, base_dir_path( make->submakes[i], ".gitignore" )); + if (make->submakes[i]->testdll) + strarray_add( &distclean_files, base_dir_path( make->submakes[i], "testlist.c" )); + } + output( "distclean::\n"); + output( "\trm -f" ); + output_filenames( distclean_files ); + output( "\n" ); + strarray_add( &phony_targets, "distclean" ); + } + if (phony_targets.count) { output( ".PHONY:" );

1 0

Alexandre Julliard : makefiles: Generate makefile dependencies from makedep.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: cd0af88591b31c1622cc6c7f46b2d3e3c1646ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0af88591b31c1622cc6c7f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 21:02:28 2016 +0900 makefiles: Generate makefile dependencies from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 -- configure | 2 -- tools/makedep.c | 7 +++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7fa79ff..d09d91b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -231,8 +231,6 @@ wine_fn_has_flag () wine_fn_depend_rules () { wine_fn_append_file SUBDIRS $ac_dir - wine_fn_append_rule \ -"Makefile: $srcdir/$ac_dir/Makefile.in" } wine_fn_pot_rules () diff --git a/configure b/configure index 7ed6963..c11b266 100755 --- a/configure +++ b/configure @@ -7426,8 +7426,6 @@ wine_fn_has_flag () wine_fn_depend_rules () { wine_fn_append_file SUBDIRS $ac_dir - wine_fn_append_rule \ -"Makefile: $srcdir/$ac_dir/Makefile.in" } wine_fn_pot_rules () diff --git a/tools/makedep.c b/tools/makedep.c index d46c715..e514cb3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2845,15 +2845,22 @@ static struct strarray output_sources( const struct makefile *make ) if (make->subdirs.count) { + struct strarray makefile_deps = empty_strarray; struct strarray distclean_files = empty_strarray; + for (i = 0; i < make->subdirs.count; i++) { + strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( make->submakes[i], + strmake ( "%s.in", output_makefile_name )))); strarray_add( &distclean_files, base_dir_path( make->submakes[i], output_makefile_name )); if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( make->submakes[i], ".gitignore" )); if (make->submakes[i]->testdll) strarray_add( &distclean_files, base_dir_path( make->submakes[i], "testlist.c" )); } + output( "Makefile:" ); + output_filenames( makefile_deps ); + output( "\n" ); output( "distclean::\n"); output( "\trm -f" ); output_filenames( distclean_files );

1 0

Piotr Caban : msvcp120: Fix layout of classes with vtordisp field.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 6d22a3a4764d2e3247b26c875ff27ee2963e7220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d22a3a4764d2e3247b26c875… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 11 10:36:47 2016 +0100 msvcp120: Fix layout of classes with vtordisp field. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 48 +++------ dlls/msvcp90/ios.c | 237 ++++++++++++++--------------------------- 2 files changed, 97 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d22a3a4764d2e3247b26…

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle::overflowX implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 9e8be69d7bca79f842258a619e06338b8fc5e62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8be69d7bca79f842258a619… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 13:51:48 2016 +0100 mshtml: Added IHTMLCurrentStyle::overflowX implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 4257074..cace5ba 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -781,8 +781,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_accelerator(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_overflowX(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_X, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_overflowY(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 18905b1..e5f9619 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2904,6 +2904,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "none"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCurrentStyle_get_overflowX(current_style, &str); + ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style); b = 100;

1 0