February 2020 - wine-devel

[PATCH 1/5] qasf/dmowrapper: Implement receiving and delivering samples.
by Zebediah Figura 21 Feb '20

21 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/qasf/dmowrapper.c | 247 +++++++++++++++++++++++- dlls/qasf/tests/dmowrapper.c | 365 +++++++++++++++++++++++++++++++++-- include/mediaobj.idl | 17 ++ 3 files changed, 609 insertions(+), 20 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 9480d3b95bb..41fe34cf1ed 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -22,9 +22,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(qasf); +struct buffer +{ + IMediaBuffer IMediaBuffer_iface; + IMediaSample *sample; +}; + struct dmo_wrapper_source { struct strmbase_source pin; + struct buffer buffer; }; struct dmo_wrapper @@ -37,6 +44,80 @@ struct dmo_wrapper DWORD sink_count, source_count; struct strmbase_sink *sinks; struct dmo_wrapper_source *sources; + DMO_OUTPUT_DATA_BUFFER *buffers; + struct buffer input_buffer; +}; + +static struct buffer *impl_from_IMediaBuffer(IMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct buffer, IMediaBuffer_iface); +} + +static HRESULT WINAPI buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IMediaBuffer)) + { + IMediaBuffer_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI buffer_AddRef(IMediaBuffer *iface) +{ + TRACE("iface %p.\n", iface); + return 2; +} + +static ULONG WINAPI buffer_Release(IMediaBuffer *iface) +{ + TRACE("iface %p.\n", iface); + return 1; +} + +static HRESULT WINAPI buffer_SetLength(IMediaBuffer *iface, DWORD len) +{ + struct buffer *buffer = impl_from_IMediaBuffer(iface); + + TRACE("iface %p, len %u.\n", iface, len); + + return IMediaSample_SetActualDataLength(buffer->sample, len); +} + +static HRESULT WINAPI buffer_GetMaxLength(IMediaBuffer *iface, DWORD *len) +{ + struct buffer *buffer = impl_from_IMediaBuffer(iface); + + TRACE("iface %p, len %p.\n", iface, len); + + *len = IMediaSample_GetSize(buffer->sample); + return S_OK; +} + +static HRESULT WINAPI buffer_GetBufferAndLength(IMediaBuffer *iface, BYTE **data, DWORD *len) +{ + struct buffer *buffer = impl_from_IMediaBuffer(iface); + + TRACE("iface %p, data %p, len %p.\n", iface, data, len); + + *len = IMediaSample_GetActualDataLength(buffer->sample); + return IMediaSample_GetPointer(buffer->sample, data); +} + +static const IMediaBufferVtbl buffer_vtbl = +{ + buffer_QueryInterface, + buffer_AddRef, + buffer_Release, + buffer_SetLength, + buffer_GetMaxLength, + buffer_GetBufferAndLength, }; static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -120,6 +201,140 @@ static void dmo_wrapper_sink_disconnect(struct strmbase_sink *iface) IMediaObject_Release(dmo); } +static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) +{ + DMO_OUTPUT_DATA_BUFFER *buffers = filter->buffers; + DWORD status, i; + BOOL more_data; + HRESULT hr; + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].pin.pin.peer) + { + if (FAILED(hr = IMemAllocator_GetBuffer(filter->sources[i].pin.pAllocator, + &filter->sources[i].buffer.sample, NULL, NULL, 0))) + { + ERR("Failed to get sample, hr %#x.\n", hr); + goto out; + } + buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; + IMediaSample_SetActualDataLength(filter->sources[i].buffer.sample, 0); + } + else + buffers[i].pBuffer = NULL; + } + + do + { + more_data = FALSE; + + hr = IMediaObject_ProcessOutput(dmo, DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER, + filter->source_count, buffers, &status); + if (hr != S_OK) + break; + + for (i = 0; i < filter->source_count; ++i) + { + IMediaSample *sample = filter->sources[i].buffer.sample; + + if (!buffers[i].pBuffer) + continue; + + if (buffers[i].dwStatus & DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE) + more_data = TRUE; + + if (buffers[i].dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIME) + { + if (buffers[i].dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH) + { + REFERENCE_TIME stop = buffers[i].rtTimestamp + buffers[i].rtTimelength; + IMediaSample_SetTime(sample, &buffers[i].rtTimestamp, &stop); + } + else + IMediaSample_SetTime(sample, &buffers[i].rtTimestamp, NULL); + } + + if (buffers[i].dwStatus & DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT) + IMediaSample_SetSyncPoint(sample, TRUE); + + if (IMediaSample_GetActualDataLength(sample)) + { + if (FAILED(hr = IMemInputPin_Receive(filter->sources[i].pin.pMemInputPin, sample))) + { + WARN("Downstream sink returned %#x.\n", hr); + goto out; + } + IMediaSample_SetActualDataLength(sample, 0); + } + + } + } while (more_data); + +out: + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].buffer.sample) + { + IMediaSample_Release(filter->sources[i].buffer.sample); + filter->sources[i].buffer.sample = NULL; + } + } + + return hr; +} + +static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); + DWORD index = iface - filter->sinks; + REFERENCE_TIME start = 0, stop = 0; + IMediaObject *dmo; + DWORD flags = 0; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + if (IMediaSample_IsDiscontinuity(sample) == S_OK) + { + if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) + { + ERR("Discontinuity() failed, hr %#x.\n", hr); + goto out; + } + + /* Calling Discontinuity() might change the DMO's mind about whether it + * has more data to process. The DirectX documentation explicitly + * states that we should call ProcessOutput() again in this case. */ + process_output(filter, dmo); + } + + if (IMediaSample_IsSyncPoint(sample) == S_OK) + flags |= DMO_INPUT_DATA_BUFFERF_SYNCPOINT; + + if (SUCCEEDED(hr = IMediaSample_GetTime(sample, &start, &stop))) + { + flags |= DMO_INPUT_DATA_BUFFERF_TIME | DMO_INPUT_DATA_BUFFERF_TIMELENGTH; + if (hr == VFW_S_NO_STOP_TIME) + stop = start + 1; + } + + filter->input_buffer.sample = sample; + if (FAILED(hr = IMediaObject_ProcessInput(dmo, index, + &filter->input_buffer.IMediaBuffer_iface, flags, start, stop - start))) + { + ERR("ProcessInput() failed, hr %#x.\n", hr); + goto out; + } + + process_output(filter, dmo); + +out: + filter->input_buffer.sample = NULL; + IMediaObject_Release(dmo); + return hr; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = dmo_wrapper_sink_query_interface, @@ -127,6 +342,7 @@ static const struct strmbase_sink_ops sink_ops = .base.pin_get_media_type = dmo_wrapper_sink_get_media_type, .sink_connect = dmo_wrapper_sink_connect, .sink_disconnect = dmo_wrapper_sink_disconnect, + .pfnReceive = dmo_wrapper_sink_Receive, }; static inline struct dmo_wrapper_source *impl_source_from_strmbase_pin(struct strmbase_pin *iface) @@ -245,6 +461,7 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID { struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); struct dmo_wrapper_source *sources; + DMO_OUTPUT_DATA_BUFFER *buffers; DWORD input_count, output_count; struct strmbase_sink *sinks; IMediaObject *dmo; @@ -270,10 +487,12 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID sinks = calloc(sizeof(*sinks), input_count); sources = calloc(sizeof(*sources), output_count); - if (!sinks || !sources) + buffers = calloc(sizeof(*buffers), output_count); + if (!sinks || !sources || !buffers) { free(sinks); free(sources); + free(buffers); IMediaObject_Release(dmo); IUnknown_Release(unk); return hr; @@ -289,6 +508,7 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID { swprintf(id, ARRAY_SIZE(id), L"out%u", i); strmbase_source_init(&sources[i].pin, &filter->filter, id, &source_ops); + sources[i].buffer.IMediaBuffer_iface.lpVtbl = &buffer_vtbl; } EnterCriticalSection(&filter->filter.csFilter); @@ -298,6 +518,7 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID filter->source_count = output_count; filter->sinks = sinks; filter->sources = sources; + filter->buffers = buffers; LeaveCriticalSection(&filter->filter.csFilter); @@ -358,13 +579,34 @@ static HRESULT dmo_wrapper_query_interface(struct strmbase_filter *iface, REFIID return E_NOINTERFACE; } +static HRESULT dmo_wrapper_init_stream(struct strmbase_filter *iface) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); + DWORD i; + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].pin.pin.peer) + IMemAllocator_Commit(filter->sources[i].pin.pAllocator); + } + + return S_OK; +} + static HRESULT dmo_wrapper_cleanup_stream(struct strmbase_filter *iface) { struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); IMediaObject *dmo; + DWORD i; IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].pin.pin.peer) + IMemAllocator_Decommit(filter->sources[i].pin.pAllocator); + } + IMediaObject_Flush(dmo); IMediaObject_Release(dmo); @@ -376,6 +618,7 @@ static struct strmbase_filter_ops filter_ops = .filter_get_pin = dmo_wrapper_get_pin, .filter_destroy = dmo_wrapper_destroy, .filter_query_interface = dmo_wrapper_query_interface, + .filter_init_stream = dmo_wrapper_init_stream, .filter_cleanup_stream = dmo_wrapper_cleanup_stream, }; @@ -391,6 +634,8 @@ HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out) object->IDMOWrapperFilter_iface.lpVtbl = &dmo_wrapper_filter_vtbl; + object->input_buffer.IMediaBuffer_iface.lpVtbl = &buffer_vtbl; + TRACE("Created DMO wrapper %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 42d3a4f0e0e..00ca09de2e7 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -56,6 +56,13 @@ static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TY && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static const IMediaObjectVtbl dmo_vtbl; static IMediaObject testdmo = {&dmo_vtbl}; @@ -69,7 +76,11 @@ static HRESULT testdmo_GetOutputSizeInfo_hr = S_OK; static DWORD testdmo_output_size = 123; static DWORD testdmo_output_alignment = 1; -static unsigned int got_Flush; +static unsigned int got_Flush, got_Discontinuity, got_ProcessInput, got_ProcessOutput, got_Receive; + +static IMediaBuffer *testdmo_buffer; + +static int testmode; static HRESULT WINAPI dmo_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) { @@ -249,8 +260,9 @@ static HRESULT WINAPI dmo_Flush(IMediaObject *iface) static HRESULT WINAPI dmo_Discontinuity(IMediaObject *iface, DWORD index) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("Discontinuity(index %u)\n", index); + ++got_Discontinuity; + return S_OK; } static HRESULT WINAPI dmo_AllocateStreamingResources(IMediaObject *iface) @@ -267,22 +279,132 @@ static HRESULT WINAPI dmo_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI dmo_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("GetInputStatus(index %u)\n", index); + *flags = DMO_INPUT_STATUSF_ACCEPT_DATA; + return S_OK; } static HRESULT WINAPI dmo_ProcessInput(IMediaObject *iface, DWORD index, IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + BYTE *data, expect[200]; + DWORD len, i; + HRESULT hr; + + if (winetest_debug > 1) trace("ProcessInput(index %u, flags %#x, timestamp %I64d, timelength %I64d)\n", + index, flags, timestamp, timelength); + + ++got_ProcessInput; + + hr = IMediaBuffer_GetBufferAndLength(buffer, &data, &len); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(len == 200, "Got length %u.\n", len); + for (i = 0; i < 200; ++i) + expect[i] = i; + ok(!memcmp(data, expect, 200), "Data didn't match.\n"); + + hr = IMediaBuffer_GetMaxLength(buffer, &len); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(len == 256, "Got length %u.\n", len); + + if (testmode == 0) + { + ok(!flags, "Got flags %#x.\n", flags); + ok(!timestamp, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp)); + ok(!timelength, "Got length %s.\n", wine_dbgstr_longlong(timelength)); + } + else if (testmode == 1) + { + ok(flags == (DMO_INPUT_DATA_BUFFERF_TIME | DMO_INPUT_DATA_BUFFERF_TIMELENGTH), "Got flags %#x.\n", flags); + ok(timestamp == 20000, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp)); + ok(timelength == 1, "Got length %s.\n", wine_dbgstr_longlong(timelength)); + } + else if (testmode == 6) + { + ok(flags == (DMO_INPUT_DATA_BUFFERF_TIME | DMO_INPUT_DATA_BUFFERF_TIMELENGTH + | DMO_INPUT_DATA_BUFFERF_SYNCPOINT), "Got flags %#x.\n", flags); + ok(timestamp == 20000, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp)); + ok(timelength == 10000, "Got length %s.\n", wine_dbgstr_longlong(timelength)); + } + else + { + ok(flags == (DMO_INPUT_DATA_BUFFERF_TIME | DMO_INPUT_DATA_BUFFERF_TIMELENGTH), "Got flags %#x.\n", flags); + ok(timestamp == 20000, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp)); + ok(timelength == 10000, "Got length %s.\n", wine_dbgstr_longlong(timelength)); + } + + testdmo_buffer = buffer; + IMediaBuffer_AddRef(buffer); + + return S_OK; } static HRESULT WINAPI dmo_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + DWORD len, i; + HRESULT hr; + BYTE *data; + + if (winetest_debug > 1) trace("ProcessOutput(flags %#x, count %u)\n", flags, count); + + ++got_ProcessOutput; + + *status = 0; + + ok(flags == DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER, "Got flags %#x.\n", flags); + ok(count == 2, "Got count %u.\n", count); + + ok(!!buffers[0].pBuffer, "Expected a buffer.\n"); + ok(!buffers[1].pBuffer, "Got unexpected buffer %p.\n", buffers[1].pBuffer); + + buffers[1].dwStatus = DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE; + + hr = IMediaBuffer_GetBufferAndLength(buffers[0].pBuffer, &data, &len); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!len, "Got length %u.\n", len); + + hr = IMediaBuffer_GetMaxLength(buffers[0].pBuffer, &len); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(len == 16384, "Got length %u.\n", len); + + buffers[0].dwStatus = DMO_OUTPUT_DATA_BUFFERF_TIME | DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH; + buffers[0].rtTimelength = 1000; + buffers[0].rtTimestamp = 5000; + + if (testmode == 3) + { + hr = IMediaBuffer_SetLength(buffers[0].pBuffer, 16200); + ok(hr == S_OK, "Got hr %#x.\n", hr); + buffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE; + return S_OK; + } + else if (testmode == 5) + { + hr = IMediaBuffer_SetLength(buffers[0].pBuffer, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaBuffer_Release(testdmo_buffer); + return S_FALSE; + } + else + { + if (testmode == 7) + buffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT; + else if (testmode == 8) + buffers[0].dwStatus = DMO_OUTPUT_DATA_BUFFERF_TIME; + else if (testmode == 9) + buffers[0].dwStatus = 0; + + for (i = 0; i < 300; ++i) + data[i] = 111 - i; + hr = IMediaBuffer_SetLength(buffers[0].pBuffer, 300); + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (testmode != 10) + IMediaBuffer_Release(testdmo_buffer); + return S_OK; + } + + return S_OK; } static HRESULT WINAPI dmo_Lock(IMediaObject *iface, LONG lock) @@ -384,13 +506,6 @@ static IBaseFilter *create_dmo_wrapper(void) return filter; } -static ULONG get_refcount(void *iface) -{ - IUnknown *unknown = iface; - IUnknown_AddRef(unknown); - return IUnknown_Release(unknown); -} - #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -1077,6 +1192,61 @@ static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { + REFERENCE_TIME start, stop; + LONG len, i; + HRESULT hr; + + ++got_Receive; + + len = IMediaSample_GetSize(sample); + ok(len == 16384, "Got size %u.\n", len); + len = IMediaSample_GetActualDataLength(sample); + if (testmode == 3) + ok(len == 16200, "Got length %u.\n", len); + else + { + BYTE *data, expect[300]; + + ok(len == 300, "Got length %u.\n", len); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < 300; ++i) + expect[i] = 111 - i; + ok(!memcmp(data, expect, 300), "Data didn't match.\n"); + } + + hr = IMediaSample_GetTime(sample, &start, &stop); + if (testmode == 8) + { + ok(hr == VFW_S_NO_STOP_TIME, "Got hr %#x.\n", hr); + ok(start == 5000, "Got start time %s.\n", wine_dbgstr_longlong(start)); + } + else if (testmode == 9) + ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); + else + { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start == 5000, "Got start time %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 6000, "Got stop time %s.\n", wine_dbgstr_longlong(stop)); + } + + hr = IMediaSample_GetMediaTime(sample, &start, &stop); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + + hr = IMediaSample_IsDiscontinuity(sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IMediaSample_IsPreroll(sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IMediaSample_IsSyncPoint(sample); + ok(hr == (testmode == 7 ? S_OK : S_FALSE), "Got hr %#x.\n", hr); + + if (testmode == 3) + testmode = 4; + if (testmode == 10) + testmode = 11; + return S_OK; } @@ -1100,7 +1270,7 @@ static void testfilter_init(struct testfilter *filter) static void test_sink_allocator(IMemInputPin *input) { IMemAllocator *req_allocator, *ret_allocator; - ALLOCATOR_PROPERTIES props; + ALLOCATOR_PROPERTIES props, ret_props; HRESULT hr; hr = IMemInputPin_GetAllocatorRequirements(input, &props); @@ -1141,6 +1311,13 @@ static void test_sink_allocator(IMemInputPin *input) CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)&req_allocator); + props.cBuffers = 1; + props.cbBuffer = 256; + props.cbAlign = 1; + props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(req_allocator, &props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1275,6 +1452,155 @@ static void test_filter_state(IMediaControl *control) ok(state == State_Stopped, "Got state %u.\n", state); } +static void test_sample_processing(IMediaControl *control, IMemInputPin *input) +{ + REFERENCE_TIME start, stop; + IMemAllocator *allocator; + IMediaSample *sample; + LONG size, i; + HRESULT hr; + BYTE *data; + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + 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_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); + size = IMediaSample_GetSize(sample); + ok(size == 256, "Got size %d.\n", size); + for (i = 0; i < 200; ++i) + data[i] = i; + hr = IMediaSample_SetActualDataLength(sample, 200); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start = 10000; + stop = 20000; + hr = IMediaSample_SetMediaTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testmode = 0; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 1, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + start = 20000; + hr = IMediaSample_SetTime(sample, &start, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testmode = 1; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 1, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + stop = 30000; + hr = IMediaSample_SetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testmode = 2; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 1, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + testmode = 3; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 2, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 2, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + testmode = 5; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(!got_Receive, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + hr = IMediaSample_SetSyncPoint(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testmode = 6; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 1, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + hr = IMediaSample_SetSyncPoint(sample, FALSE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testmode = 7; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 1, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + testmode = 8; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 1, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + testmode = 9; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 1, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + hr = IMediaSample_SetDiscontinuity(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!got_Discontinuity, "Got %u calls to Discontinuity().\n", got_Discontinuity); + testmode = 10; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_ProcessOutput == 2, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 2, "Got %u calls to Receive().\n", got_Receive); + ok(got_Discontinuity == 1, "Got %u calls to Discontinuity().\n", got_Discontinuity); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -1366,6 +1692,9 @@ static void test_connect_pin(void) ok(testdmo_output_mt_set, "Ouput type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &req_mt), "Media types didn't match.\n"); + test_filter_state(control); + test_sample_processing(control, meminput); + hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, source); @@ -1383,8 +1712,6 @@ static void test_connect_pin(void) ok(!testdmo_output_mt_set, "Output type should not be set.\n"); - test_filter_state(control); - req_mt.lSampleSize = 0; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 793e1bcf8e0..4c2e4963174 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -87,6 +87,23 @@ interface IMediaBuffer : IUnknown ); } +enum _DMO_INPUT_STATUS_FLAGS +{ + DMO_INPUT_STATUSF_ACCEPT_DATA = 0x00000001, +}; + +enum _DMO_INPUT_DATA_BUFFER_FLAGS +{ + DMO_INPUT_DATA_BUFFERF_SYNCPOINT = 0x00000001, + DMO_INPUT_DATA_BUFFERF_TIME = 0x00000002, + DMO_INPUT_DATA_BUFFERF_TIMELENGTH = 0x00000004, +}; + +enum _DMO_PROCESS_OUTPUT_FLAGS +{ + DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x00000001, +}; + typedef struct _DMO_OUTPUT_DATA_BUFFER { IMediaBuffer *pBuffer; DWORD dwStatus; -- 2.25.0

1 4

[tools] testbot/Engine: Importing LogUtils is not necessary anymore.
by Francois Gouget 21 Feb '20

21 Feb '20

The log renaming code has been removed already. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a8fc2f0de9..48bb797cc0 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -51,7 +51,6 @@ use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::LogUtils; # FIXME Temporary, for the log renaming use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::RecordGroups; -- 2.20.1

1 0

[tools] testbot/LogUtils: Simplify a couple of regular expressions.
by Francois Gouget 21 Feb '20

21 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 863cca6bf4..2a39b35fee 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -102,7 +102,7 @@ sub GetLogLineCategory($) $Line =~ /: error: / or $Line =~ /: undefined reference to `/ or $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^Makefile:\d+: recipe for target .* failed$/ or $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or @@ -1047,7 +1047,7 @@ sub _GetLineKey($) $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/; # The exact amount of data printed does not change the error - $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; + $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; # Note: The 'done (258)' lines are modified by ParseWineTestReport() and # no longer contain the pid. So they need no further change here. -- 2.20.1

1 0

[tools] testbot/LogUtils: The done lines always contain timing information.
by Francois Gouget 21 Feb '20

21 Feb '20

Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Plus the trailing CRs are dropped so it was unnecessarily complicated too. testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 7b5547ae51..2601af4d74 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -648,8 +648,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) or - $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) + $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) or + $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4); -- 2.20.1

1 0

[tools] winetest/dissect: The done lines always contain timing information.
by Francois Gouget 21 Feb '20

21 Feb '20

Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Plus the trailing CRs are dropped so it was unnecessarily complicated too. winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 6c6c594277..ca8648a462 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -710,8 +710,8 @@ while ($line = <IN>) { } } elsif (($dll ne "" and - $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) or - $line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) + $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$ in /) or + $line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$ in /) { my ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4); -- 2.20.1

1 0

[tools] testbot/LogUtils: The exception codes are always 32 bit.
by Francois Gouget 21 Feb '20

21 Feb '20

Only the addresses may be 64 bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2a39b35fee..7b5547ae51 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1044,7 +1044,7 @@ sub _GetLineKey($) # Remove the crash code address: it changes whenever the test is recompiled $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; # and the process id - $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/; + $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/; # The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; -- 2.20.1

1 0

[tools] testbot/LogUtils: Report validation errors must not contain LFs.
by Francois Gouget 21 Feb '20

21 Feb '20

Otherwise the LF translates into an empty line in the .errors file, which is not a valid line format and gets rejected by LoadLogErrors(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2601af4d74..9e6ab4463f 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -572,7 +572,7 @@ sub ParseWineTestReport($$$) } else { - _AddExtra($LogInfo, "Misplaced $SubUnit subtest\n"); + _AddExtra($LogInfo, "Misplaced $SubUnit subtest"); } } elsif (($Cur->{Unit} ne "" and -- 2.20.1

1 0

[tools] testbot/LogUtils: Identify invalid line numbers in the .errors file.
by Francois Gouget 21 Feb '20

21 Feb '20

This should never happen but if it does this helps with diagnosis. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will hopefully never be needed again but identifying the troublesome line just makes sense as a general rule. testbot/lib/WineTestBot/LogUtils.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9e6ab4463f..734d3225b8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -848,9 +848,10 @@ sub LoadLogErrors($) return $LogInfo; } - my $CurGroup; + my ($LineNo, $CurGroup); foreach my $Line (<$ErrorsFile>) { + $LineNo++; chomp $Line; my ($Type, $Property, $Value) = split / /, $Line, 3; if ($Type eq "p") @@ -861,7 +862,7 @@ sub LoadLogErrors($) } else { - $LogInfo->{BadLog} = "Cannot set $Property = $Value because it is already set to $LogInfo->{$Property}"; + $LogInfo->{BadLog} = "$LineNo: Cannot set $Property = $Value because it is already set to $LogInfo->{$Property}"; last; } } @@ -871,7 +872,7 @@ sub LoadLogErrors($) } elsif (!$CurGroup) { - $LogInfo->{BadLog} = "Got a $Type line with no group"; + $LogInfo->{BadLog} = "$LineNo: Got a $Type line with no group"; last; } elsif ($Type eq "o") @@ -884,7 +885,7 @@ sub LoadLogErrors($) } else { - $LogInfo->{BadLog} = "Found an unknown line type ($Type)"; + $LogInfo->{BadLog} = "$LineNo: Found an unknown line type ($Type)"; last; } } -- 2.20.1

1 0

[PATCH v2 01/11] mfplat/tests: Add more comprehensive media source tests.
by Derek Lesho 21 Feb '20

21 Feb '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 184 ++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d0e05650c2..43ca186236 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -350,6 +350,67 @@ static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = test_create_from_file_handler_callback_Invoke, }; +struct expected_event +{ + HRESULT status_code; + MediaEventType type; + GUID *extended_type; +}; + +static BOOL expect_event(IMFMediaEventGenerator *gen, struct expected_event *expected, PROPVARIANT *out) +{ + HRESULT hr; + IMFMediaEvent *event; + BOOL ret = TRUE; + + hr = IMFMediaEventGenerator_GetEvent(gen, 0, &event); + ok(hr == S_OK, "Failed to get event from media source, hr %#x.\n", hr); + { + HRESULT status_code; + hr = IMFMediaEvent_GetStatus(event, &status_code); + ok (hr == S_OK, "Failed to get status code, hr %#x.\n", hr); + ok (status_code == expected->status_code, "Unexpected status code %#x, expected %#x.\n", + status_code, expected->status_code); + + if (hr != S_OK || status_code != expected->status_code) + ret = FALSE; + } + { + MediaEventType event_type; + hr = IMFMediaEvent_GetType(event, &event_type); + ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); + ok(event_type == expected->type, "Unexpected event type %u, expected %u.\n", + event_type, expected->type); + + if (hr != S_OK || event_type != expected->type) + ret = FALSE; + } + if (expected->extended_type) + { + GUID extended_type; + BOOL is_equal; + hr = IMFMediaEvent_GetExtendedType(event, &extended_type); + ok(hr == S_OK, "Failed to get extended type, hr %#x.\n", hr); + is_equal = IsEqualGUID(&extended_type, expected->extended_type); + ok(is_equal, "Unexpected extended type %s, expected %s.\n", + debugstr_guid(&extended_type), debugstr_guid(expected->extended_type)); + + if (hr != S_OK || !is_equal) + ret = FALSE; + } + if (out) + { + hr = IMFMediaEvent_GetValue(event, out); + ok (hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + + if (hr != S_OK) + ret = FALSE; + } + IMFMediaEvent_Release(event); + + return ret; +} + static void test_source_resolver(void) { static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; @@ -361,7 +422,7 @@ static void test_source_resolver(void) IMFMediaSource *mediasource; IMFPresentationDescriptor *descriptor; IMFMediaTypeHandler *handler; - BOOL selected, do_uninit; + IMFMediaType *type; MF_OBJECT_TYPE obj_type; IMFStreamDescriptor *sd; IUnknown *cancel_cookie; @@ -370,6 +431,9 @@ static void test_source_resolver(void) HRESULT hr; WCHAR *filename; GUID guid; + PROPVARIANT empty_var; + BOOL selected, do_uninit, skip_source_tests; + ULONG refcount; if (!pMFCreateSourceResolver) { @@ -451,13 +515,127 @@ static void test_source_resolver(void) hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); + if (hr == S_OK) + { + ok (IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &type); + ok (hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + + hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &guid); + ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); + ok(hr == S_OK, "Failed to select video stream, hr %#x.\n", hr); + + IMFMediaType_Release(type); + + skip_source_tests = FALSE; + } + else + { + /* skip media source tests to avoid crashing, as the media source is fake */ + skip_source_tests = TRUE; + } IMFMediaTypeHandler_Release(handler); IMFStreamDescriptor_Release(sd); + if (skip_source_tests) + goto source_tests_end; + + empty_var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &empty_var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (hr == S_OK) + { + static struct expected_event new_stream_event = { S_OK, MENewStream, NULL }; + static struct expected_event source_started_event = { S_OK, MESourceStarted, NULL }; + static struct expected_event end_of_presentation_event = {S_OK, MEEndOfPresentation, NULL }; + PROPVARIANT new_stream_value; + IMFMediaStream *video_stream; + + expect_event((IMFMediaEventGenerator*)mediasource, &new_stream_event, &new_stream_value); + ok(new_stream_value.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", + new_stream_value.vt); + video_stream = (IMFMediaStream *)new_stream_value.punkVal; + expect_event((IMFMediaEventGenerator*)mediasource, &source_started_event, NULL); + + /* TODO: verify stream information */ + + /* Request samples, our file is 10 frames at 25fps */ + { + static struct expected_event stream_started_event = { S_OK, MEStreamStarted, NULL }; + static struct expected_event new_sample_event = {S_OK, MEMediaSample, NULL}; + static struct expected_event end_of_stream_event = {S_OK, MEEndOfStream, NULL}; + unsigned int i, sample_count = 10; + + expect_event((IMFMediaEventGenerator*)video_stream, &stream_started_event, NULL); + + /* request one beyond EOS, otherwise EndOfStream isn't queued */ + for (i = 0; i <= sample_count; i++) + { + hr = IMFMediaStream_RequestSample(video_stream, NULL); + if (i == sample_count) + break; + ok(hr == S_OK, "Failed to request sample %u, hr %#x.\n", i + 1, hr); + if (hr != S_OK) + break; + } + + for (i = 0; i < sample_count; i++) + { + PROPVARIANT new_sample_value; + IMFSample *sample; + DWORD buffer_count; + LONGLONG duration, time; + static const LONGLONG MILLI_TO_100_NANO = 10000; + + if (!(expect_event((IMFMediaEventGenerator*)video_stream, &new_sample_event, &new_sample_value))) + { + ok(FALSE, "Sample %u not recieved.\n", i + 1); + break; + } + ok(new_sample_value.vt == VT_UNKNOWN, "Unexpected value type %u from MEMediaSample event.\n", + new_sample_value.vt); + sample = (IMFSample *)new_sample_value.punkVal; + + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(buffer_count == 1, "Unexpected buffer count %u.\n", buffer_count); + + hr = IMFSample_GetSampleDuration(sample, &duration); + ok(hr == S_OK, "Failed to get sample duration, hr %#x.\n", hr); + ok(duration == 40 * MILLI_TO_100_NANO, "Unexpected duration %s.\n", wine_dbgstr_longlong(duration)); + + hr = IMFSample_GetSampleTime(sample, &time); + ok(hr == S_OK, "Failed to get sample time, hr %#x.\n", hr); + ok(time == i * 40 * MILLI_TO_100_NANO, "Unexpected time %s.\n", wine_dbgstr_longlong(time)); + } + + if (i == sample_count) + expect_event((IMFMediaEventGenerator*)video_stream, &end_of_stream_event, NULL); + + hr = IMFMediaStream_RequestSample(video_stream, NULL); + ok (hr == MF_E_END_OF_STREAM, "Unexpected hr %#x, expected MF_E_END_OF_STREAM.\n", hr); + } + + expect_event((IMFMediaEventGenerator*)mediasource, &end_of_presentation_event, NULL); + } + IMFPresentationDescriptor_Release(descriptor); - IMFMediaSource_Release(mediasource); - IMFByteStream_Release(stream); + IMFMediaSource_Shutdown(mediasource); + + hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); + ok (hr == MF_E_SHUTDOWN, "Got 0x%08x\n", hr); + + source_tests_end: + refcount = IMFMediaSource_Release(mediasource); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + refcount = IMFByteStream_Release(stream); + ok(!refcount, "Unexpected refcount %u.\n", refcount); /* Create from URL. */ callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); -- 2.25.0

4 24

[PATCH website 1/5] Remove Korean translation of license.template
by Shinjo Park 21 Feb '20

21 Feb '20

No other translation templates are translating the license.template file, and the information is now on wiki, so removing it from Korean website translation. Signed-off-by: Shinjo Park <peremen(a)gmail.com> --- templates/ko/license.template | 834 ---------------------------------- 1 file changed, 834 deletions(-) delete mode 100644 templates/ko/license.template diff --git a/templates/ko/license.template b/templates/ko/license.template deleted file mode 100644 index d7c2637a..00000000 --- a/templates/ko/license.template +++ /dev/null @@ -1,834 +0,0 @@ - - - - -<h1 class="title">와인 저작권</h1> - -Copyright (c) 1993-{$curtime_year} 와인 제작자 (목록은 -<a href="//source.winehq.org/source/AUTHORS">제작자</a> -에 있습니다.) - -와인은 무료 무른모입니다. 여러분은 자유 소프트웨어 재단에서 배포한 -<a href="//source.winehq.org/source/COPYING.LIB">그누 약소 일반 공중 사용 허가서</a> -하에 자유로이 수정 및 재배포하실 수 있습니다. -여기 명시된 그누 약소 일반 공중 사용 허가서는 2.1판이며, -원하시면 2.1판 이상을 따르실 수 있습니다. - -본 누리집의 정보는 유용하겠지만, 안전이 보장되지 않습니다. -시장성, 특정 목적에 대한 적합성에 대한 암묵적 보증도 하지 않습니다. -그누 약소 일반 공중 사용 허가서를 읽어 더 자세한 내용을 확인하십시오. - -그누 약소 일반 공중 사용 허가서의 사본은 와인에 내장되어 배포됩니다. -<a href="//source.winehq.org/source/COPYING.LIB">COPYING.LIB</a>. -본 허가서의 사본을 받지 못하셨다면 자유 소프트웨어 재단에 문의하십시오. -주소 : 미합중국 매사추세츠주 보스턴시 스위트가 330번지 템플 플레이스 59호 우편 주소 : 02111-1307 -(59 Temple Place, Suite 330, Boston, MA 02111-1307 USA) - - -<h1>GNU 약소 일반 공중 사용 허가서</h1> - - - -2.1판, 1999년 2월 -<pre>Copyright (C) 1991, 1999 Free Software Foundation, Inc. -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -누구든지 본 사용 허가서를 있는 그대로 복제하고 배포할 수 -있습니다. 그러나 본문에 대한 수정은 허용되지 않습니다. - - -[이 문서는 GNU 약소 일반 공중 사용 허가서의 이름으로 공표된 최초의 판본입니다. - 본 사용 허가서는 GNU 라이브러리 일반 공중 사용 허가서 2판의 후속판으로 - 간주되기 때문에 2.1의 판번호를 갖고 있습니다.] -</pre> - - -<h1>전 문</h1> -소프트웨어에 적용되는 대부분의 사용 허가서들은 -소프트웨어에 대한 수정과 공유의 자유를 제한하려는 -것을 그 목적으로 합니다. 그러나 GNU 일반 공중 사용 -허가서들은 자유 소프트웨어에 대한 수정과 공유의 자유를 -모든 사용자들에게 보장하기 위해서 성립된 것입니다. - - -본 사용 허가서인 GNU 약소 일반 공중 사용 허가서(이하, -``LGPL''이라고 칭합니다.)는 자유 소프트웨어 재단과 -그밖의 저작자들이 이를 채택하기로 결정한, 주로 -라이브러리와 같은 일부 특정한 소프트웨어 꾸러미에 -적용됩니다. 누구든지 자신의 프로그램에 LGPL을 적용할 -수 있지만, 어떤 상황에서 어떤 사용 허가서를 선택하는 -것이 보다 나은 전략인지에 대해서 다음의 설명을 기준으로 -먼저 신중히 고려해 보시기 바랍니다. - - -자유 소프트웨어라는 말에서 사용된 ``자유''라는 -단어는 무료를 의미하는 금전적인 측면의 자유가 아니라 -구속되지 않는다는 관점에서의 자유를 의미하며, GNU 일반 -공중 사용 허가서들은 자유 소프트웨어를 이용한 복제와 -개작 및 배포와 수익 사업 등의 가능한 모든 형태의 자유를 -실질적으로 보장하고 있습니다. 여기에는 원시 코드의 일부 -또는 전부를 원용해서 보다 개선된 프로그램을 만들거나 -새로운 프로그램을 창작할 수 있는 자유가 보장되어 -있으며, 자신에게 양도된 이러한 자유와 권리를 보다 -명확하게 인식할 수 있도록 하기 위한 규정도 포함되어 -있습니다. - - -소프트웨어를 양도받은 사람의 권리를 보호하기 -위해서 우리는 배포자들이 이러한 권리를 부정하거나 -포기하도록 피양도자에게 요구하는 행위를 금지시킬 -필요가 있습니다. 이러한 금지 사항은 라이브러리를 -개작하거나 배포하는 모든 사람들이 예외없이 지켜야 -할 의무와 같습니다. - - -예를 들어, LGPL 라이브러리를 배포할 경우에는 이를 -유료로 판매하거나 무료로 배포하는 것에 관계없이 -자신이 해당 라이브러리에 대해서 가질 수 있었던 모든 -권리를 피양도자에게 그대로 양도해 주어야 하고, -라이브러리의 원시 코드를 함께 제공하거나 원시 코드를 -구할 수 있는 방법을 확실히 알려주어야 합니다. 또한 -라이브러리에 다른 코드를 링크시켰다면, 라이브러리를 -수정한 뒤에도 정상적으로 컴파일을 진행할 수 있도록 -링크 되었던 코드에 해당하는 완전한 목적 파일 전체를 -함께 제공해야 합니다. 또한 피양도자에게 이러한 -모든 사항들을 분명히 알 수 있도록 해 주어야 합니다. - - -자유 소프트웨어 재단은 다음과 같은 두 가지 단계를 -통해서 사용자들의 권리를 보호합니다. (1) 라이브러리에 -저작권을 설정합니다. (2) 저작권의 양도에 관한 실정법에 -의해서 유효한 법률적 효력을 갖는 LGPL을 통해서 -소프트웨어를 복제하거나 개작 및 배포할 수 있는 권리를 -사용자에게 부여합니다. - - -모든 배포자들을 보호하기 위해서 우리는 자유 -라이브러리에 대한 어떠한 보증도 제공하지 않는다는 점을 -명확히 밝혀둡니다. 라이브러리를 사용하는 사람들은 -반복적인 재배포 과정을 통해 라이브러리 자체에 수정과 -변형이 일어날 수도 있으며, 이는 최초의 저작자가 만든 -라이브러리가 갖고 있는 문제가 아닐 수 있다는 개연성을 -인식하고 있어야 합니다. 우리는 개작과 재배포 과정에서 -다른 사람에 의해 발생된 문제로 인해 라이브러리의 -원저작자의 신망이 실추되는 것을 원하지 않습니다. - - -특허 제도는 자유 소프트웨어의 존재를 위협하는 요소일 -수밖에 없습니다. 우리는 특허권자로부터 기업이 제한적인 -사용 허가를 얻은 뒤에 이를 통해 자유 프로그램의 -사용자들을 규제할 수 없게 되기를 희망합니다. 따라서 -우리는 특정한 버전의 라이브러리에 대한 어떠한 특허 -사용 허가의 취득도 LGPL에 규정된 자유를 완전히 -만족시키는 범위 내에서 이루어 져야 할 것을 요구합니다. - - -몇몇 라이브러리를 포함한 대부분의 GNU 소프트웨어에는 -GPL이 적용됩니다. 본 사용 허가서인 LGPL은 -특정한 라이브러리에만 적용되며 GPL과는 상당히 다른 면을 -갖고 있습니다. LGPL은 특정한 라이브러리가 자유 -소프트웨어가 아닌 프로그램과 함께 링크되는 것을 -허용하려는 목적으로 사용됩니다. - - -어떤 프로그램이 라이브러리와 함께 링크된다면, -라이브러리가 정적으로 링크되든지 공유 라이브러리로 -사용되든지 간에 이 두개의 조합은 법적으로 말할 때 -결합 저작물, 즉 최초의 라이브러리로부터 파생된 2차적 -저작물로 간주됩니다. GPL은 이러한 형태의 링크가 -일어날 경우에 결합된 전체 저작물이 GPL을 만족할 때에 -한해서만 링크를 허용합니다. 그러나 LGPL은 보다 유연한 -링크 조건을 허용하고 있습니다. - - -우리가 본 사용 허가서를 ``약소'' 일반 공중 사용 -허가서라고 부르는 이유는 사용자들의 자유를 보호하는 -강도를 GPL보다 경감시켰기 때문입니다. 또한 LGPL은 -자유 소프트웨어가 아닌 프로그램과 경쟁하는데 있어서 -자유 소프트웨어 개발자들에게 GPL보다 이점을 덜 제공합니다. -우리가 많은 종류의 라이브러리에 LGPL이 아닌 일반적인 -GPL을 사용하는 것은 이러한 이유 때문입니다. 그러나 -특수한 상황에서는 오히려 LGPL을 사용하는 것이 유리할 -수 있습니다. - - -극히 드문 예이긴 하지만, 어떤 라이브러리의 사용 폭을 -가능한 넓게 유도해서 그것을 사실상의 표준으로 만들어야 -할 특별한 필요가 있다고 생각해 봅시다. 이것을 가능하게 -만들기 위해서는 자유 소프트웨어가 아닌 프로그램도 -이러한 라이브러리를 사용할 수 있도록 허용해야 합니다. -이보다 흔한 또 한가지 예로 자유 소프트웨어가 아닌 -라이브러리가 폭넓게 사용되고 있을 때 이와 동일한 -기능을 제공하는 자유 라이브러리가 만들어진 경우를 생각해 -볼 수 있습니다. 이러한 상황에서는 자유 라이브러리의 -사용을 자유 소프트웨어에만 한정함으로써 얻을 수 있는 -이익이 거의 없습니다. 이런 경우에 우리는 LGPL을 -사용합니다. - - -또 하나의 예는 자유 소프트웨어가 아닌 프로그램에 특정한 -라이브러리의 사용을 허용함으로써 보다 많은 사람들이 자유 -소프트웨어를 사용할 수 있게 만드는 경우입니다. 예를 -들면, 자유 소프트웨어가 아닌 프로그램들이 GNU C -라이브러리를 사용할 수 있도록 허용해서 사람들이 GNU -운영체제와 GNU/리눅스 운영체제를 사용하도록 유도할 -수 있습니다. - - -LGPL이 사용자의 자유를 보다 약소적으로 보호하고 -있음에도 불구하고, LGPL로 설정된 라이브러리와 링크된 -프로그램을 사용하는 사용자는 라이브러리가 개작되더라도 -개작된 버전을 사용해서 프로그램을 실행할 수 있는 -확실한 자유와 이에 필요한 수단을 갖고 있습니다. - - -복제와 개작 및 배포에 관련된 구체적인 조건과 규정은 -다음과 같습니다. ``라이브러리에 기반한 저작물''과 -``라이브러리를 사용하는 저작물''의 차이에 특별한 -주의를 기울이기 바랍니다. 전자는 라이브러리로부터 -파생된 코드를 담고 있는 저작물을 의미하는데 반해서 -후자는 실행되기 위해서 라이브러리와 결합되어야 하는 -저작물을 말합니다. - - -<h1>복제와 개작 및 배포에 관한 조건과 규정</h1> - - - -제 0 조. -본 사용 허가 계약은 GNU 약소 일반 공중 사용 -허가서(이하, ``LGPL''이라고 칭합니다.)의 규정에 -따라 배포될 수 있다는 사항이 저작권자 또는 그에 -준하는 정당한 권리을 갖고 있는 자에 의해서 명시된 -모든 종류의 소프트웨어 라이브러리와 컴퓨터 프로그램 -저작물(이하, ``프로그램''이라고 칭합니다.)에 대해서 -동일하게 적용됩니다. ``피양도자''란 LGPL의 규정에 -따라 프로그램을 양도받은 사람을 의미합니다. - - - -``라이브러리''란 소프트웨어 함수와 데이터를 -함께 또는 개별적으로 수집해 놓은 -것으로 이들 중 일부를 사용하는 응용 프로그램과 -링크되어 실행물을 생성하는데 편리하도록 미리 준비된 것을 -의미합니다. - - -이하로 언급되는 ``라이브러리''는 본 사용 허가서에 -의해서 배포되고 있는 모든 소프트웨어 라이브러리와 -저작물을 의미합니다. ``라이브러리에 기반한 저작물''은 -라이브러리 또는 저작권법에 따른 라이브러리의 2차적 -저작물을 모두 의미합니다. 다시 말하면, 전술한 -라이브러리 자신 또는 저작권법의 규정에 따라 -라이브러리의 전부 또는 상당 부분을 원용하거나 -다른 언어로의 번역을 포함할 수 있는 개작 과정을 -통해서 창작된 새로운 라이브러리와 이와 관련된 -저작물입니다. (이후로 다른 언어로의 번역은 별다른 -제한없이 개작의 범위에 포함되는 것으로 간주합니다.) - - -저작물에 대한 ``원시 코드''란 해당 저작물을 개작하기에 -적절한 형식을 의미합니다. 라이브러리에 대한 완전한 -원시 코드란 라이브러리에 포함된 모든 모듈들의 원시 -코드와 이와 관련된 인터페이스 정의 파일 모두, -그리고 라이브러리의 컴파일과 설치를 제어하는데 -사용된 스크립트 전부를 의미합니다. - - -본 허가서는 복제와 개작 및 배포 행위에 대해서만 -적용됩니다. 따라서 라이브러리를 사용하는 프로그램을 -실행시키는 행위에 대한 제한은 없습니다. 이러한 -프로그램의 결과물에는, 결과물을 생성하기 위한 도구로 -라이브러리가 사용되었는지 아닌지의 여부에 관계없이 -결과물이 라이브러리에 기반한 2차적 저작물을 구성했을 -때에 한해서 본 허가서의 규정들이 적용됩니다. 2차적 -저작물의 구성 여부는 2차적 저작물 안에서의 라이브러리의 -역할과 라이브러리를 사용한 프로그램의 역할을 토대로 -판단합니다. - - -제 1 조. -적절한 저작권 표시와 라이브러리에 대한 보증이 -제공되지 않는다는 사실을 각각의 복제물에 명시하는 -한, 피양도자는 라이브러리의 원시 코드를 자신이 -양도받은 상태 그대로 어떠한 매체를 통해서도 -복제하고 배포할 수 있습니다. 복제와 배포가 이루어 -질 때는 본 허가서와 라이브러리에 대한 보증이 제공되지 -않는다는 사실에 대해서 언급되었던 모든 내용들을 -그대로 유지시켜야 하며, 영문판 LGPL을 함께 제공해야 -합니다. - - -배포자는 복제물을 물리적으로 인도하는데 소요된 비용을 -청구할 수 있으며, 선택 사항으로 독자적인 유료 보증을 -설정할 수 있습니다. - - -제 2 조. -피양도자는 자신이 양도받은 라이브러리의 전부나 일부를 -개작할 수 있으며, 이를 통해 -라이브러리에 기반한 2차적 저작물을 창작할 수 있습니다. -개작된 라이브러리나 창작된 2차적 저작물은 다음의 사항들을 -모두 만족시키는 조건에 한해서, 제1조의 -규정에 따라 또다시 복제되고 배포될 수 있습니다. - - -<blockquote> -제 1 항. -개작된 저작물은 반드시 소프트웨어 라이브러리여야 합니다. - - -제 2 항. -파일을 개작할 때는 파일을 개작한 사실과 그 날짜를 -파일 안에 명시해야 합니다. - - -제 3 항. -저작물 전체에 대한 사용 권리를 본 허가서의 규정에 -따라 공중에게 무상으로 허용해야 합니다. - - -제 4 항. -개작된 라이브러리에 포함된 기능이 그 기능을 사용하는 -응용 프로그램으로부터 제공되는 함수나 데이터 테이블을 -참조하는 경우에는, 이러한 기능이 호출되었을 때 매개 -인수를 전달하는 경우를 제외하고는 응용 프로그램이 -그러한 함수나 테이블을 제공하지 않는 경우에도 기능이 -독립적으로 수행되고 목적하는 모든 부분이 확실하게 -유효할 수 있도록 최대의 노력을 기울여야만 합니다. - - -(예를 들면, 라이브러리에 포함된 제곱근 연산 함수는 -응용 프로그램으로부터 명확하고 완전하게 독립적인 -형태로 만들어져야 합니다. 따라서 제2조 4항은 제곱근 -연산 함수가 어떠한 응용 프로그램이 제공하는 함수나 -테이블도 필수적으로 사용되는 않는 형태로 만들어져야 -한다는 것을 규정합니다. 즉, 응용 프로그램이 제공하는 -기능 없이도 제곱근 연산 함수가 제곱근을 구할 수 -있어야 합니다.) -</blockquote> - - -위의 조항들은 개작된 라이브러리 전체에 적용됩니다. -만약, 개작된 라이브러리에 포함된 특정 부분이 -라이브러리부터 파생된 것이 아닌 별도의 -독립 저작물로 인정될 만한 상당한 이유가 있을 -경우에는 해당 저작물의 개별적인 배포에는 본 허가서의 -규정들이 적용되지 않습니다. 그러나 이러한 -저작물이 라이브러리에 기반한 2차적 저작물의 일부로서 -함께 배포된다면 개별적인 저작권과 배포 기준에 상관없이 -저작물 모두가 본 허가서에 의해서 관리되어야 하며, -전체 저작물에 대한 사용 권리는 공중에게 무상으로 -양도됩니다. - - -이러한 규정은 개별적인 저작물에 대한 저작자들의 -권리를 침해하거나 인정하지 않으려는 것이 아니라, -라이브러리로부터 파생된 2차적 저작물이나 수집 -저작물의 배포를 일관적으로 규제할 수 있는 권리를 -행사하기 위한 것입니다. - - -라이브러리나 라이브러리로부터 파생된 2차적 -저작물을 이들로부터 파생되지 않은 다른 저작물과 -함께 단순히 저장하거나 배포하기 위한 목적으로 -동일한 매체에 모아 놓은 집합물의 경우에는, -라이브러리로부터 파생되지 않은 다른 저작물에는 -본 허가서의 규정들이 적용되지 않습니다. - - -제 3 조. -피양도자는 자신이 양도받은 라이브러리의 복제물에 -LGPL 대신 GPL의 규정을 적용할 수 있습니다. -이것이 가능하기 위해서는 LGPL에 대해서 언급되었던 -모든 사항을 GPL 2판으로 대체시켜야 -합니다. (GPL 2판보다 신판이 공표되었을 경우에는 -원한다면 신판의 판번호를 사용할 수 있습니다.) -그 이외에 다른 사항들은 변경할 수 없습니다. - - -복제물에 대해서 이러한 수정이 이루어 졌을 경우에는 -GPL로 변경된 사용권 허가를 다시 변경할 수 없으며, -이에 따라서 해당 복제물을 기반으로 만들어진 모든 -저작물과 복제물에는 GPL이 적용되어야만 합니다. -이러한 선택 사항은 라이브러리의 코드 일부분을 -라이브러리가 아닌 일반 프로그램에 포함시키고자 할 -경우에 유용합니다. - - -제 4 조. -피양도자는 제1조와 제2조의 규정에 따라 -라이브러리(또는 제2조에 의한 라이브러리의 일부나 -라이브러리에 기반한 2차적 저작물)를 목적 코드나 -실행물의 형태로 복제하고 배포할 수 있습니다. -이 때 목적 코드나 실행물에 상응하는 컴퓨터가 -인식할 수 있는 완전한 원시 코드를 제1조와 제2조의 -규정에 따라 소프트웨어의 교환을 위해서 일반적으로 -사용되는 매체를 통해 함께 제공해야 합니다. - - -목적 코드를 지정한 장소로부터 복제해 갈 수 있게 -하는 방식으로 배포할 경우, 동일한 장소로부터 원시 -코드를 복제할 수 있는 동등한 접근 방법을 제공한다면 -이는 원시 코드가 목적 코드와 함께 복제되도록 -설정되지 않았다 하더라도 원시 코드를 배포하는 -것으로 간주됩니다. - - -제 5 조. -라이브러리의 어떠한 부분으로부터의 파생물도 -포함하지 않지만, 컴파일 또는 링크를 통해서 -라이브러리와 함께 작동하도록 설계된 프로그램은 -``라이브러리를 사용하는 저작물''이 됩니다. 이러한 -저작물이 별도로 분리되어 있을 때는 라이브러리에 -대한 파생물이 아니므로 본 사용 허가서가 적용되지 -않습니다. - - -그러나 ``라이브러리를 사용하는 저작물''이 -라이브러리와 링크된 결과로 생성된 실행물은, -실행물 안에 라이브러리의 일부를 포함하고 있기 -때문에 라이브러리에 기반한 2차적 저작물을 -구성하게 됩니다. 따라서 이러한 방식으로 생성된 -실행물은 본 사용 허가서의 적용을 받습니다. 제6조는 -이러한 종류의 실행물의 배포를 위한 규정을 담고 -있습니다. - - -``라이브러리를 사용하는 저작물''이 라이브러리의 -일부인 헤더 파일의 자료를 사용한 경우에는 그러한 -저작물의 원시 코드가 라이브러리에 기반한 2차적 -저작물이 아니었다 하더라도 목적 코드는 라이브러리에 -기반한 2차적 저작물이 될 수 있습니다. 이러한 -구분이 성립될 수 있는지의 여부는 그러한 저작물 -자체가 라이브러리이거나 저작물에 사용된 라이브러리 -없이도 링크될 수 있는 경우에 있어서 매우 중요한 -차이를 갖습니다. 그러나 이러한 구분이 성립될 수 -있는 명확한 판단 기준은 법률적으로 정의되어 있지 -않습니다. - - -만약 이와같은 형태의 목적 파일이 단지 숫자 매개 -변수와 자료 구조의 설계 형태 및 이에 대한 접근 도구 -그리고 10행 미만으로 이루어진 작은 인라인 함수와 -매크로만을 사용하는 것이라면 법적 기준에 의한 -2차적 저작물의 성립 여부에 관계없이 그 사용이 -제한되지 않습니다. (그러나 이러한 목적 코드와 -라이브러리의 일부가 함께 포함된 실행물은 여전히 -제6조의 적용을 받습니다.) - - -저작물이 라이브러리에 기반한 2차적 저작물이라면 -해당 저작물에 대한 목적 코드는 제6조에 따라 -배포될 수 있습니다. 또한 그러한 저작물을 -포함한 실행물들은 기반이 된 라이브러리에 직접 -링크되는지 아닌지의 여부에 관계없이 모두 제6조의 -적용을 받습니다. - - -제 6 조. -위의 조항들에 대한 예외의 하나로, 라이브러리와 -``라이브러리를 사용하는 저작물''을 함께 -결합하거나 링크시켜서 라이브러리의 일부분이 -포함된 저작물을 만들었다면, 이를 자신이 선택한 -규정에 따라 배포할 수 있습니다. 이 경우 배포 -규정에는 피양도자들이 자신의 필요에 따라 저작물을 -개작할 수 있으며 개작에 따른 디버깅을 위해 -코드역분석(reverse regineering)을 -허용한다는 사항이 포함되어야 합니다. - - -라이브러리와 라이브러리의 사용에는 본 사용 허가서가 -적용된다는 것과 저작물 안에 이러한 라이브러리가 -사용되고 있다는 사실을 담고 있는 안내 문구를 모든 -복제물에 분명하게 명시해야 합니다. 또한 영문판 -LGLP 사본을 함께 제공해야 합니다. 저작물이 실행될 -때 저작권 사항이 표시되는 형태를 취하고 있다면 -라이브러리에 대한 저작권 사항도 함께 포함시켜야 -하며 LGPL 사본을 참고할 수 있는 방법을 명시해야 -합니다. 또한 다음 중 하나의 사항을 반드시 만족시켜야 -합니다. - - -<blockquote> - -제 1 항. -저작물에 포함된 라이브러리에 어떠한 수정이 -가해졌다 하더라도 해당 라이브러리에 대한 컴퓨터가 -인식할 수 있는 완전한 형태의 원시 코드를 저작물과 -함께 제공해야 합니다. 이 원시 코드는 제1조와 -제2조의 규정에 따라 배포될 수 있어야 합니다. 만약 -저작물이 라이브러리와 링크되는 실행물이었을 경우에는 -피양도자가 실행물과 링크되는 라이브러리를 개작한 -뒤에도 링크를 통해 새로운 실행물을 만들 수 있도록 -하기 위해서 ``라이브러리를 사용한 저작물''로서 -배포된 저작물에 해당하는 컴퓨터가 인식할 수 있는 -완전한 형태의 원시 코드와 목적 코드 중 하나 또는 -둘 모두를 제공해야 합니다. (라이브러리에 포함된 -정의 파일의 내용을 수정한 경우에는 변경된 정의 -부분을 사용하기 위해서 응용 프로그램을 반드시 -다시 컴파일할 필요는 없다는 점은 인정됩니다.) - - -제 2 항. -라이브러리는 적절한 공유 라이브러리 방식을 -사용해서 링크되어야 합니다. 적절한 방식이란, -(1) 라이브러리의 함수를 실행물 속으로 직접 -복제하는 것이 아니라 실행 시점에서 볼 때 이미 -사용자의 컴퓨터 시스템 상에 존재하고 있는 -라이브러리의 복제물이 사용되는 것입니다. -또한 (2) 사용자가 개작된 라이브러리를 설치한 -경우에도 개작된 라이브러리가 저작물을 만들 때 -사용된 라이브러리의 버전과 인터페이스상으로 -호환되는 한, 적절하게 동작할 수 있어야 합니다. - - -제 3 항. -배포에 필요한 최소한의 비용만을 받고 -피양도자에게 제6조 1항에 규정된 자료를 -배포하겠다는, 최소한 3년간 유효한 약정서를 -저작물과 함께 제공해야 합니다. - - -제 4 항. -저작물을 지정한 장소로부터 복제해 갈 수 있게 -하는 방식으로 배포하는 경우, 동일한 장소로부터 제6조 -1항에 규정된 자료를 복제할 수 있는 동등한 접근 방법을 -제공하는 것은 저작물에 대한 배포 조건을 충족하는 -것으로 간주됩니다. - - -제 5 항. -피양도자가 제6조 1항에 규정된 자료의 복제물을 이미 -수령했는지를 확인하거나 자신이 피양도자에게 그러한 -자료를 이미 송부했는지를 확인해야 합니다. -</blockquote> - - -실행물이 ``라이브러리를 사용하는 저작물''의 형태로 -배포된다면 여기에는 실행물을 재생산하기 위해서 -필요한 유틸리티 프로그램과 데이터들이 모두 포함되어야 -합니다. 그러나 특별한 예외의 하나로서, 실행물이 -실행될 운영체제의 주요 부분(컴파일러나 커널 등)과 -함께 (원시 코드나 바이너리의 형태로) 일반적으로 -배포되는 구성 요소들은 이러한 구성 요소 자체가 -실행물에 수반되지 않는한 배포 대상에서 제외되어도 -무방합니다. - - -이러한 규정이 일반적으로 운영체제에 함께 수반되지 -않는 독점 라이브러리들의 사용 허가서와 충돌하게 될 -경우에는 배포하고자 하는 실행물 안에 본 사용 -허가서가 적용되는 라이브러리와 독점 라이브러리를 -함께 사용할 수 없습니다. - - -제 7 조. -라이브러리에 기반한 저작물로서의 라이브러리의 -일부를 본 사용 허가서가 적용되지 않는 다른 -라이브러리의 일부와 하나의 라이브러리 안에 병존시킬 -수 있습니다. 이러한 결합 라이브러리를 배포할 경우에는 -라이브러리에 기반한 저작물과 그렇지 않은 라이브러리가 -별도로 배포될 수 있음을 명시해야 하며 다음의 -두가지 사항을 준수해야 합니다. - - -<blockquote> - -제 1 항. -결합 라이브러리를 구성하고 있는 ``라이브러리에 -기반한 저작물''의 복제물을 결합되지 않은 독립된 -상태로 함께 제공해야 합니다. -이 복제물의 배포에는 위의 조항들이 적용됩니다. - - -제 2 항. -라이브러리에 기반한 저작물의 일부가 결합 라이브러리 -안에 포함하고 있다는 사실을 명시해야 하며, -제7조 1항에 의해서 제공된 결합되지 않은 상태의 -``라이브러리에 기반한 저작물''의 위치 정보를 명기해야 합니다. -</blockquote> - - -제 8 조. -본 허가서에 의해서 명시적으로 이루어 지지 않는 한 -라이브러리에 대한 복제와 개작, 하위 허가권 -설정과 링크 및 배포가 이루어 질 수 없습니다. -이와 관련된 어떠한 행위도 무효이며 본 허가서가 -보장한 권리는 자동으로 소멸됩니다. 그러나 본 -허가서의 규정에 따라 라이브러리의 복제물이나 -권리를 양도받았던 제3자는 본 허가서의 규정들을 -준수하는 한, 배포자의 권리 소멸에 관계없이 -사용상의 권리를 계속해서 유지할 수 있습니다. - - -제 9 조. -본 허가서는 서명이나 날인이 수반되는 형식을 갖고 -있지 않기 때문에 피양도자가 본 허가서의 -내용을 반드시 받아들여야 할 필요는 없습니다. -그러나 라이브러리나 라이브러리에 기반한 2차적 -저작물에 대한 개작 및 배포를 허용하는 것은 본 -허가서에 의해서만 가능합니다. 만약 본 허가서에 -동의하지 않을 경우에는 이러한 행위들이 법률적으로 -금지됩니다. 따라서 라이브러리(또는 라이브러리에 -기반한 2차적 저작물)을 개작하거나 배포하는 -행위는 이에 따른 본 허가서의 내용에 동의한다는 -것을 의미하며, 복제와 개작 및 배포에 관한 본 -허가서의 조건과 규정들을 모두 받아들이겠다는 -의미로 간주됩니다. - - -제 10 조. -피양도자에 의해서 라이브러리(또는 라이브러리에 -기반한 2차적 저작물)이 반복적으로 재배포될 -경우, 각 단계에서의 피양도자는 본 허가서의 -규정에 따른 라이브러리의 복제와 개작, 링크, -배포에 대한 권리를 최초의 양도자로부터 -양도받은 것으로 자동적으로 간주됩니다. 라이브러리(또는 -라이브러리에 기반한 2차적 저작물)을 배포할 때는 -피양도자의 권리의 행사를 제한할 수 있는 어떠한 -사항도 추가할 수 없습니다. 그러나 피양도자에게 -재배포가 일어날 시점에서의 제3의 피양도자에게 -본 허가서를 준수하도록 강제할 책임은 부과되지 -않습니다. - - -제 11 조. -법원의 판결이나 특허권 침해에 대한 주장 또는 특허 -문제에 국한되지 않은 그밖의 이유들로 인해서 본 -허가서의 규정에 배치되는 사항이 발생한다 하더라도 -그러한 사항이 선행하거나 본 허가서의 조건과 규정들이 -면제되는 것은 아닙니다. 따라서 법원의 명령이나 합의 -등에 의해서 본 허가서에 위배되는 사항들이 발생한 -상황이라도 양측 모두를 만족시킬 수 없다면 라이브러리는 -배포될 수 없습니다. 예를 들면, 특정한 특허 관련 -허가가 라이브러리의 복제물을 직접 또는 간접적인 -방법으로 양도받은 임의의 제3자에게 해당 라이브러리를 -무상으로 재배포할 수 있게 허용하지 않는다면, 그러한 -허가와 본 사용 허가를 동시에 만족시키면서 라이브러리를 -배포할 수 있는 방법은 없습니다. - - -본 조항은 특정한 상황에서 본 조항의 일부가 유효하지 -않거나 적용될 수 없을 경우에도 본 조항의 나머지 -부분들을 적용하기 위한 의도로 만들어 졌습니다. 따라서 -그 이외의 상황에서는 본 조항을 전체적으로 적용하면 됩니다. - - -본 조항의 목적은 특허나 저작권 침해 등의 행위를 -조장하거나 해당 권리를 인정하지 않으려는 것이 아니라, -공중 사용 허가서들을 통해서 구현되어 있는 자유 -소프트웨어의 배포 체계를 통합적으로 보호하기 위한 -것입니다. 많은 사람들이 배포 체계에 대한 신뢰있는 -지원을 계속해 줌으로써 소프트웨어의 다양한 분야에 -많은 공헌을 해 주었습니다. 소프트웨어를 어떠한 배포 -체계를 통해 배포할 것인가를 결정하는 것은 전적으로 -저작자와 기증자들의 의지에 달려있는 것이지, 일반 -사용자들이 강요할 수 있는 문제는 아닙니다. - - -본 조항은 본 허가서의 다른 조항들에서 무엇이 중요하게 -고려되어야 하는 지를 명확하게 설명하기 위한 목적으로 -만들어진 것입니다 - - -제 12 조. -특허나 저작권이 설정된 인터페이스로 인해서 특정 -국가에서 라이브러리의 배포와 사용이 함께 또는 -개별적으로 제한되어 있는 경우, 본 사용 허가서를 -라이브러리에 적용한 최초의 저작권자는 문제가 -발생하지 않는 국가에 한해서 라이브러리를 -배포한다는 배포상의 지역적 제한 조건을 명시적으로 -설정할 수 있으며, 이러한 사항은 본 허가서의 일부로 -간주됩니다. - - -제 13 조. -자유 소프트웨어 재단은 때때로 본 사용 허가서의 -개정판이나 신판을 공표할 수 있습니다. 새롭게 -공표될 판은 당면한 문제나 현안을 처리하기 위해서 -세부적인 내용에 차이가 발생할 수 있지만, 그 근본 -정신에는 변함이 없을 것입니다. - - -각각의 판들은 판번호를 사용해서 구별됩니다. 특정한 -판번호와 그 이후 판을 따른다는 사항이 명시된 -라이브러리에는 해당 판이나 그 이후에 -발행된 어떠한 판을 선택해서 적용해도 무방하고, -판번호를 명시하고 있지 않은 경우에는 자유 소프트웨어 -재단이 공표한 어떠한 판번호의 판을 적용해도 무방합니다. - - -제 14 조. -라이브러리의 일부를 본 허가서와 배포 기준이 다른 -자유 프로그램과 함께 결합하고자 할 경우에는 -해당 프로그램의 저작자로부터 서면 승인을 받아야 -합니다. 자유 소프트웨어 재단이 저작권을 갖고 있는 -소프트웨어의 경우에는 자유 소프트웨어 재단의 -승인을 얻어야 합니다. 우리는 이러한 요청을 수락하기 -위해서 때때로 예외 기준을 만들기도 합니다. 자유 -소프트웨어 재단은 일반적으로 자유 소프트웨어의 2차적 -저작물들을 모두 자유로운 상태로 유지시키려는 목적과 -소프트웨어의 공유와 재활용을 증진시키려는 두가지 -목적을 기준으로 승인 여부를 결정할 것입니다. - - -보증의 결여 (제15조, 제16조) - -제 15 조. -본 허가서를 따르는 라이브러리는 무상으로 양도되기 때문에 -관련 법률이 허용하는 한도 내에서 어떠한 형태의 보증도 -제공되지 않습니다. 라이브러리의 저작권자와 배포자가 공동 -또는 개별적으로 별도의 보증을 서면으로 제공할 때를 -제외하면, 특정한 목적에 대한 라이브러리의 적합성이나 -상업성 여부에 대한 보증을 포함한 어떠한 형태의 보증도 -명시적이나 묵시적으로 설정되지 않은 ``있는 그대로의'' -상태로 이 라이브러리를 배포합니다. -라이브러리와 라이브러리의 -실행에 따라 발생할 수 있는 모든 위험은 피양도자에게 -인수되며 이에 따른 보수 및 복구를 위한 제반 경비 또한 -피양도자가 모두 부담해야 합니다. - - -제 16 조. -저작권자나 배포자가 라이브러리의 손상 가능성을 -사전에 알고 있었다 하더라도 발생된 손실이 관련 -법규에 의해 보호되고 있거나 이에 대한 별도의 서면 -보증이 설정된 경우가 아니라면, 저작권자나 라이브러리를 -원래의 상태 또는 개작한 상태로 제공한 배포자는 -라이브러리의 사용이나 비작동으로 인해 발생된 손실이나 -라이브러리 자체의 손실에 대해 책임지지 않습니다. 이러한 -면책 조건은 사용자나 제3자가 라이브러리를 조작함으로써 -발생된 손실이나 다른 소프트웨어와 라이브러리를 함께 -동작시키는 것으로 인해서 발생된 데이터의 상실 및 -부정확한 산출 결과에만 국한되는 것이 아닙니다. -발생된 손실의 일반성이나 특수성 뿐 아니라 원인의 -우발성 및 필연성도 전혀 고려되지 않습니다. - - -<h1>복제와 개작 및 배포에 관한 조건과 규정의 끝.</h1> - -<h1>새로운 라이브러리에 LGPL을 적용하는 방법</h1> -새로운 라이브러리를 개발하고 그 라이브러리가 -보다 많은 사람들에게 최대한 유용하게 사용되기를 -원한다면, 본 허가서나 GNU 일반 공중 사용 -허가서를 선택적으로 적용해서 누구나 자유롭게 개작하고 -재배포할 수 있는 자유 소프트웨어로 만드는 것이 최선의 -방법입니다. - - -라이브러리를 자유 소프트웨어로 만들기 위해서는 다음과 -같은 사항을 라이브러리에 추가하면 됩니다. 라이브러리에 -대한 보증이 제공되지 않는다는 사실을 가장 효과적으로 -전달할 수 있는 방법은 원시 코드 파일의 시작 부분에 -이러한 사항을 추가하는 것입니다. 각각의 파일에는 최소한 -저작권을 명시한 행과 본 사용 허가서의 전체 내용을 참고할 -수 있는 위치 정보를 명시해야 합니다. - - -<div align="center"> - <table width="89%" cellspacing="0" cellpadding="1" border="0"> - <tbody> - <tr> - <td bgcolor="#000000"> - <table width="100%" cellspacing="0" cellpadding="4" border="0"> - <tbody> - <tr> - <td wrap="" bgcolor="#ffffff"> - -<blockquote> -라이브러리의 이름과 용도를 한 줄 정도로 설명합니다. - Copyright (C) 20<var>yy</var>년 <프로그램 저작자의 이름> - - -이 라이브러리는 자유 소프트웨어입니다. 소프트웨어의 -피양도자는 자유 소프트웨어 재단이 공표한 GNU 약소 일반 -공중 사용 허가서 2.1판 또는 그 이후 판을 임의로 선택해서, -그 규정에 따라 라이브러리를 개작하거나 재배포할 수 -있습니다. - - -이 라이브러리는 유용하게 사용될 수 있으리라는 희망에서 -배포되고 있지만, 특정한 목적에 맞는 적합성 여부나 -판매용으로 사용할 수 있으리라는 묵시적인 보증을 -포함한 어떠한 형태의 보증도 제공하지 않습니다. -보다 자세한 사항에 대해서는 GNU 약소 일반 공중 사용 -허가서를 참고하시기 바랍니다. - - -GNU 약소 일반 공중 사용 허가서는 이 라이브러리와 -함께 제공됩니다. 만약, 이 문서가 누락되어 있다면 -자유 소프트웨어 재단으로 문의하시기 바랍니다. -(자유 소프트웨어 재단: Free Software Foundation, -Inc., 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA) -</blockquote> - </td> - </tr> - </tbody> - </table> - </td> - </tr> - </tbody> - </table> -</div> - - -또한, 사용자들이 라이브러리를 배포한 사람에게 전자 -우편과 서면으로 연락할 수 있는 정보를 추가해야 합니다. - - -만약, 라이브러리의 저작자가 학교나 기업과 같은 단체나 -기관에 프로그래머로 고용되어 있다면 라이브러리의 -자유로운 배포를 위해서 고용주나 해당 기관장으로부터 -라이브러리에 대한 저작권 포기 각서를 받아야 합니다. -예를 들면 다음과 같은 형식이 될 수 있다. -(아래의 문구를 실제로 사용할 경우에는 예로 사용된 -이름들을 실제 이름으로 대체하면 됩니다.) - - -<div align="center"> - <table width="89%" cellspacing="0" cellpadding="1" border="0"> - <tbody> - <tr> - <td bgcolor="#000000"> - <table width="100%" cellspacing="0" cellpadding="4" border="0"> - <tbody> - <tr> - <td wrap="" bgcolor="#ffffff"> - -<blockquote> -본사는 제임스 해커가 만든 (설정 옵션을 조정하기 위한) -`Frob' 라이브러리에 관련된 모든 저작권을 포기합니다. - - -1990년 4월 1일 Yoyodye, Inc., -부사장: Ty Coon 서명: <var>Ty Coon의 서명</var> -</blockquote> - </td> - </tr> - </tbody> - </table> - </td> - </tr> - </tbody> - </table> -</div> - -  -- 2.20.1

1 4

[PATCH] ntdll: Add system family and SKU to generated SMBIOS tables.
by Brendan Shanks 20 Feb '20

20 Feb '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/nt.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b89602cee8..f88ded34c1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -111,6 +111,11 @@ struct smbios_bios { BYTE date; BYTE size; UINT64 characteristics; + BYTE characteristics_ext[2]; + BYTE system_bios_major_release; + BYTE system_bios_minor_release; + BYTE ec_firmware_major_release; + BYTE ec_firmware_minor_release; }; struct smbios_system { @@ -120,6 +125,9 @@ struct smbios_system { BYTE version; BYTE serial; BYTE uuid[16]; + BYTE wake_up_type; + BYTE sku_number; + BYTE family; }; struct smbios_board { @@ -137,6 +145,10 @@ struct smbios_chassis { BYTE version; BYTE serial; BYTE asset_tag; + BYTE boot_state; + BYTE power_supply_state; + BYTE thermal_state; + BYTE security_status; }; #include "poppack.h" @@ -2142,6 +2154,8 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG size_t bios_vendor_len, bios_version_len, bios_date_len; char system_vendor[128], system_product[128], system_version[128], system_serial[128]; size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; + char system_sku[128], system_family[128]; + size_t system_sku_len, system_family_len; char board_vendor[128], board_product[128], board_version[128], board_serial[128]; size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; @@ -2163,6 +2177,8 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); + system_sku_len = get_smbios_string("/sys/class/dmi/id/product_sku", S(system_sku)); + system_family_len = get_smbios_string("/sys/class/dmi/id/product_family", S(system_family)); board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); @@ -2181,7 +2197,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG *required_len += sizeof(struct smbios_system); *required_len += max(system_vendor_len + system_product_len + system_version_len + - system_serial_len + 5, 2); + system_serial_len + system_sku_len + system_family_len + 7, 2); *required_len += sizeof(struct smbios_board); *required_len += max(board_vendor_len + board_product_len + board_version_len + board_serial_len + 5, 2); @@ -2200,7 +2216,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG prologue = (struct smbios_prologue*)buffer; prologue->calling_method = 0; prologue->major_version = 2; - prologue->minor_version = 0; + prologue->minor_version = 4; prologue->revision = 0; prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); buffer += sizeof(struct smbios_prologue); @@ -2216,6 +2232,12 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG bios->date = bios_date_len ? ++string_count : 0; bios->size = 0; bios->characteristics = 0x4; /* not supported */ + bios->characteristics_ext[0] = 0; + bios->characteristics_ext[1] = 0; + bios->system_bios_major_release = 0xFF; /* not supported */ + bios->system_bios_minor_release = 0xFF; /* not supported */ + bios->ec_firmware_major_release = 0xFF; /* not supported */ + bios->ec_firmware_minor_release = 0xFF; /* not supported */ buffer += sizeof(struct smbios_bios); copy_smbios_string(&buffer, bios_vendor, bios_vendor_len); @@ -2234,12 +2256,17 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system->version = system_version_len ? ++string_count : 0; system->serial = system_serial_len ? ++string_count : 0; get_system_uuid( (GUID *)system->uuid ); + system->wake_up_type = 0x02; /* unknown */ + system->sku_number = system_sku_len ? ++string_count : 0; + system->family = system_family_len ? ++string_count : 0; buffer += sizeof(struct smbios_system); copy_smbios_string(&buffer, system_vendor, system_vendor_len); copy_smbios_string(&buffer, system_product, system_product_len); copy_smbios_string(&buffer, system_version, system_version_len); copy_smbios_string(&buffer, system_serial, system_serial_len); + copy_smbios_string(&buffer, system_sku, system_sku_len); + copy_smbios_string(&buffer, system_family, system_family_len); if (!string_count) *buffer++ = 0; *buffer++ = 0; @@ -2271,6 +2298,10 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG chassis->version = chassis_version_len ? ++string_count : 0; chassis->serial = chassis_serial_len ? ++string_count : 0; chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0; + chassis->boot_state = 0x02; /* unknown */ + chassis->power_supply_state = 0x02; /* unknown */ + chassis->thermal_state = 0x02; /* unknown */ + chassis->security_status = 0x02; /* unknown */ buffer += sizeof(struct smbios_chassis); copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_len); -- 2.24.1

1 0

The Wine Project has been accepted as a GSoC 2020 mentor organization!
by André Hentschel 20 Feb '20

20 Feb '20

Hi all, I just invited some possible Mentors and think I forgot lots of them compared to recent years, so please check your inbox and if you can't find an invitation, let me know

1 0

[PATCH] winex11.drv: Don't hard-lock when dropping from native into Wine application that shows modal dialog.
by Roman Pišl 20 Feb '20

20 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46522 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46452 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/winex11.drv/window.c | 3 +++ dlls/winex11.drv/x11drv.h | 4 +++- dlls/winex11.drv/xdnd.c | 25 +++++++++++++++++++------ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd..6ff0f6027d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2740,6 +2740,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) return 0; case WM_X11DRV_CLIP_CURSOR: return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); + case WM_X11DRV_DROPEVENT: + X11DRV_XDND_DropEventProcess( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947b..10cb7b74a2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -242,6 +242,7 @@ extern void IME_SetResultString(LPWSTR lpResult, DWORD dwResultlen) DECLSPEC_HID extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; +extern void X11DRV_XDND_DropEventProcess( HWND hWnd ); extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, @@ -537,7 +538,8 @@ enum x11drv_window_messages WM_X11DRV_SET_WIN_REGION, WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_SET_CURSOR, - WM_X11DRV_CLIP_CURSOR + WM_X11DRV_CLIP_CURSOR, + WM_X11DRV_DROPEVENT }; /* _NET_WM_STATE properties that we keep track of */ diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0cd2ad8892..49a2b7650a 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -400,12 +400,14 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) XSendEvent(event->display, event->data.l[0], False, NoEventMask, (XEvent*)&e); } +static XClientMessageEvent dropEvent; + /************************************************************************** - * X11DRV_XDND_DropEvent + * X11DRV_XDND_DropEventProcess * * Handle an XdndDrop event. */ -void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) +void X11DRV_XDND_DropEventProcess( HWND hWnd ) { XClientMessageEvent e; IDropTarget *dropTarget; @@ -481,17 +483,28 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) /* Tell the target we are finished. */ memset(&e, 0, sizeof(e)); e.type = ClientMessage; - e.display = event->display; - e.window = event->data.l[0]; + e.display = dropEvent.display; + e.window = dropEvent.data.l[0]; e.message_type = x11drv_atom(XdndFinished); e.format = 32; - e.data.l[0] = event->window; + e.data.l[0] = dropEvent.window; e.data.l[1] = accept; if (accept) e.data.l[2] = X11DRV_XDND_DROPEFFECTToXdndAction(effect); else e.data.l[2] = None; - XSendEvent(event->display, event->data.l[0], False, NoEventMask, (XEvent*)&e); + XSendEvent(dropEvent.display, dropEvent.data.l[0], False, NoEventMask, (XEvent*)&e); +} + +/************************************************************************** + * X11DRV_XDND_DropEvent + * + * Notify a XdndDrop event. + */ +void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) +{ + memcpy(&dropEvent, event, sizeof(*event)); + PostMessageW(hWnd, WM_X11DRV_DROPEVENT, 0, 0); } /************************************************************************** -- 2.20.1

1 0

[PATCH] kernel32/tests: Link to activation context API directly.
by Nikolay Sivov 20 Feb '20

20 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/actctx.c | 333 ++++++++++++++--------------------- 1 file changed, 130 insertions(+), 203 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 1f458aa637..4b7096276e 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -29,19 +29,8 @@ #include "oaidl.h" #include "initguid.h" -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxA)(PCACTCTXA); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); -static BOOL (WINAPI *pFindActCtxSectionStringA)(DWORD,const GUID *,ULONG,LPCSTR,PACTCTX_SECTION_KEYED_DATA); -static BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWSTR,PACTCTX_SECTION_KEYED_DATA); -static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static BOOL (WINAPI *pIsDebuggerPresent)(void); -static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); static BOOL (WINAPI *pQueryActCtxSettingsW)(DWORD,HANDLE,LPCWSTR,LPCWSTR,LPWSTR,SIZE_T,SIZE_T*); -static VOID (WINAPI *pReleaseActCtx)(HANDLE); -static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); -static BOOL (WINAPI *pZombifyActCtx)(HANDLE); static NTSTATUS(NTAPI *pRtlFindActivationContextSectionString)(DWORD,const GUID *,ULONG,PUNICODE_STRING,PACTCTX_SECTION_KEYED_DATA); static BOOLEAN (NTAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, PCSZ); @@ -661,9 +650,8 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo, int if(exsize != sizeof(ACTIVATION_CONTEXT_DETAILED_INFORMATION)) { size = 0xdeadbeef; - b = pQueryActCtxW(0, handle, NULL, - ActivationContextDetailedInformation, &detailed_info_tmp, - sizeof(detailed_info_tmp), &size); + b = QueryActCtxW(0, handle, NULL, ActivationContextDetailedInformation, &detailed_info_tmp, + sizeof(detailed_info_tmp), &size); ok_(__FILE__, line)(!b, "QueryActCtx succeeded\n"); ok_(__FILE__, line)(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %u\n", GetLastError()); ok_(__FILE__, line)(size == exsize, "size=%ld, expected %ld\n", size, exsize); @@ -673,9 +661,7 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo, int detailed_info = HeapAlloc(GetProcessHeap(), 0, size); memset(detailed_info, 0xfe, size); - b = pQueryActCtxW(0, handle, NULL, - ActivationContextDetailedInformation, detailed_info, - size, &retsize); + b = QueryActCtxW(0, handle, NULL, ActivationContextDetailedInformation, detailed_info, size, &retsize); ok_(__FILE__, line)(b, "QueryActCtx failed: %u\n", GetLastError()); ok_(__FILE__, line)(retsize == exsize, "size=%ld, expected %ld\n", retsize, exsize); @@ -802,9 +788,7 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl if (exinfo->encoded_assembly_id) exsize += (lstrlenW(exinfo->encoded_assembly_id) + 1) * sizeof(WCHAR); size = 0xdeadbeef; - b = pQueryActCtxW(0, handle, &id, - AssemblyDetailedInformationInActivationContext, &info_tmp, - sizeof(info_tmp), &size); + b = QueryActCtxW(0, handle, &id, AssemblyDetailedInformationInActivationContext, &info_tmp, sizeof(info_tmp), &size); ok_(__FILE__, line)(!b, "QueryActCtx succeeded\n"); ok_(__FILE__, line)(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %u\n", GetLastError()); @@ -820,8 +804,7 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl memset(info, 0xfe, size); size = 0xdeadbeef; - b = pQueryActCtxW(0, handle, &id, - AssemblyDetailedInformationInActivationContext, info, size, &size); + b = QueryActCtxW(0, handle, &id, AssemblyDetailedInformationInActivationContext, info, size, &size); ok_(__FILE__, line)(b, "QueryActCtx failed: %u\n", GetLastError()); if (!exinfo->manifest_path) exsize += info->ulManifestPathLength + sizeof(WCHAR); @@ -914,8 +897,7 @@ static void test_file_info(HANDLE handle, ULONG assid, ULONG fileid, LPCWSTR fil +(lstrlenW(filename)+1)*sizeof(WCHAR); size = 0xdeadbeef; - b = pQueryActCtxW(0, handle, &index, - FileInformationInAssemblyOfAssemblyInActivationContext, &info_tmp, + b = QueryActCtxW(0, handle, &index, FileInformationInAssemblyOfAssemblyInActivationContext, &info_tmp, sizeof(info_tmp), &size); ok_(__FILE__, line)(!b, "QueryActCtx succeeded\n"); ok_(__FILE__, line)(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %u\n", GetLastError()); @@ -930,8 +912,7 @@ static void test_file_info(HANDLE handle, ULONG assid, ULONG fileid, LPCWSTR fil info = HeapAlloc(GetProcessHeap(), 0, size); memset(info, 0xfe, size); - b = pQueryActCtxW(0, handle, &index, - FileInformationInAssemblyOfAssemblyInActivationContext, info, size, &size); + b = QueryActCtxW(0, handle, &index, FileInformationInAssemblyOfAssemblyInActivationContext, info, size, &size); ok_(__FILE__, line)(b, "QueryActCtx failed: %u\n", GetLastError()); ok_(__FILE__, line)(!size, "size=%lu, expected 0\n", size); @@ -979,8 +960,7 @@ static void test_runlevel_info(HANDLE handle, const runlevel_info_t *exinfo, int BOOL b; size = sizeof(runlevel_info); - b = pQueryActCtxW(0, handle, NULL, - RunlevelInformationInActivationContext, &runlevel_info, + b = QueryActCtxW(0, handle, NULL, RunlevelInformationInActivationContext, &runlevel_info, sizeof(runlevel_info), &retsize); if (!b && GetLastError() == ERROR_INVALID_PARAMETER) { @@ -1009,7 +989,7 @@ static HANDLE test_create(const char *file) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); /* to be tested outside of this helper, including last error */ if (handle == INVALID_HANDLE_VALUE) return handle; @@ -1041,7 +1021,7 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest, actctx.lpSource = path; create_manifest_file("bad.manifest", manifest, -1, "testdep.manifest", depmanifest); - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); todo_wine_if(todo) { if (is_broken) @@ -1053,7 +1033,7 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest, if (handle == INVALID_HANDLE_VALUE) ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "Unexpected error %d.\n", GetLastError()); } - if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx( handle ); + if (handle != INVALID_HANDLE_VALUE) ReleaseActCtx( handle ); DeleteFileA("bad.manifest"); DeleteFileA("testdep.manifest"); } @@ -1070,11 +1050,11 @@ static void test_create_wide_and_fail(const char *manifest, BOOL fBOM) actctx.lpSource = path; create_wide_manifest("bad.manifest", manifest, fBOM, FALSE); - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError()); - if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx( handle ); + if (handle != INVALID_HANDLE_VALUE) ReleaseActCtx( handle ); DeleteFileA("bad.manifest"); } @@ -1089,7 +1069,7 @@ static void test_create_fail(void) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError == %u\n", GetLastError()); @@ -1209,9 +1189,7 @@ static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - libname, &data); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, libname, &data); ok_(__FILE__, line)(ret, "FindActCtxSectionStringW failed: %u\n", GetLastError()); if (!ret) return; @@ -1243,9 +1221,8 @@ static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); - ret = pFindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, - ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - libname, &data); + ret = FindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, libname, &data); ok_(__FILE__, line)(ret, "FindActCtxSectionStringW failed: %u\n", GetLastError()); if (!ret) return; @@ -1263,7 +1240,7 @@ static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", data.ulAssemblyRosterIndex, exid); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, int line) @@ -1276,9 +1253,7 @@ static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, i memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, - clsname, &data); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, clsname, &data); ok_(__FILE__, line)(ret, "FindActCtxSectionStringW failed: %u, class %s\n", GetLastError(), wine_dbgstr_w(clsname)); if (!ret) return; @@ -1340,9 +1315,8 @@ static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, i memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); - ret = pFindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, - ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, - clsname, &data); + ret = FindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, clsname, &data); ok_(__FILE__, line)(ret, "FindActCtxSectionStringW failed: %u, class %s\n", GetLastError(), wine_dbgstr_w(clsname)); if (!ret) return; @@ -1360,7 +1334,7 @@ static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, i ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", data.ulAssemblyRosterIndex, exid); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } static void test_find_string_fail(void) @@ -1368,34 +1342,29 @@ static void test_find_string_fail(void) ACTCTX_SECTION_KEYED_DATA data = {sizeof(data)}; BOOL ret; - ret = pFindActCtxSectionStringW(0, NULL, 100, testlib_dll, &data); + ret = FindActCtxSectionStringW(0, NULL, 100, testlib_dll, &data); ok(!ret, "FindActCtxSectionStringW succeeded\n"); ok(GetLastError() == ERROR_SXS_SECTION_NOT_FOUND, "GetLastError()=%u\n", GetLastError()); - ret = pFindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - testlib2_dll, &data); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, testlib2_dll, &data); ok(!ret, "FindActCtxSectionStringW succeeded\n"); ok(GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "GetLastError()=%u\n", GetLastError()); - ret = pFindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - testlib_dll, NULL); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, testlib_dll, NULL); ok(!ret, "FindActCtxSectionStringW succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError()=%u\n", GetLastError()); - ret = pFindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - NULL, &data); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, NULL, &data); ok(!ret, "FindActCtxSectionStringW succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError()=%u\n", GetLastError()); data.cbSize = 0; - ret = pFindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - testlib_dll, &data); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, testlib_dll, &data); ok(!ret, "FindActCtxSectionStringW succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError()=%u\n", GetLastError()); data.cbSize = 35; - ret = pFindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - testlib_dll, &data); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, testlib_dll, &data); ok(!ret, "FindActCtxSectionStringW succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError()=%u\n", GetLastError()); } @@ -1407,8 +1376,7 @@ static void test_basic_info(HANDLE handle, int line) SIZE_T size; BOOL b; - b = pQueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, - ActivationContextBasicInformation, &basic, + b = QueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, ActivationContextBasicInformation, &basic, sizeof(basic), &size); ok_(__FILE__, line) (b,"ActivationContextBasicInformation failed\n"); @@ -1416,8 +1384,7 @@ static void test_basic_info(HANDLE handle, int line) ok_(__FILE__, line) (basic.dwFlags == 0, "unexpected flags %x\n",basic.dwFlags); ok_(__FILE__, line) (basic.hActCtx == handle, "unexpected handle\n"); - b = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX | - QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, + b = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX | QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, ActivationContextBasicInformation, &basic, sizeof(basic), &size); if (handle) @@ -1498,9 +1465,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); - ret = pFindActCtxSectionGuid(0, NULL, - ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, - clsid, &data); + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &data); if (!ret) { skip("failed for guid %s\n", wine_dbgstr_guid(clsid)); @@ -1618,9 +1583,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU /* generated guid for this class works as key guid in search */ memset(&data2, 0xfe, sizeof(data2)); data2.cbSize = sizeof(data2); - ret = pFindActCtxSectionGuid(0, NULL, - ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, - &comclass->alias, &data2); + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, &comclass->alias, &data2); ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); comclass2 = (struct comclassredirect_data*)data2.lpData; @@ -1656,9 +1619,7 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); - ret = pFindActCtxSectionGuid(0, NULL, - ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, - iid, &data); + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, iid, &data); ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); ifaceps = (struct ifacepsredirect_data*)data.lpData; @@ -1727,9 +1688,7 @@ static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *n memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); - ret = pFindActCtxSectionGuid(0, NULL, - ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, - clsid, &data); + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &data); if (!ret) { skip("surrogate sections are not supported\n"); @@ -1789,9 +1748,7 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); - ret = pFindActCtxSectionStringA(0, NULL, - ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, - progid, &data); + ret = FindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, progid, &data); ok_(__FILE__, line)(ret, "FindActCtxSectionStringA failed: %u\n", GetLastError()); progiddata = (struct progidredirect_data*)data.lpData; @@ -1812,9 +1769,7 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const memset(&data2, 0, sizeof(data2)); data2.cbSize = sizeof(data2); - ret = pFindActCtxSectionGuid(0, NULL, - ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, - guid, &data2); + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, guid, &data2); ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); comclass = (struct comclassredirect_data*)data2.lpData; @@ -1855,7 +1810,7 @@ static void test_wndclass_section(void) DeleteFileA("testdep2.manifest"); DeleteFileA("main_wndcls.manifest"); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); memset(&data, 0, sizeof(data)); @@ -1864,13 +1819,9 @@ static void test_wndclass_section(void) data2.cbSize = sizeof(data2); /* get data for two classes from different assemblies */ - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, - wndClass1W, &data); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, wndClass1W, &data); ok(ret, "got %d\n", ret); - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, - wndClass3W, &data2); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, wndClass3W, &data2); ok(ret, "got %d\n", ret); section = (struct strsection_header*)data.lpSectionBase; @@ -1891,10 +1842,10 @@ static void test_wndclass_section(void) ptrW = (WCHAR*)((BYTE*)data2.lpData + classdata->name_offset); ok(!lstrcmpW(ptrW, wndClass3W), "got %s\n", wine_dbgstr_w(ptrW)); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } static void test_dllredirect_section(void) @@ -1919,7 +1870,7 @@ static void test_dllredirect_section(void) DeleteFileA("testdep2.manifest"); DeleteFileA("main_wndcls.manifest"); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); memset(&data, 0, sizeof(data)); @@ -1928,13 +1879,9 @@ static void test_dllredirect_section(void) data2.cbSize = sizeof(data2); /* get data for two files from different assemblies */ - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - testlib1W, &data); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, testlib1W, &data); ok(ret, "got %d\n", ret); - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - testlib2W, &data2); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, testlib2W, &data2); ok(ret, "got %d\n", ret); section = (struct strsection_header*)data.lpSectionBase; @@ -1946,10 +1893,10 @@ static void test_dllredirect_section(void) ok(data.ulSectionTotalLength == data2.ulSectionTotalLength, "got %u, %u\n", data.ulSectionTotalLength, data2.ulSectionTotalLength); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } static void test_typelib_section(void) @@ -1974,7 +1921,7 @@ static void test_typelib_section(void) DeleteFileA("testdep2.manifest"); DeleteFileA("main_wndcls.manifest"); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); memset(&data, 0, sizeof(data)); @@ -1983,14 +1930,11 @@ static void test_typelib_section(void) data2.cbSize = sizeof(data2); /* get data for two typelibs from different assemblies */ - ret = pFindActCtxSectionGuid(0, NULL, - ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, - &IID_TlibTest, &data); + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, &IID_TlibTest, &data); ok(ret, "got %d\n", ret); - ret = pFindActCtxSectionGuid(0, NULL, - ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, - &IID_TlibTest4, &data2); + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, + &IID_TlibTest4, &data2); ok(ret, "got %d\n", ret); section = (struct guidsection_header*)data.lpSectionBase; @@ -2015,10 +1959,10 @@ static void test_typelib_section(void) ok(tlib->help_len == sizeof(helpW), "got %d\n", tlib->help_len); ok(tlib->flags == (LIBFLAG_FHIDDEN|LIBFLAG_FCONTROL|LIBFLAG_FRESTRICTED), "got %x\n", tlib->flags); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } static void test_allowDelayedBinding(void) @@ -2040,7 +1984,7 @@ static void test_allowDelayedBinding(void) DeleteFileA("testdep.manifest"); if (handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } } @@ -2052,14 +1996,14 @@ static void test_actctx(void) trace("default actctx\n"); - b = pGetCurrentActCtx(&handle); + b = GetCurrentActCtx(&handle); ok(handle == NULL, "handle = %p, expected NULL\n", handle); ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); if(b) { test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info0, __LINE__); test_runlevel_info(handle, &runlevel_info0, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } /* test for whitespace handling in Eq ::= S? '=' S? */ @@ -2067,7 +2011,7 @@ static void test_actctx(void) handle = test_create("test1_1.manifest"); ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test1_1.manifest"); - pReleaseActCtx(handle); + ReleaseActCtx(handle); if(!create_manifest_file("test1.manifest", manifest1, -1, NULL, NULL)) { skip("Could not create manifest file\n"); @@ -2092,7 +2036,7 @@ static void test_actctx(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() == %u\n", GetLastError()); } - pReleaseActCtx(handle); + ReleaseActCtx(handle); } if(!create_manifest_file("test2.manifest", manifest2, -1, "testdep.manifest", testdep_manifest1)) { @@ -2111,7 +2055,7 @@ static void test_actctx(void) test_detailed_info(handle, &detailed_info2, __LINE__); test_info_in_assembly(handle, 1, &manifest2_info, __LINE__); test_info_in_assembly(handle, 2, &depmanifest1_info, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } if(!create_manifest_file("test2-2.manifest", manifest2, -1, "testdep.manifest", testdep_manifest2)) { @@ -2133,14 +2077,14 @@ static void test_actctx(void) test_file_info(handle, 1, 0, testlib_dll, __LINE__); test_file_info(handle, 1, 1, testlib2_dll, __LINE__); - b = pActivateActCtx(handle, &cookie); + b = ActivateActCtx(handle, &cookie); ok(b, "ActivateActCtx failed: %u\n", GetLastError()); test_find_dll_redirection(handle, testlib_dll, 2, __LINE__); test_find_dll_redirection(handle, testlib2_dll, 2, __LINE__); - b = pDeactivateActCtx(0, cookie); + b = DeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } trace("manifest2 depmanifest3\n"); @@ -2162,16 +2106,16 @@ static void test_actctx(void) test_file_info(handle, 1, 0, testlib_dll, __LINE__); test_file_info(handle, 1, 1, testlib2_dll, __LINE__); - b = pActivateActCtx(handle, &cookie); + b = ActivateActCtx(handle, &cookie); ok(b, "ActivateActCtx failed: %u\n", GetLastError()); test_find_dll_redirection(handle, testlib_dll, 2, __LINE__); test_find_dll_redirection(handle, testlib2_dll, 2, __LINE__); test_find_window_class(handle, wndClassW, 2, __LINE__); test_find_window_class(handle, wndClass2W, 2, __LINE__); - b = pDeactivateActCtx(0, cookie); + b = DeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } trace("manifest3\n"); @@ -2198,7 +2142,7 @@ static void test_actctx(void) test_info_in_assembly(handle, 1, &manifest3_info, __LINE__); test_file_info(handle, 0, 0, testlib_dll, __LINE__); - b = pActivateActCtx(handle, &cookie); + b = ActivateActCtx(handle, &cookie); ok(b, "ActivateActCtx failed: %u\n", GetLastError()); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); @@ -2225,9 +2169,9 @@ static void test_actctx(void) test_find_ifaceps_redirection(handle, &IID_Iifaceps3, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); test_find_string_fail(); - b = pDeactivateActCtx(0, cookie); + b = DeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } trace("manifest6\n"); @@ -2241,7 +2185,7 @@ static void test_actctx(void) if(handle != INVALID_HANDLE_VALUE) { test_runlevel_info(handle, &runlevel_info6, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } } else @@ -2257,7 +2201,7 @@ static void test_actctx(void) if(handle != INVALID_HANDLE_VALUE) { test_runlevel_info(handle, &runlevel_info7, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } } else @@ -2273,7 +2217,7 @@ static void test_actctx(void) if(handle != INVALID_HANDLE_VALUE) { test_runlevel_info(handle, &runlevel_info8, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } } else @@ -2289,7 +2233,7 @@ static void test_actctx(void) if(handle != INVALID_HANDLE_VALUE) { test_runlevel_info(handle, &runlevel_info9, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } } else @@ -2303,7 +2247,7 @@ static void test_actctx(void) if(handle != INVALID_HANDLE_VALUE) { test_runlevel_info(handle, &runlevel_info8, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } } else @@ -2325,7 +2269,7 @@ static void test_actctx(void) test_detailed_info(handle, &detailed_info2, __LINE__); test_info_in_assembly(handle, 1, &manifest4_info, __LINE__); test_info_in_assembly(handle, 2, &manifest_comctrl_info, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } trace("manifest1 in subdir\n"); @@ -2344,7 +2288,7 @@ static void test_actctx(void) test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info1, __LINE__); test_info_in_assembly(handle, 1, &manifest1_info, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } SetCurrentDirectoryW(work_dir); } @@ -2365,7 +2309,7 @@ static void test_actctx(void) test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info1, __LINE__); test_info_in_assembly(handle, 1, &manifest1_info, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } trace("UTF-16 manifest1, reverse endian, with BOM\n"); @@ -2381,7 +2325,7 @@ static void test_actctx(void) test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info1, __LINE__); test_info_in_assembly(handle, 1, &manifest1_info, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } test_wndclass_section(); @@ -2397,14 +2341,14 @@ static void test_app_manifest(void) trace("child process manifest1\n"); - b = pGetCurrentActCtx(&handle); + b = GetCurrentActCtx(&handle); ok(handle == NULL, "handle != NULL\n"); ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); if(b) { test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info1_child, __LINE__); test_info_in_assembly(handle, 1, &manifest1_child_info, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } } @@ -2434,7 +2378,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should data.cbSize = sizeof(data); SetLastError(0); - ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, &data); + ret = FindActCtxSectionStringA(0, NULL, section, string_to_find, &data); err = GetLastError(); ok_(__FILE__, line)(ret == should_find, "FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret); @@ -2446,7 +2390,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should data.cbSize = sizeof(data); SetLastError(0); - ret = pFindActCtxSectionStringW(0, NULL, section, string_to_findW.Buffer, &data); + ret = FindActCtxSectionStringW(0, NULL, section, string_to_findW.Buffer, &data); err = GetLastError(); ok_(__FILE__, line)(ret == should_find, "FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret); @@ -2455,7 +2399,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should "FindActCtxSectionStringW: unexpected error %u\n", err); SetLastError(0); - ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, NULL); + ret = FindActCtxSectionStringA(0, NULL, section, string_to_find, NULL); err = GetLastError(); ok_(__FILE__, line)(!ret, "FindActCtxSectionStringA: expected failure, got %u\n", ret); @@ -2463,7 +2407,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should "FindActCtxSectionStringA: unexpected error %u\n", err); SetLastError(0); - ret = pFindActCtxSectionStringW(0, NULL, section, string_to_findW.Buffer, NULL); + ret = FindActCtxSectionStringW(0, NULL, section, string_to_findW.Buffer, NULL); err = GetLastError(); ok_(__FILE__, line)(!ret, "FindActCtxSectionStringW: expected failure, got %u\n", ret); @@ -2504,7 +2448,7 @@ static void test_findsectionstring(void) ULONG_PTR cookie; handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); /* first we show the parameter validation from kernel32 */ @@ -2525,9 +2469,9 @@ static void test_findsectionstring(void) ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, FALSE, __LINE__); ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, FALSE, __LINE__); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } static void run_child_process(void) @@ -2652,9 +2596,9 @@ static void test_CreateActCtx(void) actctx.lpSource = path; /* create using lpSource without specified directory */ - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle != INVALID_HANDLE_VALUE, "failed to generate context, error %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); /* with specified directory, that doesn't contain dependent assembly */ GetWindowsDirectoryA(dir, ARRAY_SIZE(dir)); @@ -2666,27 +2610,27 @@ static void test_CreateActCtx(void) actctx.lpSource = path; SetLastError(0xdeadbeef); - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); todo_wine { ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "got error %d\n", GetLastError()); } - if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); + if (handle != INVALID_HANDLE_VALUE) ReleaseActCtx(handle); /* with specified directory, that does contain dependent assembly */ GetTempPathA(ARRAY_SIZE(dir), dir); actctx.lpAssemblyDirectory = dir; - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); - pReleaseActCtx(handle); + ReleaseActCtx(handle); /* Should still work if we add a dll with the same name, but without manifest */ strcpy(dll, dir); strcat(dll, "testdep1.dll"); extract_resource("dummy.dll", "TESTDLL", dll); - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) , "got error %d\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); DeleteFileA(dll); delete_manifest_file("main_wndcls.manifest"); @@ -2698,7 +2642,7 @@ todo_wine { actctx.cbSize = sizeof(ACTCTXA); actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID; SetLastError(0xdeadbeef); - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); todo_wine ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY) /* XP, win2k3 */, @@ -2713,7 +2657,7 @@ todo_wine actctx.hModule = GetModuleHandleA(NULL); SetLastError(0xdeadbeef); - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); @@ -2732,7 +2676,7 @@ todo_wine actctx.lpAssemblyDirectory = dir; SetLastError(0xdeadbeef); - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(GetLastError()==ERROR_PATH_NOT_FOUND || broken(GetLastError()==ERROR_FILE_NOT_FOUND) /* WinXP */, @@ -2746,7 +2690,7 @@ todo_wine actctx.lpAssemblyDirectory = dir; SetLastError(0xdeadbeef); - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %d\n", GetLastError()); SetCurrentDirectoryW(work_dir); @@ -2758,9 +2702,9 @@ todo_wine actctx.lpSource = "testdir.manifest"; actctx.lpAssemblyDirectory = dir; - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); - pReleaseActCtx(handle); + ReleaseActCtx(handle); memset(&actctx, 0, sizeof(actctx)); actctx.cbSize = sizeof(actctx); @@ -2768,9 +2712,9 @@ todo_wine actctx.lpSource = path; actctx.lpAssemblyDirectory = dir; - handle = pCreateActCtxA(&actctx); + handle = CreateActCtxA(&actctx); ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); - pReleaseActCtx(handle); + ReleaseActCtx(handle); delete_manifest_file("testdir.manifest"); delete_manifest_file("assembly_dir\\testdir.manifest"); @@ -2782,18 +2726,7 @@ static BOOL init_funcs(void) HMODULE hLibrary = GetModuleHandleA("kernel32.dll"); #define X(f) if (!(p##f = (void*)GetProcAddress(hLibrary, #f))) return FALSE; - X(ActivateActCtx); - X(CreateActCtxA); - X(CreateActCtxW); - X(DeactivateActCtx); - X(FindActCtxSectionStringA); - X(FindActCtxSectionStringW); - X(GetCurrentActCtx); X(IsDebuggerPresent); - X(QueryActCtxW); - X(ReleaseActCtx); - X(FindActCtxSectionGuid); - X(ZombifyActCtx); pQueryActCtxSettingsW = (void *)GetProcAddress( hLibrary, "QueryActCtxSettingsW" ); hLibrary = GetModuleHandleA("ntdll.dll"); @@ -2813,67 +2746,65 @@ static void test_ZombifyActCtx(void) BOOL ret; SetLastError(0xdeadbeef); - ret = pZombifyActCtx(NULL); + ret = ZombifyActCtx(NULL); todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); - ret = pGetCurrentActCtx(&current); + ret = GetCurrentActCtx(&current); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(current == NULL, "got %p\n", current); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); - ret = pGetCurrentActCtx(&current); + ret = GetCurrentActCtx(&current); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(handle == current, "got %p, %p\n", current, handle); memset(&basicinfo, 0xff, sizeof(basicinfo)); - ret = pQueryActCtxW(0, handle, 0, ActivationContextBasicInformation, - &basicinfo, sizeof(basicinfo), NULL); + ret = QueryActCtxW(0, handle, 0, ActivationContextBasicInformation, &basicinfo, sizeof(basicinfo), NULL); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); memset(&basicinfo, 0xff, sizeof(basicinfo)); - ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, + ret = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, &basicinfo, sizeof(basicinfo), NULL); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); - ret = pZombifyActCtx(handle); + ret = ZombifyActCtx(handle); todo_wine ok(ret, "got %d\n", ret); memset(&basicinfo, 0xff, sizeof(basicinfo)); - ret = pQueryActCtxW(0, handle, 0, ActivationContextBasicInformation, - &basicinfo, sizeof(basicinfo), NULL); + ret = QueryActCtxW(0, handle, 0, ActivationContextBasicInformation, &basicinfo, sizeof(basicinfo), NULL); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); memset(&basicinfo, 0xff, sizeof(basicinfo)); - ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, - &basicinfo, sizeof(basicinfo), NULL); + ret = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); - ret = pGetCurrentActCtx(&current); + ret = GetCurrentActCtx(&current); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(current == handle, "got %p\n", current); /* one more time */ - ret = pZombifyActCtx(handle); + ret = ZombifyActCtx(handle); todo_wine ok(ret, "got %d\n", ret); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } /* Test structure to verify alignment */ @@ -2889,9 +2820,8 @@ static void test_no_compat(HANDLE handle, int line) BOOL b; memset(&compat_info, 0, sizeof(compat_info)); - b = pQueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, - CompatibilityInformationInActivationContext, &compat_info, - sizeof(compat_info), &size); + b = QueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, CompatibilityInformationInActivationContext, + &compat_info, sizeof(compat_info), &size); ok_(__FILE__, line)(b, "CompatibilityInformationInActivationContext failed\n"); ok_(__FILE__, line)(size == sizeof(DWORD), "size mismatch (got %lu, expected 4)\n", size); @@ -2907,9 +2837,8 @@ static void test_with_compat(HANDLE handle, DWORD num_compat, const GUID* expect BOOL b; memset(&compat_info, 0, sizeof(compat_info)); - b = pQueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, - CompatibilityInformationInActivationContext, &compat_info, - sizeof(compat_info), &size); + b = QueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, CompatibilityInformationInActivationContext, + &compat_info, sizeof(compat_info), &size); ok_(__FILE__, line)(b, "CompatibilityInformationInActivationContext failed\n"); ok_(__FILE__, line)(size == expected, "size mismatch (got %lu, expected %lu)\n", size, expected); @@ -2948,20 +2877,19 @@ static void test_compatibility(void) BOOL b; memset(buffer, 0, sizeof(buffer)); - b = pQueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, - CompatibilityInformationInActivationContext, buffer, - sizeof(buffer), &size); + b = QueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, CompatibilityInformationInActivationContext, + buffer, sizeof(buffer), &size); if (!b && GetLastError() == ERROR_INVALID_PARAMETER) { win_skip("CompatibilityInformationInActivationContext not supported.\n"); - pReleaseActCtx(handle); + ReleaseActCtx(handle); return; } test_basic_info(handle, __LINE__); test_no_compat(handle, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } /* Still no compat results returned */ @@ -2978,7 +2906,7 @@ static void test_compatibility(void) { test_basic_info(handle, __LINE__); test_no_compat(handle, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } /* Just one result returned */ @@ -2999,7 +2927,7 @@ static void test_compatibility(void) }; test_basic_info(handle, __LINE__); test_with_compat(handle, 1, expect_manifest, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } /* Show that the order is retained */ @@ -3024,7 +2952,7 @@ static void test_compatibility(void) }; test_basic_info(handle, __LINE__); test_with_compat(handle, 5, expect_manifest, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } /* Show that even unknown GUID's are stored */ @@ -3045,7 +2973,7 @@ static void test_compatibility(void) }; test_basic_info(handle, __LINE__); test_with_compat(handle, 1, expect_manifest, __LINE__); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } } @@ -3157,7 +3085,7 @@ static void test_settings(void) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); ok( size == ARRAY_SIZE(trueW), "wrong len %lu\n", size ); - pReleaseActCtx(handle); + ReleaseActCtx(handle); create_manifest_file( "manifest_settings2.manifest", settings_manifest2, -1, NULL, NULL ); handle = test_create("manifest_settings2.manifest"); @@ -3173,7 +3101,7 @@ static void test_settings(void) ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); ok( size == lstrlenW( buffer ) + 1, "wrong len %lu\n", size ); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } create_manifest_file( "manifest_settings3.manifest", settings_manifest3, -1, NULL, NULL ); @@ -3186,10 +3114,9 @@ static void test_settings(void) ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, 80, &size ); ok( !ret, "QueryActCtxSettingsW succeeded\n" ); ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %u\n", GetLastError() ); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } - typedef struct { char path_tmp[MAX_PATH]; -- 2.25.0

