November 2015 - Wine-Commits

Mark Harmstone : winepulse: Add stub for GetPropValue.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 8c62cc5e66f3c648c42a5f794b4927c867877295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c62cc5e66f3c648c42a5f794… Author: Mark Harmstone <mark(a)harmstone.com> Date: Tue Nov 3 16:22:09 2015 -0600 winepulse: Add stub for GetPropValue. Edited by Maarten Lankhorst: No support for multiple devices in winepulse yet. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 7 +++++++ dlls/winepulse.drv/winepulse.drv.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e5ba869..64e6c2a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -50,6 +50,7 @@ #include "initguid.h" #include "ks.h" #include "ksmedia.h" +#include "propkey.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "endpointvolume.h" @@ -3198,3 +3199,9 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, *out = &This->IAudioSessionManager2_iface; return S_OK; } + +HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) +{ + TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + return E_NOTIMPL; +} diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 288de87..7aeb175 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -3,6 +3,7 @@ @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager +@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue # WinMM driver functions @ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc

1 0

Martin Storsjo : ucrtbase: Handle the swprintf style termination and return values.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: b09aadd202db469a8bab163624986961a1472111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09aadd202db469a8bab16362… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:35 2015 +0200 ucrtbase: Handle the swprintf style termination and return values. When neither the "legacy vsprintf null termination" nor the "standard snprintf behaviour" flags are specified, the functions return -2 when the output string didn't fit (similar to old style msvcrt _snprintf that returned -1), but they are null terminated (similar to the C99 snprintf style behaviour). This is the same way as the C99 swprintf function behaves. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/wcs.c | 40 ++++++++++++++++++++++++++-------------- dlls/ucrtbase/tests/printf.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a3b2595..f11d0a8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1130,6 +1130,9 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY (0x0008) #define UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS (0x0010) +#define UCRTBASE_PRINTF_TERMINATION_MASK (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION | \ + UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + #define UCRTBASE_SCANF_SECURECRT (0x0001) #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0bfddbb..169012c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -701,10 +701,10 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) if(!out->buf) return len; - if(out->len - 1 < len) { - memcpy(out->buf, str, out->len - 1); - out->buf += out->len - 1; - out->len = 1; + if(out->len < len) { + memcpy(out->buf, str, out->len); + out->buf += out->len; + out->len = 0; return len; } @@ -724,12 +724,18 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS struct _str_ctx_a ctx = {len, str}; int ret; - if (options != UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION && - options != UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_a(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR ? puts_clbk_str_c99_a : puts_clbk_str_a, + ret = pf_printf_a(puts_clbk_str_c99_a, &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); puts_clbk_str_a(&ctx, 1, &nullbyte); + + if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + return ret>len ? -1 : ret; + if(ret>=len) { + if(len) str[len-1] = 0; + return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + } return ret; } @@ -1148,10 +1154,10 @@ static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) if(!out->buf) return len; - if(out->len - 1 < len) { - memcpy(out->buf, str, (out->len - 1)*sizeof(MSVCRT_wchar_t)); - out->buf += out->len - 1; - out->len = 1; + if(out->len < len) { + memcpy(out->buf, str, out->len*sizeof(MSVCRT_wchar_t)); + out->buf += out->len; + out->len = 0; return len; } @@ -1171,12 +1177,18 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, MSVCRT_wchar struct _str_ctx_w ctx = {len, str}; int ret; - if (options != UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION && - options != UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_w(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR ? puts_clbk_str_c99_w : puts_clbk_str_w, + ret = pf_printf_w(puts_clbk_str_c99_w, &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); puts_clbk_str_w(&ctx, 1, &nullbyte); + + if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + return ret>len ? -1 : ret; + if(ret>=len) { + if(len) str[len-1] = 0; + return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + } return ret; } diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 99d756e..ce47e2a 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -120,6 +120,21 @@ static void test_snprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); } + + /* swprintf style termination */ + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt) >= bufsiz ? -2 : strlen(fmt); + const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); + const int valid = n < 0 ? bufsiz - 1 : n; + + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); + ok (buffer[valid] == '\0', + "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); + } } static int __cdecl vswprintf_wrapper(unsigned __int64 options, wchar_t *str, @@ -177,6 +192,23 @@ static void test_swprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); } + + /* swprintf style termination */ + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + const wchar_t *fmt = tests[i]; + const int expect = wcslen(fmt) >= bufsiz ? -2 : wcslen(fmt); + const int n = vswprintf_wrapper (0, buffer, bufsiz, fmt); + const int valid = n < 0 ? bufsiz - 1 : n; + + WideCharToMultiByte (CP_ACP, 0, buffer, -1, narrow, sizeof(narrow), NULL, NULL); + WideCharToMultiByte (CP_ACP, 0, fmt, -1, narrow_fmt, sizeof(narrow_fmt), NULL, NULL); + ok (n == expect, "\"%s\": expected %d, returned %d\n", + narrow_fmt, expect, n); + ok (!memcmp (fmt, buffer, valid * sizeof(wchar_t)), + "\"%s\": rendered \"%.*s\"\n", narrow_fmt, valid, narrow); + ok (buffer[valid] == '\0', + "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); + } } static int __cdecl vfprintf_wrapper(FILE *file,

