wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Jacek Caban : server: Introduce IOCTL_CONDRV_FILL_OUTPUT ioctl.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 6b96e0e0cbdc28e9dbde3fa3d9bc948b512fd1fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b96e0e0cbdc28e9dbde3fa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:17 2020 +0200 server: Introduce IOCTL_CONDRV_FILL_OUTPUT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 13 +++++++++++++ server/console.c | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 25e5820046..a8b7c04915 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -36,6 +36,7 @@ /* console output ioctls */ #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -80,6 +81,18 @@ struct condrv_output_info_params struct condrv_output_info info; /* output info */ }; +/* IOCTL_CONDRV_FILL_OUTPUT params */ +struct condrv_fill_output_params +{ + int x; /* position where to start writing */ + int y; + int mode; /* char info mode */ + int count; /* number to write */ + int wrap; /* wrap around at end of line? */ + WCHAR ch; /* character to write */ + unsigned short attr; /* attribute to write */ +}; + #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 #define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 diff --git a/server/console.c b/server/console.c index 72e98f14a9..a5ddd82478 100644 --- a/server/console.c +++ b/server/console.c @@ -1682,6 +1682,26 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_output_info( screen_buffer, params, get_req_data_size() - sizeof(*params) ); } + case IOCTL_CONDRV_FILL_OUTPUT: + { + const struct condrv_fill_output_params *params = get_req_data(); + char_info_t data; + DWORD written; + if (get_req_data_size() != sizeof(*params) || + (get_reply_max_size() && get_reply_max_size() != sizeof(written))) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + data.ch = params->ch; + data.attr = params->attr; + written = fill_console_output( screen_buffer, data, params->mode, + params->x, params->y, params->count, params->wrap ); + if (written && get_reply_max_size() == sizeof(written)) + set_reply_data( &written, sizeof(written) ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Piotr Caban : msvcrt: Use proper flags instead of characters for printf flags.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: e20756e9b8dcb29241ae435760d04a9c7cf519bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e20756e9b8dcb29241ae4357… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 15:33:33 2020 +0200 msvcrt: Use proper flags instead of characters for printf flags. Port 1a43c5de71eea457855f7dcfb7e5811f1c74ebf8 to msvcrt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 101 ++++++++++++++++++++++++--------------------------- dlls/msvcrt/wcs.c | 9 +++++ 2 files changed, 56 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e20756e9b8dcb29241ae…

1 0

Piotr Caban : ntdll: Ignore L length specifier in printf.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: a6fb7be678438ab689ac87ad4ed21a9b33a17c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6fb7be678438ab689ac87ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 15:33:24 2020 +0200 ntdll: Ignore L length specifier in printf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.h | 6 +++++- dlls/ntdll/tests/string.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/printf.h b/dlls/ntdll/printf.h index febb9e7bf7..9f7bad767f 100644 --- a/dlls/ntdll/printf.h +++ b/dlls/ntdll/printf.h @@ -375,11 +375,15 @@ static int FUNC_NAME(pf_vsnprintf)( FUNC_NAME(pf_output) *out, const APICHAR *fo flags.IntegerDouble = TRUE; p += 2; } - else if( *p == 'l' || *p == 'L' ) + else if( *p == 'l' ) { flags.IntegerLength = LEN_LONG; p++; } + else if( *p == 'L' ) + { + p++; + } else if( *p == 'h') { flags.IntegerLength = LEN_SHORT; diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index cade4e4533..b6a40f6709 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1529,6 +1529,14 @@ static void test__snprintf(void) ok(!memcmp(buffer, "tes", 3), "buf = %s\n", buffer); ok(buffer[3] == 0x7c, "buffer[3] = %x\n", buffer[3]); + res = p_snprintf(buffer, sizeof(buffer), "%ls", L"test"); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_a(buffer)); + + res = p_snprintf(buffer, sizeof(buffer), "%Ls", "test"); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_a(buffer)); + res = p_snprintf(buffer, sizeof(buffer), "%I64x %d", (ULONGLONG)0x1234567890, 1); ok(res == strlen(buffer), "wrong size %d\n", res); ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer));

1 0

Nikolay Sivov : shlwapi/tests: Remove failing test.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 859766698cf2978e757316af04d07fa0c69d30d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859766698cf2978e757316af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:52:40 2020 +0300 shlwapi/tests: Remove failing test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8c5e3e261e..919cac8563 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1684,11 +1684,8 @@ if (0) LocalFileTimeToFileTime(&filetime, &filetime); /* no way to get required buffer length here */ - SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, NULL, NULL, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS /* Win7 */), - "expected 0xdeadbeef, got %d\n", GetLastError()); SetLastError(0xdeadbeef); buff[0] = 'a'; buff[1] = 0;

