January 2021 - Wine-devel - list.winehq.org

[PATCH 4/5] jscript: Support VT_DATE to string conversion.
by Jacek Caban 19 Jan '21

19 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/date.c | 25 +++++++++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 14 +++++++++++--- dlls/jscript/tests/lang.js | 3 +++ 4 files changed, 40 insertions(+), 3 deletions(-)

1 0

[PATCH 3/5] jscript: Support VT_DATE to number conversion.
by Jacek Caban 19 Jan '21

19 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/date.c | 21 +++++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 13 ++++++++++--- dlls/jscript/tests/lang.js | 11 +++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-)

1 0

[PATCH 2/5] jscript/tests: Add VT_DATE handling tests.
by Jacek Caban 19 Jan '21

19 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/lang.js | 9 +++++++++ dlls/jscript/tests/run.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+)

1 0

[PATCH 1/5] jscript: Return DateInstance from create_date.
by Jacek Caban 19 Jan '21

19 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/date.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)

1 0

[PATCH] ntdll: Set EnvironmentSize field for process parameters.
by Nikolay Sivov 19 Jan '21

19 Jan '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50405 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/env.c | 17 ++++++++++++++--- dlls/ntdll/tests/env.c | 12 ++++++++++++ include/winternl.h | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 5d1b6de5bba..7ccdb281b89 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -715,6 +715,7 @@ void WINAPI RtlSetCurrentEnvironment(PWSTR new_env, PWSTR* old_env) prev = NtCurrentTeb()->Peb->ProcessParameters->Environment; NtCurrentTeb()->Peb->ProcessParameters->Environment = new_env; + NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize = new_env ? get_env_length(new_env) * sizeof(*new_env) : 0; RtlReleasePebLock(); @@ -1041,7 +1042,11 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu append_unicode_string( &ptr, Desktop, &params->Desktop ); append_unicode_string( &ptr, ShellInfo, &params->ShellInfo ); append_unicode_string( &ptr, RuntimeInfo, &params->RuntimeInfo ); - if (Environment) params->Environment = memcpy( ptr, Environment, env_size ); + if (Environment) + { + params->Environment = memcpy( ptr, Environment, env_size ); + params->EnvironmentSize = env_size; + } *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); } @@ -1194,8 +1199,10 @@ void init_user_process_params(void) PROCESS_PARAMS_FLAG_NORMALIZED )) return; - params->Environment = env; NtCurrentTeb()->Peb->ProcessParameters = params; + NtCurrentTeb()->Peb->ProcessParameters->Environment = env; + NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize = env ? get_env_length( env ) * sizeof(*env) : 0; + RtlFreeUnicodeString( &initial_params.ImagePathName ); RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path ); @@ -1249,7 +1256,11 @@ void init_user_process_params(void) env_size = data_size - info_size; if ((params->Environment = RtlAllocateHeap( GetProcessHeap(), 0, max( env_size, sizeof(WCHAR) )))) { - if (env_size) memcpy( params->Environment, (char *)info + info_size, env_size ); + if (env_size) + { + memcpy( params->Environment, (char *)info + info_size, env_size ); + NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize = env_size; + } else params->Environment[0] = 0; } diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 4865a0a8e51..2cbbcbb34e1 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -58,6 +58,13 @@ static WCHAR small_env[] = {'f','o','o','=','t','o','t','o',0, 'n','u','l','=',0, 0}; +static SIZE_T get_env_size( const WCHAR *env ) +{ + const WCHAR *end = env; + while (*end) end += lstrlenW(end) + 1; + return (end + 1 - env) * sizeof( *env ); +} + static void testQuery(void) { struct test @@ -439,6 +446,9 @@ static void test_process_params(void) pos += (str - params->Environment) * sizeof(WCHAR); ok( ((pos + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) == size || broken( ((pos + 3) & ~3) == size ), "wrong size %lx/%lx\n", pos, size ); + /* Win8+ uses pointer-sized alignment. */ + ok( params->EnvironmentSize >= get_env_size( params->Environment ), + "Unexpected environment size.\n"); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ pRtlDestroyProcessParameters( params ); @@ -601,6 +611,8 @@ static void test_RtlSetCurrentEnvironment(void) RtlSetCurrentEnvironment(env, &prev); ok(prev == old_env, "got wrong previous env %p\n", prev); ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n"); + ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == get_env_size(env), + "Unexpected environment size.\n"); check_env_var("testenv1", "unus"); check_env_var("testenv2", NULL); diff --git a/include/winternl.h b/include/winternl.h index a7b0e04aade..5eca36a12b8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -199,6 +199,7 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS UNICODE_STRING ShellInfo; UNICODE_STRING RuntimeInfo; RTL_DRIVE_LETTER_CURDIR DLCurrentDirectory[0x20]; + ULONG EnvironmentSize; } RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; /* value for Flags field (FIXME: not the correct name) */ -- 2.29.2

