wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

André Hentschel : mapi32: Fix some spec file entries.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 04aa1a32e64bc7a37e6327d153b4fe8392af582a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04aa1a32e64bc7a37e6327d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 15 17:29:28 2019 +0100 mapi32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/mapi32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 0b5acbb737..32d0b7a458 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -95,7 +95,7 @@ 152 stub OpenTnefStreamEx 153 stub GetTnefStreamCodepage@12 154 stub GetTnefStreamCodepage -155 stdcall UlFromSzHex@4(ptr) UlFromSzHex +155 stdcall UlFromSzHex@4(wstr) UlFromSzHex 156 stub UNKOBJ_ScAllocate@12 157 stub UNKOBJ_ScAllocateMore@16 158 stub UNKOBJ_Free@8 @@ -144,7 +144,7 @@ 204 stub EncodeID@12 205 stub FDecodeID@12 206 stub CchOfEncoding@4 -207 stdcall CbOfEncoded@4(ptr) CbOfEncoded +207 stdcall CbOfEncoded@4(str) CbOfEncoded 208 stdcall MAPISendDocuments(long str str str long) 209 stdcall MAPILogon(long str str long long ptr) 210 stdcall MAPILogoff(ptr long long long)

1 0

André Hentschel : kernel32: Fix some spec file entries.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 9367475f288acdbdf1a0405d06adb5a3dab3f57e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9367475f288acdbdf1a0405d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 15 15:46:20 2019 +0100 kernel32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index fd1a0bcf0a..4998af04d9 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -64,6 +64,6 @@ @ stdcall SetVolumeLabelW(wstr wstr) kernel32.SetVolumeLabelW @ stdcall SetVolumeMountPointW(wstr wstr) kernel32.SetVolumeMountPointW @ stdcall UnregisterWait(long) kernel32.UnregisterWait -@ stdcall VerifyVersionInfoW(long long int64) kernel32.VerifyVersionInfoW +@ stdcall VerifyVersionInfoW(ptr long int64) kernel32.VerifyVersionInfoW @ stdcall WaitForMultipleObjects(long ptr long long) kernel32.WaitForMultipleObjects @ stdcall WTSGetActiveConsoleSessionId() kernel32.WTSGetActiveConsoleSessionId diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b580021706..1fcd0c1f61 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1558,8 +1558,8 @@ @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @ stdcall VerifyConsoleIoHandle(long) # @ stub VerifyScripts -@ stdcall VerifyVersionInfoA(long long int64) -@ stdcall VerifyVersionInfoW(long long int64) +@ stdcall VerifyVersionInfoA(ptr long int64) +@ stdcall VerifyVersionInfoW(ptr long int64) @ stdcall -import VirtualAlloc(ptr long long long) @ stdcall -import VirtualAllocEx(long ptr long long long) @ stdcall -import VirtualAllocExNuma(long ptr long long long long) @@ -1632,7 +1632,7 @@ @ stdcall WritePrivateProfileStructW(wstr wstr ptr long wstr) @ stdcall -import WriteProcessMemory(long ptr ptr long ptr) @ stdcall WriteProfileSectionA(str str) -@ stdcall WriteProfileSectionW(str str) +@ stdcall WriteProfileSectionW(wstr wstr) @ stdcall WriteProfileStringA(str str str) @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long)

1 0