1 0

Martin Storsjo : msvcrt: Ignore 'N' as format length modifier for pointers , just like 'F'.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 1d17e8502668c1d17cd2eba73eabd93cb2f1b92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d17e8502668c1d17cd2eba73… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:37 2015 +0200 msvcrt: Ignore 'N' as format length modifier for pointers, just like 'F'. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/tests/printf.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 91b27ad..a724404 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -461,7 +461,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API p++; } else if(*p == 'w') flags.WideString = *p++; - else if(*p == 'F') + else if(*p == 'F' || *p == 'N') p++; /* ignore */ else break; diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 2de515d..c5bc102 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -413,6 +413,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"0000000000000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); ok( r==16, "return count wrong\n"); + format = "%Np"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"0000000000000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==16, "return count wrong\n"); + format = "%#-020p"; r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X0000000000000039 "),"Pointer formatted incorrectly\n"); @@ -435,6 +440,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); ok( r==8, "return count wrong\n"); + format = "%Np"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + format = "%#-012p"; r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); @@ -670,6 +680,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,""), "failed\n"); ok( r==0, "return count wrong\n"); + format = "%N"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,""), "failed\n"); + ok( r==0, "return count wrong\n"); + format = "%H"; r = sprintf(buffer, format,-1); ok(!strcmp(buffer,"H"), "failed\n");

1 0

Martin Storsjo : ucrtbase: Implement the new printf corner case behaviour.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: b9d0f5d562b1a5e96a32779f8906e50c0e4ba206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d0f5d562b1a5e96a32779f8… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:38 2015 +0200 ucrtbase: Implement the new printf corner case behaviour. Check the option flags whether the new or old legacy behaviours are wanted. For _MSVCR_VER < 140, don't check the option flags but hardcode them to TRUE. (This avoids having to manually add all three flags into every caller of pf_printf.) Mask out any other flags, to avoid other out-of-range flags to be interpreted as the other flags (positional params, invoke invalid param handler). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 6 ++- dlls/msvcrt/msvcrt.h | 3 +- dlls/msvcrt/printf.h | 51 +++++++++++++++++++------ dlls/msvcrt/wcs.c | 35 +++++++++++------ dlls/ucrtbase/tests/printf.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 158 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9d0f5d562b1a5e96a327…

1 0