1 0

Nikolay Sivov : msxml3/tests: Remove traces.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 007df5deed60fc16689d9480e75fecaccdeb1d37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=007df5deed60fc16689d9480… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:47:48 2020 +0300 msxml3/tests: Remove traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ---- dlls/msxml3/tests/httpreq.c | 1 - 2 files changed, 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f45364058a..7f3b42d840 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13146,8 +13146,6 @@ static BOOL qi_list_contains_service(REFIID service, REFIID iid) static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID iid, void **ppv) { - trace("sp_QueryInterface: %s\n", wine_dbgstr_guid(iid)); - if (qi_count < ARRAY_SIZE(qi_list)) qi_list[qi_count++] = iid; else @@ -13177,8 +13175,6 @@ static ULONG WINAPI sp_Release(IServiceProvider *iface) static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, REFIID iid, void **ppv) { - trace("sp_QueryService: %s, %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(iid)); - if (IsEqualGUID(service, &SID_SContainerDispatch) || IsEqualGUID(service, &SID_SInternetHostSecurityManager)) { diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 8a2ed2c73a..74c302d5eb 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -235,7 +235,6 @@ static IHTMLElementCollection htmlecoll = { &TestHTMLECollectionVtbl }; /* test IHTMLDocument2 */ static HRESULT WINAPI htmldoc2_QueryInterface(IHTMLDocument2 *iface, REFIID riid, void **ppvObject) { - trace("\n"); *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Nikolay Sivov : evr/tests: Fix test crash on Windows 7.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: ea53b3c22e60a17c595cd2c463d3092ec123422d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea53b3c22e60a17c595cd2c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:40:57 2020 +0300 evr/tests: Fix test crash on Windows 7. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5e18494718..6a5d80df41 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1080,15 +1080,18 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); - /* Device manager wasn't set, sample get regular memory buffers. */ - hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + /* Device manager wasn't set, sample gets regular memory buffers. */ + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + } IMFMediaBuffer_Release(buffer); - IMFGetService_Release(gs); IMFSample_Release(sample); }

1 0

Gijs Vermeulen : amstream: Implement AMMediaStream::JoinFilterGraph.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: c6b437284554a77c9510873c90cd1c7055e845f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b437284554a77c9510873c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jul 13 19:08:45 2020 +0200 amstream: Implement AMMediaStream::JoinFilterGraph. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 6 +++--- dlls/amstream/ddrawstream.c | 6 +++--- dlls/amstream/tests/amstream.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 60a2572b3b..112891eeb7 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -593,11 +593,11 @@ static HRESULT WINAPI audio_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMe static HRESULT WINAPI audio_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + TRACE("stream %p, filtergraph %p.\n", stream, filtergraph); - return S_FALSE; + return S_OK; } static const struct IAMMediaStreamVtbl audio_IAMMediaStream_vtbl = diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5530603f7a..9f74eaf91a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -261,11 +261,11 @@ static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMe static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + TRACE("stream %p, filtergraph %p.\n", stream, filtergraph); - return S_FALSE; + return S_OK; } static const struct IAMMediaStreamVtbl ddraw_IAMMediaStream_vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a0876d6242..a81cdba3f3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4371,7 +4371,7 @@ static void check_ammediastream_join_filter_graph(const MSPID *id) } hr = IAMMediaStream_JoinFilterGraph(stream, graph); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); EXPECT_REF(builder, 4); EXPECT_REF(graph, 1);

1 0