Alexandre Julliard : ntdll: Fix RtlQueryUnbiasedInterruptTime() prototype.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 8b0a7b25036f74ebe60b3bd5b7b6ecd37f5f1385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b0a7b25036f74ebe60b3bd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 18:44:07 2019 +0100 ntdll: Fix RtlQueryUnbiasedInterruptTime() prototype. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48239 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntdll/time.c | 9 +++++++-- include/winternl.h | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 5faabd36e1..28312bac3c 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -1027,6 +1027,38 @@ static void test_GetTickCount(void) ok(t2 <= t3, "out of order %d %d\n", t2, t3); } +BOOL (WINAPI *pQueryUnbiasedInterruptTime)(ULONGLONG *time); +BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)(ULONGLONG *time); + +static void test_QueryUnbiasedInterruptTime(void) +{ + ULONGLONG time; + BOOL ret; + + if (pQueryUnbiasedInterruptTime) + { + SetLastError( 0xdeadbeef ); + ret = pQueryUnbiasedInterruptTime( &time ); + ok( ret, "QueryUnbiasedInterruptTime failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pQueryUnbiasedInterruptTime( NULL ); + ok( !ret, "QueryUnbiasedInterruptTime succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + else win_skip( "QueryUnbiasedInterruptTime not supported\n" ); + if (pRtlQueryUnbiasedInterruptTime) + { + SetLastError( 0xdeadbeef ); + ret = pRtlQueryUnbiasedInterruptTime( &time ); + ok( ret, "RtlQueryUnbiasedInterruptTime failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pRtlQueryUnbiasedInterruptTime( NULL ); + ok( !ret, "RtlQueryUnbiasedInterruptTime succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + else win_skip( "RtlQueryUnbiasedInterruptTime not supported\n" ); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); @@ -1039,7 +1071,9 @@ START_TEST(time) pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); pGetSystemTimePreciseAsFileTime = (void *)GetProcAddress(hKernel, "GetSystemTimePreciseAsFileTime"); pGetTimeZoneInformationForYear = (void *)GetProcAddress(hKernel, "GetTimeZoneInformationForYear"); + pQueryUnbiasedInterruptTime = (void *)GetProcAddress(hKernel, "QueryUnbiasedInterruptTime"); pNtGetTickCount = (void *)GetProcAddress(hntdll, "NtGetTickCount"); + pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(hntdll, "RtlQueryUnbiasedInterruptTime"); test_conversions(); test_invalid_arg(); @@ -1055,4 +1089,5 @@ START_TEST(time) test_GetSystemTimePreciseAsFileTime(); test_GetTimeZoneInformationForYear(); test_GetTickCount(); + test_QueryUnbiasedInterruptTime(); } diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 4e3d5583c7..7f79c3e4ff 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -1121,8 +1121,13 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old /*********************************************************************** * RtlQueryUnbiasedInterruptTime [NTDLL.@] */ -NTSTATUS WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG *time) +BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG *time) { + if (!time) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); + return FALSE; + } *time = monotonic_counter(); - return STATUS_SUCCESS; + return TRUE; } diff --git a/include/winternl.h b/include/winternl.h index 9e7e2bad93..0122684483 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2849,7 +2849,7 @@ NTSYSAPI BOOL WINAPI RtlQueryPerformanceFrequency(LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER); NTSYSAPI NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, PVOID, PVOID); NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*); -NTSYSAPI NTSTATUS WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*); +NTSYSAPI BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*); NTSYSAPI NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); NTSYSAPI void WINAPI RtlRaiseException(PEXCEPTION_RECORD); NTSYSAPI void WINAPI RtlRaiseStatus(NTSTATUS);

1 0

Alexandre Julliard : api-ms-win-core-localization: Add spec entry for FindNLSString().
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 6233add31021c3da7e9f9584471757068eb1b574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6233add31021c3da7e9f9584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 12:30:29 2019 +0100 api-ms-win-core-localization: Add spec entry for FindNLSString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec index 90f68c52cd..81db61b945 100644 --- a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall ConvertDefaultLocale(long) kernel32.ConvertDefaultLocale -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall GetACP() kernel32.GetACP @ stub GetCPFileNameFromRegistry diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 16584834a9..94971021d8 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -2,7 +2,7 @@ @ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID @ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA @ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA @ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index da8825b8ba..9b5f70eb21 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -3,7 +3,7 @@ @ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA @ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx @ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA @ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW

1 0

