August 2020 - Wine-commits - list.winehq.org

Zebediah Figura : msvcrt/tests: Fix some tests on Windows 2003 and earlier.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 3f5066b12ef71385c02be345896800271d9ec590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5066b12ef71385c02be345… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 1 10:19:15 2020 -0500 msvcrt/tests: Fix some tests on Windows 2003 and earlier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8e23f9cffe..3970f703f6 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1983,7 +1983,8 @@ static void test__strtod(void) ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", i, (int)(end - tests[i].str)); - ok(errno == tests[i].err, "%d) errno = %d\n", i, errno); + ok(errno == tests[i].err || (!tests[i].err && errno == 0xdeadbeef) /* <= 2003 */, + "%d) errno = %d\n", i, errno); } if (!p__strtod_l)

1 0

Zebediah Figura : quartz/tests: Fix a test in test_basic_video().
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: eedbfe0c0d7c6575aa9b5d04f103bc05d4c7bf2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eedbfe0c0d7c6575aa9b5d04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 1 10:49:37 2020 -0500 quartz/tests: Fix a test in test_basic_video(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 9e6a618a36..c2b6271021 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2733,6 +2733,7 @@ static void test_basic_video(void) vih.bmiHeader.biWidth = 16; vih.bmiHeader.biHeight = 16; + vih.bmiHeader.biSizeImage = 0; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Jacek Caban : configure: Build with -mcx16 on x86_64.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: dc199ae8b8b38ac088eb0bcd05e1b023e3f5cd8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc199ae8b8b38ac088eb0bcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 15:37:17 2020 +0200 configure: Build with -mcx16 on x86_64. This is needed on clang msvc target to allow _InterlockedCompareExchange128. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 31 +++++++++++++++++++++++++++++++ configure.ac | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 8808ab6807..f4e188f38e 100755 --- a/configure +++ b/configure @@ -10582,6 +10582,37 @@ fi $as_echo "$ac_cv_crosscflags__Wnonnull" >&6; } if test "x$ac_cv_crosscflags__Wnonnull" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wnonnull" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -mcx16" >&5 +$as_echo_n "checking whether the cross-compiler supports -mcx16... " >&6; } +if ${ac_cv_crosscflags__mcx16+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -mcx16" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__mcx16=yes +else + ac_cv_crosscflags__mcx16=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__mcx16" >&5 +$as_echo "$ac_cv_crosscflags__mcx16" >&6; } +if test "x$ac_cv_crosscflags__mcx16" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -mcx16" fi ;; esac diff --git a/configure.ac b/configure.ac index 65a7c5d625..c0a44f3712 100644 --- a/configure.ac +++ b/configure.ac @@ -1096,7 +1096,8 @@ then *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) ;; x86_64) WINE_TRY_CROSSCFLAGS([-Wno-format]) WINE_TRY_CROSSCFLAGS([-Wformat-overflow]) - WINE_TRY_CROSSCFLAGS([-Wnonnull]) ;; + WINE_TRY_CROSSCFLAGS([-Wnonnull]) + WINE_TRY_CROSSCFLAGS([-mcx16]) ;; esac dnl Determine debug info format

1 0

Alexandre Julliard : winebuild: Always use DllMain as entry point for the 32-bit side of a 16-bit module.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: cff04b34ac7bc252799932a5c376a93094e6f115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cff04b34ac7bc252799932a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 3 11:44:33 2020 +0200 winebuild: Always use DllMain as entry point for the 32-bit side of a 16-bit module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49559 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 1 + tools/winebuild/parser.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 34761ea4c5..da9ad62022 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -475,6 +475,7 @@ static int has_stubs( const DLLSPEC *spec ) static void add_extra_undef_symbols( DLLSPEC *spec ) { add_extra_ld_symbol( spec->init_func ); + if (spec->type == SPEC_WIN16) add_extra_ld_symbol( "DllMain" ); if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); if (delayed_imports.count) add_extra_ld_symbol( "__wine_spec_delay_load" ); } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 9822456fe5..54fffd8a1b 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -836,6 +836,7 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) spec32->file_name = xstrdup( spec16->file_name ); spec32->characteristics = IMAGE_FILE_DLL; + spec32->init_func = xstrdup( "DllMain" ); /* add an export for the NE module */

1 0

