October 2019 - Wine-commits

Zebediah Figura : quartz/videorenderer: Get the window DC in VideoRenderer_SendSampleData().
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 9cef48941e4965171e9bc49037199f2b4d2a53c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cef48941e4965171e9bc490… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:50 2019 -0500 quartz/videorenderer: Get the window DC in VideoRenderer_SendSampleData(). Partly because we cannot depend on the filter being destroyed on the same thread as it was allocated from. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 11a1183355..87365d9212 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -155,6 +155,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, AM_MEDIA_TYPE amt; HRESULT hr = S_OK; BITMAPINFOHEADER *bmiHeader; + HDC dc; TRACE("(%p)->(%p, %d)\n", This, data, size); @@ -178,18 +179,15 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return VFW_E_RUNTIME_ERROR; } - if (!This->baseControlWindow.baseWindow.hDC) { - ERR("Cannot get DC from window!\n"); - return E_FAIL; - } - TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); - StretchDIBits(This->baseControlWindow.baseWindow.hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, + dc = GetDC(This->baseControlWindow.baseWindow.hWnd); + StretchDIBits(dc, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); + ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); return S_OK; }

1 0

Zebediah Figura : strmbase: Get rid of the unused "hDC" field of the BaseWindow structure.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 3e7a804790a8c3ab2d1b7ab393f21a375d3e467a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e7a804790a8c3ab2d1b7ab3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:51 2019 -0500 strmbase: Get rid of the unused "hDC" field of the BaseWindow structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 6 ------ include/wine/strmbase.h | 1 - 2 files changed, 7 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index c99a529fa2..23f37de52b 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -130,8 +130,6 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) SetWindowLongPtrW(This->hWnd, 0, (LONG_PTR)This); - This->hDC = GetDC(This->hWnd); - return S_OK; } @@ -140,10 +138,6 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) if (!This->hWnd) return S_OK; - if (This->hDC) - ReleaseDC(This->hWnd, This->hDC); - This->hDC = NULL; - SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cc06e70447..5be7caa371 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -359,7 +359,6 @@ typedef struct tagBaseWindow HWND hWnd; LONG Width; LONG Height; - HDC hDC; const struct BaseWindowFuncTable* pFuncsTable; } BaseWindow;

1 0