1 0

[PATCH] user32/tests: Add tests for implicit MTA on Window Creation.
by Alistair Leslie-Hughes 19 Jan '21

19 Jan '21

Based on a patch by Paul Gofman. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/win.c | 182 ++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3c..73f692b9d4b 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 hid +IMPORTS = user32 gdi32 advapi32 hid ole32 imm32 C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 47864340e39..3d570a611a4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -19,6 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <assert.h> #include <limits.h> @@ -31,6 +32,10 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "objbase.h" +#include "initguid.h" +#include "wincodec.h" +#include "imm.h" #include "wine/test.h" @@ -11894,6 +11899,181 @@ static void test_cancel_mode(void) DestroyWindow(hwnd2); } +static LRESULT CALLBACK TestWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, uMsg, wParam, lParam); +} + +static DWORD WINAPI window_create_noime_thread(LPVOID data) +{ + HWND hwnd; + HRESULT hr; + IUnknown *unk; + + /* Show that Disabling IME stops the implicit MTA creation. */ + ImmDisableIME(GetCurrentThreadId()); + + hwnd = CreateWindowExA(0, "Test class", "Test window", WS_VISIBLE, 0, 0, 100, 100, + GetDesktopWindow(), NULL, GetModuleHandleA(NULL), NULL); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&unk); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + DestroyWindow(hwnd); + + return 0; +} + +static DWORD WINAPI window_create_setwindowpos_thread(LPVOID data) +{ + APTTYPEQUALIFIER apttypequal; + APTTYPE apttype; + HWND hwnd; + HRESULT hr; + IUnknown *unk; + + hr = CoGetApartmentType(&apttype, &apttypequal); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hwnd = CreateWindowExA(0, "Test class", "Test window", WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU | WS_MINIMIZEBOX, 0, 0, 100, 100, + GetDesktopWindow(), NULL, GetModuleHandleA(NULL), NULL); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&unk); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &apttypequal); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + /* Showing the window actually causes the implicit MTA */ + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW); + + hr = CoGetApartmentType(&apttype, &apttypequal); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine ok(apttype == APTTYPE_MAINSTA && apttypequal == APTTYPEQUALIFIER_NONE, "Unexpected %u/%u\n", apttype, apttypequal); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&unk); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (hr == S_OK) + IUnknown_Release(unk); + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CoGetApartmentType(&apttype, &apttypequal); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MTA && apttypequal == APTTYPEQUALIFIER_NONE, "Unexpected %u/%u\n", apttype, apttypequal); + CoUninitialize(); + + DestroyWindow(hwnd); + + return 0; +} + +static DWORD WINAPI window_create_show_window_thread(LPVOID data) +{ + APTTYPEQUALIFIER apttypequal; + APTTYPE apttype; + HWND hwnd; + HRESULT hr; + IUnknown *unk; + + hr = CoGetApartmentType(&apttype, &apttypequal); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hwnd = CreateWindowExA(0, "Test class", "Test window", WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU | WS_MINIMIZEBOX, 0, 0, 100, 100, + GetDesktopWindow(), NULL, GetModuleHandleA(NULL), NULL); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&unk); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &apttypequal); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + /* Showing the window actually causes the implicit MTA */ + ShowWindow(hwnd, SW_SHOW); + + hr = CoGetApartmentType(&apttype, &apttypequal); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine ok(apttype == APTTYPE_MAINSTA && apttypequal == APTTYPEQUALIFIER_NONE, "Unexpected %u/%u\n", apttype, apttypequal); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&unk); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (hr == S_OK) + IUnknown_Release(unk); + + DestroyWindow(hwnd); + + return 0; +} + +static DWORD WINAPI window_create_visible_thread(LPVOID data) +{ + APTTYPEQUALIFIER apttypequal; + APTTYPE apttype; + HWND hwnd; + HRESULT hr; + IUnknown *unk; + + hr = CoGetApartmentType(&apttype, &apttypequal); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hwnd = CreateWindowExA(0, "Test class", "Test window", WS_VISIBLE, 0, 0, 100, 100, + GetDesktopWindow(), NULL, GetModuleHandleA(NULL), NULL); + + hr = CoGetApartmentType(&apttype, &apttypequal); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine ok(apttype == APTTYPE_MAINSTA && apttypequal == APTTYPEQUALIFIER_NONE, "Unexpected %u/%u\n", apttype, apttypequal); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&unk); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (hr == S_OK) + IUnknown_Release(unk); + + DestroyWindow(hwnd); + + return 0; +} + +static void test_implicit_mta(void) +{ + APTTYPEQUALIFIER apttypequal; + APTTYPE apttype; + WNDCLASSA clsA; + HRESULT hr; + HANDLE thread; + + clsA.style = 0; + clsA.lpfnWndProc = TestWindowProc; + clsA.cbClsExtra = 0; + clsA.cbWndExtra = 0; + clsA.hInstance = GetModuleHandleA(NULL); + clsA.hIcon = 0; + clsA.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + clsA.hbrBackground = GetStockObject(WHITE_BRUSH); + clsA.lpszMenuName = NULL; + clsA.lpszClassName = "Test class"; + + RegisterClassA(&clsA); + + hr = CoGetApartmentType(&apttype, &apttypequal); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + thread = CreateThread(NULL, 0, window_create_noime_thread, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + thread = CreateThread(NULL, 0, window_create_setwindowpos_thread, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + thread = CreateThread(NULL, 0, window_create_show_window_thread, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + thread = CreateThread(NULL, 0, window_create_visible_thread, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); +} + START_TEST(win) { char **argv; @@ -11941,6 +12121,8 @@ START_TEST(win) return; } + test_implicit_mta(); + if (!RegisterWindowClasses()) assert(0); hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", -- 2.29.2

