- Wine-Commits - list.winehq.org

Huw Davies : winemac: Fix return type of ProcessEvents().
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: 9260e6333b5171959f96564f56642b8a2351dacf URL: https://gitlab.winehq.org/wine/wine/-/commit/9260e6333b5171959f96564f56642b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 24 09:30:28 2023 +0000 winemac: Fix return type of ProcessEvents(). Introduced by commit a97fd9f29e7dbeee2dc06415a34a9f7669ea2e0d --- dlls/winemac.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 5b717b4b730..5953dc0e0d8 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -512,7 +512,7 @@ static int process_events(macdrv_event_queue queue, macdrv_event_mask mask) /*********************************************************************** * ProcessEvents (MACDRV.@) */ -NTSTATUS macdrv_ProcessEvents(DWORD mask) +BOOL macdrv_ProcessEvents(DWORD mask) { struct macdrv_thread_data *data = macdrv_thread_data(); macdrv_event_mask event_mask = get_event_mask(mask);

1 0

Alexandre Julliard : ntdll: Mark the Wow64 TLS slots as reserved.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: aa3e772abf636663313ff0dfe299c6c383ed1b0a URL: https://gitlab.winehq.org/wine/wine/-/commit/aa3e772abf636663313ff0dfe299c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 11:51:35 2023 +0100 ntdll: Mark the Wow64 TLS slots as reserved. --- dlls/ntdll/loader.c | 3 ++- include/winternl.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f533db060d0..d0d9bae7f0b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4176,7 +4176,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, sizeof(peb->TlsExpansionBitmapBits) * 8 ); - RtlSetBits( peb->TlsBitmap, 0, 1 ); /* TLS index 0 is reserved and should be initialized to NULL. */ + /* TLS index 0 is always reserved, and wow64 reserves extra TLS entries */ + RtlSetBits( peb->TlsBitmap, 0, NtCurrentTeb()->WowTebOffset ? WOW64_TLS_MAX_NUMBER : 1 ); init_user_process_params(); load_global_options(); diff --git a/include/winternl.h b/include/winternl.h index 3a6c89a5f7a..93bd32e3786 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1084,6 +1084,7 @@ typedef struct _TEB64 #define WOW64_TLS_TEMPLIST 3 #define WOW64_TLS_USERCALLBACKDATA 5 #define WOW64_TLS_FILESYSREDIR 8 +#define WOW64_TLS_MAX_NUMBER 19 /***********************************************************************

1 0

Tingzhong Luo : evr: Fix crash when clearing input type for the mixer.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: c56638278cecc1db682af28b16fbdba6c73bbf42 URL: https://gitlab.winehq.org/wine/wine/-/commit/c56638278cecc1db682af28b16fbdb… Author: Tingzhong Luo <luotingzhong(a)uniontech.com> Date: Thu Feb 23 11:56:54 2023 +0800 evr: Fix crash when clearing input type for the mixer. Signed-off-by: Tingzhong Luo <luotingzhong(a)uniontech.com> --- dlls/evr/mixer.c | 9 +++++++-- dlls/evr/tests/evr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 668a97da979..222fc538fec 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -240,7 +240,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer) free(mixer->output.rt_formats); if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); - mixer->output.media_type = NULL; + memset(&mixer->output, 0, sizeof(mixer->output)); } static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) @@ -855,12 +855,17 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW TRACE("%p, %lu, %p, %#lx.\n", iface, id, media_type, flags); + if (!media_type && (flags & MFT_SET_TYPE_TEST_ONLY)) + return E_INVALIDARG; + EnterCriticalSection(&mixer->cs); if (!(flags & MFT_SET_TYPE_TEST_ONLY)) video_mixer_clear_types(mixer); - if (!mixer->device_manager) + if (!media_type) + hr = S_OK; + else if (!mixer->device_manager) hr = MF_E_NOT_INITIALIZED; else { diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index acfb92f2ea5..4f30dd28570 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1249,6 +1249,11 @@ static void test_default_mixer_type_negotiation(void) goto done; } + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1469,9 +1474,48 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == media_type2, "Unexpected media type instance.\n"); + + IMFMediaType_Release(media_type); + + /* Clear input types */ + hr = IMFTransform_SetInputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + + /* Restore types */ + hr = IMFTransform_SetOutputType(transform, 0, media_type2, 0); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, video_type, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(media_type == video_type, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(media_type2 == media_type, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type2); IMFMediaType_Release(media_type); + /* Resetting type twice */ + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFVideoProcessor_Release(processor); IMFMediaType_Release(video_type);

1 0