Nikolay Sivov : include: Add some more MF reader/writer API definitions.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: db080b0c7fd19944e7474a18ca7bad64af859cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db080b0c7fd19944e7474a18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 08:40:40 2019 +0300 include: Add some more MF reader/writer API definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index cbfeef812c..93920a2d38 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -46,6 +46,13 @@ typedef [v1_enum] enum MF_SOURCE_READER_FLAG MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x00000200, } MF_SOURCE_READER_FLAG; +enum +{ + MF_SINK_WRITER_INVALID_STREAM_INDEX = 0xffffffff, + MF_SINK_WRITER_ALL_STREAMS = 0xfffffffe, + MF_SINK_WRITER_MEDIASINK = 0xffffffff, +}; + typedef struct _MF_SINK_WRITER_STATISTICS { DWORD cb; @@ -116,6 +123,20 @@ interface IMFSourceReaderCallback : IUnknown [in] IMFMediaEvent *event); } +[ + object, + uuid(cf839fe6-8c2a-4dd2-b6ea-c22d6961af05), + local +] +interface IMFSourceReaderCallback2 : IMFSourceReaderCallback +{ + HRESULT OnTransformChange(); + + HRESULT OnStreamError( + [in] DWORD stream_index, + [in] HRESULT status); +} + interface IMFMediaSource; [ @@ -138,6 +159,32 @@ interface IMFSourceReader : IUnknown HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); } +[ + object, + uuid(7b981cf0-560e-4116-9875-b099895f23d7), + local +] +interface IMFSourceReaderEx : IMFSourceReader +{ + HRESULT SetNativeMediaType( + [in] DWORD stream_index, + [in] IMFMediaType *media_type, + [out] DWORD *stream_flags); + + HRESULT AddTransformForStream( + [in] DWORD stream_index, + [in] IUnknown *transform); + + HRESULT RemoveAllTransformsForStream( + [in] DWORD stream_index); + + HRESULT GetTransformForStream( + [in] DWORD stream_index, + [in] DWORD transform_index, + [out] GUID *category, + [out] IMFTransform **transform); +} + [ object, uuid(3137f1cd-fe5e-4805-a5d8-fb477448cb3d), @@ -169,6 +216,52 @@ interface IMFSinkWriterEx : IMFSinkWriter [out] IMFTransform **transform); } +[ + object, + uuid(17c3779e-3cde-4ede-8c60-3899f5f53ad6), + local +] +interface IMFSinkWriterEncoderConfig : IUnknown +{ + HRESULT SetTargetMediaType( + [in] DWORD stream_index, + [in] IMFMediaType *media_type, + [in] IMFAttributes *encoding_parameters); + + HRESULT PlaceEncodingParameters( + [in] DWORD stream_index, + [in] IMFAttributes *encoding_parameters); +} + +[ + object, + uuid(666f76de-33d2-41b9-a458-29ed0a972c58), + local +] +interface IMFSinkWriterCallback : IUnknown +{ + HRESULT OnFinalize( + [in] HRESULT status); + + HRESULT OnMarker( + [in] DWORD stream_index, + [in] void *context); +} + +[ + object, + uuid(2456bd58-c067-4513-84fe-8d0c88ffdc61), + local +] +interface IMFSinkWriterCallback2 : IMFSinkWriterCallback +{ + HRESULT OnTransformChange(); + + HRESULT OnStreamError( + [in] DWORD stream_index, + [in] HRESULT status); +} + [ object, uuid(e7fe2e12-661c-40da-92f9-4f002ab67627),

1 0

Alexandre Julliard : programs: Make all program entrypoints cdecl.
by Alexandre Julliard 17 Oct '19

17 Oct '19

1 0

Alexandre Julliard : libport: Add codepage 28601 (Latin/Thai).
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 4f6397116994a3ad93f4d155e42b8056fff10c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f6397116994a3ad93f4d155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 18:23:37 2019 +0200 libport: Add codepage 28601 (Latin/Thai). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/port/c_28601.c | 725 ++++++++++++++++++++++++++++++++++++++++++++++++++ libs/port/cptable.c | 4 +- loader/wine.inf.in | 1 + tools/make_unicode | 1 + 5 files changed, 731 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f6397116994a3ad93f4…

1 0

Gijs Vermeulen : msvcrt: Add Concurrency::details::_Context::_Yield stub.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 170ab94bdebb0b8081b32ff908bfa215140c131a URL: https://source.winehq.org/git/wine.git/?a=commit;h=170ab94bdebb0b8081b32ff9… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Oct 16 22:54:18 2019 +0200 msvcrt: Add Concurrency::details::_Context::_Yield stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46279 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/scheduler.c | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 1535456097..9a8ef13aae 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -468,7 +468,7 @@ @ stub -arch=win64 ?_TryAcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QEAA_NXZ @ stub ?_UnderlyingYield(a)details@Concurrency@@YAXXZ @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() msvcr120.?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ -@ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ +@ cdecl ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ() msvcr120.?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=i386 ?cancel(a)agent@Concurrency@@QAE_NXZ @ stub -arch=win64 ?cancel(a)agent@Concurrency@@QEAA_NXZ @ stub ?current(a)location@Concurrency@@SA?AV12(a)XZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 12a5e66e88..343f2bd3c9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -685,7 +685,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI(a)Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value -@ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ +@ cdecl ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ() Context_Yield @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 56e9986e0f..9938b1ff46 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -667,7 +667,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI(a)Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value -@ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ +@ cdecl ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ() Context_Yield @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c7a30b403c..89d240b567 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -663,7 +663,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI(a)Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() msvcr120.?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ -@ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ +@ cdecl ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ() msvcr120.?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 53a9669fea..08a3242e6b 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -237,6 +237,7 @@ void __cdecl Context_Block(void) } /* ?Yield(a)Context@Concurrency@@SAXXZ */ +/* ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ */ void __cdecl Context_Yield(void) { FIXME("()\n");

1 0

Gijs Vermeulen : advapi32/tests: Fix test_process_security with non-English locale.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 70bb6551553345ace6ab329a513d9d97492f0591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70bb6551553345ace6ab329a… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Oct 17 13:47:30 2019 +0200 advapi32/tests: Fix test_process_security with non-English locale. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index aee4587425..5f65ed385d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3004,7 +3004,10 @@ static void test_process_security(void) ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); ok(ret, "LookupAccountSid failed with %d\n", ret); todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); - todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) + skip("Non-English locale (test with hardcoded 'None')\n"); + else + todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res);

1 0