2 2

[PATCH v2] wineboot: Populate BIOS registry keys.
by Brendan Shanks 20 Feb '20

20 Feb '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Now parses SMBIOS directly instead of using WBEM. Separate patches for ntdll are in progress to populate more SMBIOS fields (SKU, family) on Linux. programs/wineboot/wineboot.c | 240 +++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 8e3e234397..6e70f0978c 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -187,6 +187,10 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value ) { return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, (lstrlenW(value) + 1) * sizeof(WCHAR) ); } +static DWORD set_reg_value_dword( HKEY hkey, const WCHAR *name, DWORD value ) +{ + return RegSetValueExW( hkey, name, 0, REG_DWORD, (const BYTE *)&value, sizeof(value) ); +} #if defined(__i386__) || defined(__x86_64__) @@ -299,6 +303,239 @@ static void get_namestring( WCHAR *buf ) { } #endif /* __i386__ || __x86_64__ */ +#include "pshpack1.h" +struct smbios_prologue +{ + BYTE calling_method; + BYTE major_version; + BYTE minor_version; + BYTE revision; + DWORD length; +}; + +enum smbios_type +{ + SMBIOS_TYPE_BIOS, + SMBIOS_TYPE_SYSTEM, + SMBIOS_TYPE_BASEBOARD, +}; + +struct smbios_header +{ + BYTE type; + BYTE length; + WORD handle; +}; + +struct smbios_baseboard +{ + struct smbios_header hdr; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; +}; + +struct smbios_bios +{ + struct smbios_header hdr; + BYTE vendor; + BYTE version; + WORD start; + BYTE date; + BYTE size; + UINT64 characteristics; + BYTE characteristics_ext[2]; + BYTE system_bios_major_release; + BYTE system_bios_minor_release; + BYTE ec_firmware_major_release; + BYTE ec_firmware_minor_release; +}; + +struct smbios_system +{ + struct smbios_header hdr; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; + BYTE uuid[16]; + BYTE wake_up_type; + BYTE sku; + BYTE family; +}; +#include "poppack.h" + +#define RSMB (('R' << 24) | ('S' << 16) | ('M' << 8) | 'B') + +static const struct smbios_header *find_smbios_entry( enum smbios_type type, const char *buf, UINT len ) +{ + const char *ptr, *start; + const struct smbios_prologue *prologue; + const struct smbios_header *hdr; + + if (len < sizeof(struct smbios_prologue)) return NULL; + prologue = (const struct smbios_prologue *)buf; + if (prologue->length > len - sizeof(*prologue) || prologue->length < sizeof(*hdr)) return NULL; + + start = (const char *)(prologue + 1); + hdr = (const struct smbios_header *)start; + + for (;;) + { + if ((const char *)hdr - start >= prologue->length - sizeof(*hdr)) return NULL; + + if (!hdr->length) + { + WARN( "invalid entry\n" ); + return NULL; + } + + if (hdr->type == type) + { + if ((const char *)hdr - start + hdr->length > prologue->length) return NULL; + break; + } + else /* skip other entries and their strings */ + { + for (ptr = (const char *)hdr + hdr->length; ptr - buf < len && *ptr; ptr++) + { + for (; ptr - buf < len; ptr++) if (!*ptr) break; + } + if (ptr == (const char *)hdr + hdr->length) ptr++; + hdr = (const struct smbios_header *)(ptr + 1); + } + } + + return hdr; +} + +static inline WCHAR *heap_strdupAW( const char *src ) +{ + int len; + WCHAR *dst; + if (!src) return NULL; + len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = HeapAlloc( GetProcessHeap(), 0, len * sizeof(*dst) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + return dst; +} + +static WCHAR *get_smbios_string( BYTE id, const char *buf, UINT offset, UINT buflen ) +{ + const char *ptr = buf + offset; + UINT i = 0; + + if (!id || offset >= buflen) return NULL; + for (ptr = buf + offset; ptr - buf < buflen && *ptr; ptr++) + { + if (++i == id) return heap_strdupAW( ptr ); + for (; ptr - buf < buflen; ptr++) if (!*ptr) break; + } + return NULL; +} + +static void set_value_from_smbios_string( HKEY key, const WCHAR *value, BYTE id, const char *buf, UINT offset, UINT buflen ) +{ + WCHAR *str; + str = get_smbios_string( id, buf, offset, buflen ); + set_reg_value( key, value, str ? str : L"" ); + HeapFree( GetProcessHeap(), 0, str ); +} + +static void create_bios_baseboard_values( HKEY bios_key, const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_baseboard *baseboard; + UINT offset; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BASEBOARD, buf, len ))) return; + baseboard = (const struct smbios_baseboard *)hdr; + offset = (const char *)baseboard - buf + baseboard->hdr.length; + + set_value_from_smbios_string( bios_key, L"BaseBoardManufacturer", baseboard->vendor, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"BaseBoardProduct", baseboard->product, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"BaseBoardVersion", baseboard->version, buf, offset, len ); +} + +static void create_bios_bios_values( HKEY bios_key, const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + UINT offset; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return; + bios = (const struct smbios_bios *)hdr; + offset = (const char *)bios - buf + bios->hdr.length; + + set_value_from_smbios_string( bios_key, L"BIOSVendor", bios->vendor, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"BIOSVersion", bios->version, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"BIOSReleaseDate", bios->date, buf, offset, len ); + + if (bios->hdr.length >= 0x18) + { + set_reg_value_dword( bios_key, L"BiosMajorRelease", bios->system_bios_major_release ); + set_reg_value_dword( bios_key, L"BiosMinorRelease", bios->system_bios_minor_release ); + set_reg_value_dword( bios_key, L"ECFirmwareMajorVersion", bios->ec_firmware_major_release ); + set_reg_value_dword( bios_key, L"ECFirmwareMinorVersion", bios->ec_firmware_minor_release ); + } + else + { + set_reg_value_dword( bios_key, L"BiosMajorRelease", 0xFF ); + set_reg_value_dword( bios_key, L"BiosMinorRelease", 0xFF ); + set_reg_value_dword( bios_key, L"ECFirmwareMajorVersion", 0xFF ); + set_reg_value_dword( bios_key, L"ECFirmwareMinorVersion", 0xFF ); + } +} + +static void create_bios_system_values( HKEY bios_key, const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_system *system; + UINT offset; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len ))) return; + system = (const struct smbios_system *)hdr; + offset = (const char *)system - buf + system->hdr.length; + + set_value_from_smbios_string( bios_key, L"SystemManufacturer", system->vendor, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"SystemProductName", system->product, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"SystemVersion", system->version, buf, offset, len ); + + if (system->hdr.length >= 0x1B) + { + set_value_from_smbios_string( bios_key, L"SystemSKU", system->sku, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"SystemFamily", system->family, buf, offset, len ); + } + else + { + set_value_from_smbios_string( bios_key, L"SystemSKU", 0, buf, offset, len ); + set_value_from_smbios_string( bios_key, L"SystemFamily", 0, buf, offset, len ); + } +} + +static void create_bios_key( HKEY system_key ) +{ + HKEY bios_key; + UINT len; + char *buf; + + if (RegCreateKeyExW( system_key, L"BIOS", 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &bios_key, NULL )) + return; + + len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); + if (!(buf = HeapAlloc( GetProcessHeap(), 0, len ))) goto done; + len = GetSystemFirmwareTable( RSMB, 0, buf, len ); + + create_bios_baseboard_values( bios_key, buf, len ); + create_bios_bios_values( bios_key, buf, len ); + create_bios_system_values( bios_key, buf, len ); + +done: + HeapFree( GetProcessHeap(), 0, buf ); + RegCloseKey( bios_key ); +} + /* create the volatile hardware registry keys */ static void create_hardware_registry_keys(void) { @@ -409,6 +646,9 @@ static void create_hardware_registry_keys(void) RegCloseKey( hkey ); } } + + create_bios_key( system_key ); + RegCloseKey( fpu_key ); RegCloseKey( cpu_key ); RegCloseKey( system_key ); -- 2.24.1