Ivan Chikish : gdi32/tests: Check last error on ' '.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: 907b1b4a364be1745e005bc0f7f5d2eb105f79a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/907b1b4a364be1745e005bc0f7f5d2… Author: Ivan Chikish <nekotekina(a)gmail.com> Date: Mon Feb 6 20:51:18 2023 +0300 gdi32/tests: Check last error on ' '. --- dlls/gdi32/tests/font.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 608749e0446..7be8d6f2c66 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4754,6 +4754,7 @@ static void test_GetGlyphOutline(void) if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok(ret == 0, "GetGlyphOutlineW should return 0 buffer size for space char\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", GetLastError()); ok(gm.gmBlackBoxX == 1, "Expected 1, got %u\n", gm.gmBlackBoxX); ok(gm.gmBlackBoxY == 1, "Expected 1, got %u\n", gm.gmBlackBoxY); } @@ -4789,6 +4790,7 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", GetLastError()); ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } @@ -4802,6 +4804,7 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", GetLastError()); ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } @@ -4815,6 +4818,7 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", GetLastError()); ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); }

1 0

Alexandre Julliard : ntdll: Stop loading libwine.so.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: 69910d38511ed69804fdb327bed4296bc1829276 URL: https://gitlab.winehq.org/wine/wine/-/commit/69910d38511ed69804fdb327bed429… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 10:10:21 2023 +0100 ntdll: Stop loading libwine.so. --- dlls/ntdll/unix/loader.c | 93 ++++++++---------------------------------------- 1 file changed, 15 insertions(+), 78 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5cbe57c020a..cde37c48b0d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -380,9 +380,6 @@ static const char *dll_dir; static const char *ntdll_dir; static const char *wineloader; static SIZE_T dll_path_maxlen; -static int *p___wine_main_argc; -static char ***p___wine_main_argv; -static WCHAR ***p___wine_main_wargv; const char *home_dir = NULL; const char *data_dir = NULL; @@ -1185,54 +1182,6 @@ static void relocate_ntdll( void *module ) } -static void *callback_module; - -/*********************************************************************** - * load_builtin_callback - * - * Load a library in memory; callback function for wine_dll_register - */ -static void load_builtin_callback( void *module, const char *filename ) -{ - callback_module = module; -} - - -/*********************************************************************** - * load_libwine - */ -static void load_libwine(void) -{ -#ifdef __APPLE__ -#define LIBWINE "libwine.1.dylib" -#else -#define LIBWINE "libwine.so.1" -#endif - typedef void (*load_dll_callback_t)( void *, const char * ); - void (*p_wine_dll_set_callback)( load_dll_callback_t load ); - char ***p___wine_main_environ; - - char *path; - void *handle; - - if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); - else path = build_path( ntdll_dir, LIBWINE ); - - handle = dlopen( path, RTLD_NOW ); - free( path ); - if (!handle && !(handle = dlopen( LIBWINE, RTLD_NOW ))) return; - - p_wine_dll_set_callback = dlsym( handle, "wine_dll_set_callback" ); - p___wine_main_argc = dlsym( handle, "__wine_main_argc" ); - p___wine_main_argv = dlsym( handle, "__wine_main_argv" ); - p___wine_main_wargv = dlsym( handle, "__wine_main_wargv" ); - p___wine_main_environ = dlsym( handle, "__wine_main_environ" ); - - if (p_wine_dll_set_callback) p_wine_dll_set_callback( load_builtin_callback ); - if (p___wine_main_environ) *p___wine_main_environ = main_envp; -} - - /*********************************************************************** * fill_builtin_image_info */ @@ -1275,34 +1224,32 @@ static NTSTATUS dlopen_dll( const char *so_name, UNICODE_STRING *nt_name, void * void *module, *handle; const IMAGE_NT_HEADERS *nt; - callback_module = (void *)1; handle = dlopen( so_name, RTLD_NOW ); if (!handle) { WARN( "failed to load .so lib %s: %s\n", debugstr_a(so_name), dlerror() ); return STATUS_INVALID_IMAGE_FORMAT; } - if (callback_module != (void *)1) /* callback was called */ + + if (!(nt = dlsym( handle, "__wine_spec_nt_header" ))) { - if (!callback_module) return STATUS_NO_MEMORY; - WARN( "got old-style builtin library %s, constructors won't work\n", debugstr_a(so_name) ); - module = callback_module; - if (get_builtin_so_handle( module )) goto already_loaded; + ERR( "invalid .so library %s, too old?\n", debugstr_a(so_name)); + return STATUS_INVALID_IMAGE_FORMAT; } - else if ((nt = dlsym( handle, "__wine_spec_nt_header" ))) + + module = (HMODULE)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); + if (get_builtin_so_handle( module )) /* already loaded */ { - module = (HMODULE)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); - if (get_builtin_so_handle( module )) goto already_loaded; - if (map_so_dll( nt, module )) - { - dlclose( handle ); - return STATUS_NO_MEMORY; - } + fill_builtin_image_info( module, image_info ); + *ret_module = module; + dlclose( handle ); + return STATUS_SUCCESS; } - else /* already loaded .so */ + + if (map_so_dll( nt, module )) { - WARN( "%s already loaded?\n", debugstr_a(so_name)); - return STATUS_INVALID_IMAGE_FORMAT; + dlclose( handle ); + return STATUS_NO_MEMORY; } fill_builtin_image_info( module, image_info ); @@ -1320,12 +1267,6 @@ static NTSTATUS dlopen_dll( const char *so_name, UNICODE_STRING *nt_name, void * } *ret_module = module; return STATUS_SUCCESS; - -already_loaded: - fill_builtin_image_info( module, image_info ); - *ret_module = module; - dlclose( handle ); - return STATUS_SUCCESS; } @@ -2102,11 +2043,7 @@ static void start_main_thread(void) virtual_map_user_shared_data(); init_cpu_info(); init_files(); - load_libwine(); init_startup_info(); - if (p___wine_main_argc) *p___wine_main_argc = main_argc; - if (p___wine_main_argv) *p___wine_main_argv = main_argv; - if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); set_load_order_app_name( main_wargv[0] ); init_thread_stack( teb, 0, 0, 0 );