Jacek Caban : kernel32/tests: Add message mode non-blocking pipe test.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: c0724e56ac6b8ad46b86707dd202a1a5439366d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0724e56ac6b8ad46b86707d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 15:17:35 2019 +0200 kernel32/tests: Add message mode non-blocking pipe test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a192779e1d..d8d5726f1a 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3887,7 +3887,7 @@ static void test_wait_pipe(void) CloseHandle(ov.hEvent); } -static void test_nowait(void) +static void test_nowait(DWORD pipe_type) { HANDLE piperead, pipewrite, file; OVERLAPPED ol, ol2; @@ -3897,7 +3897,7 @@ static void test_nowait(void) /* CreateNamedPipe with PIPE_NOWAIT, and read from empty pipe */ piperead = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, - /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* dwPipeMode */ pipe_type | PIPE_NOWAIT, /* nMaxInstances */ 1, /* nOutBufSize */ 512, /* nInBufSize */ 512, @@ -3925,7 +3925,7 @@ static void test_nowait(void) /* create write side with PIPE_NOWAIT, read side PIPE_WAIT, and test writes */ pipewrite = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, - /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* dwPipeMode */ pipe_type | PIPE_NOWAIT, /* nMaxInstances */ 1, /* nOutBufSize */ 512, /* nInBufSize */ 512, @@ -3994,9 +3994,23 @@ static void test_nowait(void) ok(ReadFile(piperead, readbuf, 1, &read, &ol2) == FALSE, "ReadFile should fail\n"); ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); ok(WriteFile(pipewrite, readbuf, 514, &write, &ol), "WriteFile should succeed\n"); - ok(write == 1, "got %d, write should be %d\n", write, 1); - ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); - ok(read == 1, "got %d, read should be %d\n", read, 1); + if (pipe_type == PIPE_TYPE_MESSAGE) + { + todo_wine + ok(write == 0, "got %d\n", write); + todo_wine + ok(!GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should fail\n"); + todo_wine + ok(GetLastError() == ERROR_IO_INCOMPLETE, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + todo_wine + ok(read == 0, "got %d, read should be %d\n", read, 1); + } + else + { + ok(write == 1, "got %d\n", write); + ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should fail\n"); + ok(read == 1, "got %d, read should be %d\n", read, 1); + } if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) CancelIo(piperead); @@ -4015,7 +4029,7 @@ static void test_nowait(void) /* CreateNamedPipe with PIPE_NOWAIT, test ConnectNamedPipe */ pipewrite = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, - /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* dwPipeMode */ pipe_type | PIPE_NOWAIT, /* nMaxInstances */ 1, /* nOutBufSize */ 512, /* nInBufSize */ 512, @@ -4118,5 +4132,6 @@ START_TEST(pipe) test_namedpipe_session_id(); test_multiple_instances(); test_wait_pipe(); - test_nowait(); + test_nowait(PIPE_TYPE_BYTE); + test_nowait(PIPE_TYPE_MESSAGE); }

1 0

Jacek Caban : kernelbase: Update SetNamedPipeHandleState debug trace.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 293dae8fdcf7e812145621af5ab76dd8d495168c URL: https://source.winehq.org/git/wine.git/?a=commit;h=293dae8fdcf7e812145621af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 15:17:47 2019 +0200 kernelbase: Update SetNamedPipeHandleState debug trace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index d2cd346270..781a729ae9 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1255,9 +1255,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetNamedPipeHandleState( HANDLE pipe, LPDWORD mode IO_STATUS_BLOCK iosb; NTSTATUS status = STATUS_SUCCESS; - /* should be a fixme, but this function is called a lot by the RPC - * runtime, and it slows down InstallShield a fair bit. */ - WARN( "semi-stub: %p %p/%d %p %p\n", pipe, mode, mode ? *mode : 0, count, timeout ); + TRACE( "%p %p/%d %p %p\n", pipe, mode, mode ? *mode : 0, count, timeout ); + if (count || timeout) FIXME( "Unsupported arguments\n" ); if (mode) {

1 0

Alex Henrie : winex11: Copy icon color table in 256-color mode (Valgrind).
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 7dd3abe69f6c48eb57391cc88932da49c02caac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd3abe69f6c48eb57391cc8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 15 19:00:59 2019 -0600 winex11: Copy icon color table in 256-color mode (Valgrind). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 4eec3288e2..973af40c33 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -924,13 +924,14 @@ static void free_ximage_bits( struct gdi_image_bits *bits ) XFree( bits->ptr ); } -/* only for use on sanitized BITMAPINFO structures */ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) { if (info->bmiHeader.biCompression == BI_BITFIELDS) return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); if (coloruse == DIB_PAL_COLORS) return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + if (!info->bmiHeader.biClrUsed && info->bmiHeader.biBitCount <= 8) + return FIELD_OFFSET( BITMAPINFO, bmiColors[1 << info->bmiHeader.biBitCount] ); return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); }

1 0