Alexandre Julliard : makefiles: Generate rules for installing IDL headers.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 316448cd4780855961f397a9947b3e2d16eb3463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316448cd4780855961f397a99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 14:57:37 2015 +0900 makefiles: Generate rules for installing IDL headers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 30 +++++------------------------- include/stdole2.idl | 3 +++ include/wine/winedxgi.idl | 2 ++ tools/make_makefiles | 16 +++------------- tools/makedep.c | 21 +++++++++++++++++++-- 5 files changed, 32 insertions(+), 40 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 682072c..e3c0acc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,7 +1,4 @@ -PRIVATE_IDL_H_SRCS = \ - wine/winedxgi.idl - -PUBLIC_IDL_H_SRCS = \ +IDL_SRCS = \ activaut.idl \ activdbg.idl \ activscp.idl \ @@ -112,6 +109,7 @@ PUBLIC_IDL_H_SRCS = \ shldisp.idl \ shobjidl.idl \ shtypes.idl \ + stdole2.idl \ strmif.idl \ structuredquerycondition.idl \ taskschd.idl \ @@ -138,6 +136,7 @@ PUBLIC_IDL_H_SRCS = \ windows.foundation.idl \ wine/itss.idl \ wine/svcctl.idl \ + wine/winedxgi.idl \ winsxs.idl \ wmiutils.idl \ wmp.idl \ @@ -151,9 +150,6 @@ PUBLIC_IDL_H_SRCS = \ xaudio2fx.idl \ xmllite.idl -IDL_TLB_SRCS = \ - stdole2.idl - HEADER_SRCS = \ accctrl.h \ aclapi.h \ @@ -645,8 +641,6 @@ XTEMPLATE_SRCS = \ rmxftmpl.x SRCDIR_INCLUDES = \ - $(IDL_TLB_SRCS) \ - $(PUBLIC_IDL_H_SRCS) \ access.idl \ asynot.idl \ asysta.idl \ @@ -681,31 +675,17 @@ SRCDIR_INCLUDES = \ xmldom.idl \ xmldso.idl -IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) -IDL_SRCS = $(IDL_H_SRCS) $(IDL_TLB_SRCS) - -OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) - -all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) - -.PHONY: install install-dev uninstall - -install install-dev:: $(OBJDIR_INCLUDES) +install install-dev:: for f in $(SRCDIR_INCLUDES); do case $$f in \ wine/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ msvcrt/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/$$f ;; \ *) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/windows/$$f ;; \ esac; done - for f in $(OBJDIR_INCLUDES); do case $$f in \ - wine/*) $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ - msvcrt/*) $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/$$f ;; \ - *) $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/windows/$$f ;; \ - esac; done # Don't just do a rm -rf on $(includedir) -- don't want to wipe out # anything extra the user may have put there. uninstall:: - for f in $(SRCDIR_INCLUDES) $(OBJDIR_INCLUDES); do case $$f in \ + for f in $(SRCDIR_INCLUDES); do case $$f in \ wine/*) $(RM) $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ msvcrt/*) $(RM) $(DESTDIR)$(includedir)/$$f ;; \ *) $(RM) $(DESTDIR)$(includedir)/windows/$$f ;; \ diff --git a/include/stdole2.idl b/include/stdole2.idl index 81b5463..9839c4c 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -18,7 +18,10 @@ * */ +#if 0 +#pragma makedep install #pragma makedep typelib +#endif #include <olectl.h> diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 452f022..d13a2f1 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "dxgi.idl"; [ diff --git a/tools/make_makefiles b/tools/make_makefiles index 7229d06..b97f04e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -373,16 +373,15 @@ sub assign_sources_to_makefiles(@) next if ($name =~ /\.in$/); if ($name =~ /^wine\// && !$exported_wine_headers{$name}) { - if ($private_idl_headers{$name}) { push @{${$make}{"=PRIVATE_IDL_H_SRCS"}}, $name; } + if ($private_idl_headers{$name}) { push @{${$make}{"=IDL_SRCS"}}, $name; } next; } - if ($name =~ /stdole2\.idl$/) { push @{${$make}{"=IDL_TLB_SRCS"}}, $name; } - elsif ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + if ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($name =~ /\.h$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; } elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } - elsif ($name =~ /\.idl$/) { push @{${$make}{"=PUBLIC_IDL_H_SRCS"}}, $name; } + elsif ($name =~ /\.idl$/) { push @{${$make}{"=IDL_SRCS"}}, $name; } else { die "unknown file $name in include dir"; } } else @@ -432,12 +431,6 @@ sub assign_sources_to_makefiles(@) } } - # add extra variables to include source list - my $make = $makefiles{"include/Makefile"}; - unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)"; - unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)"; - unshift @{${$make}{"=IDL_SRCS"}}, "\$(IDL_H_SRCS) \$(IDL_TLB_SRCS)"; - # preserve shared source files from the parent makefile foreach my $file (@makefiles) { @@ -556,9 +549,6 @@ sub update_makefiles(@) replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "MANPAGES" ); next unless $file eq "include/Makefile"; - replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); - replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" ); - replace_makefile_variable( $file, "IDL_TLB_SRCS" ); replace_makefile_variable( $file, "SRCDIR_INCLUDES" ); } diff --git a/tools/makedep.c b/tools/makedep.c index d2d39a6..9ea3fb6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1702,6 +1702,10 @@ static void add_generated_sources( struct makefile *make ) { add_generated_source( make, replace_extension( source->name, ".idl", "_r.res" ), NULL ); } + if (!source->file->flags && strendswith( source->name, ".idl" )) + { + add_generated_source( make, replace_extension( source->name, ".idl", ".h" ), NULL ); + } if (strendswith( source->name, ".x" )) { add_generated_source( make, replace_extension( source->name, ".x", ".h" ), NULL ); @@ -2035,8 +2039,8 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t struct strarray targets = empty_strarray; char *dest; - if (!source->file->flags || find_include_file( make, strmake( "%s.h", obj ))) - source->file->flags |= FLAG_IDL_HEADER; + if (!source->file->flags) source->file->flags |= FLAG_IDL_HEADER | FLAG_INSTALL; + if (find_include_file( make, strmake( "%s.h", obj ))) source->file->flags |= FLAG_IDL_HEADER; for (i = 0; i < sizeof(idl_outputs) / sizeof(idl_outputs[0]); i++) { @@ -2046,6 +2050,19 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strarray_add( &targets, dest ); } if (source->file->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); + if (source->file->flags & FLAG_INSTALL) + { + strarray_add( &make->install_dev_rules, xstrdup( source->filename )); + strarray_add( &make->install_dev_rules, + strmake( "D$(includedir)/%s.idl", get_include_install_path( obj ) )); + if (source->file->flags & FLAG_IDL_HEADER) + { + strarray_add( &make->install_dev_rules, strmake( "%s.h", obj )); + strarray_add( &make->install_dev_rules, + strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) )); + } + } + if (!targets.count) continue; output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) );

