February 2019 - Wine-Commits

Alistair Leslie-Hughes : kernel32: Correct GetCurrencyFormatW/ A spec entries.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 941e4f54414e328eec2022bb6f553a6f5ba89093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=941e4f54414e328eec2022bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 24 07:00:07 2019 +0000 kernel32: Correct GetCurrencyFormatW/A spec entries. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec b/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec index ba319c9..75fdc07 100644 --- a/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec +++ b/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec @@ -8,5 +8,5 @@ @ stdcall EnumTimeFormatsEx(ptr wstr long long) kernel32.EnumTimeFormatsEx @ stdcall EnumTimeFormatsW(ptr long long) kernel32.EnumTimeFormatsW @ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) kernel32.GetCurrencyFormatEx -@ stdcall GetCurrencyFormatW(long long str ptr str long) kernel32.GetCurrencyFormatW +@ stdcall GetCurrencyFormatW(long long wstr ptr ptr long) kernel32.GetCurrencyFormatW @ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ae7bc88..d925431 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -618,9 +618,9 @@ @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() -@ stdcall GetCurrencyFormatA(long long str ptr str long) +@ stdcall GetCurrencyFormatA(long long str ptr ptr long) @ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) -@ stdcall GetCurrencyFormatW(long long str ptr str long) +@ stdcall GetCurrencyFormatW(long long wstr ptr ptr long) @ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) # @ stub GetCurrentConsoleFontEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 45b375c..0b19212 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -449,7 +449,7 @@ @ stdcall GetConsoleScreenBufferInfoEx(long ptr) kernel32.GetConsoleScreenBufferInfoEx @ stdcall GetConsoleTitleW(ptr long) kernel32.GetConsoleTitleW @ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) kernel32.GetCurrencyFormatEx -@ stdcall GetCurrencyFormatW(long long str ptr str long) kernel32.GetCurrencyFormatW +@ stdcall GetCurrencyFormatW(long long wstr ptr ptr long) kernel32.GetCurrencyFormatW @ stdcall GetCurrentActCtx(ptr) kernel32.GetCurrentActCtx # @ stub GetCurrentApplicationUserModelId @ stdcall GetCurrentDirectoryA(long ptr) kernel32.GetCurrentDirectoryA

1 0