Gijs Vermeulen : amstream: Add AMMediaStream::JoinFilterGraph() tests.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 3572a7f44004a9ebd16e2b1e8164b3477f0d5227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3572a7f44004a9ebd16e2b1e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jul 13 19:08:44 2020 +0200 amstream: Add AMMediaStream::JoinFilterGraph() tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2d9f3e35f2..a0876d6242 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4328,6 +4328,89 @@ static void test_ammediastream_join_filter(void) check_ammediastream_join_filter(&CLSID_AMDirectDrawStream); } +static void check_ammediastream_join_filter_graph(const MSPID *id) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IGraphBuilder *builder, *builder2; + IMediaStreamFilter *filter; + IAMMediaStream *stream; + IFilterGraph *graph; + FILTER_INFO info; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, (IMediaStream **)&stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!builder, "Expected non-null graph.\n"); + EXPECT_REF(builder, 4); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + /* Crashes on native. */ + if (0) + { + hr = IAMMediaStream_JoinFilterGraph(stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + hr = IAMMediaStream_JoinFilterGraph(stream, graph); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(builder2 == builder, "Expected graph %p, got %p.\n", builder, builder2); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IGraphBuilder_Release(builder2); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + ref = IFilterGraph_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(builder); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ammediastream_join_filter_graph(void) +{ + check_ammediastream_join_filter_graph(&MSPID_PrimaryAudio); + check_ammediastream_join_filter_graph(&MSPID_PrimaryVideo); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5023,6 +5106,7 @@ START_TEST(amstream) test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); + test_ammediastream_join_filter_graph(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run();

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate temporary system information.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 20bc32cddc6ca8b1e2577cbc12050804972ca0ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=20bc32cddc6ca8b1e2577cbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:35:27 2020 +0200 ntdll: Use malloc() to allocate temporary system information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 835cf8d134..c705f5a8d1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2073,7 +2073,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, char *buffer = NULL; unsigned int pos = 0; - if (size && !(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + if (size && !(buffer = malloc( size ))) { ret = STATUS_NO_MEMORY; break; @@ -2090,7 +2090,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, if (ret) { - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); break; } @@ -2166,7 +2166,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } if (len > size) ret = STATUS_INFO_LENGTH_MISMATCH; - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); break; } @@ -2327,8 +2327,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } num_handles = (size - FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION, Handle )) / sizeof(SYSTEM_HANDLE_ENTRY); - if (!(handle_info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*handle_info) * num_handles ))) - return STATUS_NO_MEMORY; + if (!(handle_info = malloc( sizeof(*handle_info) * num_handles ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_system_handles ) { @@ -2355,7 +2354,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, handle_info ); + free( handle_info ); break; }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the system processor information.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 242dc8989a993d1b3807f437fbac7b92707b6e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=242dc8989a993d1b3807f437… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:35:14 2020 +0200 ntdll: Use malloc() to allocate the system processor information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index eedd67fba1..835cf8d134 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2182,6 +2182,11 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, ret = STATUS_INFO_LENGTH_MISMATCH; break; } + if (!(sppi = calloc( out_cpus, sizeof(*sppi) ))) + { + ret = STATUS_NO_MEMORY; + break; + } else #ifdef __APPLE__ { @@ -2196,8 +2201,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { int i; cpus = min(cpus,out_cpus); - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - sppi = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, len); for (i = 0; i < cpus; i++) { sppi[i].IdleTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_IDLE]; @@ -2214,7 +2217,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { unsigned long clk_tck = sysconf(_SC_CLK_TCK); unsigned long usr,nice,sys,idle,remainder[8]; - int i, count; + int i, count, id; char name[32]; char line[255]; @@ -2230,17 +2233,12 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, for (i = 0; i + 5 < count; ++i) sys += remainder[i]; sys += idle; usr += nice; - cpus = atoi( name + 3 ) + 1; - if (cpus > out_cpus) break; - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - if (sppi) - sppi = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sppi, len ); - else - sppi = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - - sppi[cpus-1].IdleTime.QuadPart = (ULONGLONG)idle * 10000000 / clk_tck; - sppi[cpus-1].KernelTime.QuadPart = (ULONGLONG)sys * 10000000 / clk_tck; - sppi[cpus-1].UserTime.QuadPart = (ULONGLONG)usr * 10000000 / clk_tck; + id = atoi( name + 3 ) + 1; + if (id > out_cpus) break; + if (id > cpus) cpus = id; + sppi[id-1].IdleTime.QuadPart = (ULONGLONG)idle * 10000000 / clk_tck; + sppi[id-1].KernelTime.QuadPart = (ULONGLONG)sys * 10000000 / clk_tck; + sppi[id-1].UserTime.QuadPart = (ULONGLONG)usr * 10000000 / clk_tck; } fclose(cpuinfo); } @@ -2251,8 +2249,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, static int i = 1; unsigned int n; cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - sppi = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, len); FIXME("stub info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); /* many programs expect these values to change so fake change */ for (n = 0; n < cpus; n++) @@ -2264,6 +2260,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, i++; } + len = sizeof(*sppi) * cpus; if (size >= len) { if (!info) ret = STATUS_ACCESS_VIOLATION; @@ -2271,7 +2268,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } else ret = STATUS_INFO_LENGTH_MISMATCH; - RtlFreeHeap(GetProcessHeap(),0,sppi); + free( sppi ); break; }

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
83
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 July 2020