1 0

Martin Storsjo : msvcrt: Interpret 'I' as size_t size specifier for integer conversions.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 494572ed4d49dd36508759c300c59124aa88181e URL: http://source.winehq.org/git/wine.git/?a=commit;h=494572ed4d49dd36508759c30… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:39 2015 +0200 msvcrt: Interpret 'I' as size_t size specifier for integer conversions. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/tests/printf.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 1e215aa..f68eaf6 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -34,7 +34,7 @@ typedef struct FUNC_NAME(pf_flags_t) { APICHAR Sign, LeftAlign, Alternate, PadZero; int FieldLength, Precision; - APICHAR IntegerLength, IntegerDouble; + APICHAR IntegerLength, IntegerDouble, IntegerNative; APICHAR WideString; APICHAR Format; } FUNC_NAME(pf_flags); @@ -470,7 +470,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API else if(isdigit(*(p+1)) || !*(p+1)) break; else - p++; + flags.IntegerNative = *p++; } else if(*p == 'w') flags.WideString = *p++; else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) @@ -533,7 +533,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(!tmp) return -1; - if(flags.IntegerDouble) + if(flags.IntegerDouble || (flags.IntegerNative && sizeof(void*) == 8)) FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, VT_I8, valist).get_longlong); else if(flags.Format=='d' || flags.Format=='i') diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index c5bc102..c8797f3 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -422,6 +422,11 @@ static void test_sprintf( void ) r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X0000000000000039 "),"Pointer formatted incorrectly\n"); ok( r==20, "return count wrong\n"); + + format = "%Ix %d"; + r = sprintf(buffer,format,(size_t)0x12345678123456,1); + ok(!strcmp(buffer,"12345678123456 1"),"buffer = %s\n",buffer); + ok( r==16, "return count wrong\n"); } else { @@ -449,6 +454,11 @@ static void test_sprintf( void ) r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); ok( r==12, "return count wrong\n"); + + format = "%Ix %d"; + r = sprintf(buffer,format,0x123456,1); + ok(!strcmp(buffer,"123456 1"),"buffer = %s\n",buffer); + ok( r==8, "return count wrong\n"); } format = "%04s";