1 0

Alexandre Julliard : libwine: Remove obsolete library.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

1 0

Alistair Leslie-Hughes : include: Add DBCOLUMNFLAGS_ enums values.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: 7582ebcd1ad31a51eeeb3d41d2500b1a951e5dc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7582ebcd1ad31a51eeeb3d41d2500b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 24 17:30:27 2023 +1100 include: Add DBCOLUMNFLAGS_ enums values. --- include/dbs.idl | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index d5b903138d6..d3cc46b4010 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -816,6 +816,33 @@ enum DBCOLUMNFLAGSENUM { DBCOLUMNFLAGS_CACHEDEFERRED = 0x1000 }; +enum DBCOLUMNFLAGS15ENUM { + DBCOLUMNFLAGS_ISCHAPTER = 0x002000 +}; + +enum DBCOLUMNFLAGSENUM20 { + DBCOLUMNFLAGS_SCALEISNEGATIVE = 0x004000, + DBCOLUMNFLAGS_RESERVED = 0x008000 +}; + +enum DBCOLUMNFLAGSENUM21 { + DBCOLUMNFLAGS_ISROWURL = 0x010000, + DBCOLUMNFLAGS_ISDEFAULTSTREAM = 0x020000, + DBCOLUMNFLAGS_ISCOLLECTION = 0x040000 +}; + +enum DBCOLUMNFLAGSENUM26 { + DBCOLUMNFLAGS_ISSTREAM = 0x080000, + DBCOLUMNFLAGS_ISROWSET = 0x100000, + DBCOLUMNFLAGS_ISROW = 0x200000, + DBCOLUMNFLAGS_ROWSPECIFICCOLUMN = 0x400000 +}; + + +enum DBCOLUMNFLAGSDEPRECATED { + DBCOLUMNFLAGS_KEYCOLUMN = 0x008000 +}; + typedef struct tagDBCOLUMNINFO { LPOLESTR pwszName; ITypeInfo *pTypeInfo;

1 0

Rémi Bernon : include: Allow overriding LANGID in module VERSIONINFO.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

1 0

Mohamad Al-Jaf : cryptowinrt/tests: Add IKeyCredentialManagerStatics::IsSupportedAsync() tests.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: b7cccbce92d6eb55251527982672dcd1065aaeca URL: https://gitlab.winehq.org/wine/wine/-/commit/b7cccbce92d6eb55251527982672dc… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Dec 1 06:25:36 2022 -0500 cryptowinrt/tests: Add IKeyCredentialManagerStatics::IsSupportedAsync() tests. --- dlls/cryptowinrt/tests/crypto.c | 206 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+)

1 0

Torge Matthies : kernelbase: Break out of inner for-loop early in find_substring.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: 01146582cc56e399a3313e4bad6f367c7d33c503 URL: https://gitlab.winehq.org/wine/wine/-/commit/01146582cc56e399a3313e4bad6f36… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Feb 6 05:51:33 2023 +0100 kernelbase: Break out of inner for-loop early in find_substring. If I'm interpreting this code correctly, once either of these two if-conditions are true once, they will also be true at some point during all of the remaining iterations of the for-loop. Thus, we can just stop the for-loop here. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernelbase/locale.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 13ec1ebeb3a..edab78317da 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3924,8 +3924,12 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH pos += append_weights( sortid, flags, src, srclen, pos, case_mask, except, compr_tables, &s, TRUE ); - if (s.primary_pos + s.key_primary.len > val.key_primary.len) goto next; - if (memcmp( primary, val.key_primary.buf + s.primary_pos, s.key_primary.len )) goto next; + if (s.primary_pos + s.key_primary.len > val.key_primary.len || + memcmp( primary, val.key_primary.buf + s.primary_pos, s.key_primary.len )) + { + len = srclen + 1; + goto next; + } s.primary_pos += s.key_primary.len; s.key_primary.len = 0; }

1 0