wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Alexandre Julliard : cabinet: Import zlib deflate code.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 03e9bf95be8217b6326038c1e701e4debcb942e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e9bf95be8217b6326038c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:27 2019 +0100 cabinet: Import zlib deflate code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/Makefile.in | 3 +- dlls/cabinet/deflate.c | 2974 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/cabinet/fci.c | 10 +- dlls/cabinet/zlib.h | 162 +++ 4 files changed, 3138 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03e9bf95be8217b63260…

1 0

Alexandre Julliard : wininet: Build with msvcrt.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 3c31cc5836026b45a40818ec874bbbcc4d6ad982 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c31cc5836026b45a40818ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:14 2019 +0100 wininet: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 2 + dlls/wininet/cookie.c | 43 +++--- dlls/wininet/dialogs.c | 21 ++- dlls/wininet/ftp.c | 12 +- dlls/wininet/gopher.c | 2 - dlls/wininet/http.c | 320 +++++++++++++++++++++---------------------- dlls/wininet/internet.c | 96 ++++++------- dlls/wininet/internet.h | 5 +- dlls/wininet/netconnection.c | 1 - dlls/wininet/urlcache.c | 34 +++-- dlls/wininet/utility.c | 14 +- 11 files changed, 268 insertions(+), 282 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c31cc5836026b45a408…

1 0

Alexandre Julliard : wininet: Import zlib inflate code.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: cee281a036cf5e9017d5a25e0cbe75c2bcd2c146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee281a036cf5e9017d5a25e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:29:53 2019 +0100 wininet: Import zlib inflate code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 3 +- dlls/wininet/http.c | 17 +- dlls/wininet/inflate.c | 1916 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/zlib.h | 162 ++++ 4 files changed, 2080 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cee281a036cf5e9017d5…

1 0

John Chadwick : winex11/wintab: Fix values for lcSys* and lcOut*.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 578d26f826ca863d10e5905f220c49bbccaf99e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=578d26f826ca863d10e5905f… Author: John Chadwick <john(a)jchw.io> Date: Sun Nov 24 23:03:00 2019 -0800 winex11/wintab: Fix values for lcSys* and lcOut*. Testing using the Wacom wintab32 (from driver version 6.3.37-3) on Windows 10, it appears that the values for lcOut* were likely accidentally mixed up with the values for lcSys*. The lcSys* values are, according to the documentation, supposed to specify the extent of the screen mapping area for the cursor, wheras lcOut* simply specifies the output coordinate space for the given context. There is no logical reason I'm aware of for why lcOut* would have different default values from lcIn*, and in testing Wacom wintab32 defaults lcOut* to match lcIn*. In addition, lcSysExt* should use SM_C*VIRTUALSCREEN instead of SM_C*SCREEN, to handle multi-monitor setups properly. Setting lcSysExt* to these values works even if the tablet is mapped to a subset of this area. After this change, PaintTool SAI 2 appears to work out of the box. Other wintab clients I tested appear to be unaffected (such as the Wintab SDK demos and Adobe Photoshop CS2.) Signed-off-by: John Chadwick <john(a)jchw.io> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 12eb89ac7f..ef42a1f07c 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -537,8 +537,8 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysContext.lcSensZ = 65536; gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensY= 65536; - gSysContext.lcOutExtX= GetSystemMetrics(SM_CXSCREEN); - gSysContext.lcOutExtY= GetSystemMetrics(SM_CYSCREEN); + gSysContext.lcSysExtX = GetSystemMetrics(SM_CXVIRTUALSCREEN); + gSysContext.lcSysExtY = GetSystemMetrics(SM_CYVIRTUALSCREEN); /* initialize cursors */ disable_system_cursors(); @@ -671,9 +671,9 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.X.axUnits = TU_INCHES; gSysDevice.X.axResolution = Axis->resolution; gSysContext.lcInOrgX = Axis->min_value; - gSysContext.lcSysOrgX = Axis->min_value; + gSysContext.lcOutOrgX = Axis->min_value; gSysContext.lcInExtX = Axis->max_value; - gSysContext.lcSysExtX = Axis->max_value; + gSysContext.lcOutExtX = Axis->max_value; Axis++; } if (Val->num_axes>=2) @@ -684,9 +684,9 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.Y.axUnits = TU_INCHES; gSysDevice.Y.axResolution = Axis->resolution; gSysContext.lcInOrgY = Axis->min_value; - gSysContext.lcSysOrgY = Axis->min_value; + gSysContext.lcOutOrgY = Axis->min_value; gSysContext.lcInExtY = Axis->max_value; - gSysContext.lcSysExtY = Axis->max_value; + gSysContext.lcOutExtY = Axis->max_value; Axis++; } if (Val->num_axes>=3)