3 2

[PATCH] ws2_32: Use if_nameindex() instead of SIOCGIFNAME.
by Paul Gofman 19 Jan '21

19 Jan '21

Fixes Mac build broken by 03fcb54c0e852b93b94bd11225237af84cdc3697 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50525 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The alternative would be to use if_indextoname(), but the current problem is that it is available both in iphlpapi.dll and native libc. The function gets a prototype from native net/if.h but is linked to WINAPI variant from iphlpapi. Working that around probably does not worth it. dlls/ws2_32/socket.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 31ea9b339ed..5def84ce973 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4797,6 +4797,7 @@ static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD DWORD size, interface_count = 0, ret; INTERFACE_INFO *info = out_buff; PMIB_IPADDRTABLE table = NULL; + struct if_nameindex *if_ni; DWORD status = 0; int fd; @@ -4823,7 +4824,7 @@ static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD } if (GetIpAddrTable(table, &size, TRUE) != NO_ERROR) { - ERR("Unable to get interface table./\n"); + ERR("Unable to get interface table.\n"); status = WSAEINVAL; goto done; } @@ -4835,24 +4836,36 @@ static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD goto done; } + if (!(if_ni = if_nameindex())) + { + ERR("Unable to get interface name index.\n"); + status = WSAEINVAL; + goto done; + } + for (; interface_count < table->dwNumEntries; ++interface_count, ++info) { unsigned int addr, mask; struct ifreq if_info; + unsigned int i; memset(info, 0, sizeof(*info)); - if_info.ifr_ifindex = table->table[interface_count].dwIndex; - if (ioctl(fd, SIOCGIFNAME, &if_info) < 0) + for (i = 0; if_ni[i].if_index || if_ni[i].if_name; ++i) + if (if_ni[i].if_index == table->table[interface_count].dwIndex) + break; + + if (!if_ni[i].if_name) { - ERR("Error obtaining interface name for ifindex %d.\n", if_info.ifr_ifindex); + ERR("Error obtaining interface name for ifindex %u.\n", table->table[interface_count].dwIndex); status = WSAEINVAL; break; } + lstrcpynA(if_info.ifr_name, if_ni[i].if_name, IFNAMSIZ); if (ioctl(fd, SIOCGIFFLAGS, &if_info) < 0) { - ERR("Error obtaining status flags for socket!\n"); + ERR("Error obtaining status flags for socket.\n"); status = WSAEINVAL; break; } @@ -4888,7 +4901,7 @@ static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD info->iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = addr | ~mask; } } - + if_freenameindex(if_ni); done: heap_free(table); *total_bytes = sizeof(INTERFACE_INFO) * interface_count; -- 2.29.2