Józef Kucia : d3d11: Use better name for current entry variable in validate_stream_output_entries ().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 5661e29008cab32138cd1f1154e8ea301845022e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5661e29008cab32138cd1f11… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 13:24:14 2019 +0100 d3d11: Use better name for current entry variable in validate_stream_output_entries(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 9a4f1a8..2276dd7 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -961,53 +961,53 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * for (i = 0; i < entry_count; ++i) { - const D3D11_SO_DECLARATION_ENTRY *f = &entries[i]; + const D3D11_SO_DECLARATION_ENTRY *e = &entries[i]; TRACE("Stream: %u, semantic: %s, semantic idx: %u, start component: %u, " "component count %u, output slot %u.\n", - f->Stream, debugstr_a(f->SemanticName), f->SemanticIndex, - f->StartComponent, f->ComponentCount, f->OutputSlot); + e->Stream, debugstr_a(e->SemanticName), e->SemanticIndex, + e->StartComponent, e->ComponentCount, e->OutputSlot); - if (f->Stream >= D3D11_SO_STREAM_COUNT) + if (e->Stream >= D3D11_SO_STREAM_COUNT) { - WARN("Invalid stream %u.\n", f->Stream); + WARN("Invalid stream %u.\n", e->Stream); return E_INVALIDARG; } - if (f->Stream && feature_level < D3D_FEATURE_LEVEL_11_0) + if (e->Stream && feature_level < D3D_FEATURE_LEVEL_11_0) { - WARN("Invalid stream %u for feature level %#x.\n", f->Stream, feature_level); + WARN("Invalid stream %u for feature level %#x.\n", e->Stream, feature_level); return E_INVALIDARG; } - if (f->Stream) + if (e->Stream) { FIXME("Streams not implemented yet.\n"); return E_INVALIDARG; } - if (f->OutputSlot >= D3D11_SO_BUFFER_SLOT_COUNT) + if (e->OutputSlot >= D3D11_SO_BUFFER_SLOT_COUNT) { - WARN("Invalid output slot %u.\n", f->OutputSlot); + WARN("Invalid output slot %u.\n", e->OutputSlot); return E_INVALIDARG; } - if (!f->SemanticName) + if (!e->SemanticName) { - if (f->SemanticIndex) + if (e->SemanticIndex) { - WARN("Invalid semantic idx %u for stream output gap.\n", f->SemanticIndex); + WARN("Invalid semantic idx %u for stream output gap.\n", e->SemanticIndex); return E_INVALIDARG; } - if (f->StartComponent || !f->ComponentCount) + if (e->StartComponent || !e->ComponentCount) { - WARN("Invalid stream output gap %u-%u.\n", f->StartComponent, f->ComponentCount); + WARN("Invalid stream output gap %u-%u.\n", e->StartComponent, e->ComponentCount); return E_INVALIDARG; } } else { - if (f->StartComponent > 3 || f->ComponentCount > 4 || !f->ComponentCount - || f->StartComponent + f->ComponentCount > 4) + if (e->StartComponent > 3 || e->ComponentCount > 4 || !e->ComponentCount + || e->StartComponent + e->ComponentCount > 4) { - WARN("Invalid component range %u-%u.\n", f->StartComponent, f->ComponentCount); + WARN("Invalid component range %u-%u.\n", e->StartComponent, e->ComponentCount); return E_INVALIDARG; } }

1 0

Nikolay Sivov : mfplay: Add stub dll.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 5dcb329667e3d4e630a7b3723f2eaee31652a568 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dcb329667e3d4e630a7b372… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 10:14:47 2019 +0300 mfplay: Add stub dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/mfplay/Makefile.in | 4 ++++ dlls/mfplay/mfplay.spec | 6 ++++++ dlls/mfplay/player.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index 166ddbf..6eec5f1 100755 --- a/configure +++ b/configure @@ -1371,6 +1371,7 @@ enable_mciwave enable_mf enable_mf3216 enable_mfplat +enable_mfplay enable_mfreadwrite enable_mfuuid enable_mgmtapi @@ -19714,6 +19715,7 @@ wine_fn_config_makefile dlls/mf/tests enable_tests wine_fn_config_makefile dlls/mf3216 enable_mf3216 wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests +wine_fn_config_makefile dlls/mfplay enable_mfplay wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests wine_fn_config_makefile dlls/mfuuid enable_mfuuid diff --git a/configure.ac b/configure.ac index f11a452..8d3475a 100644 --- a/configure.ac +++ b/configure.ac @@ -3442,6 +3442,7 @@ WINE_CONFIG_MAKEFILE(dlls/mf/tests) WINE_CONFIG_MAKEFILE(dlls/mf3216) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) +WINE_CONFIG_MAKEFILE(dlls/mfplay) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) WINE_CONFIG_MAKEFILE(dlls/mfuuid) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in new file mode 100644 index 0000000..1ecf743 --- /dev/null +++ b/dlls/mfplay/Makefile.in @@ -0,0 +1,4 @@ +MODULE = mfplay.dll + +C_SRCS = \ + player.c diff --git a/dlls/mfplay/mfplay.spec b/dlls/mfplay/mfplay.spec new file mode 100644 index 0000000..964b90a --- /dev/null +++ b/dlls/mfplay/mfplay.spec @@ -0,0 +1,6 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub MFPCreateMediaPlayer +@ stub MFPCreateMediaPlayerEx diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c new file mode 100644 index 0000000..8873f52 --- /dev/null +++ b/dlls/mfplay/player.c @@ -0,0 +1,36 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Zebediah Figura : quartz/tests: Add tests for IMemAllocator_GetProperties( ) and IMemAllocator_SetProperties().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: eccffa4872453ae2efe217ee7ed371ce2139219a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eccffa4872453ae2efe217ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 22 19:27:02 2019 -0600 quartz/tests: Add tests for IMemAllocator_GetProperties() and IMemAllocator_SetProperties(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/memallocator.c | 91 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index ee6a409..53e5698 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -31,6 +31,96 @@ static IMemAllocator *create_allocator(void) return allocator; } +static void test_properties(void) +{ + ALLOCATOR_PROPERTIES req_props = {0}, ret_props; + IMemAllocator *allocator = create_allocator(); + IMediaSample *sample; + LONG size, ret_size; + unsigned int i; + HRESULT hr; + + static const ALLOCATOR_PROPERTIES tests[] = + { + {0, 0, 1, 0}, + {1, 0, 1, 0}, + {1, 1, 1, 0}, + {1, 1, 4, 0}, + {2, 1, 1, 0}, + {1, 2, 4, 0}, + {1, 1, 16, 0}, + {1, 16, 16, 0}, + {1, 17, 16, 0}, + {1, 32, 16, 0}, + {1, 1, 16, 1}, + {1, 15, 16, 1}, + {1, 16, 16, 1}, + {1, 17, 16, 1}, + {1, 0, 16, 16}, + {1, 1, 16, 16}, + {1, 16, 16, 16}, + }; + + memset(&ret_props, 0xcc, sizeof(ret_props)); + hr = IMemAllocator_GetProperties(allocator, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!ret_props.cBuffers, "Got %d buffers.\n", ret_props.cBuffers); + ok(!ret_props.cbBuffer, "Got size %d.\n", ret_props.cbBuffer); + ok(!ret_props.cbAlign, "Got align %d.\n", ret_props.cbAlign); + ok(!ret_props.cbPrefix, "Got prefix %d.\n", ret_props.cbPrefix); + + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == VFW_E_BADALIGN, "Got hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + req_props = tests[i]; + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); + ok(!memcmp(&req_props, &tests[i], sizeof(req_props)), "Test %u: Requested props should not be changed.\n", i); + ok(ret_props.cBuffers == req_props.cBuffers, "Test %u: Got %d buffers.\n", i, ret_props.cBuffers); + ok(ret_props.cbBuffer >= req_props.cbBuffer, "Test %u: Got size %d.\n", i, ret_props.cbBuffer); + ok(ret_props.cbAlign == req_props.cbAlign, "Test %u: Got alignment %d.\n", i, ret_props.cbAlign); + ok(ret_props.cbPrefix == req_props.cbPrefix, "Test %u: Got prefix %d.\n", i, ret_props.cbPrefix); + ret_size = ret_props.cbBuffer; + + hr = IMemAllocator_GetProperties(allocator, &ret_props); + ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); + ok(ret_props.cBuffers == req_props.cBuffers, "Test %u: Got %d buffers.\n", i, ret_props.cBuffers); + ok(ret_props.cbBuffer == ret_size, "Test %u: Got size %d.\n", i, ret_props.cbBuffer); + ok(ret_props.cbAlign == req_props.cbAlign, "Test %u: Got alignment %d.\n", i, ret_props.cbAlign); + ok(ret_props.cbPrefix == req_props.cbPrefix, "Test %u: Got prefix %d.\n", i, ret_props.cbPrefix); + + hr = IMemAllocator_Commit(allocator); + if (!req_props.cbBuffer) + { + ok(hr == VFW_E_SIZENOTSET, "Test %u: Got hr %#x.\n", i, hr); + continue; + } + ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); + + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == VFW_E_ALREADY_COMMITTED, "Test %u: Got hr %#x.\n", i, hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); + + size = IMediaSample_GetSize(sample); + ok(size == ret_size, "Test %u: Got size %d.\n", i, size); + + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); + + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == VFW_E_BUFFERS_OUTSTANDING, "Test %u: Got hr %#x.\n", i, hr); + + hr = IMediaSample_Release(sample); + ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); + } + + IMemAllocator_Release(allocator); +} + static void test_commit(void) { ALLOCATOR_PROPERTIES req_props = {2, 65536, 1, 0}, ret_props; @@ -85,6 +175,7 @@ START_TEST(memallocator) { CoInitialize(NULL); + test_properties(); test_commit(); CoUninitialize();

1 0

Vincent Povirk : gdiplus: Add support for reading nested metafiles.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: e2f37558a7476dd8a9c7c77f9b863287e924e470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f37558a7476dd8a9c7c77f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 22 10:59:32 2019 -0600 gdiplus: Add support for reading nested metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 08dde2f..1e48d07 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1817,6 +1817,39 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si } break; } + case ImageDataTypeMetafile: + { + EmfPlusMetafile *metafiledata = &data->ImageData.metafile; + + if (data_size <= FIELD_OFFSET(EmfPlusMetafile, MetafileData)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusMetafile, MetafileData); + + switch (metafiledata->Type) { + case MetafileTypeEmf: + case MetafileTypeEmfPlusOnly: + case MetafileTypeEmfPlusDual: + { + HENHMETAFILE hemf; + + hemf = SetEnhMetaFileBits(data_size, metafiledata->MetafileData); + + if (!hemf) + return GenericError; + + status = GdipCreateMetafileFromEmf(hemf, TRUE, (GpMetafile**)image); + + if (status != Ok) + DeleteEnhMetaFile(hemf); + + break; + } + default: + FIXME("metafile type %d not supported.\n", metafiledata->Type); + return NotImplemented; + } + break; + } default: FIXME("image type %d not supported.\n", data->Type); return NotImplemented;

