May 2020 - Wine-Commits - list.winehq.org

Francois Gouget : msvcrt: Fix a couple of spelling errors in comments.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 10bfa512df7e8fbcdf8d4e2e2f205dd9c72076ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bfa512df7e8fbcdf8d4e2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 16 12:18:21 2020 +0200 msvcrt: Fix a couple of spelling errors in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 407f819884..7baf8eee8e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -864,7 +864,7 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(b.data[BNUM_IDX(b.b)]) break; } - /* move decimal point to limb boundry */ + /* move decimal point to limb boundary */ if(limb_digits==dp && b.b==b.e-1) return make_double(sign, 0, b.data[BNUM_IDX(b.e-1)], ROUND_ZERO, err); off = (dp - limb_digits) % LIMB_DIGITS; @@ -893,7 +893,7 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), } /* Check if fractional part is non-zero */ - /* Caution: it's only correct because bnum_to_mant returns more then 53 bits */ + /* Caution: it's only correct because bnum_to_mant returns more than 53 bits */ for(i=b.e-3; i>=b.b; i--) { if (!b.data[BNUM_IDX(b.b)]) continue; round = ROUND_DOWN;

1 0

Emilio Cobos Álvarez : widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: b1084ff910864a44d6fd0e0bda6b2b6c64987b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1084ff910864a44d6fd0e0b… Author: Emilio Cobos Álvarez <emilio(a)crisal.io> Date: Sun May 17 01:02:04 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49173 Signed-off-by: Emilio Cobos Álvarez <emilio(a)crisal.io> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a1db88a7c0..04280cbb72 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4813,20 +4813,21 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (is_array( arg->declspec.type ) || is_ptr( arg->declspec.type )) align = pointer_size; else type_memsize_and_alignment( arg->declspec.type, &align ); - if (align >= pointer_size) - fprintf( file, "%s;\n", arg->name ); - else - fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); + if (align < pointer_size) + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + fprintf( file, "%s;\n", arg->name ); } if (add_retval && !is_void( retval->declspec.type )) { print_file(file, 2, "%s", ""); - write_type_decl( file, &retval->declspec, retval->name ); - if (is_array( retval->declspec.type ) || is_ptr( retval->declspec.type ) || - type_memsize( retval->declspec.type ) == pointer_size) - fprintf( file, ";\n" ); - else - fprintf( file, " DECLSPEC_ALIGN(%u);\n", pointer_size ); + write_type_left( file, &retval->declspec, NAME_DEFAULT, TRUE, TRUE ); + if (needs_space_after( retval->declspec.type )) fputc( ' ', file ); + if (!is_array( retval->declspec.type ) && !is_ptr( retval->declspec.type ) && + type_memsize( retval->declspec.type ) != pointer_size) + { + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + } + fprintf( file, "%s;\n", retval->name ); } print_file(file, 1, "} %s;\n", var_decl ); if (needs_packing) print_file( file, 0, "#include <poppack.h>\n" );

1 0