1 0

[PATCH v3 1/4] include: Move InterlockedCompareExchange128 next to the other InterlockedCompareExchange* functions.
by Zebediah Figura 19 Jan '21

19 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/winnt.h | 52 +++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 7bbe0185139..1bb29836a3d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6898,6 +6898,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) +#ifdef _WIN64 +#pragma intrinsic(_InterlockedCompareExchange128) +#endif #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) #pragma intrinsic(_InterlockedIncrement) @@ -6905,6 +6908,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +#ifdef _WIN64 +unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); +#endif long _InterlockedDecrement(long volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); @@ -6920,6 +6926,13 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); } +#ifdef _WIN64 +static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + return _InterlockedCompareExchange128( dest, xchg_high, xchg_low, compare ); +} +#endif + static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { return _InterlockedExchange( (long volatile *)dest, val ); @@ -6982,6 +6995,13 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return __sync_val_compare_and_swap( dest, compare, xchg ); } +#ifdef _WIN64 +static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); +} +#endif + static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; @@ -7024,38 +7044,6 @@ static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *des #endif /* __GNUC__ */ -#ifdef _WIN64 - -#if defined(_MSC_VER) - -#define InterlockedCompareExchange128 _InterlockedCompareExchange128 -unsigned char _InterlockedCompareExchange128(volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); -#pragma intrinsic(_InterlockedCompareExchange128) - -#elif defined(__x86_64__) - -static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) -{ - unsigned char ret; - __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" - : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), - "=a" (compare[0]), "=d" (compare[1]) - : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), - "c" (xchg_high), "b" (xchg_low) ); - return ret; -} - -#elif defined(__GNUC__) - -static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) -{ - return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); -} - -#endif - -#endif /* _WIN64 */ - #ifdef __cplusplus } #endif -- 2.29.2

2 4

[PATCH 1/5] winegstreamer: Do not handle GST_EVENT_TAG in event_src().
by Zebediah Figura 19 Jan '21

19 Jan '21

GST_EVENT_TAG is a downstream-only event. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d6b47e871d5..f45036ae946 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -647,7 +647,6 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) break; default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); - case GST_EVENT_TAG: case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: return gst_pad_event_default(pad, parent, event); -- 2.30.0

1 4

[PATCH v2 1/5] windowscodecs: Move several helpers to new wincodecs_common.c source.
by Rémi Bernon 18 Jan '21