1 0

[PATCH 6/6] jscript: Preserve the 'enter_notified' field when an error occurs.
by Jacek Caban 20 Feb '20

20 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 5/6] jscript: Implement the SCRIPTITEM_CODEONLY flag.
by Jacek Caban 20 Feb '20

20 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 4/6] jscript: Lookup the named item using a helper function.
by Jacek Caban 20 Feb '20

20 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 34 ++++++---------------------------- dlls/jscript/jscript.c | 35 +++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 2 ++ 3 files changed, 43 insertions(+), 28 deletions(-)

1 0

[PATCH 3/6] jscript: Move the named_item_t definition.
by Jacek Caban 20 Feb '20

20 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH 2/6] jscript: Move the clear_script_queue up to SCRIPTSTATE_INITIALIZED.
by Jacek Caban 20 Feb '20

20 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6] jscript: Initialize the script context in SetScriptSite.
by Jacek Caban 20 Feb '20

20 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 98 +++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 50 deletions(-)

1 0

[PATCH] advapi32/tests: Simplify the name of the test unit for child processes.
by Francois Gouget 20 Feb '20

20 Feb '20

The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index afcdb6328e0..d003a7f1a0d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3010,7 +3010,7 @@ static void test_process_security(void) CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); test_group_equal( event, UsersSid, __LINE__ ); - sprintf(buffer, "%s tests/security.c test", myARGV[0]); + sprintf(buffer, "%s security test", myARGV[0]); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -7186,7 +7186,7 @@ static void test_token_security_descriptor(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - sprintf(buffer, "%s tests/security.c test_token_sd", myARGV[0]); + sprintf(buffer, "%s security test_token_sd", myARGV[0]); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); ok(ret, "CreateProcess failed with error %u\n", GetLastError()); winetest_wait_child_process(info.hProcess); -- 2.20.1