Zebediah Figura : quartz/tests: Fix a test failure in Windows 7 and higher.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 1e9d3ff3228d106a017be7e1476ddcad0803a651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e9d3ff3228d106a017be7e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 14:38:14 2020 -0500 quartz/tests: Fix a test failure in Windows 7 and higher. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 41b933275d..b9123ce525 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -668,11 +668,8 @@ static void test_aggregation(void) static void test_dmo(void) { DMO_PARTIAL_MEDIATYPE mt = {MEDIATYPE_Audio, MEDIASUBTYPE_PCM}; - IEnumRegFilters *enumerator1; IEnumMoniker *enumerator; IFilterMapper3 *mapper; - IFilterMapper *mapper1; - REGFILTER *regfilter; IMoniker *moniker; WCHAR *name; HRESULT hr; @@ -688,8 +685,6 @@ static void test_dmo(void) ok(hr == S_OK, "Got hr %#x.\n", hr); mapper = create_mapper(); - IFilterMapper3_QueryInterface(mapper, &IID_IFilterMapper, (void **)&mapper1); - ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterMapper3_EnumMatchingFilters(mapper, &enumerator, 0, FALSE, 0, FALSE, 0, NULL, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); @@ -710,20 +705,8 @@ static void test_dmo(void) IEnumMoniker_Release(enumerator); ok(found, "DMO should be enumerated.\n"); - /* DMOs lack a CLSID property and are therefore not enumerated by IFilterMapper. */ - - hr = IFilterMapper_EnumMatchingFilters(mapper1, &enumerator1, 0, FALSE, - GUID_NULL, GUID_NULL, FALSE, FALSE, GUID_NULL, GUID_NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - while (IEnumRegFilters_Next(enumerator1, 1, &regfilter, NULL) == S_OK) - { - ok(!IsEqualGUID(&regfilter->Clsid, &testclsid), "DMO should not be enumerated.\n"); - ok(wcscmp(regfilter->Name, L"dmo test"), "DMO should not be enumerated.\n"); - } - IEnumRegFilters_Release(enumerator1); + /* DMOs are enumerated by IFilterMapper in Windows 7 and higher. */ - IFilterMapper_Release(mapper1); ref = IFilterMapper3_Release(mapper); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zhiyi Zhang : kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW().
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 3cbd9cda195be6afc4290202b6676417812e536b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cbd9cda195be6afc4290202… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 18 09:52:03 2020 +0800 kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49175 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 29887a2353..d7e2f0a234 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -3521,7 +3521,7 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(src_url), canonicalized, canonicalized_len, flags); - if (!src_url || !canonicalized || !canonicalized || !*canonicalized_len) + if (!src_url || !canonicalized || !canonicalized_len || !*canonicalized_len) return E_INVALIDARG; if (!*src_url)

1 0

Alexandre Julliard : ntdll: Store main() arguments in the Unix library.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 45a63e5b3ce0e5d7fcc55ce57f315086b87f8ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45a63e5b3ce0e5d7fcc55ce5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:44:16 2020 +0200 ntdll: Store main() arguments in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 21 ++++++++------------- dlls/ntdll/loader.c | 10 ++++++---- dlls/ntdll/unix/loader.c | 40 ++++++++++++++++++++++++++++++++++------ dlls/ntdll/unixlib.h | 3 ++- 4 files changed, 50 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 3acf7f52d5..5ba3c7c7b3 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -61,13 +61,6 @@ static inline SIZE_T get_env_length( const WCHAR *env ) return end + 1 - env; } -#ifdef __APPLE__ -extern char **__wine_get_main_environment(void); -#else -extern char **__wine_main_environ; -static char **__wine_get_main_environment(void) { return __wine_main_environ; } -#endif - /*********************************************************************** * is_special_env_var @@ -779,8 +772,6 @@ static void set_library_wargv( char **argv, const UNICODE_STRING *image ) total -= reslen; } wargv[argc] = NULL; - - __wine_main_argc = argc; __wine_main_wargv = wargv; } @@ -1465,6 +1456,10 @@ void init_user_process_params( SIZE_T data_size ) startup_info_t *info = NULL; RTL_USER_PROCESS_PARAMETERS *params = NULL; UNICODE_STRING curdir, dllpath, imagepath, cmdline, title, desktop, shellinfo, runtime; + int argc; + char **argv, **envp; + + unix_funcs->get_main_args( &argc, &argv, &envp ); if (!data_size) { @@ -1472,13 +1467,13 @@ void init_user_process_params( SIZE_T data_size ) WCHAR *env, curdir_buffer[MAX_PATH]; NtCurrentTeb()->Peb->ProcessParameters = &initial_params; - initial_params.Environment = build_initial_environment( __wine_get_main_environment() ); + initial_params.Environment = build_initial_environment( envp ); curdir.Buffer = curdir_buffer; curdir.MaximumLength = sizeof(curdir_buffer); get_current_directory( &curdir ); initial_params.CurrentDirectory.DosPath = curdir; - get_image_path( __wine_main_argv[0], &initial_params.ImagePathName ); - set_library_wargv( __wine_main_argv, &initial_params.ImagePathName ); + get_image_path( argv[0], &initial_params.ImagePathName ); + set_library_wargv( argv, &initial_params.ImagePathName ); build_command_line( __wine_main_wargv, &cmdline ); LdrGetDllPath( initial_params.ImagePathName.Buffer, 0, &load_path, &dummy ); RtlInitUnicodeString( &dllpath, load_path ); @@ -1566,7 +1561,7 @@ void init_user_process_params( SIZE_T data_size ) else params->Environment[0] = 0; } - set_library_wargv( __wine_main_argv, NULL ); + set_library_wargv( argv, NULL ); done: RtlFreeHeap( GetProcessHeap(), 0, info ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 35dc7e1eaa..fa65ae1e9f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1324,11 +1324,12 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) static void call_constructors( WINE_MODREF *wm ) { #ifdef HAVE_DLINFO - extern char **__wine_main_environ; struct link_map *map; void (*init_func)(int, char **, char **) = NULL; void (**init_array)(int, char **, char **) = NULL; ULONG_PTR i, init_arraysz = 0; + int argc; + char **argv, **envp; #ifdef _WIN64 const Elf64_Dyn *dyn; #else @@ -1351,11 +1352,12 @@ static void call_constructors( WINE_MODREF *wm ) TRACE( "%s: got init_func %p init_array %p %lu\n", debugstr_us( &wm->ldr.BaseDllName ), init_func, init_array, init_arraysz ); - if (init_func) init_func( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + unix_funcs->get_main_args( &argc, &argv, &envp ); + + if (init_func) init_func( argc, argv, envp ); if (init_array) - for (i = 0; i < init_arraysz / sizeof(*init_array); i++) - init_array[i]( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + for (i = 0; i < init_arraysz / sizeof(*init_array); i++) init_array[i]( argc, argv, envp ); #endif } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 73dfb7b6c7..ebe143ca97 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -65,6 +65,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); extern IMAGE_NT_HEADERS __wine_spec_nt_header; extern void CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ); +extern int __wine_main_argc; +extern char **__wine_main_argv; +extern char **__wine_main_environ; + +static int main_argc; +static char **main_argv; +static char **main_envp; + static inline void *get_rva( const IMAGE_NT_HEADERS *nt, ULONG_PTR addr ) { return (BYTE *)nt + addr; @@ -150,6 +158,19 @@ void CDECL get_host_version( const char **sysname, const char **release ) } +/************************************************************************* + * get_main_args + * + * Return the initial arguments. + */ +static void CDECL get_main_args( int *argc, char **argv[], char **envp[] ) +{ + *argc = main_argc; + *argv = main_argv; + *envp = main_envp; +} + + /************************************************************************* * map_so_dll * @@ -428,6 +449,7 @@ static HMODULE load_ntdll(void) */ static struct unix_funcs unix_funcs = { + get_main_args, get_version, get_build_id, get_host_version, @@ -684,9 +706,6 @@ static void check_command_line( int argc, char *argv[] ) */ void __wine_main( int argc, char *argv[], char *envp[] ) { - extern int __wine_main_argc; - extern char **__wine_main_argv; - extern char **__wine_main_environ; HMODULE module; wine_init_argv0_path( argv[0] ); @@ -705,9 +724,9 @@ void __wine_main( int argc, char *argv[], char *envp[] ) } } - __wine_main_argc = argc; - __wine_main_argv = argv; - __wine_main_environ = envp; + __wine_main_argc = main_argc = argc; + __wine_main_argv = main_argv = argv; + __wine_main_environ = main_envp = envp; virtual_init(); module = load_ntdll(); @@ -734,6 +753,15 @@ NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void { const IMAGE_NT_HEADERS *nt = ptr_in; +#ifdef __APPLE__ + extern char **__wine_get_main_environment(void); + main_envp = __wine_get_main_environment(); +#else + main_envp = __wine_main_environ; +#endif + main_argc = __wine_main_argc; + main_argv = __wine_main_argv; + map_so_dll( nt, module ); fixup_ntdll_imports( &__wine_spec_nt_header, module ); *(struct unix_funcs **)ptr_out = &unix_funcs; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 62ba2615ba..12e7aa0265 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -24,11 +24,12 @@ #include "wine/debug.h" /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 3 +#define NTDLL_UNIXLIB_VERSION 4 struct unix_funcs { /* environment functions */ + void (CDECL *get_main_args)( int *argc, char **argv[], char **envp[] ); const char * (CDECL *get_version)(void); const char * (CDECL *get_build_id)(void); void (CDECL *get_host_version)( const char **sysname, const char **release );