1 0

Vincent Povirk : comdlg32: Add ES_AUTOHSCROLL style to filename text box.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 30ac0f5a663fdb56c161a448d8c5de1d1a2a2dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ac0f5a663fdb56c161a448d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 3 13:27:30 2015 -0600 comdlg32: Add ES_AUTOHSCROLL style to filename text box. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index f5c1c9e..5113e80 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -484,7 +484,7 @@ CAPTION "Open" FONT 8, "MS Shell Dlg" { LTEXT "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS - EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |

1 0

Andrew Eikum : winepulse: Always mute buffer.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 8ed553c3c7f4ba860abaf9ff3f1749a06444bdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed553c3c7f4ba860abaf9ff3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 3 16:21:48 2015 -0600 winepulse: Always mute buffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 3895f4c..0e2bc08 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -572,6 +572,11 @@ static HRESULT pulse_stream_valid(ACImpl *This) { return S_OK; } +static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes) +{ + memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); +} + static void dump_attr(const pa_buffer_attr *attr) { TRACE("maxlength: %u\n", attr->maxlength); TRACE("minreq: %u\n", attr->minreq); @@ -1315,7 +1320,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, else { ACPacket *cur_packet = (ACPacket*)((char*)This->tmp_buffer + This->bufsize_bytes); BYTE *data = This->tmp_buffer; - memset(This->tmp_buffer, This->ss.format == PA_SAMPLE_U8 ? 0x80 : 0, This->bufsize_bytes); + silence_buffer(This->ss.format, This->tmp_buffer, This->bufsize_bytes); list_init(&This->packet_free_head); list_init(&This->packet_filled_head); for (i = 0; i < capture_packets; ++i, ++cur_packet) { @@ -1985,18 +1990,17 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( return AUDCLNT_E_INVALID_SIZE; } - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) { - if (This->ss.format == PA_SAMPLE_U8) - memset(This->tmp_buffer, 128, written_bytes); - else - memset(This->tmp_buffer, 0, written_bytes); - } - This->locked = 0; - if (This->locked_ptr) + if (This->locked_ptr) { + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(This->ss.format, This->locked_ptr, written_bytes); pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE); - else + } else { + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(This->ss.format, This->tmp_buffer, written_bytes); pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE); + } + This->pad += written_bytes; This->locked_ptr = NULL; TRACE("Released %u, pad %zu\n", written_frames, This->pad / pa_frame_size(&This->ss));

1 0

Martin Storsjo : ucrtbase: Handle the _s variant of vsscanf.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 1fecaae9737563ef649c7c226dfbabc747852994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fecaae9737563ef649c7c226… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:41 2015 +0200 ucrtbase: Handle the _s variant of vsscanf. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/scanf.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4ce8202..77f612e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1139,4 +1139,6 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) +#define UCRTBASE_SCANF_MASK (0x0007) + #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index b02977f..a19d450 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -671,9 +671,15 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, MSVCRT__locale_t locale, __ms_va_list valist) { - if (options != UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS) + /* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide + * scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf, + * but parsing of those isn't implemented at all yet. */ + if (options & ~UCRTBASE_SCANF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnscanf_l(input, length, format, locale, valist); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vsnscanf_s_l(input, length, format, locale, valist); + else + return MSVCRT_vsnscanf_l(input, length, format, locale, valist); } /*********************************************************************

1 0

Martin Storsjo : msvcrt: Refactor pf_printf to take options as flags instead of as BOOL parameter.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 1c8412d9e5bd941428ccfe615f5260dd7406145d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8412d9e5bd941428ccfe615… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:36 2015 +0200 msvcrt: Refactor pf_printf to take options as flags instead of as BOOL parameter. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/file.c | 14 ++++++++------ dlls/msvcrt/msvcrt.h | 7 +++++-- dlls/msvcrt/printf.h | 8 +++++--- dlls/msvcrt/wcs.c | 47 +++++++++++++++++++++++++++-------------------- 5 files changed, 47 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c8412d9e5bd941428ccf…

1 0