2 2

[PATCH 1/2] msvcrt: Add _CRT_INT_MAX to corecrt.h.
by Francois Gouget 20 Feb '20

20 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- include/msvcrt/corecrt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index cff4549d376..ea81e95db36 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -158,6 +158,7 @@ #endif #define _ARGMAX 100 +#define _CRT_INT_MAX 0x7fffffff #ifndef _MSVCRT_LONG_DEFINED #define _MSVCRT_LONG_DEFINED -- 2.20.1

1 1

[PATCH] winebrowser: Avoid recursively calling winebrowser forever
by Joshua Ashton 20 Feb '20

20 Feb '20

Signed-off-by: Joshua Ashton <joshua(a)froggi.es> --- programs/winebrowser/main.c | 40 +++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 11 deletions(-)

2 3

[PATCH 1/6] server: Use monotonic clock for relative timeouts.
by Piotr Caban 20 Feb '20

20 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Relative timeouts are expected to wait given amount of time even if system clock is changed. It's also behaving incorrectly on daylight saving related time change. server/fd.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 9 deletions(-)

2 1

[PATCH 2/2] include: Include sys/stat.h from wchar.h.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/sys/stat.h | 4 -- include/msvcrt/wchar.h | 136 +------------------------------------- 2 files changed, 1 insertion(+), 139 deletions(-)