Alexandre Julliard : ntdll: Fix wcsncpy() implementation now that length is unsigned.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 647c54e539c6dcc76c6289bad0fc387274d999eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=647c54e539c6dcc76c6289ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 3 13:00:03 2020 +0200 ntdll: Fix wcsncpy() implementation now that length is unsigned. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49206 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/wcstring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 393d5af8c2..eee856b21d 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -244,8 +244,8 @@ int __cdecl wcsncmp( LPCWSTR str1, LPCWSTR str2, size_t n ) LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) { WCHAR *ret = s1; - while (n-- > 0) if (!(*s1++ = *s2++)) break; - while (n-- > 0) *s1++ = 0; + for ( ; n; n--) if (!(*s1++ = *s2++)) break; + for ( ; n; n--) *s1++ = 0; return ret; }

1 0

Alexandre Julliard : ntdll: Move the critical section fallback code out of the Unix library.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 2c903e9e9bb1254a9fbed60767b56668e675f64e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c903e9e9bb1254a9fbed607… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 3 15:52:05 2020 +0200 ntdll: Move the critical section fallback code out of the Unix library. This partially reverts commit ff19f21913c508f5827df0e7e4c3a351c36711a0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/critsection.c | 53 ++++++++++++++++++++++++++++++++++--- dlls/ntdll/unix/sync.c | 69 +++++------------------------------------------- 2 files changed, 55 insertions(+), 67 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 232d6aa06c..fe7d933c0f 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -50,6 +50,44 @@ static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; } +/*********************************************************************** + * get_semaphore + */ +static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) +{ + HANDLE ret = crit->LockSemaphore; + if (!ret) + { + HANDLE sem; + if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0; + if (!(ret = InterlockedCompareExchangePointer( &crit->LockSemaphore, sem, 0 ))) + ret = sem; + else + NtClose(sem); /* somebody beat us to it */ + } + return ret; +} + +/*********************************************************************** + * wait_semaphore + */ +static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) +{ + NTSTATUS ret; + + /* debug info is cleared by MakeCriticalSectionGlobal */ + if (!crit_section_has_debuginfo( crit ) || + ((ret = unix_funcs->fast_RtlpWaitForCriticalSection( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + { + HANDLE sem = get_semaphore( crit ); + LARGE_INTEGER time; + + time.QuadPart = timeout * (LONGLONG)-10000000; + ret = NtWaitForSingleObject( sem, FALSE, &time ); + } + return ret; +} + /*********************************************************************** * RtlInitializeCriticalSection (NTDLL.@) * @@ -260,7 +298,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) for (;;) { EXCEPTION_RECORD rec; - NTSTATUS status = unix_funcs->fast_RtlpWaitForCriticalSection( crit, 5 ); + NTSTATUS status = wait_semaphore( crit, 5 ); timeout -= 5; if ( status == STATUS_TIMEOUT ) @@ -270,14 +308,14 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if (!name) name = "?"; ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = unix_funcs->fast_RtlpWaitForCriticalSection( crit, 60 ); + status = wait_semaphore( crit, 60 ); timeout -= 60; if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) { ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (5 min)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = unix_funcs->fast_RtlpWaitForCriticalSection( crit, 300 ); + status = wait_semaphore( crit, 300 ); timeout -= 300; } } @@ -327,8 +365,15 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) */ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) { - NTSTATUS ret = unix_funcs->fast_RtlpUnWaitCriticalSection( crit ); + NTSTATUS ret; + /* debug info is cleared by MakeCriticalSectionGlobal */ + if (!crit_section_has_debuginfo( crit ) || + ((ret = unix_funcs->fast_RtlpUnWaitCriticalSection( crit )) == STATUS_NOT_IMPLEMENTED)) + { + HANDLE sem = get_semaphore( crit ); + ret = NtReleaseSemaphore( sem, 1, NULL ); + } if (ret) RtlRaiseStatus( ret ); return ret; } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 2dc1a7c2aa..e7e13a6c7e 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2129,16 +2129,9 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl } -static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; - -static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) -{ - return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; -} - #ifdef __linux__ -static inline NTSTATUS fast_critsection_wait( RTL_CRITICAL_SECTION *crit, int timeout ) +NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) { int val; struct timespec timespec; @@ -2157,7 +2150,7 @@ static inline NTSTATUS fast_critsection_wait( RTL_CRITICAL_SECTION *crit, int ti return STATUS_WAIT_0; } -static inline NTSTATUS fast_critsection_wake( RTL_CRITICAL_SECTION *crit ) +NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) { if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; @@ -2189,7 +2182,7 @@ static inline semaphore_t get_mach_semaphore( RTL_CRITICAL_SECTION *crit ) return ret; } -static inline NTSTATUS fast_critsection_wait( RTL_CRITICAL_SECTION *crit, int timeout ) +NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) { mach_timespec_t timespec; semaphore_t sem = get_mach_semaphore( crit ); @@ -2212,7 +2205,7 @@ static inline NTSTATUS fast_critsection_wait( RTL_CRITICAL_SECTION *crit, int ti } } -static inline NTSTATUS fast_critsection_wake( RTL_CRITICAL_SECTION *crit ) +NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) { semaphore_t sem = get_mach_semaphore( crit ); semaphore_signal( sem ); @@ -2227,12 +2220,12 @@ NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) #else /* __APPLE__ */ -static inline NTSTATUS fast_critsection_wait( RTL_CRITICAL_SECTION *crit, int timeout ) +NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) { return STATUS_NOT_IMPLEMENTED; } -static inline NTSTATUS fast_critsection_wake( RTL_CRITICAL_SECTION *crit ) +NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) { return STATUS_NOT_IMPLEMENTED; } @@ -2244,56 +2237,6 @@ NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) #endif -static inline HANDLE get_critsection_semaphore( RTL_CRITICAL_SECTION *crit ) -{ - HANDLE ret = crit->LockSemaphore; - if (!ret) - { - HANDLE sem; - if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0; - if (!(ret = InterlockedCompareExchangePointer( &crit->LockSemaphore, sem, 0 ))) - ret = sem; - else - NtClose( sem ); /* somebody beat us to it */ - } - return ret; -} - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - NTSTATUS ret; - - /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = fast_critsection_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) - { - HANDLE sem = get_critsection_semaphore( crit ); - LARGE_INTEGER time; - select_op_t select_op; - - time.QuadPart = timeout * (LONGLONG)-10000000; - select_op.wait.op = SELECT_WAIT; - select_op.wait.handles[0] = wine_server_obj_handle( sem ); - ret = server_wait( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time ); - } - return ret; -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - NTSTATUS ret; - - /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = fast_critsection_wake( crit )) == STATUS_NOT_IMPLEMENTED)) - { - HANDLE sem = get_critsection_semaphore( crit ); - ret = NtReleaseSemaphore( sem, 1, NULL ); - } - return ret; -} - - #ifdef __linux__

1 0

Nikolay Sivov : combase: Mark 64-bit only stubs as such.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: a2e3bbbf0e3980ec0def09cd31c06b27f7215cff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e3bbbf0e3980ec0def09cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 3 12:08:35 2020 +0300 combase: Mark 64-bit only stubs as such. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c2342cc9f8..115a5ecc56 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -194,13 +194,13 @@ @ stdcall HMENU_UserSize(ptr long ptr) @ stdcall HMENU_UserUnmarshal(ptr ptr ptr) @ stub HSTRING_UserFree -@ stub HSTRING_UserFree64 +@ stub -arch=win64 HSTRING_UserFree64 @ stub HSTRING_UserMarshal -@ stub HSTRING_UserMarshal64 +@ stub -arch=win64 HSTRING_UserMarshal64 @ stub HSTRING_UserSize -@ stub HSTRING_UserSize64 +@ stub -arch=win64 HSTRING_UserSize64 @ stub HSTRING_UserUnmarshal -@ stub HSTRING_UserUnmarshal64 +@ stub -arch=win64 HSTRING_UserUnmarshal64 @ stdcall HWND_UserFree(ptr ptr) @ stdcall HWND_UserMarshal(ptr ptr ptr) @ stdcall HWND_UserSize(ptr long ptr) @@ -298,13 +298,13 @@ @ stdcall StringFromIID(ptr ptr) ole32.StringFromIID @ stub UpdateDCOMSettings @ stdcall WdtpInterfacePointer_UserFree(ptr) -@ stub WdtpInterfacePointer_UserFree64 +@ stub -arch=win64 WdtpInterfacePointer_UserFree64 @ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) -@ stub WdtpInterfacePointer_UserMarshal64 +@ stub -arch=win64 WdtpInterfacePointer_UserMarshal64 @ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) -@ stub WdtpInterfacePointer_UserSize64 +@ stub -arch=win64 WdtpInterfacePointer_UserSize64 @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) -@ stub WdtpInterfacePointer_UserUnmarshal64 +@ stub -arch=win64 WdtpInterfacePointer_UserUnmarshal64 @ stdcall WindowsCompareStringOrdinal(ptr ptr ptr) @ stdcall WindowsConcatString(ptr ptr ptr) @ stdcall WindowsCreateString(wstr long ptr)