1 0

Francois Gouget : windowscodecs/tests: Fix the spelling of a couple of variable names.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: fe2435c93f1400c5fbc360821fe8d1c977aaa762 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe2435c93f1400c5fbc36082… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 16 12:18:08 2020 +0200 windowscodecs/tests: Fix the spelling of a couple of variable names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 8 ++++---- dlls/windowscodecs/tests/tiffformat.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 209d39f11f..bc22cc5072 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -234,16 +234,16 @@ static void test_dds_decoder_initialize(void) static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) { HRESULT hr; - IWICPalette *pallette = NULL; + IWICPalette *palette = NULL; IWICMetadataQueryReader *metadata_reader = NULL; IWICBitmapSource *preview = NULL, *thumnail = NULL; IWICColorContext *color_context = NULL; UINT count; - hr = IWICImagingFactory_CreatePalette(factory, &pallette); + hr = IWICImagingFactory_CreatePalette(factory, &palette); ok (hr == S_OK, "CreatePalette failed, hr=%x\n", hr); if (hr == S_OK) { - hr = IWICBitmapDecoder_CopyPalette(decoder, pallette); + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, NULL); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); @@ -269,7 +269,7 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) hr = IWICBitmapDecoder_GetThumbnail(decoder, NULL); ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); - if (pallette) IWICPalette_Release(pallette); + if (palette) IWICPalette_Release(palette); if (metadata_reader) IWICMetadataQueryReader_Release(metadata_reader); if (preview) IWICBitmapSource_Release(preview); if (color_context) IWICColorContext_Release(color_context); diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 4769b9c8d2..b9d60de8a1 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -402,7 +402,7 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma return hr; } -static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channels, BOOL *trasparency) +static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channels, BOOL *transparency) { HRESULT hr; IWICComponentInfo *info; @@ -415,7 +415,7 @@ static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channel hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo2, (void **)&formatinfo); if (hr == S_OK) { - hr = IWICPixelFormatInfo2_SupportsTransparency(formatinfo, trasparency); + hr = IWICPixelFormatInfo2_SupportsTransparency(formatinfo, transparency); ok(hr == S_OK, "SupportsTransparency error %#x\n", hr); IWICPixelFormatInfo2_Release(formatinfo); } @@ -1093,7 +1093,7 @@ static void test_color_formats(void) IWICBitmapFrameDecode *frame; GUID format; UINT count, i, bpp, channels, ret; - BOOL trasparency; + BOOL transparency; struct IFD_entry *tag, *tag_photo = NULL, *tag_bps = NULL, *tag_samples = NULL, *tag_colormap = NULL; struct IFD_entry *tag_width = NULL, *tag_height = NULL, *tag_extra_samples = NULL; short *bps; @@ -1236,12 +1236,12 @@ static void test_color_formats(void) i, td[i].photometric, td[i].samples, td[i].extra_samples, td[i].bps, wine_dbgstr_guid(td[i].data->format), wine_dbgstr_guid(&format)); - trasparency = (td[i].photometric == 2 && td[i].samples == 4); /* for XP */ - hr = get_pixelformat_info(&format, &bpp, &channels, &trasparency); + transparency = (td[i].photometric == 2 && td[i].samples == 4); /* for XP */ + hr = get_pixelformat_info(&format, &bpp, &channels, &transparency); ok(hr == S_OK, "%u: get_pixelformat_bpp error %#x\n", i, hr); ok(bpp == td[i].data->bpp, "%u: expected %u, got %u\n", i, td[i].data->bpp, bpp); ok(channels == td[i].samples, "%u: expected %u, got %u\n", i, td[i].samples, channels); - ok(trasparency == (td[i].photometric == 2 && td[i].samples == 4), "%u: got %u\n", i, trasparency); + ok(transparency == (td[i].photometric == 2 && td[i].samples == 4), "%u: got %u\n", i, transparency); memset(pixels, 0, sizeof(pixels)); hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, width_bytes(td[i].data->width, bpp), sizeof(pixels), pixels);