1 0

[PATCH 1/2] include: Add corecrt_wtime.h file.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wtime.h | 48 ++++++++++++++++++++++++++++++++++ include/msvcrt/time.h | 39 +-------------------------- include/msvcrt/wchar.h | 38 +-------------------------- 3 files changed, 50 insertions(+), 75 deletions(-) create mode 100644 include/msvcrt/corecrt_wtime.h

1 0

[PATCH v2 2/2] dxgi: Check NULL output parameter in dxgi_adapter_EnumOutputs().
by Zhiyi Zhang 20 Feb '20

20 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 3 +++ dlls/dxgi/tests/dxgi.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d2fc629c84..7cdf7bd0d6 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -128,6 +128,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); + if (!output) + return E_INVALIDARG; + if (output_idx > 0) { *output = NULL; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 3ff42c4bc6..e2b5df7b27 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1175,6 +1175,9 @@ static void test_output(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { -- 2.20.1

3 2

[PATCH v2 1/2] dxgi: Check NULL adapter parameter in dxgi_factory_EnumAdapterByLuid().
by Zhiyi Zhang 20 Feb '20

20 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 179059 dlls/dxgi/factory.c | 3 +++ dlls/dxgi/tests/dxgi.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a0038b4fe7..3f41df9e36 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -403,6 +403,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n", iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter); + if (!adapter) + return DXGI_ERROR_INVALID_CALL; + adapter_index = 0; while ((hr = dxgi_factory_EnumAdapters1(iface, adapter_index, &adapter1)) == S_OK) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f8e63ea25e..3ff42c4bc6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -912,6 +912,10 @@ static void test_adapter_luid(void) return; } + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, + &IID_IDXGIAdapter, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); @@ -4949,6 +4953,9 @@ static void test_multi_adapter(void) return; } + hr = IDXGIFactory_EnumAdapters(factory, 0, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) { -- 2.20.1

2 1

[PATCH v3 1/8] d3d9: Use ARRAY_SIZE in d3d9_device_GetStreamSource().
by Zebediah Figura 20 Feb '20

20 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3b4c9d5277..53e27adf05 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3709,6 +3709,7 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, UINT stream_idx, IDirect3DVertexBuffer9 **buffer, UINT *offset, UINT *stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + const struct wined3d_stateblock_state *state; const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *buffer_impl; @@ -3718,14 +3719,15 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, if (!buffer) return D3DERR_INVALIDCALL; - if (stream_idx > WINED3D_MAX_STREAMS) + if (stream_idx >= ARRAY_SIZE(state->streams)) { WARN("Stream index %u out of range.\n", stream_idx); return WINED3DERR_INVALIDCALL; } wined3d_mutex_lock(); - stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + state = wined3d_stateblock_get_state(device->state); + stream = &state->streams[stream_idx]; if (stream->buffer) { buffer_impl = wined3d_buffer_get_parent(stream->buffer); -- 2.25.0

2 15

[PATCH 8/8] stdio.h: Add ucrt vfprintf_s declaration.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdio.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH 7/8] stdio.h: Add ucrt vfprintf declaration.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdio.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH 6/8] stdio.h: Add ucrt _vsprintf_p_l declaration.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH 5/8] stdio.h: Add ucrt vsprintf_s declaration.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH 4/8] stdio.h: Add ucrt vsprintf declaration.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH 3/8] stdio.h: Add ucrt _vscprintf declaration.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH 2/8] stdio.h: Add ucrt _vsnprintf_s declaration.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdio.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)