Alexandre Julliard : kernel32: Duplicate OutputDebugStringA implementation.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 4ac3cbd6ccba52ad8d528ee7456207defc8fdcdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ac3cbd6ccba52ad8d528ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 12:00:36 2019 +0100 kernel32: Duplicate OutputDebugStringA implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48059 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 102 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 3a2e988741..f9d398fd35 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -33,6 +33,108 @@ WINE_DEFAULT_DEBUG_CHANNEL(debugstr); +static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} + +/*********************************************************************** + * OutputDebugStringA (KERNEL32.@) + * + * Duplicate since IMVU doesn't like it if we call kernelbase.OutputDebugStringA. + */ +void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) +{ + static HANDLE DBWinMutex = NULL; + static BOOL mutex_inited = FALSE; + BOOL caught_by_dbg = TRUE; + + if (!str) str = ""; + WARN( "%s\n", debugstr_a(str) ); + + /* raise exception, WaitForDebugEvent() will generate a corresponding debug event */ + __TRY + { + ULONG_PTR args[2]; + args[0] = strlen(str) + 1; + args[1] = (ULONG_PTR)str; + RaiseException( DBG_PRINTEXCEPTION_C, 0, 2, args ); + } + __EXCEPT(debug_exception_handler) + { + caught_by_dbg = FALSE; + } + __ENDTRY + if (caught_by_dbg) return; + + /* send string to a system-wide monitor */ + if (!mutex_inited) + { + /* first call to OutputDebugString, initialize mutex handle */ + static const WCHAR mutexname[] = {'D','B','W','i','n','M','u','t','e','x',0}; + HANDLE mutex = CreateMutexExW( NULL, mutexname, 0, SYNCHRONIZE ); + if (mutex) + { + if (InterlockedCompareExchangePointer( &DBWinMutex, mutex, 0 ) != 0) + /* someone beat us here... */ + CloseHandle( mutex ); + } + mutex_inited = TRUE; + } + + if (DBWinMutex) + { + static const WCHAR shmname[] = {'D','B','W','I','N','_','B','U','F','F','E','R',0}; + static const WCHAR eventbuffername[] = {'D','B','W','I','N','_','B','U','F','F','E','R','_','R','E','A','D','Y',0}; + static const WCHAR eventdataname[] = {'D','B','W','I','N','_','D','A','T','A','_','R','E','A','D','Y',0}; + HANDLE mapping; + + mapping = OpenFileMappingW( FILE_MAP_WRITE, FALSE, shmname ); + if (mapping) + { + LPVOID buffer; + HANDLE eventbuffer, eventdata; + + buffer = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); + eventbuffer = OpenEventW( SYNCHRONIZE, FALSE, eventbuffername ); + eventdata = OpenEventW( EVENT_MODIFY_STATE, FALSE, eventdataname ); + + if (buffer && eventbuffer && eventdata) + { + /* monitor is present, synchronize with other OutputDebugString invocations */ + WaitForSingleObject( DBWinMutex, INFINITE ); + + /* acquire control over the buffer */ + if (WaitForSingleObject( eventbuffer, 10000 ) == WAIT_OBJECT_0) + { + int str_len = strlen( str ); + struct _mon_buffer_t + { + DWORD pid; + char buffer[1]; + } *mon_buffer = (struct _mon_buffer_t*) buffer; + + if (str_len > (4096 - sizeof(DWORD) - 1)) str_len = 4096 - sizeof(DWORD) - 1; + mon_buffer->pid = GetCurrentProcessId(); + memcpy( mon_buffer->buffer, str, str_len ); + mon_buffer->buffer[str_len] = 0; + + /* signal data ready */ + SetEvent( eventdata ); + } + ReleaseMutex( DBWinMutex ); + } + + if (buffer) UnmapViewOfFile( buffer ); + if (eventbuffer) CloseHandle( eventbuffer ); + if (eventdata) CloseHandle( eventdata ); + CloseHandle( mapping ); + } + } +} + + /*********************************************************************** * DebugBreakProcess (KERNEL32.@) * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 408ea41540..b580021706 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1136,7 +1136,7 @@ @ stdcall -i386 OpenVxDHandle(long) @ stdcall OpenWaitableTimerA(long long str) @ stdcall -import OpenWaitableTimerW(long long wstr) -@ stdcall -import OutputDebugStringA(str) +@ stdcall OutputDebugStringA(str) @ stdcall -import OutputDebugStringW(wstr) @ stdcall -import PeekConsoleInputA(ptr ptr long ptr) @ stdcall -import PeekConsoleInputW(ptr ptr long ptr)

1 0

Alexandre Julliard : libport: Fix the Cygwin build.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 802803a028ba754267f7be2ea677a7186ac871b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=802803a028ba754267f7be2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 11:59:46 2019 +0100 libport: Fix the Cygwin build. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47959 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- include/wine/port.h | 2 +- libs/port/spawn.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0450cb04fb..61327c673d 100755 --- a/configure +++ b/configure @@ -17442,7 +17442,7 @@ fi ;; MSVCRTFLAGS="" case $host_os in - cygwin*|mingw32*) ;; + mingw32*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } if ${ac_cv_cflags__fno_builtin+:} false; then : diff --git a/configure.ac b/configure.ac index 2117e500f9..8a121bce01 100644 --- a/configure.ac +++ b/configure.ac @@ -2054,7 +2054,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"") case $host_os in - cygwin*|mingw32*) ;; + mingw32*) ;; *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac diff --git a/include/wine/port.h b/include/wine/port.h index 264f282837..feb0558655 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -47,7 +47,7 @@ * Hard-coded values for the Windows platform */ -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) #include <direct.h> #include <io.h> diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 9292005ead..e19aa615a5 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#if !defined(HAVE__SPAWNVP) && !defined(_WIN32) +#if !defined(HAVE__SPAWNVP) && (!defined(_WIN32) || defined(__CYGWIN__)) #include <errno.h> #include <signal.h>