18 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Same as v1 but move some Makefile.in changes from PATCH 4 to PATCH 3 to fix build failure, and add PATCH 5 to fix the temporary todo_wine. Notes: Supersedes: 198035-198039, 198070-198073 dlls/windowscodecs/Makefile.in | 3 +- dlls/windowscodecs/main.c | 171 ---------------------- dlls/windowscodecs/wincodecs_common.c | 203 ++++++++++++++++++++++++++ 3 files changed, 205 insertions(+), 172 deletions(-) create mode 100644 dlls/windowscodecs/wincodecs_common.c diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 80e4d16c9d4..440a638e96f 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -41,7 +41,8 @@ C_SRCS = \ ungif.c \ unix_iface.c \ unix_lib.c \ - uuid.c + uuid.c \ + wincodecs_common.c RC_SRCS = version.rc diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index e78acc3f34f..4908a5f77e1 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -30,10 +30,6 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); - -#include "wincodecs_common.h" - extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; HMODULE windowscodecs_module = 0; @@ -60,173 +56,6 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -HRESULT configure_write_source(IWICBitmapFrameEncode *iface, - IWICBitmapSource *source, const WICRect *prc, - const WICPixelFormatGUID *format, - INT width, INT height, double xres, double yres) -{ - UINT src_width, src_height; - HRESULT hr = S_OK; - - if (width == 0 && height == 0) - { - if (prc) - { - if (prc->Width <= 0 || prc->Height <= 0) return E_INVALIDARG; - width = prc->Width; - height = prc->Height; - } - else - { - hr = IWICBitmapSource_GetSize(source, &src_width, &src_height); - if (FAILED(hr)) return hr; - if (src_width == 0 || src_height == 0) return E_INVALIDARG; - width = src_width; - height = src_height; - } - hr = IWICBitmapFrameEncode_SetSize(iface, (UINT)width, (UINT)height); - if (FAILED(hr)) return hr; - } - if (width == 0 || height == 0) return E_INVALIDARG; - - if (!format) - { - WICPixelFormatGUID src_format; - - hr = IWICBitmapSource_GetPixelFormat(source, &src_format); - if (FAILED(hr)) return hr; - - hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &src_format); - if (FAILED(hr)) return hr; - } - - if (xres == 0.0 || yres == 0.0) - { - hr = IWICBitmapSource_GetResolution(source, &xres, &yres); - if (FAILED(hr)) return hr; - hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); - if (FAILED(hr)) return hr; - } - - return hr; -} - -HRESULT write_source(IWICBitmapFrameEncode *iface, - IWICBitmapSource *source, const WICRect *prc, - const WICPixelFormatGUID *format, UINT bpp, BOOL need_palette, - INT width, INT height) -{ - IWICBitmapSource *converted_source; - HRESULT hr=S_OK; - WICRect rc; - UINT stride; - BYTE* pixeldata; - - if (!prc) - { - UINT src_width, src_height; - hr = IWICBitmapSource_GetSize(source, &src_width, &src_height); - if (FAILED(hr)) return hr; - rc.X = 0; - rc.Y = 0; - rc.Width = src_width; - rc.Height = src_height; - prc = &rc; - } - - if (prc->Width != width || prc->Height <= 0) - return E_INVALIDARG; - - hr = WICConvertBitmapSource(format, source, &converted_source); - if (FAILED(hr)) - { - ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); - return E_NOTIMPL; - } - - if (need_palette) - { - IWICPalette *palette; - - hr = PaletteImpl_Create(&palette); - if (SUCCEEDED(hr)) - { - hr = IWICBitmapSource_CopyPalette(converted_source, palette); - - if (SUCCEEDED(hr)) - hr = IWICBitmapFrameEncode_SetPalette(iface, palette); - - IWICPalette_Release(palette); - } - - if (FAILED(hr)) - { - IWICBitmapSource_Release(converted_source); - return hr; - } - } - - stride = (bpp * width + 7)/8; - - pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); - if (!pixeldata) - { - IWICBitmapSource_Release(converted_source); - return E_OUTOFMEMORY; - } - - hr = IWICBitmapSource_CopyPixels(converted_source, prc, stride, - stride*prc->Height, pixeldata); - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, - stride*prc->Height, pixeldata); - } - - HeapFree(GetProcessHeap(), 0, pixeldata); - IWICBitmapSource_Release(converted_source); - - return hr; -} - -HRESULT CDECL stream_getsize(IStream *stream, ULONGLONG *size) -{ - STATSTG statstg; - HRESULT hr; - - hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); - - if (SUCCEEDED(hr)) - *size = statstg.cbSize.QuadPart; - - return hr; -} - -HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read) -{ - return IStream_Read(stream, buffer, read, bytes_read); -} - -HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position) -{ - HRESULT hr; - LARGE_INTEGER ofs_large; - ULARGE_INTEGER pos_large; - - ofs_large.QuadPart = ofs; - hr = IStream_Seek(stream, ofs_large, origin, &pos_large); - if (new_position) - *new_position = pos_large.QuadPart; - - return hr; -} - -HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULONG *bytes_written) -{ - return IStream_Write(stream, buffer, write, bytes_written); -} - HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) { HRESULT hr; diff --git a/dlls/windowscodecs/wincodecs_common.c b/dlls/windowscodecs/wincodecs_common.c new file mode 100644 index 00000000000..37ad7128f10 --- /dev/null +++ b/dlls/windowscodecs/wincodecs_common.c @@ -0,0 +1,203 @@ +/* + * wincodecs_common.c - Functions shared with other WIC libraries. + * + * Copyright 2020 Esme Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "objbase.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#include "wincodecs_common.h" + +HRESULT configure_write_source(IWICBitmapFrameEncode *iface, + IWICBitmapSource *source, const WICRect *prc, + const WICPixelFormatGUID *format, + INT width, INT height, double xres, double yres) +{ + UINT src_width, src_height; + HRESULT hr = S_OK; + + if (width == 0 && height == 0) + { + if (prc) + { + if (prc->Width <= 0 || prc->Height <= 0) return E_INVALIDARG; + width = prc->Width; + height = prc->Height; + } + else + { + hr = IWICBitmapSource_GetSize(source, &src_width, &src_height); + if (FAILED(hr)) return hr; + if (src_width == 0 || src_height == 0) return E_INVALIDARG; + width = src_width; + height = src_height; + } + hr = IWICBitmapFrameEncode_SetSize(iface, (UINT)width, (UINT)height); + if (FAILED(hr)) return hr; + } + if (width == 0 || height == 0) return E_INVALIDARG; + + if (!format) + { + WICPixelFormatGUID src_format; + + hr = IWICBitmapSource_GetPixelFormat(source, &src_format); + if (FAILED(hr)) return hr; + + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &src_format); + if (FAILED(hr)) return hr; + } + + if (xres == 0.0 || yres == 0.0) + { + hr = IWICBitmapSource_GetResolution(source, &xres, &yres); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); + if (FAILED(hr)) return hr; + } + + return hr; +} + +HRESULT write_source(IWICBitmapFrameEncode *iface, + IWICBitmapSource *source, const WICRect *prc, + const WICPixelFormatGUID *format, UINT bpp, BOOL need_palette, + INT width, INT height) +{ + IWICBitmapSource *converted_source; + HRESULT hr=S_OK; + WICRect rc; + UINT stride; + BYTE* pixeldata; + + if (!prc) + { + UINT src_width, src_height; + hr = IWICBitmapSource_GetSize(source, &src_width, &src_height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = src_width; + rc.Height = src_height; + prc = &rc; + } + + if (prc->Width != width || prc->Height <= 0) + return E_INVALIDARG; + + hr = WICConvertBitmapSource(format, source, &converted_source); + if (FAILED(hr)) + { + ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); + return E_NOTIMPL; + } + + if (need_palette) + { + IWICPalette *palette; + + hr = PaletteImpl_Create(&palette); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapSource_CopyPalette(converted_source, palette); + + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameEncode_SetPalette(iface, palette); + + IWICPalette_Release(palette); + } + + if (FAILED(hr)) + { + IWICBitmapSource_Release(converted_source); + return hr; + } + } + + stride = (bpp * width + 7)/8; + + pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); + if (!pixeldata) + { + IWICBitmapSource_Release(converted_source); + return E_OUTOFMEMORY; + } + + hr = IWICBitmapSource_CopyPixels(converted_source, prc, stride, + stride*prc->Height, pixeldata); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, + stride*prc->Height, pixeldata); + } + + HeapFree(GetProcessHeap(), 0, pixeldata); + IWICBitmapSource_Release(converted_source); + + return hr; +} + +HRESULT CDECL stream_getsize(IStream *stream, ULONGLONG *size) +{ + STATSTG statstg; + HRESULT hr; + + hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr)) + *size = statstg.cbSize.QuadPart; + + return hr; +} + +HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read) +{ + return IStream_Read(stream, buffer, read, bytes_read); +} + +HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position) +{ + HRESULT hr; + LARGE_INTEGER ofs_large; + ULARGE_INTEGER pos_large; + + ofs_large.QuadPart = ofs; + hr = IStream_Seek(stream, ofs_large, origin, &pos_large); + if (new_position) + *new_position = pos_large.QuadPart; + + return hr; +} + +HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULONG *bytes_written) +{ + return IStream_Write(stream, buffer, write, bytes_written); +} -- 2.30.0

2 13