1 0

[PATCH 1/8] include: Move __acrt_iob_func declaration to corecrt_wstdio.h.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 6 ++++++ include/msvcrt/stdio.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 1/3] mferror: Add some more clock error codes.
by Nikolay Sivov 20 Feb '20

20 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mferror/mferror.mc | 14 ++++++++++++++ include/mferror.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/dlls/mferror/mferror.mc b/dlls/mferror/mferror.mc index 6934611ab4..61f01b6a2d 100644 --- a/dlls/mferror/mferror.mc +++ b/dlls/mferror/mferror.mc @@ -715,3 +715,17 @@ SymbolicName=MF_E_CLOCK_STATE_ALREADY_SET Language=ENU Clock state was already set. . +MessageId=40003 +Severity=Error +Facility=MF +SymbolicName=MF_E_CLOCK_NOT_SIMPLE +Language=ENU +Clock is not simple +. +MessageId=40004 +Severity=Success +Facility=MF +SymbolicName=MF_S_CLOCK_STOPPED +Language=ENU +Clock was stopped +. diff --git a/include/mferror.h b/include/mferror.h index 6d7031ecc8..6341d832ab 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -163,5 +163,7 @@ #define MF_E_CLOCK_NO_TIME_SOURCE _HRESULT_TYPEDEF_(0xc00d9c41) #define MF_E_CLOCK_STATE_ALREADY_SET _HRESULT_TYPEDEF_(0xc00d9c42) +#define MF_E_CLOCK_NOT_SIMPLE _HRESULT_TYPEDEF_(0xc00d9c43) +#define MF_S_CLOCK_STOPPED _HRESULT_TYPEDEF_(0x000d9c44) #endif /* __WINE_MFERROR_H */ -- 2.25.0