1 0

Jacek Caban : oleacc.idl: Generate tlb file for importlib.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 0f31e48e9ba28ba8c0aee0678567d6b47e3c63aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f31e48e9ba28ba8c0aee067… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 17 01:02:45 2020 +0200 oleacc.idl: Generate tlb file for importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oleacc.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/oleacc.idl b/include/oleacc.idl index fd9c0786d1..7cf0fa82db 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -16,6 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#pragma makedep typelib +#pragma makedep header +#endif + import "oaidl.idl"; #ifndef __WIDL__

1 0

Vincent Povirk : gdiplus: Implement GdipGetMetafileDownLevelRasterizationLimit.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 6c06196497e3eed17c642be40ca716b86bf1e8e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c06196497e3eed17c642be4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun May 17 20:16:24 2020 -0500 gdiplus: Implement GdipGetMetafileDownLevelRasterizationLimit. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 22 ++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 25 +++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 43dc0a82d2..a722ab7b23 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -298,7 +298,7 @@ 298 stdcall GdipGetLogFontA(ptr ptr ptr) 299 stdcall GdipGetLogFontW(ptr ptr ptr) 300 stdcall GdipGetMatrixElements(ptr ptr) -301 stub GdipGetMetafileDownLevelRasterizationLimit +301 stdcall GdipGetMetafileDownLevelRasterizationLimit(ptr ptr) 302 stdcall GdipGetMetafileHeaderFromEmf(ptr ptr) 303 stdcall GdipGetMetafileHeaderFromFile(wstr ptr) 304 stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 39caf1a91e..9e90a5d28c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -407,6 +407,7 @@ struct GpMetafile{ BOOL auto_frame; /* If true, determine the frame automatically */ GpPointF auto_frame_min, auto_frame_max; DWORD next_object_id; + UINT limit_dpi; /* playback */ GpGraphics *playback_graphics; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 2cb1c5f284..3fdbc69fdc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -810,6 +810,7 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->comment_data = NULL; (*metafile)->comment_data_size = 0; (*metafile)->comment_data_length = 0; + (*metafile)->limit_dpi = 96; (*metafile)->hemf = NULL; list_init(&(*metafile)->containers); @@ -4006,11 +4007,32 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, return Ok; } +GpStatus WINGDIPAPI GdipGetMetafileDownLevelRasterizationLimit(GDIPCONST GpMetafile *metafile, + UINT *limitDpi) +{ + TRACE("(%p,%p)\n", metafile, limitDpi); + + if (!metafile || !limitDpi) + return InvalidParameter; + + if (!metafile->record_dc) + return WrongState; + + *limitDpi = metafile->limit_dpi; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metafile, UINT limitDpi) { TRACE("(%p,%u)\n", metafile, limitDpi); + if (!metafile) + return InvalidParameter; + + metafile->limit_dpi = limitDpi; + return Ok; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 49adbf71e3..b9dc33fce3 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -379,6 +379,7 @@ static void test_empty(void) static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + UINT limit_dpi; hdc = CreateCompatibleDC(0); @@ -408,6 +409,25 @@ static void test_empty(void) if (stat != Ok) return; + stat = GdipGetMetafileDownLevelRasterizationLimit(metafile, NULL); + expect(InvalidParameter, stat); + + stat = GdipGetMetafileDownLevelRasterizationLimit(NULL, &limit_dpi); + expect(InvalidParameter, stat); + + limit_dpi = 0xdeadbeef; + stat = GdipGetMetafileDownLevelRasterizationLimit(metafile, &limit_dpi); + expect(Ok, stat); + ok(limit_dpi == 96, "limit_dpi was %d\n", limit_dpi); + + stat = GdipSetMetafileDownLevelRasterizationLimit(metafile, 255); + expect(Ok, stat); + + limit_dpi = 0xdeadbeef; + stat = GdipGetMetafileDownLevelRasterizationLimit(metafile, &limit_dpi); + expect(Ok, stat); + ok(limit_dpi == 255, "limit_dpi was %d\n", limit_dpi); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(InvalidParameter, stat); @@ -420,6 +440,11 @@ static void test_empty(void) stat = GdipDeleteGraphics(graphics); expect(Ok, stat); + limit_dpi = 0xdeadbeef; + stat = GdipGetMetafileDownLevelRasterizationLimit(metafile, &limit_dpi); + expect(WrongState, stat); + expect(0xdeadbeef, limit_dpi); + check_metafile(metafile, empty_records, "empty metafile", dst_points, &frame, UnitPixel); sync_metafile(&metafile, "empty.emf"); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ed0f498483..b7da5427d4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -545,6 +545,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST Wm GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); +GpStatus WINGDIPAPI GdipGetMetafileDownLevelRasterizationLimit(GDIPCONST GpMetafile*,UINT*); GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT);