1 0

Nikolay Sivov : kernel32/tests: Add some tests for thread description API.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 602eb52ce9bdd1962fe1690a5fc40642144a8e06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602eb52ce9bdd1962fe1690a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 24 20:34:20 2019 +0300 kernel32/tests: Add some tests for thread description API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 132 +++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 9 ++- 2 files changed, 140 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index ddbbec93ad..180eed8241 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -105,6 +105,8 @@ static NTSTATUS (WINAPI *pNtQueryInformationThread)(HANDLE,THREADINFOCLASS,PVOID static BOOL (WINAPI *pGetThreadGroupAffinity)(HANDLE,GROUP_AFFINITY*); static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP_AFFINITY*); static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); +static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); +static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **); static HANDLE create_target_process(const char *arg) { @@ -2111,6 +2113,133 @@ todo_wine CloseHandle(thread); } +static void test_thread_description(void) +{ + THREAD_DESCRIPTION_INFORMATION *thread_desc; + static const WCHAR *desc = L"thread_desc"; + ULONG len, len2, desc_len; + NTSTATUS status; + char buff[128]; + WCHAR *ptr; + HRESULT hr; + + if (!pGetThreadDescription) + { + skip("Thread description API is not supported.\n"); + return; + } + + desc_len = lstrlenW(desc) * sizeof(*desc); + thread_desc = (THREAD_DESCRIPTION_INFORMATION *)buff; + + /* Initial description. */ + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + + len2 = 0; + thread_desc->Length = 1; + thread_desc->Description = (WCHAR *)thread_desc; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, len, &len2); + ok(!status, "Failed to get thread info, status %#x.\n", status); + ok(len2 == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + ok(!thread_desc->Length, "Unexpected description length %#x.\n", thread_desc->Length); + ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", + thread_desc->Description, thread_desc); + + hr = pSetThreadDescription(GetCurrentThread(), NULL); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + hr = pSetThreadDescription(GetCurrentThread(), desc); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Failed to get thread info, status %#x.\n", status); + ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); + + len = 0; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, buff, sizeof(buff), &len); + ok(!status, "Failed to get thread info.\n"); + ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); + + ok(thread_desc->Length == (desc_len << 16 | desc_len), "Unexpected description length %#x.\n", + thread_desc->Length); + ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", + thread_desc->Description, thread_desc); + ok(!memcmp(thread_desc->Description, desc, desc_len), "Unexpected description string.\n"); + + /* Partial results. */ + len = 0; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); + + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, buff, len - sizeof(WCHAR), &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); + + /* Change description. */ + thread_desc->Length = 8 << 16 | 8; + lstrcpyW((WCHAR *)(thread_desc + 1), L"desc"); + + status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + ok(status == STATUS_SUCCESS, "Failed to set thread description, status %#x.\n", status); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L"desc"), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc) - 1); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); + + status = NtSetInformationThread(GetCurrentThread(), ThreadDescription, NULL, sizeof(*thread_desc)); + ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); + + thread_desc->Description = NULL; + status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); + + hr = pSetThreadDescription(GetCurrentThread(), NULL); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + /* Set with 0 length/NULL pointer. */ + hr = pSetThreadDescription(GetCurrentThread(), L"123"); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + thread_desc->Length = 0; + thread_desc->Description = NULL; + status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + ok(!status, "Failed to set thread description, status %#x.\n", status); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -2147,6 +2276,8 @@ static void init_funcs(void) X(GetThreadGroupAffinity); X(SetThreadGroupAffinity); + X(SetThreadDescription); + X(GetThreadDescription); X(FlsAlloc); X(FlsFree); @@ -2223,6 +2354,7 @@ START_TEST(thread) test_ThreadErrorMode(); test_thread_fpu_cw(); test_thread_actctx(); + test_thread_description(); test_threadpool(); } diff --git a/include/winternl.h b/include/winternl.h index 8b895a9392..d5c8d76ccf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -974,7 +974,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; typedef enum _THREADINFOCLASS { - ThreadBasicInformation, + ThreadBasicInformation = 0, ThreadTimes, ThreadPriority, ThreadBasePriority, @@ -1008,6 +1008,7 @@ typedef enum _THREADINFOCLASS { ThreadUmsInformation, ThreadCounterProfiling, ThreadIdealProcessorEx, + ThreadDescription = 38, MaxThreadInfoClass } THREADINFOCLASS; @@ -1027,6 +1028,12 @@ typedef struct _THREAD_DESCRIPTOR_INFORMATION LDT_ENTRY Entry; } THREAD_DESCRIPTOR_INFORMATION, *PTHREAD_DESCRIPTOR_INFORMATION; +typedef struct _THREAD_DESCRIPTION_INFORMATION +{ + DWORD Length; + WCHAR *Description; +} THREAD_DESCRIPTION_INFORMATION, *PTHREAD_DESCRIPTION_INFORMATION; + typedef struct _KERNEL_USER_TIMES { LARGE_INTEGER CreateTime; LARGE_INTEGER ExitTime;