1 2

[PATCH] kernel32/tests: Check if CreateProcess() resets STARTUPINFO/PROCESS_INFORMATION.
by Francois Gouget 20 Feb '20

20 Feb '20

Our test framework depends on CreateProcess() initializing the hProcess field in case of a failure. The process tests depend on it not modifying the STARTUPINFO fields. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)

3 6

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 20 Feb '20

20 Feb '20

1 0

[PATCH 1/7] winegstreamer: Decommit the source allocator when cleaning up the stream.
by Zebediah Figura 20 Feb '20

20 Feb '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1337cd0a81c..488c9bd8a13 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1455,6 +1455,7 @@ static HRESULT gstdemux_cleanup_stream(struct strmbase_filter *iface) { struct gstdemux *filter = impl_from_strmbase_filter(iface); GstStateChangeReturn ret; + unsigned int i; if (!filter->container) return S_OK; @@ -1468,6 +1469,12 @@ static HRESULT gstdemux_cleanup_stream(struct strmbase_filter *iface) gst_element_get_state(filter->container, NULL, NULL, GST_CLOCK_TIME_NONE); filter->ignore_flush = FALSE; + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + IMemAllocator_Decommit(filter->sources[i]->pin.pAllocator); + } + return S_OK; } -- 2.25.0

2 7

[PATCH vkd3d 00/41] Add support for DXIL shaders
by Hans-Kristian Arntzen 19 Feb '20

19 Feb '20

This patchset implements support for DXIL shaders (SM 6.0+) via dxil-spirv (github.com/HansKristian-Work/dxil-spirv). There are three main parts of this patchset. First, support for SM 5.1 register spaces are introduced. These patches have been submitted before, but it was only reviewed after a rebase, and that rebase broke the patches due to some uninitialized member variables introduced in the UAV clear patch set which came inbetween. I've fixed those, and cleaned up the patches a little bit. I need SM 5.1 register spaces implemented because the DXIL implementation needs it as well. I also fixed some additional cases for SM 5.1 which were not implemented in the last patch set, like SM 5.1 root constants and root descriptors. To aid debugging, I also added SPIR-V dumping to the VKD3D_SHADER_DUMP_PATH which was very useful to study difference between DXBC and DXIL outputs. Second, we have the dxil-spirv integration. There are various small refactors needed to enable this, mostly just moving a few helper functions in vkd3d-shader around to the private header so they can be accessed by dxil.c. Vulkan 1.1 is enabled if active, because subgroup operations requires it. SM 6.0 support is only activated if subgroup operations are sufficiently supported and DXIL is enabled. There are other features required for SM 6.0 such as 16-bit arithmetic and storage, but that is left for later. We will need to revisit the binding model to enable that properly. The actual DXIL implementation lives in dxil.c. dxbc.c will detect that a shader blob is DXIL by looking for TAG_DXIL and dispatch the work to dxil.c if DXIL support is enabled. DXIL blobs are basically identical to DXBC blobs, except TAG_DXIL is used instead of TAG_SHDR, and ISG1 is used instead of ISGN, etc. To make integration as smooth as possible, dxil-spirv relies on callbacks rather than feeding structures to the compiler to resolve resource bindings and similar. This way, we won't have to translate the vkd3d_shader_* structures. Finally, most of the commits here are to add DXIL testing paths for many of the tests in tests/d3d12.c. The dxil-spirv repo has a lot of tests already to cover codegen, so these tests are mostly to verify that the integration works. Adding these tests *did* find some bugs in the dxil-spirv implementation as well, but it mostly went without any major problems. When emitting DXIL, the blob sizes are not word-aligned, so they are embedded as byte arrays instead. They are also much larger than equivalent DXBC blobs, due to LLVM IR bloat. I ran -Qstrip_debug -Qstrip_reflect in DXC when compiling these shaders. The main strategy I used to add DXIL tests was to turn the existing tests into a function ala static void test_something(bool use_dxil) and just select the right shader code as required. I had to add some utility functions as well because the D3D12 validation layers refuse to mix and match SM 5.1 and below with SM 6.0 and above. These utilities just use different default shader blobs. Another note is that to make the DXIL shaders pass validation on native D3D12 it is required that the DXIL is signed by Microsoft's validator. Hans-Kristian Arntzen (41): vkd3d: Deal correctly with SM 5.1 register spaces. vkd3d: Add test case for SM 5.1 register spaces. vkd3d: Add test case for root constants in SM 5.1. vkd3d-shader: Add path for debug dumping SPIR-V as well. vkd3d: Add dxil-spirv to autoconf vkd3d: Attempt to parse ISG1 as well when parsing input signatures. vkd3d-shader: Add entry point to query if DXIL is supported. vkd3d: Attempt to create a Vulkan 1.1 instance and device. vkd3d: Query subgroup properties and expose SM 6.0 if present. vkd3d: Move vkd3d_find_shader into private header. vkd3d: Add helper function to query if a blob is DXIL. vkd3d-shader: Expose debug shader dumping in private header. vkd3d-shader: Add integration for DXIL shaders. vkd3d: Add test helper function to determine if DXIL is supported. vkd3d: Add helper test function to set up a default pipeline with DXIL. vkd3d: Add DXIL test for geometry shader. vkd3d: Add DXIL test for layered rendering. vkd3d: Add DXIL test for ps_layer. vkd3d: Add DXIL test for quad_tessellation. vkd3d: Add DXIL test for tess control point phase. vkd3d: Add DXIL test for tess fork phase. vkd3d: Add DXIL test for line tessellation. vkd3d: Add DXIL test for stream output. vkd3d: Add DXIL test for bufinfo. vkd3d: Add DXIL test for register spaces. vkd3d: Add DXIL test for constant buffers (root const/desc). vkd3d: Add DXIL test for dual source blending. vkd3d: Add DXIL test for face culling. vkd3d: Add DXIL test for render_target_a8. vkd3d-shader: Hook up RT output swizzle path in DXIL. vkd3d: Add DXIL test for sample mask. vkd3d: Add DXIL test for coverage. vkd3d: Add create_pipeline_state_dxil test utility. vkd3d: Add DXIL test for shader_sample_position. vkd3d: Add DXIL test for rasterizer sample count. vkd3d-shader: Hook up RASTERIZER_SAMPLE_COUNT parameter. vkd3d: Add DXIL test for clip distance. vkd3d: Add DXIL test for combined ClipCull. vkd3d: Add DXIL test for eval attribute. vkd3d: Add DXIL test for instance_id. vkd3d: Add DXIL test for vertex ID. Makefile.am | 8 +- configure.ac | 11 + include/vkd3d_shader.h | 18 + libs/vkd3d-shader/dxbc.c | 58 +- libs/vkd3d-shader/dxil.c | 470 ++ libs/vkd3d-shader/spirv.c | 215 +- libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 99 +- libs/vkd3d-shader/vkd3d_shader_private.h | 38 + libs/vkd3d/command.c | 32 +- libs/vkd3d/device.c | 69 +- libs/vkd3d/state.c | 65 +- libs/vkd3d/utils.c | 3 + libs/vkd3d/vkd3d_private.h | 5 + tests/d3d12.c | 5983 +++++++++++++++++++--- tests/d3d12_test_utils.h | 193 +- 16 files changed, 6544 insertions(+), 724 deletions(-) create mode 100644 libs/vkd3d-shader/dxil.c -- 2.25.0

5 16

[PATCH] urlmon/tests: Get rid of a2w() in misc.c
by Michael Stefaniuc 19 Feb '20