1 0

Nikolay Sivov : combase: Move HBRUSH marshalling functions.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 0c7ecc899f9daf61cca5e98418fdfb1dee396961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7ecc899f9daf61cca5e984… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 3 12:08:36 2020 +0300 combase: Move HBRUSH marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 ++++ dlls/combase/usrmarshal.c | 1 + dlls/ole32/ole32.spec | 8 ++++---- dlls/ole32/usrmarshal.c | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 115a5ecc56..c005782a81 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -181,6 +181,10 @@ @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface @ stdcall GetRestrictedErrorInfo(ptr) +@ stdcall HBRUSH_UserFree(ptr ptr) +@ stdcall HBRUSH_UserMarshal(ptr ptr ptr) +@ stdcall HBRUSH_UserSize(ptr long ptr) +@ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) @ stdcall HDC_UserFree(ptr ptr) @ stdcall HDC_UserMarshal(ptr ptr ptr) @ stdcall HDC_UserSize(ptr long ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 08328cc673..ef5228a513 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -134,6 +134,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) handle_UserFree(pFlags, (HANDLE *)handle); \ } +IMPL_WIREM_HANDLE(HBRUSH) IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HMENU) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 03697c3e8d..3d56a8bcbf 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -131,10 +131,10 @@ @ stdcall HBITMAP_UserMarshal(ptr ptr ptr) @ stdcall HBITMAP_UserSize(ptr long ptr) @ stdcall HBITMAP_UserUnmarshal(ptr ptr ptr) -@ stdcall HBRUSH_UserFree(ptr ptr) -@ stdcall HBRUSH_UserMarshal(ptr ptr ptr) -@ stdcall HBRUSH_UserSize(ptr long ptr) -@ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) +@ stdcall HBRUSH_UserFree(ptr ptr) combase.HBRUSH_UserFree +@ stdcall HBRUSH_UserMarshal(ptr ptr ptr) combase.HBRUSH_UserMarshal +@ stdcall HBRUSH_UserSize(ptr long ptr) combase.HBRUSH_UserSize +@ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) combase.HBRUSH_UserUnmarshal @ stdcall HDC_UserFree(ptr ptr) combase.HDC_UserFree @ stdcall HDC_UserMarshal(ptr ptr ptr) combase.HDC_UserMarshal @ stdcall HDC_UserSize(ptr long ptr) combase.HDC_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 6898517568..8456bd20ee 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -355,7 +355,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) } IMPL_WIREM_HANDLE(HACCEL) -IMPL_WIREM_HANDLE(HBRUSH) /****************************************************************************** * HGLOBAL_UserSize [OLE32.@]

1 0

Nikolay Sivov : combase: Move CLIPFORMAT marshalling functions.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: f155a53b54a5c1080dbf9bc9e0aa43f873d18355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f155a53b54a5c1080dbf9bc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 3 12:08:37 2020 +0300 combase: Move CLIPFORMAT marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 +- dlls/combase/combase.spec | 4 + dlls/combase/usrmarshal.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 200 ---------------------------------------------- 5 files changed, 209 insertions(+), 205 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f155a53b54a5c1080dbf…

1 0

Nikolay Sivov : combase: Move HBITMAP marshalling functions.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 6cd7f96f287b389c18148928e6835c167322b67b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cd7f96f287b389c18148928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 3 12:08:38 2020 +0300 combase: Move HBITMAP marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 +- dlls/combase/combase.spec | 4 + dlls/combase/usrmarshal.c | 201 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 201 ---------------------------------------------- 5 files changed, 210 insertions(+), 206 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cd7f96f287b389c1814…

1 0