1 0

Zebediah Figura : qedit/samplegrabber: Fix a typo in format type negotiation.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 445f1a69297fafa5242a1133fcc02c0b126e5e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=445f1a69297fafa5242a1133… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 18:21:16 2019 -0600 qedit/samplegrabber: Fix a typo in format type negotiation. Fixes a regression introduced by 2c8e152ff06ae3e460276401b4b6bdaa1ffc676d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 87e30c5608..edb814468a 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -593,7 +593,7 @@ static HRESULT WINAPI sample_grabber_source_AttemptConnection(struct strmbase_so return VFW_E_TYPE_NOT_ACCEPTED; if (!IsEqualGUID(&mt->formattype, &FORMAT_None) && !IsEqualGUID(&mt->formattype, &GUID_NULL) - && !IsEqualGUID(&mt->formattype, &filter->mtype.majortype)) + && !IsEqualGUID(&mt->formattype, &filter->mtype.formattype)) return VFW_E_TYPE_NOT_ACCEPTED; if (!IsEqualGUID(&mt->formattype, &FORMAT_None) && !IsEqualGUID(&mt->formattype, &GUID_NULL)

1 0

Zebediah Figura : qedit/samplegrabber: Consistently use the "pMemInputPin" member of struct strmbase_source.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 835631c3cc53a74eac00e6fb1dad971445774e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=835631c3cc53a74eac00e6fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 18:21:15 2019 -0600 qedit/samplegrabber: Consistently use the "pMemInputPin" member of struct strmbase_source. Fixes a regression introduced by 2c8e152ff06ae3e460276401b4b6bdaa1ffc676d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index fb6c0b71e4..87e30c5608 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -41,7 +41,6 @@ typedef struct _SG_Impl { struct strmbase_source source; /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ IUnknown *seekthru_unk; - IMemInputPin *memOutput; struct strmbase_sink sink; AM_MEDIA_TYPE mtype; @@ -85,8 +84,6 @@ static void SampleGrabber_cleanup(SG_Impl *This) WARN("(%p) still joined to filter graph %p\n", This, This->filter.filterInfo.pGraph); if (This->allocator) IMemAllocator_Release(This->allocator); - if (This->memOutput) - IMemInputPin_Release(This->memOutput); if (This->grabberIface) ISampleGrabberCB_Release(This->grabberIface); CoTaskMemFree(This->mtype.pbFormat); @@ -398,7 +395,7 @@ SampleGrabber_IMemInputPin_GetAllocatorRequirements(IMemInputPin *iface, ALLOCAT FIXME("(%p)->(%p): semi-stub\n", This, props); if (!props) return E_POINTER; - return This->memOutput ? IMemInputPin_GetAllocatorRequirements(This->memOutput, props) : E_NOTIMPL; + return This->source.pMemInputPin ? IMemInputPin_GetAllocatorRequirements(This->source.pMemInputPin, props) : E_NOTIMPL; } /* IMemInputPin */ @@ -407,13 +404,13 @@ SampleGrabber_IMemInputPin_Receive(IMemInputPin *iface, IMediaSample *sample) { SG_Impl *This = impl_from_IMemInputPin(iface); HRESULT hr; - TRACE("(%p)->(%p) output = %p, grabber = %p\n", This, sample, This->memOutput, This->grabberIface); + TRACE("(%p)->(%p) output = %p, grabber = %p\n", This, sample, This->source.pMemInputPin, This->grabberIface); if (!sample) return E_POINTER; if (This->oneShot == OneShot_Past) return S_FALSE; SampleGrabber_callback(This, sample); - hr = This->memOutput ? IMemInputPin_Receive(This->memOutput, sample) : S_OK; + hr = This->source.pMemInputPin ? IMemInputPin_Receive(This->source.pMemInputPin, sample) : S_OK; if (This->oneShot == OneShot_Wait) { This->oneShot = OneShot_Past; hr = S_FALSE; @@ -429,14 +426,14 @@ SampleGrabber_IMemInputPin_ReceiveMultiple(IMemInputPin *iface, IMediaSample **s { SG_Impl *This = impl_from_IMemInputPin(iface); LONG idx; - TRACE("(%p)->(%p, %u, %p) output = %p, grabber = %p\n", This, samples, nSamples, nProcessed, This->memOutput, This->grabberIface); + TRACE("(%p)->(%p, %u, %p) output = %p, grabber = %p\n", This, samples, nSamples, nProcessed, This->source.pMemInputPin, This->grabberIface); if (!samples || !nProcessed) return E_POINTER; if ((This->filter.state != State_Running) || (This->oneShot == OneShot_Past)) return S_FALSE; for (idx = 0; idx < nSamples; idx++) SampleGrabber_callback(This, samples[idx]); - return This->memOutput ? IMemInputPin_ReceiveMultiple(This->memOutput, samples, nSamples, nProcessed) : S_OK; + return This->source.pMemInputPin ? IMemInputPin_ReceiveMultiple(This->source.pMemInputPin, samples, nSamples, nProcessed) : S_OK; } /* IMemInputPin */ @@ -445,7 +442,7 @@ SampleGrabber_IMemInputPin_ReceiveCanBlock(IMemInputPin *iface) { SG_Impl *This = impl_from_IMemInputPin(iface); TRACE("(%p)\n", This); - return This->memOutput ? IMemInputPin_ReceiveCanBlock(This->memOutput) : S_OK; + return This->source.pMemInputPin ? IMemInputPin_ReceiveCanBlock(This->source.pMemInputPin) : S_OK; } static const ISampleGrabberVtbl ISampleGrabber_VTable = @@ -650,7 +647,6 @@ HRESULT SampleGrabber_create(IUnknown *outer, void **out) obj->mtype.subtype = MEDIASUBTYPE_None; obj->mtype.formattype = FORMAT_None; obj->allocator = NULL; - obj->memOutput = NULL; obj->grabberIface = NULL; obj->grabberMethod = -1; obj->oneShot = OneShot_None;

1 0

Zebediah Figura : qedit/samplegrabber: Clean up the pins in sample_grabber_destroy().
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: e71b03aaf2fe4fe58b34c88110d6e47751f63aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e71b03aaf2fe4fe58b34c881… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 18:21:14 2019 -0600 qedit/samplegrabber: Clean up the pins in sample_grabber_destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index bbd43e79bf..fb6c0b71e4 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -111,6 +111,8 @@ static void sample_grabber_destroy(struct strmbase_filter *iface) SG_Impl *filter = impl_from_strmbase_filter(iface); SampleGrabber_cleanup(filter); + strmbase_sink_cleanup(&filter->sink); + strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); }

1 0

Zebediah Figura : winegstreamer: Clear the "reader" and "allocator" fields if connection fails.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 15e3adab4c6005ac39d43e0655e53a11558720db URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e3adab4c6005ac39d43e06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 17:29:12 2019 -0600 winegstreamer: Clear the "reader" and "allocator" fields if connection fails. This fixes a regression introduced by dafe81dfcb2b8896024e9d071e4bf4553e4a4018. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3945d9da8f..869a15b619 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1393,6 +1393,8 @@ static HRESULT gstdemux_sink_connect(struct strmbase_sink *iface, IPin *peer, co if (FAILED(hr = IMemAllocator_Commit(filter->alloc))) { WARN("Failed to commit allocator, hr %#x.\n", hr); + IMemAllocator_Release(filter->alloc); + filter->alloc = NULL; goto err; } @@ -1400,6 +1402,7 @@ static HRESULT gstdemux_sink_connect(struct strmbase_sink *iface, IPin *peer, co err: GST_RemoveOutputPins(filter); IAsyncReader_Release(filter->reader); + filter->reader = NULL; return hr; }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019