1 0

Zebediah Figura : quartz/filesource: Correctly report short reads from IAsyncReader_SyncRead().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 930e0cdc08785ecb30dad7d2a592da1887d93ba7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=930e0cdc08785ecb30dad7d2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 22 19:27:00 2019 -0600 quartz/filesource: Correctly report short reads from IAsyncReader_SyncRead(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 35 +++++++++++++++++++---------------- dlls/quartz/tests/filesource.c | 2 -- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6b8bfa3..11b9712 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1309,34 +1309,37 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader * iface, IMed return hr; } -static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG llPosition, LONG lLength, BYTE * pBuffer) +static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface, + LONGLONG offset, LONG length, BYTE *buffer) { OVERLAPPED ovl; - HRESULT hr = S_OK; - FileAsyncReader *This = impl_from_IAsyncReader(iface); + FileAsyncReader *filter = impl_from_IAsyncReader(iface); + DWORD read_len; + HRESULT hr; + BOOL ret; - TRACE("%p->(%s, %d, %p)\n", This, wine_dbgstr_longlong(llPosition), lLength, pBuffer); + TRACE("filter %p, offset %s, length %d, buffer %p.\n", + filter, wine_dbgstr_longlong(offset), length, buffer); ZeroMemory(&ovl, sizeof(ovl)); ovl.hEvent = CreateEventW(NULL, 0, 0, NULL); /* NOTE: llPosition is the actual byte position to start reading from */ - ovl.u.s.Offset = (DWORD) llPosition; - ovl.u.s.OffsetHigh = (DWORD) (llPosition >> (sizeof(DWORD) * 8)); - - if (!ReadFile(This->hFile, pBuffer, lLength, NULL, &ovl)) - hr = HRESULT_FROM_WIN32(GetLastError()); - - if (hr == HRESULT_FROM_WIN32(ERROR_IO_PENDING)) - hr = S_OK; + ovl.u.s.Offset = (DWORD)offset; + ovl.u.s.OffsetHigh = (DWORD)(offset >> (sizeof(DWORD) * 8)); - if (SUCCEEDED(hr)) + ret = ReadFile(filter->hFile, buffer, length, NULL, &ovl); + if (ret || GetLastError() == ERROR_IO_PENDING) { - DWORD dwBytesRead; - - if (!GetOverlappedResult(This->hFile, &ovl, &dwBytesRead, TRUE)) + if (GetOverlappedResult(filter->hFile, &ovl, &read_len, TRUE)) + hr = (read_len == length) ? S_OK : S_FALSE; + else hr = HRESULT_FROM_WIN32(GetLastError()); } + else if (GetLastError() == ERROR_HANDLE_EOF) + hr = S_FALSE; + else + hr = HRESULT_FROM_WIN32(GetLastError()); CloseHandle(ovl.hEvent); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 7f25596..e13cb05 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -722,7 +722,6 @@ static void test_async_reader(void) ok(buffer[i] == (10 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); hr = IAsyncReader_SyncRead(reader, 590, 20, buffer); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); for (i = 0; i < 10; i++) ok(buffer[i] == (590 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); @@ -731,7 +730,6 @@ todo_wine memset(buffer, 0xcc, sizeof(buffer)); hr = IAsyncReader_SyncRead(reader, 600, 10, buffer); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(buffer[0] == 0xcc, "Got wrong byte %02x.\n", buffer[0]);

1 0

Zebediah Figura : quartz/tests: Clean up CommitDecommitTest().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 83dc66730e6468428a9ecf03c9880afe2dc74ed8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83dc66730e6468428a9ecf03… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 22 19:27:01 2019 -0600 quartz/tests: Clean up CommitDecommitTest(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/memallocator.c | 113 ++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 1086ed5..ee6a409 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -1,5 +1,5 @@ /* - * Unit tests for Direct Show functions + * Memory allocator unit tests * * Copyright (C) 2005 Christian Costa * @@ -19,72 +19,73 @@ */ #define COBJMACROS - -#include "wine/test.h" -#include "uuids.h" #include "dshow.h" -#include "control.h" +#include "wine/test.h" -static void CommitDecommitTest(void) +static IMemAllocator *create_allocator(void) { - IMemAllocator* pMemAllocator; + IMemAllocator *allocator = NULL; + HRESULT hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return allocator; +} + +static void test_commit(void) +{ + ALLOCATOR_PROPERTIES req_props = {2, 65536, 1, 0}, ret_props; + IMemAllocator *allocator = create_allocator(); + IMediaSample *sample, *sample2; HRESULT hr; + BYTE *data; + + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Extant samples remain valid even after Decommit() is called. */ + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(data, 0xcc, 65536); + + hr = IMemAllocator_GetBuffer(allocator, &sample2, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)&pMemAllocator); - ok(hr==S_OK, "Unable to create memory allocator %x\n", hr); - - if (hr == S_OK) - { - ALLOCATOR_PROPERTIES RequestedProps; - ALLOCATOR_PROPERTIES ActualProps; - - IMediaSample *sample = NULL, *sample2 = NULL; - - RequestedProps.cBuffers = 2; - RequestedProps.cbBuffer = 65536; - RequestedProps.cbAlign = 1; - RequestedProps.cbPrefix = 0; - - hr = IMemAllocator_SetProperties(pMemAllocator, &RequestedProps, &ActualProps); - ok(hr==S_OK, "SetProperties returned: %x\n", hr); - - hr = IMemAllocator_Commit(pMemAllocator); - ok(hr==S_OK, "Commit returned: %x\n", hr); - hr = IMemAllocator_Commit(pMemAllocator); - ok(hr==S_OK, "Commit returned: %x\n", hr); - - hr = IMemAllocator_GetBuffer(pMemAllocator, &sample, NULL, NULL, 0); - ok(hr==S_OK, "Could not get a buffer: %x\n", hr); - - hr = IMemAllocator_Decommit(pMemAllocator); - ok(hr==S_OK, "Decommit returned: %x\n", hr); - hr = IMemAllocator_Decommit(pMemAllocator); - ok(hr==S_OK, "Cecommit returned: %x\n", hr); - - /* Decommit and recommit while holding a sample */ - if (sample) - { - hr = IMemAllocator_Commit(pMemAllocator); - ok(hr==S_OK, "Commit returned: %x\n", hr); - - hr = IMemAllocator_GetBuffer(pMemAllocator, &sample2, NULL, NULL, 0); - ok(hr==S_OK, "Could not get a buffer: %x\n", hr); - IMediaSample_Release(sample); - if (sample2) - IMediaSample_Release(sample2); - - hr = IMemAllocator_Decommit(pMemAllocator); - ok(hr==S_OK, "Cecommit returned: %x\n", hr); - } - IMemAllocator_Release(pMemAllocator); - } + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); } START_TEST(memallocator) { CoInitialize(NULL); - CommitDecommitTest(); + test_commit(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/filesource: Correctly report short reads from IAsyncReader_SyncReadAligned().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 4df6d303d6f78bb5e442fb1ba9b1b2c1eb1190d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df6d303d6f78bb5e442fb1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 22 19:27:04 2019 -0600 quartz/filesource: Correctly report short reads from IAsyncReader_SyncReadAligned(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 73 ++++++++++++++++++++++++------------------ dlls/quartz/tests/filesource.c | 1 - 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 11b9712..71724af 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1283,36 +1283,60 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw return hr; } -static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG llPosition, LONG lLength, BYTE * pBuffer); +static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, DWORD *read_len) +{ + OVERLAPPED ovl = {0}; + BOOL ret; -static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader * iface, IMediaSample * pSample) + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ovl.u.s.Offset = (DWORD)offset; + ovl.u.s.OffsetHigh = offset >> 32; + + ret = ReadFile(file, buffer, length, NULL, &ovl); + if (ret || GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(file, &ovl, read_len, TRUE); + + TRACE("Returning %u bytes.\n", *read_len); + + CloseHandle(ovl.hEvent); + return ret; +} + +static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader *iface, IMediaSample *sample) { - BYTE * pBuffer; - REFERENCE_TIME tStart; - REFERENCE_TIME tStop; + FileAsyncReader *filter = impl_from_IAsyncReader(iface); + REFERENCE_TIME start_time, end_time; + DWORD read_len; + BYTE *buffer; + LONG length; HRESULT hr; + BOOL ret; - TRACE("(%p)\n", pSample); + TRACE("filter %p, sample %p.\n", filter, sample); - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); + hr = IMediaSample_GetTime(sample, &start_time, &end_time); if (SUCCEEDED(hr)) - hr = IMediaSample_GetPointer(pSample, &pBuffer); + hr = IMediaSample_GetPointer(sample, &buffer); if (SUCCEEDED(hr)) - hr = FileAsyncReader_SyncRead(iface, - BYTES_FROM_MEDIATIME(tStart), - (LONG) BYTES_FROM_MEDIATIME(tStop - tStart), - pBuffer); + { + length = BYTES_FROM_MEDIATIME(end_time - start_time); + ret = sync_read(filter->hFile, BYTES_FROM_MEDIATIME(start_time), length, buffer, &read_len); + if (ret) + hr = (read_len == length) ? S_OK : S_FALSE; + else if (GetLastError() == ERROR_HANDLE_EOF) + hr = S_OK; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + } - TRACE("-- %x\n", hr); return hr; } static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface, LONGLONG offset, LONG length, BYTE *buffer) { - OVERLAPPED ovl; FileAsyncReader *filter = impl_from_IAsyncReader(iface); DWORD read_len; HRESULT hr; @@ -1321,29 +1345,14 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface, TRACE("filter %p, offset %s, length %d, buffer %p.\n", filter, wine_dbgstr_longlong(offset), length, buffer); - ZeroMemory(&ovl, sizeof(ovl)); - - ovl.hEvent = CreateEventW(NULL, 0, 0, NULL); - /* NOTE: llPosition is the actual byte position to start reading from */ - ovl.u.s.Offset = (DWORD)offset; - ovl.u.s.OffsetHigh = (DWORD)(offset >> (sizeof(DWORD) * 8)); - - ret = ReadFile(filter->hFile, buffer, length, NULL, &ovl); - if (ret || GetLastError() == ERROR_IO_PENDING) - { - if (GetOverlappedResult(filter->hFile, &ovl, &read_len, TRUE)) - hr = (read_len == length) ? S_OK : S_FALSE; - else - hr = HRESULT_FROM_WIN32(GetLastError()); - } + ret = sync_read(filter->hFile, offset, length, buffer, &read_len); + if (ret) + hr = (read_len == length) ? S_OK : S_FALSE; else if (GetLastError() == ERROR_HANDLE_EOF) hr = S_FALSE; else hr = HRESULT_FROM_WIN32(GetLastError()); - CloseHandle(ovl.hEvent); - - TRACE("-- %x\n", hr); return hr; } diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 32b007f..340d1c4 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -714,7 +714,6 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAsyncReader_SyncReadAligned(reader, sample); -todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample);

1 0

Vincent Povirk : mscoree: Add support for config stream in GetRequestedRuntime.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: e41502b429d60767c5c90737c175e7a210e9a805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41502b429d60767c5c90737… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Feb 24 09:12:24 2019 -0600 mscoree: Add support for config stream in GetRequestedRuntime. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37751 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 27 +++++++++++++++++++-------- dlls/mscoree/corruntimehost.c | 6 +++--- dlls/mscoree/metahost.c | 21 ++++++++++++--------- dlls/mscoree/mscoree_main.c | 14 +++++++------- dlls/mscoree/mscoree_private.h | 5 ++++- 5 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index a5c0666..777195d 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -650,33 +650,44 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result) return S_OK; } -HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) +HRESULT parse_config_stream(IStream *stream, parsed_config_file *result) { - IStream *stream; VARIANT var; HRESULT hr; HRESULT initresult; init_config(result); - - hr = CreateConfigStream(filename, &stream); - if (FAILED(hr)) - return hr; - initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; hr = parse_config(var, result); - IStream_Release(stream); if (SUCCEEDED(initresult)) CoUninitialize(); return hr; } +HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) +{ + HRESULT hr; + IStream *stream; + + init_config(result); + + hr = CreateConfigStream(filename, &stream); + if (FAILED(hr)) + return hr; + + hr = parse_config_stream(stream, result); + + IStream_Release(stream); + + return hr; +} + void free_parsed_config_file(parsed_config_file *file) { supported_runtime *cursor, *cursor2; diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index f6c77be..ca8ba0d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1296,7 +1296,7 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) - hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); @@ -1469,7 +1469,7 @@ __int32 WINAPI _CorExeMain(void) FixupVTable(GetModuleHandleW(NULL)); - hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) { @@ -1831,7 +1831,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) *ppObj = NULL; - hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) { hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 422ca31..b9f7637 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1126,11 +1126,10 @@ static HRESULT WINAPI metahostpolicy_GetRequestedRuntime(ICLRMetaHostPolicy *ifa pwzVersion, pcchVersion, pwzImageVersion, pcchImageVersion, pdwConfigFlags, debugstr_guid(riid), ppRuntime); - if (pCfgStream) - FIXME("ignoring config file stream\n"); - - if (pdwConfigFlags) + if (pdwConfigFlags) { FIXME("ignoring config flags\n"); + *pdwConfigFlags = 0; + } if(dwPolicyFlags & METAHOST_POLICY_USE_PROCESS_IMAGE_PATH) { @@ -1145,7 +1144,7 @@ static HRESULT WINAPI metahostpolicy_GetRequestedRuntime(ICLRMetaHostPolicy *ifa if(dwPolicyFlags & METAHOST_POLICY_APPLY_UPGRADE_POLICY) flags |= RUNTIME_INFO_UPGRADE_VERSION; - hr = get_runtime_info(path, pwzImageVersion, NULL, 0, flags, FALSE, &result); + hr = get_runtime_info(path, pwzImageVersion, NULL, pCfgStream, 0, flags, FALSE, &result); if (SUCCEEDED(hr)) { if (pwzImageVersion) @@ -1276,7 +1275,8 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname } HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, - DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) + IStream *config_stream, DWORD startup_flags, DWORD runtimeinfo_flags, + BOOL legacy, ICLRRuntimeInfo **result) { static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; static const DWORD supported_startup_flags = 0; @@ -1297,7 +1297,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (exefile && !exefile[0]) exefile = NULL; - if (exefile && !config_file) + if (exefile && !config_file && !config_stream) { strcpyW(local_config_file, exefile); strcatW(local_config_file, dotconfig); @@ -1305,10 +1305,13 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, config_file = local_config_file; } - if (config_file) + if (config_file || config_stream) { BOOL found = FALSE; - hr = parse_config_file(config_file, &parsed_config); + if (config_file) + hr = parse_config_file(config_file, &parsed_config); + else + hr = parse_config_stream(config_stream, &parsed_config); if (SUCCEEDED(hr)) { diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 785ecd0..db5f426 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -205,7 +205,7 @@ HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor *ppv = NULL; - ret = get_runtime_info(NULL, pwszVersion, pwszHostConfigFile, startupFlags, 0, TRUE, &info); + ret = get_runtime_info(NULL, pwszVersion, pwszHostConfigFile, NULL, startupFlags, 0, TRUE, &info); if (SUCCEEDED(ret)) { @@ -274,7 +274,7 @@ HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwL if (!dwLength || !pbuffer) return E_POINTER; - ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { @@ -297,7 +297,7 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) if (!dwLength || !pbuffer) return E_POINTER; - ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { @@ -336,7 +336,7 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST if (!dwlength) dwlength = &length_dummy; - ret = get_runtime_info(pExe, pwszVersion, pConfigurationFile, startupFlags, runtimeInfoFlags, TRUE, &info); + ret = get_runtime_info(pExe, pwszVersion, pConfigurationFile, NULL, startupFlags, runtimeInfoFlags, TRUE, &info); if (SUCCEEDED(ret)) { @@ -482,7 +482,7 @@ HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD *ppv = NULL; - ret = get_runtime_info(NULL, szVersion, NULL, nflags, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, szVersion, NULL, NULL, nflags, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { @@ -503,7 +503,7 @@ HRESULT WINAPI CorBindToCurrentRuntime(LPCWSTR filename, REFCLSID rclsid, REFIID *ppv = NULL; - ret = get_runtime_info(NULL, NULL, filename, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, NULL, filename, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { @@ -526,7 +526,7 @@ STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject) TRACE("(%s,%s,%p)\n", debugstr_w(pTypeName), debugstr_guid(riid), ppObject); /* FIXME: How to determine which runtime version to use? */ - ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 3f2aa70..8ffb1f9 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -103,7 +103,8 @@ typedef struct CorDebug } CorDebug; extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, - DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; + IStream *config_stream, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, + ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; @@ -122,6 +123,8 @@ typedef struct supported_runtime extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) DECLSPEC_HIDDEN; +extern HRESULT parse_config_stream(IStream *stream, parsed_config_file *result) DECLSPEC_HIDDEN; + extern void free_parsed_config_file(parsed_config_file *file) DECLSPEC_HIDDEN; typedef enum {

1 0

Zebediah Figura : setupapi: Return the "Device Parameters" subkey for DIREG_DEV.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 486fffa45c47fa102a40f88ea4f46c74fbd7640c URL: https://source.winehq.org/git/wine.git/?a=commit;h=486fffa45c47fa102a40f88e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 24 22:08:17 2019 -0600 setupapi: Return the "Device Parameters" subkey for DIREG_DEV. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21023 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 60 ++++++++++++++----------------------------- dlls/setupapi/tests/devinst.c | 39 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 888bed0..cf6bc5d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1426,6 +1426,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da { struct device *device; HKEY key = INVALID_HANDLE_VALUE; + LONG l; TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, inf_handle %p, inf_section %s.\n", devinfo, device_data, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); @@ -1453,7 +1454,12 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da switch (KeyType) { case DIREG_DEV: - key = SETUPDI_CreateDevKey(device); + if ((l = RegCreateKeyExW(device->key, DeviceParameters, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL))) + { + key = INVALID_HANDLE_VALUE; + } + SetLastError(l); break; case DIREG_DRV: key = create_driver_key(device); @@ -3512,21 +3518,6 @@ BOOL WINAPI SetupDiSetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ } } -static HKEY SETUPDI_OpenDevKey(struct device *device, REGSAM samDesired) -{ - HKEY enumKey, key = INVALID_HANDLE_VALUE; - LONG l; - - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, - NULL, &enumKey, NULL); - if (!l) - { - RegOpenKeyExW(enumKey, device->instanceId, 0, samDesired, &key); - RegCloseKey(enumKey); - } - return key; -} - /*********************************************************************** * SetupDiOpenDevRegKey (SETUPAPI.@) */ @@ -3535,6 +3526,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, { struct device *device; HKEY key = INVALID_HANDLE_VALUE; + LONG l; TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, access %#x.\n", devinfo, device_data, Scope, HwProfile, KeyType, samDesired); @@ -3563,7 +3555,9 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, switch (KeyType) { case DIREG_DEV: - key = SETUPDI_OpenDevKey(device, samDesired); + if ((l = RegOpenKeyExW(device->key, DeviceParameters, 0, samDesired, &key))) + key = INVALID_HANDLE_VALUE; + SetLastError(l); break; case DIREG_DRV: key = open_driver_key(device, samDesired); @@ -3574,24 +3568,6 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, return key; } -static BOOL SETUPDI_DeleteDevKey(struct device *device) -{ - HKEY enumKey; - BOOL ret = FALSE; - LONG l; - - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, - NULL, &enumKey, NULL); - if (!l) - { - ret = RegDeleteTreeW(enumKey, device->instanceId); - RegCloseKey(enumKey); - } - else - SetLastError(l); - return ret; -} - /*********************************************************************** * SetupDiDeleteDevRegKey (SETUPAPI.@) */ @@ -3600,6 +3576,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat { struct device *device; BOOL ret = FALSE; + LONG l; TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d.\n", devinfo, device_data, Scope, HwProfile, KeyType); @@ -3627,16 +3604,17 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat FIXME("unimplemented for scope %d\n", Scope); switch (KeyType) { - case DIREG_DEV: - ret = SETUPDI_DeleteDevKey(device); - break; case DIREG_DRV: ret = delete_driver_key(device); break; case DIREG_BOTH: - ret = SETUPDI_DeleteDevKey(device); - if (ret) - ret = delete_driver_key(device); + if (!(ret = delete_driver_key(device))) + break; + /* fall through */ + case DIREG_DEV: + l = RegDeleteKeyW(device->key, DeviceParameters); + SetLastError(l); + ret = !l; break; default: WARN("unknown KeyType %d\n", KeyType); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 804d15b..9f36b2a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1030,6 +1030,8 @@ static void test_device_iface_detail(void) static void test_device_key(void) { + static const char params_key_path[] = "System\\CurrentControlSet\\Enum\\Root" + "\\LEGACY_BOGUS\\0000\\Device Parameters"; static const char class_key_path[] = "System\\CurrentControlSet\\Control\\Class" "\\{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', @@ -1159,6 +1161,43 @@ todo_wine { ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); +todo_wine + ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, params_key_path, &key); + ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + + key = SetupDiCreateDevRegKeyA(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + ok(key != INVALID_HANDLE_VALUE, "Got unexpected error %#x.\n", GetLastError()); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, params_key_path, &key); + ok(!res, "Failed to open device key, error %u.\n", res); + res = RegSetValueExA(key, "foo", 0, REG_SZ, (BYTE *)"bar", sizeof("bar")); + ok(!res, "Failed to set value, error %u.\n", res); + RegCloseKey(key); + + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); + ok(key != INVALID_HANDLE_VALUE, "Got unexpected error %#x.\n", GetLastError()); + size = sizeof(data); + res = RegQueryValueExA(key, "foo", NULL, NULL, (BYTE *)data, &size); + ok(!res, "Failed to get value, error %u.\n", res); + ok(!strcmp(data, "bar"), "Got wrong data %s.\n", data); + RegCloseKey(key); + + ret = SetupDiDeleteDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); +todo_wine + ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, params_key_path, &key); + ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + key = SetupDiCreateDevRegKeyW(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); ok(key != INVALID_HANDLE_VALUE, "Failed to create device key, error %#x.\n", GetLastError()); RegCloseKey(key);

1 0