1 0

Myah Caron : kernel32: Allow NtQueryDirectoryFile underfilling FileInformation.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 1658d5a20de4b12df539f3e5ecc11b81984684a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1658d5a20de4b12df539f3e5… Author: Myah Caron <qsniyg(a)mail.com> Date: Sat Nov 23 19:01:43 2019 +0100 kernel32: Allow NtQueryDirectoryFile underfilling FileInformation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47832 Signed-off-by: Myah Caron <qsniyg(a)mail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 14a2d6b33a..c3be67cc3c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -801,7 +801,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } info->data_len = io.Information; - if (!has_wildcard || info->data_len < info->data_size - max_entry_size) + if (!has_wildcard) { if (has_wildcard) /* release unused buffer space */ HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY,

1 0

Francois Gouget : gdi32/tests: Fix a copy/paste error in an ok() message.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 389d110545af589cf1ac5dfa5de40fc28ab4631b URL: https://source.winehq.org/git/wine.git/?a=commit;h=389d110545af589cf1ac5dfa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 21 16:10:21 2019 +0100 gdi32/tests: Fix a copy/paste error in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f1978f7bdf..ca433b33c0 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -994,7 +994,7 @@ static void test_mf_SaveDC(void) ok(ret, "ret = %d\n", ret); hMetafile = CloseMetaFile(hdcMetafile); - ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); ret = DeleteMetaFile(hMetafile); ok( ret, "DeleteMetaFile error %d\n", GetLastError());

1 0

Vijay Kiran Kamuju : include: Fix definition of PHONECALLBACK in tapi.h.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: c451f84caf70667b6194093a3953fa0d3f4c7f89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c451f84caf70667b6194093a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Nov 22 23:46:26 2019 +0100 include: Fix definition of PHONECALLBACK in tapi.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tapi.h b/include/tapi.h index 535ca67a42..b87b139dda 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -879,7 +879,7 @@ typedef struct phonestatus_tag { DWORD dwDevSpecificOffset; } PHONESTATUS, *LPPHONESTATUS; -typedef void (CALLBACK *PHONECALLBACK)(HANDLE, DWORD, DWORD, DWORD, DWORD, DWORD); +typedef void (CALLBACK *PHONECALLBACK)(DWORD, DWORD, DWORD_PTR, DWORD_PTR, DWORD_PTR, DWORD_PTR); typedef struct varstring_tag { DWORD dwTotalSize;

1 0

Zebediah Figura : quartz/acmwrapper: Don't drop the "csReceive" mutex while calling IMemInputPin::Receive().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 66eb752fe50fc70bfc228834f0b65b6a02443099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66eb752fe50fc70bfc228834… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:14:03 2019 -0600 quartz/acmwrapper: Don't drop the "csReceive" mutex while calling IMemInputPin::Receive(). There's no reason to do this, and there may never have been. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 9e818579df..64e0018980 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -202,10 +202,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); - LeaveCriticalSection(&This->tf.csReceive); hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); - EnterCriticalSection(&This->tf.csReceive); - if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (FAILED(hr)) ERR("Error sending sample (%x)\n", hr);

1 0

Zebediah Figura : quartz/acmwrapper: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 5cfdf950222e7b601a9ea99ad0497b0c4de42080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cfdf950222e7b601a9ea99a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:14:02 2019 -0600 quartz/acmwrapper: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index d1e4803fac..9e818579df 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -203,7 +203,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); LeaveCriticalSection(&This->tf.csReceive); - hr = BaseOutputPinImpl_Deliver(&This->tf.source, pOutSample); + hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) {

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
90
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 November 2019