1 0

Zebediah Figura : quartz/filtergraph: Get rid of tracing for outer IUnknown methods.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 11af7a02bf4cd963ed5bf9f5b639e020a7caba90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11af7a02bf4cd963ed5bf9f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 14:44:30 2020 -0500 quartz/filtergraph: Get rid of tracing for outer IUnknown methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 207 ++++++++++++++-------------------------------- 1 file changed, 63 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11af7a02bf4cd963ed5b…

1 0

André Hentschel : ntdll: Fix SystemRecommendedSharedDataAlignment on ARM.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 44274d172bb72ef06157f5f8a84152a9e7fc5c82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44274d172bb72ef06157f5f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 17 15:54:33 2020 +0200 ntdll: Fix SystemRecommendedSharedDataAlignment on ARM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43961 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 9 ++++++++- dlls/ntdll/tests/info.c | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 4dced31641..2076806573 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3034,7 +3034,14 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; - else *((DWORD *)SystemInformation) = 64; + else + { +#ifdef __arm__ + *((DWORD *)SystemInformation) = 32; +#else + *((DWORD *)SystemInformation) = 64; +#endif + } } else ret = STATUS_INFO_LENGTH_MISMATCH; } diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7a641f8b84..b591f39cea 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2518,7 +2518,11 @@ static void test_query_data_alignment(void) status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength); +#ifdef __arm__ + ok(value == 32, "Expected 32, got %u\n", value); +#else ok(value == 64, "Expected 64, got %u\n", value); +#endif } static void test_thread_lookup(void)

1 0