19 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/misc.c | 83 +++++++++++++++------------------------- 1 file changed, 31 insertions(+), 52 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 07ab52407e..4c5c6aea10 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -84,21 +84,6 @@ static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static HRESULT (WINAPI *pIEInstallScope)(DWORD*); -static WCHAR *a2w(const char *str) -{ - WCHAR *ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static WCHAR *a2co(const char *str) { WCHAR *ret; @@ -476,22 +461,22 @@ static void test_CoInternetQueryInfo(void) } static const struct { - const char *url; + const WCHAR *url; const WCHAR *mime; HRESULT hres; BOOL broken_failure; const WCHAR *broken_mime; } mime_tests[] = { - {"res://mshtml.dll/blank.htm", L"text/html", S_OK}, - {"index.htm", L"text/html", S_OK}, - {"file://c:\\Index.htm", L"text/html", S_OK}, - {"file://c:\\Index.htm?q=test", L"text/html", S_OK, TRUE}, - {"file://c:\\Index.htm#hash_part", L"text/html", S_OK, TRUE}, - {"file://c:\\Index.htm#hash_part.txt", L"text/html", S_OK, FALSE, L"text/plain"}, - {"file://some%20file%2ejpg", NULL, E_FAIL}, - {"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, - {"about:blank", NULL, E_FAIL}, - {"ftp://winehq.org/file.test", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} + {L"res://mshtml.dll/blank.htm", L"text/html", S_OK}, + {L"index.htm", L"text/html", S_OK}, + {L"file://c:\\Index.htm", L"text/html", S_OK}, + {L"file://c:\\Index.htm?q=test", L"text/html", S_OK, TRUE}, + {L"file://c:\\Index.htm#hash_part", L"text/html", S_OK, TRUE}, + {L"file://c:\\Index.htm#hash_part.txt", L"text/html", S_OK, FALSE, L"text/plain"}, + {L"file://some%20file%2ejpg", NULL, E_FAIL}, + {L"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, + {L"about:blank", NULL, E_FAIL}, + {L"ftp://winehq.org/file.test", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} }; static BYTE data1[] = "test data\n"; @@ -599,8 +584,8 @@ static const struct { const WCHAR *mime; const WCHAR *mime_pjpeg; const WCHAR *broken_mime; - const char *url; - const char *proposed_mime; + const WCHAR *url; + const WCHAR *proposed_mime; } mime_tests2[] = { {data1, sizeof(data1), L"text/plain"}, {data2, sizeof(data2), L"application/octet-stream", L"image/pjpeg"}, @@ -700,22 +685,22 @@ static const struct { {data96, sizeof(data96), L"text/plain"}, {data97, sizeof(data97), L"text/html", L"text/plain"}, {data98, sizeof(data98), L"text/html", L"text/plain"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {NULL, 0, L"text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, - {NULL, sizeof(data1), L"text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css"}, - {data2, sizeof(data2), L"text/css", NULL, NULL, "http://www.winehq.org/test.css"}, - {data10, sizeof(data10), L"text/html", NULL, NULL, "http://www.winehq.org/test.css"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css", "text/plain"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css", "application/octet-stream"}, - {data1, sizeof(data1), L"text/test", NULL, NULL, "http://www.winehq.org/test.css", "text/test"} + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {NULL, 0, L"text/html", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"res://mshtml.dll/blank.htm", L"application/octet-stream"}, + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"file:some%20file%2ejpg", L"application/octet-stream"}, + {NULL, sizeof(data1), L"text/html", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data2, sizeof(data2), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data10, sizeof(data10), L"text/html", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css", L"text/plain"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css", L"application/octet-stream"}, + {data1, sizeof(data1), L"text/test", NULL, NULL, L"http://www.winehq.org/test.css", L"text/test"} }; static void test_FindMimeFromData(void) { - WCHAR *mime, *proposed_mime, *url; + WCHAR *mime; HRESULT hres; BYTE b; int i; @@ -728,8 +713,7 @@ static void test_FindMimeFromData(void) for(i = 0; i < ARRAY_SIZE(mime_tests); i++) { mime = (LPWSTR)0xf0f0f0f0; - url = a2w(mime_tests[i].url); - hres = pFindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { ok(hres == S_OK || broken(mime_tests[i].broken_failure), "[%d] FindMimeFromData failed: %08x\n", i, hres); if(hres == S_OK) { @@ -746,32 +730,27 @@ static void test_FindMimeFromData(void) } mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, url, NULL, 0, text_plainW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, L"text/plain"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, url, NULL, 0, app_octet_streamW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, app_octet_streamW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, L"application/octet-stream"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); - heap_free(url); } for(i = 0; i < ARRAY_SIZE(mime_tests2); i++) { - url = a2w(mime_tests2[i].url); - proposed_mime = a2w(mime_tests2[i].proposed_mime); - hres = pFindMimeFromData(NULL, url, mime_tests2[i].data, mime_tests2[i].size, - proposed_mime, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests2[i].url, mime_tests2[i].data, mime_tests2[i].size, + mime_tests2[i].proposed_mime, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); b = !lstrcmpW(mime, mime_tests2[i].mime); ok(b || broken(mime_tests2[i].broken_mime && !lstrcmpW(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); - heap_free(proposed_mime); - heap_free(url); CoTaskMemFree(mime); - if(!b || url || proposed_mime) + if(!b || mime_tests2[i].url || mime_tests2[i].proposed_mime) continue; hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, -- 2.24.1

3 3

[PATCH 2/2] urlmon/tests: Get rid of a2w() in sec_mgr.c
by Michael Stefaniuc 19 Feb '20

19 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/sec_mgr.c | 172 +++++++++++++++--------------------- 1 file changed, 72 insertions(+), 100 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index dda50dd056..54dc67bdee 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -177,19 +177,6 @@ static int strcmp_w(const WCHAR *str1, const WCHAR *str2) return memcmp(str1, str2, len1*sizeof(WCHAR)); } -static inline LPWSTR a2w(LPCSTR str) -{ - LPWSTR ret = NULL; - - if(str) { - DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - } - - return ret; -} - /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) @@ -867,7 +854,7 @@ static void run_child_process(void) } typedef struct { - const char *url; + const WCHAR *url; DWORD zone; BOOL todo; DWORD broken_zone; @@ -875,33 +862,33 @@ typedef struct { static const zone_mapping_test zone_mapping_tests[] = { /* Tests for "yabadaba.do" zone mappings. */ - {"http://yabadaba.do/",URLZONE_CUSTOM}, - {"http://google.yabadaba.do/",URLZONE_CUSTOM}, - {"zip://yabadaba.do/",URLZONE_INTERNET}, + {L"http://yabadaba.do/", URLZONE_CUSTOM}, + {L"http://google.yabadaba.do/", URLZONE_CUSTOM}, + {L"zip://yabadaba.do/", URLZONE_INTERNET}, /* Tests for "super.cool" zone mappings. */ - {"ftp://testing.google.super.cool/",URLZONE_INTERNET}, - {"ftp://testing.*.super.cool/",URLZONE_CUSTOM2}, - {"ftp://google.testing.super.cool/",URLZONE_CUSTOM2}, + {L"ftp://testing.google.super.cool/", URLZONE_INTERNET}, + {L"ftp://testing.*.super.cool/", URLZONE_CUSTOM2}, + {L"ftp://google.testing.super.cool/", URLZONE_CUSTOM2}, /* Tests for "tests.test" zone mappings. */ - {"http://tests.test/",URLZONE_CUSTOM}, - {"http://www.tests.test/",URLZONE_CUSTOM}, - {"ftp://tests.test/",URLZONE_CUSTOM}, - {"ftp://www.tests.test/",URLZONE_CUSTOM}, - {"test://www.tests.test/",URLZONE_INTERNET}, - {"test://tests.test/",URLZONE_INTERNET}, - {"zip://www.tests.test/",URLZONE_INTERNET}, - {"zip://tests.test/",URLZONE_INTERNET}, + {L"http://tests.test/", URLZONE_CUSTOM}, + {L"http://www.tests.test/", URLZONE_CUSTOM}, + {L"ftp://tests.test/", URLZONE_CUSTOM}, + {L"ftp://www.tests.test/", URLZONE_CUSTOM}, + {L"test://www.tests.test/", URLZONE_INTERNET}, + {L"test://tests.test/", URLZONE_INTERNET}, + {L"zip://www.tests.test/", URLZONE_INTERNET}, + {L"zip://tests.test/", URLZONE_INTERNET}, /* Tests for "www.testing.com" zone mappings. */ - {"http://google.www.testing.com/",URLZONE_INTERNET}, - {"http://www.testing.com/",URLZONE_CUSTOM,FALSE,URLZONE_INTERNET}, - {"http://testing.www.testing.com/",URLZONE_CUSTOM2,FALSE,URLZONE_INTERNET}, + {L"http://google.www.testing.com/", URLZONE_INTERNET}, + {L"http://www.testing.com/", URLZONE_CUSTOM, FALSE, URLZONE_INTERNET}, + {L"http://testing.www.testing.com/", URLZONE_CUSTOM2, FALSE, URLZONE_INTERNET}, /* Tests for "org" zone mappings. */ - {"http://google.org/",URLZONE_INTERNET,FALSE,URLZONE_CUSTOM}, - {"http://org/",URLZONE_CUSTOM}, - {"http://testing.org/",URLZONE_CUSTOM2}, + {L"http://google.org/", URLZONE_INTERNET, FALSE, URLZONE_CUSTOM}, + {L"http://org/", URLZONE_CUSTOM}, + {L"http://testing.org/", URLZONE_CUSTOM2}, /* Tests for "wine.testing" mapping */ - {"*:wine.testing/test",URLZONE_CUSTOM2}, - {"http://wine.testing/testing",URLZONE_CUSTOM2} + {L"*:wine.testing/test", URLZONE_CUSTOM2}, + {L"http://wine.testing/testing", URLZONE_CUSTOM2} }; static void test_zone_domain_mappings(void) @@ -931,16 +918,13 @@ static void test_zone_domain_mappings(void) for(i = 0; i < ARRAY_SIZE(zone_mapping_tests); ++i) { const zone_mapping_test *test = zone_mapping_tests+i; - LPWSTR urlW = a2w(test->url); zone = URLZONE_INVALID; - hres = IInternetSecurityManager_MapUrlToZone(secmgr, urlW, &zone, 0); + hres = IInternetSecurityManager_MapUrlToZone(secmgr, test->url, &zone, 0); ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres); todo_wine_if (test->todo) ok(zone == test->zone || broken(test->broken_zone == zone), "Expected %d, but got %d on test %d\n", test->zone, zone, i); - - heap_free(urlW); } IInternetSecurityManager_Release(secmgr); @@ -1581,7 +1565,7 @@ static void unregister_protocols(void) { } static const struct { - const char *uri; + const WCHAR *uri; DWORD create_flags; const char *security_uri; HRESULT security_hres; @@ -1589,17 +1573,17 @@ static const struct { HRESULT default_hres; BOOL todo; } sec_url_ex_tests[] = { - {"index.htm", Uri_CREATE_ALLOW_RELATIVE, "*:index.html", S_OK, L"*:index.htm", S_OK}, - {"file://c:\\Index.htm", Uri_CREATE_FILE_USE_DOS_PATH, "file:///c:/Index.htm", S_OK, L"file:///c:/Index.htm", S_OK}, - {"file:some%20file%2ejpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, - {"file:some file.jpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, - {"http://www.zone3.winetest/", 0, "http://www.zone3.winetest/", S_OK, L"http://www.zone3.winetest/", S_OK}, - {"about:blank", 0, "about:blank", S_OK, L"about:blank", S_OK}, - {"ftp://zone3.winetest/file.test", 0, "ftp://zone3.winetest/file.test", S_OK, L"ftp://zone3.winetest/file.test", S_OK}, - {"test:123abc", 0, "test:123abc", S_OK, L"test:123abc", S_OK}, - {"http:google.com/test.file", 0, "http:google.com/test.file", S_OK, L"http:google.com/test.file", S_OK}, - {"ftp://test@ftp.winehq.org/", 0, "ftp://ftp.winehq.org/", S_OK, L"ftp://ftp.winehq.org/", S_OK}, - {"test://google@ftp.winehq.org/", 0, "test://google@ftp.winehq.org/", S_OK, L"test://google@ftp.winehq.org/", S_OK} + {L"index.htm", Uri_CREATE_ALLOW_RELATIVE, "*:index.html", S_OK, L"*:index.htm", S_OK}, + {L"file://c:\\Index.htm", Uri_CREATE_FILE_USE_DOS_PATH, "file:///c:/Index.htm", S_OK, L"file:///c:/Index.htm", S_OK}, + {L"file:some%20file%2ejpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {L"file:some file.jpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {L"http://www.zone3.winetest/", 0, "http://www.zone3.winetest/", S_OK, L"http://www.zone3.winetest/", S_OK}, + {L"about:blank", 0, "about:blank", S_OK, L"about:blank", S_OK}, + {L"ftp://zone3.winetest/file.test", 0, "ftp://zone3.winetest/file.test", S_OK, L"ftp://zone3.winetest/file.test", S_OK}, + {L"test:123abc", 0, "test:123abc", S_OK, L"test:123abc", S_OK}, + {L"http:google.com/test.file", 0, "http:google.com/test.file", S_OK, L"http:google.com/test.file", S_OK}, + {L"ftp://test@ftp.winehq.org/", 0, "ftp://ftp.winehq.org/", S_OK, L"ftp://ftp.winehq.org/", S_OK}, + {L"test://google@ftp.winehq.org/", 0, "test://google@ftp.winehq.org/", S_OK, L"test://google@ftp.winehq.org/", S_OK} }; static void test_InternetGetSecurityUrlEx(void) @@ -1619,10 +1603,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(result == (void*) 0xdeadbeef, "'result' was %p\n", result); for(i = 0; i < ARRAY_SIZE(sec_url_ex_tests); ++i) { - LPWSTR uriW = a2w(sec_url_ex_tests[i].uri); uri = NULL; - hr = pCreateUri(uriW, sec_url_ex_tests[i].create_flags, 0, &uri); + hr = pCreateUri(sec_url_ex_tests[i].uri, sec_url_ex_tests[i].create_flags, 0, &uri); ok(hr == S_OK, "CreateUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { result = NULL; @@ -1674,7 +1657,6 @@ static void test_InternetGetSecurityUrlEx(void) } if(uri) IUri_Release(uri); - heap_free(uriW); } } @@ -1744,7 +1726,7 @@ static const BYTE secidex2_2[] = {'z','i','p',':','t','e','s','t','i','n','g','. static const BYTE secidex2_3[] = {'*',':','t','e','s','t','i','n','g','.','c','o','m',3,0,0,0}; static const struct { - const char *uri; + const WCHAR *uri; DWORD create_flags; HRESULT map_hres; DWORD zone; @@ -1754,19 +1736,19 @@ static const struct { HRESULT secid_hres; BOOL secid_todo; } sec_mgr_ex2_tests[] = { - {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE,FALSE,secid1,sizeof(secid1),S_OK}, - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET,FALSE,secid2,sizeof(secid2),S_OK}, - {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE,FALSE,secid1,sizeof(secid1),S_OK}, - {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET,FALSE,secid5,sizeof(secid5),S_OK}, - {"about:blank",0,0,URLZONE_INTERNET,FALSE,secid6,sizeof(secid6),S_OK}, - {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET,FALSE,secid7,sizeof(secid7),S_OK}, - {"/file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET,FALSE,NULL,0,E_INVALIDARG}, - {"zip://testing.com/",0,0,URLZONE_INTERNET,FALSE,secidex2_1,sizeof(secidex2_1),S_OK}, - {"zip:testing.com",0,0,URLZONE_INTERNET,FALSE,secidex2_2,sizeof(secidex2_2),S_OK}, - {"http:google.com",0,S_OK,URLZONE_INVALID,FALSE,NULL,0,E_INVALIDARG}, - {"http:/google.com",0,S_OK,URLZONE_INVALID,FALSE,NULL,0,E_INVALIDARG}, - {"*:/testing",0,S_OK,URLZONE_INTERNET,FALSE,NULL,0,E_INVALIDARG}, - {"*://testing.com",0,S_OK,URLZONE_INTERNET,FALSE,secidex2_3,sizeof(secidex2_3),S_OK} + {L"res://mshtml.dll/blank.htm", 0, S_OK, URLZONE_LOCAL_MACHINE, FALSE, secid1, sizeof(secid1), S_OK}, + {L"index.htm", Uri_CREATE_ALLOW_RELATIVE, 0, URLZONE_INTERNET, FALSE, secid2, sizeof(secid2), S_OK}, + {L"file://c:\\Index.html", 0, 0, URLZONE_LOCAL_MACHINE, FALSE, secid1, sizeof(secid1), S_OK}, + {L"http://www.zone3.winetest/", 0, 0, URLZONE_INTERNET, FALSE, secid5, sizeof(secid5), S_OK}, + {L"about:blank", 0, 0, URLZONE_INTERNET, FALSE, secid6, sizeof(secid6), S_OK}, + {L"ftp://zone3.winetest/file.test", 0, 0, URLZONE_INTERNET, FALSE, secid7, sizeof(secid7), S_OK}, + {L"/file/testing/test.test", Uri_CREATE_ALLOW_RELATIVE, 0, URLZONE_INTERNET, FALSE, NULL, 0, E_INVALIDARG}, + {L"zip://testing.com/", 0, 0, URLZONE_INTERNET, FALSE, secidex2_1, sizeof(secidex2_1), S_OK}, + {L"zip:testing.com", 0, 0, URLZONE_INTERNET, FALSE, secidex2_2, sizeof(secidex2_2), S_OK}, + {L"http:google.com", 0, S_OK, URLZONE_INVALID, FALSE, NULL, 0, E_INVALIDARG}, + {L"http:/google.com", 0, S_OK, URLZONE_INVALID, FALSE, NULL, 0, E_INVALIDARG}, + {L"*:/testing", 0, S_OK, URLZONE_INTERNET, FALSE, NULL, 0, E_INVALIDARG}, + {L"*://testing.com", 0, S_OK, URLZONE_INTERNET, FALSE, secidex2_3, sizeof(secidex2_3), S_OK} }; static void test_SecurityManagerEx2(void) @@ -1821,20 +1803,18 @@ static void test_SecurityManagerEx2(void) IUri_Release(uri); for(i = 0; i < ARRAY_SIZE(sec_mgr_ex2_tests); ++i) { - LPWSTR uriW = a2w(sec_mgr_ex2_tests[i].uri); - uri = NULL; zone = URLZONE_INVALID; - hres = pCreateUri(uriW, sec_mgr_ex2_tests[i].create_flags, 0, &uri); - ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].uri); + hres = pCreateUri(sec_mgr_ex2_tests[i].uri, sec_mgr_ex2_tests[i].create_flags, 0, &uri); + ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, wine_dbgstr_w(sec_mgr_ex2_tests[i].uri)); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); todo_wine_if (sec_mgr_ex2_tests[i].map_todo) { ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x for '%s'\n", - hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); + hres, sec_mgr_ex2_tests[i].map_hres, wine_dbgstr_w(sec_mgr_ex2_tests[i].uri)); ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, - zone, sec_mgr_ex2_tests[i].uri); + zone, wine_dbgstr_w(sec_mgr_ex2_tests[i].uri)); } buf_size = sizeof(buf); @@ -1843,16 +1823,15 @@ static void test_SecurityManagerEx2(void) hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, 0); todo_wine_if (sec_mgr_ex2_tests[i].secid_todo) { ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", - hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); + hres, sec_mgr_ex2_tests[i].secid_hres, wine_dbgstr_w(sec_mgr_ex2_tests[i].uri)); if(sec_mgr_ex2_tests[i].secid) { ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong security id size=%d, expected %d on test '%s'\n", - buf_size, sec_mgr_ex2_tests[i].secid_size, sec_mgr_ex2_tests[i].uri); + buf_size, sec_mgr_ex2_tests[i].secid_size, wine_dbgstr_w(sec_mgr_ex2_tests[i].uri)); ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid, sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test '%s'\n", - sec_mgr_ex2_tests[i].uri); + wine_dbgstr_w(sec_mgr_ex2_tests[i].uri)); } } - heap_free(uriW); IUri_Release(uri); } @@ -1884,25 +1863,24 @@ static void test_SecurityManagerEx2(void) static void test_CoInternetIsFeatureZoneElevationEnabled(void) { struct { - const char *url_from; - const char *url_to; + const WCHAR *url_from; + const WCHAR *url_to; DWORD flags; HRESULT hres; DWORD policy_flags; } testcases[] = { - /* 0 */ { "http://www.winehq.org", "http://www.winehq.org", 0, S_FALSE, URLPOLICY_ALLOW }, - /* 1 */ { "http://www.winehq.org", "http://www.winehq.org", 0, S_OK, URLPOLICY_DISALLOW }, - /* 2 */ { "http://www.winehq.org", "http://www.codeweavers.com", 0, S_FALSE, URLPOLICY_ALLOW }, - /* 3 */ { "http://www.winehq.org", "http://www.codeweavers.com", 0, S_OK, URLPOLICY_DISALLOW }, - /* 4 */ { "http://www.winehq.org", "http://www.winehq.org", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, - /* 5 */ { "http://www.winehq.org", "http://www.winehq.org/dir", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, - /* 6 */ { "http://www.winehq.org", "http://www.codeweavers.com", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, - /* 7 */ { "http://www.winehq.org", "ftp://winehq.org", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, - /* 8 */ { "http://www.winehq.org", "ftp://winehq.org", GET_FEATURE_FROM_PROCESS|0x100, S_FALSE, URLPOLICY_ALLOW }, - /* 9 */ { "http://www.winehq.org", "ftp://winehq.org", GET_FEATURE_FROM_REGISTRY, S_FALSE, URLPOLICY_ALLOW }, + /* 0 */ { L"http://www.winehq.org", L"http://www.winehq.org", 0, S_FALSE, URLPOLICY_ALLOW }, + /* 1 */ { L"http://www.winehq.org", L"http://www.winehq.org", 0, S_OK, URLPOLICY_DISALLOW }, + /* 2 */ { L"http://www.winehq.org", L"http://www.codeweavers.com", 0, S_FALSE, URLPOLICY_ALLOW }, + /* 3 */ { L"http://www.winehq.org", L"http://www.codeweavers.com", 0, S_OK, URLPOLICY_DISALLOW }, + /* 4 */ { L"http://www.winehq.org", L"http://www.winehq.org", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, + /* 5 */ { L"http://www.winehq.org", L"http://www.winehq.org/dir", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, + /* 6 */ { L"http://www.winehq.org", L"http://www.codeweavers.com", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, + /* 7 */ { L"http://www.winehq.org", L"ftp://winehq.org", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, + /* 8 */ { L"http://www.winehq.org", L"ftp://winehq.org", GET_FEATURE_FROM_PROCESS|0x100, S_FALSE, URLPOLICY_ALLOW }, + /* 9 */ { L"http://www.winehq.org", L"ftp://winehq.org", GET_FEATURE_FROM_REGISTRY, S_FALSE, URLPOLICY_ALLOW }, }; - WCHAR *url_from, *url_to; int i; HRESULT hres; @@ -1934,14 +1912,11 @@ static void test_CoInternetIsFeatureZoneElevationEnabled(void) } for(i = 0; i < ARRAY_SIZE(testcases); i++) { - url_from = a2w(testcases[i].url_from); - url_to = a2w(testcases[i].url_to); - if(testcases[i].policy_flags != -1) { ProcessUrlAction_policy = testcases[i].policy_flags; SET_EXPECT(ProcessUrlAction); } - hres = pCoInternetIsFeatureZoneElevationEnabled(url_from, url_to, + hres = pCoInternetIsFeatureZoneElevationEnabled(testcases[i].url_from, testcases[i].url_to, &security_manager, testcases[i].flags); ok(hres == testcases[i].hres, "%d) CoInternetIsFeatureZoneElevationEnabled returned %x\n", i, hres); if(testcases[i].policy_flags != -1) @@ -1950,13 +1925,10 @@ static void test_CoInternetIsFeatureZoneElevationEnabled(void) if(testcases[i].policy_flags != -1) SET_EXPECT(ProcessUrlAction); hres = pCoInternetIsFeatureEnabledForUrl(FEATURE_ZONE_ELEVATION, - testcases[i].flags, url_to, &security_manager); + testcases[i].flags, testcases[i].url_to, &security_manager); ok(hres == testcases[i].hres, "%d) CoInternetIsFeatureEnabledForUrl returned %x\n", i, hres); if(testcases[i].policy_flags != -1) CHECK_CALLED(ProcessUrlAction); - - heap_free(url_from); - heap_free(url_to); } } -- 2.24.1

3 2

[PATCH 1/2] urlmon/tests: Get rid of strcmp_aw() in sec_mgr.c
by Michael Stefaniuc 19 Feb '20

19 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/sec_mgr.c | 43 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2974eecc36..dda50dd056 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -190,13 +190,6 @@ static inline LPWSTR a2w(LPCSTR str) return ret; } -static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { - LPWSTR strAW = a2w(strA); - DWORD ret = lstrcmpW(strAW, strB); - heap_free(strAW); - return ret; -} - /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) @@ -1592,21 +1585,21 @@ static const struct { DWORD create_flags; const char *security_uri; HRESULT security_hres; - const char *default_uri; + const WCHAR *default_uri; HRESULT default_hres; BOOL todo; } sec_url_ex_tests[] = { - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,"*:index.html",S_OK,"*:index.htm",S_OK}, - {"file://c:\\Index.htm",Uri_CREATE_FILE_USE_DOS_PATH,"file:///c:/Index.htm",S_OK,"file:///c:/Index.htm",S_OK}, - {"file:some%20file%2ejpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, - {"file:some file.jpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, - {"http://www.zone3.winetest/",0,"http://www.zone3.winetest/",S_OK,"http://www.zone3.winetest/",S_OK}, - {"about:blank",0,"about:blank",S_OK,"about:blank",S_OK}, - {"ftp://zone3.winetest/file.test",0,"ftp://zone3.winetest/file.test",S_OK,"ftp://zone3.winetest/file.test",S_OK}, - {"test:123abc",0,"test:123abc",S_OK,"test:123abc",S_OK}, - {"http:google.com/test.file",0,"http:google.com/test.file",S_OK,"http:google.com/test.file",S_OK}, - {"ftp://test@ftp.winehq.org/",0,"ftp://ftp.winehq.org/",S_OK,"ftp://ftp.winehq.org/",S_OK}, - {"test://google@ftp.winehq.org/",0,"test://google@ftp.winehq.org/",S_OK,"test://google@ftp.winehq.org/",S_OK} + {"index.htm", Uri_CREATE_ALLOW_RELATIVE, "*:index.html", S_OK, L"*:index.htm", S_OK}, + {"file://c:\\Index.htm", Uri_CREATE_FILE_USE_DOS_PATH, "file:///c:/Index.htm", S_OK, L"file:///c:/Index.htm", S_OK}, + {"file:some%20file%2ejpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {"file:some file.jpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {"http://www.zone3.winetest/", 0, "http://www.zone3.winetest/", S_OK, L"http://www.zone3.winetest/", S_OK}, + {"about:blank", 0, "about:blank", S_OK, L"about:blank", S_OK}, + {"ftp://zone3.winetest/file.test", 0, "ftp://zone3.winetest/file.test", S_OK, L"ftp://zone3.winetest/file.test", S_OK}, + {"test:123abc", 0, "test:123abc", S_OK, L"test:123abc", S_OK}, + {"http:google.com/test.file", 0, "http:google.com/test.file", S_OK, L"http:google.com/test.file", S_OK}, + {"ftp://test@ftp.winehq.org/", 0, "ftp://ftp.winehq.org/", S_OK, L"ftp://ftp.winehq.org/", S_OK}, + {"test://google@ftp.winehq.org/", 0, "test://google@ftp.winehq.org/", S_OK, L"test://google@ftp.winehq.org/", S_OK} }; static void test_InternetGetSecurityUrlEx(void) @@ -1647,9 +1640,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { todo_wine_if (sec_url_ex_tests[i].todo) { - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); + ok(!lstrcmpW(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", + wine_dbgstr_w(sec_url_ex_tests[i].default_uri), wine_dbgstr_w(received), i); } } SysFreeString(received); @@ -1670,9 +1663,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { todo_wine_if (sec_url_ex_tests[i].todo) { - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); + ok(!lstrcmpW(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", + wine_dbgstr_w(sec_url_ex_tests[i].default_uri), wine_dbgstr_w(received), i); } } SysFreeString(received); -- 2.24.1

3 2

[PATCH 1/2] kernelbase: Handle RegGetValue() RRF_SUBKEY_WOW64*KEY flags.
by Serge Gautherie 19 Feb '20

19 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/kernelbase/registry.c | 26 ++++++++++++++++++++++++-- include/winreg.h | 4 +++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 137c0ef..b4f540c 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1739,13 +1739,24 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; + if ((dwFlags & (RRF_SUBKEY_WOW6464KEY | RRF_SUBKEY_WOW6432KEY)) == (RRF_SUBKEY_WOW6464KEY | RRF_SUBKEY_WOW6432KEY)) + return ERROR_INVALID_PARAMETER; + if (pszSubKey && pszSubKey[0]) { - ret = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + REGSAM samDesired = KEY_QUERY_VALUE; + + if (dwFlags & RRF_SUBKEY_WOW6464KEY) + samDesired |= KEY_WOW64_64KEY; + else if (dwFlags & RRF_SUBKEY_WOW6432KEY) + samDesired |= KEY_WOW64_32KEY; + + ret = RegOpenKeyExW(hKey, pszSubKey, 0, samDesired, &hKey); if (ret != ERROR_SUCCESS) return ret; } @@ -1835,13 +1846,24 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; + if ((dwFlags & (RRF_SUBKEY_WOW6464KEY | RRF_SUBKEY_WOW6432KEY)) == (RRF_SUBKEY_WOW6464KEY | RRF_SUBKEY_WOW6432KEY)) + return ERROR_INVALID_PARAMETER; + if (pszSubKey && pszSubKey[0]) { - ret = RegOpenKeyExA(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + REGSAM samDesired = KEY_QUERY_VALUE; + + if (dwFlags & RRF_SUBKEY_WOW6464KEY) + samDesired |= KEY_WOW64_64KEY; + else if (dwFlags & RRF_SUBKEY_WOW6432KEY) + samDesired |= KEY_WOW64_32KEY; + + ret = RegOpenKeyExA(hKey, pszSubKey, 0, samDesired, &hKey); if (ret != ERROR_SUCCESS) return ret; } diff --git a/include/winreg.h b/include/winreg.h index c003791..665ea8b 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -80,7 +80,9 @@ typedef LONG LSTATUS; #define RRF_RT_REG_QWORD (1 << 6) #define RRF_RT_DWORD (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD) #define RRF_RT_QWORD (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD) -#define RRF_RT_ANY 0xffff +#define RRF_RT_ANY 0x0000ffff +#define RRF_SUBKEY_WOW6464KEY (1 << 16) +#define RRF_SUBKEY_WOW6432KEY (1 << 17) #define RRF_NOEXPAND (1 << 28) #define RRF_ZEROONFAILURE (1 << 29) -- 2.10.0.windows.1

3 5

[PATCH 4/4] stdio.h: Make *scanf declarations compatible with ucrt.
by Jacek Caban 19 Feb '20

19 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdio.h | 105 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 7 deletions(-)

2 1

[PATCH 3/4] stdio.h: Make *printf declarations compatible with ucrt.
by Jacek Caban 19 Feb '20

19 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp90/msvcp_main.c | 10 -- include/msvcrt/stdio.h | 191 +++++++++++++++++++++++++++++++------- 2 files changed, 158 insertions(+), 43 deletions(-)

2 1

[PATCH 2/4] corecrt_wstdio.h: Make *wscanf declarations compatible with ucrt.
by Jacek Caban 19 Feb '20

19 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 88 ++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 6 deletions(-)

2 1

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-devel February 2020