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

[PATCH 1/4] corecrt_wstdio.h: Make *wprintf 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 | 221 +++++++++++++++++++++++++++++--- 1 file changed, 203 insertions(+), 18 deletions(-)

2 1

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

19 Feb '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Note that not all WMI properties referenced are implemented yet by Wine, future patches will add these. programs/wineboot/Makefile.in | 4 +- programs/wineboot/wineboot.c | 143 ++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 3921fa9644..67944a2444 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,7 +1,7 @@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 -DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev +IMPORTS = uuid advapi32 wbemuuid +DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev ole32 oleaut32 EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 8e3e234397..30d75b3214 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -72,6 +72,7 @@ #include <shellapi.h> #include <setupapi.h> #include <newdev.h> +#include <wbemcli.h> #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -299,6 +300,145 @@ static void get_namestring( WCHAR *buf ) { } #endif /* __i386__ || __x86_64__ */ +struct reg_wmi_map +{ + const WCHAR *registry_valname; + const WCHAR *wmi_propname; +}; +static const struct reg_wmi_map bios_map[] = +{ + { L"BiosMajorRelease", L"SystemBiosMajorVersion" }, + { L"BiosMinorRelease", L"SystemBiosMinorVersion" }, + { L"BIOSReleaseDate", L"ReleaseDate" }, + { L"BIOSVendor", L"Manufacturer" }, + { L"BIOSVersion", L"SMBIOSBIOSVersion" }, + { L"ECFirmwareMajorVersion", L"EmbeddedControllerMajorVersion" }, + { L"ECFirmwareMinorVersion", L"EmbeddedControllerMinorVersion" }, +}; +static const struct reg_wmi_map baseboard_map[] = +{ + { L"BaseBoardManufacturer", L"Manufacturer" }, + { L"BaseBoardProduct", L"Product" }, + { L"BaseBoardVersion", L"Version" }, +}; +static const struct reg_wmi_map computersystem_map[] = +{ + { L"SystemFamily", L"SystemFamily" }, + { L"SystemManufacturer", L"Manufacturer" }, + { L"SystemProductName", L"Model" }, + { L"SystemSKU", L"SystemSKUNumber" }, +}; +static const struct reg_wmi_map computersystemproduct_map[] = +{ + { L"SystemVersion", L"Version" }, +}; + +static void create_bios_values( HKEY bios_key, IWbemServices *services, const WCHAR *class, const struct reg_wmi_map *map, unsigned int map_size ) +{ + static const WCHAR select_allW[] = L"SELECT * FROM "; + HRESULT hr; + IEnumWbemClassObject *result = NULL; + LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; + BSTR wql = NULL, query = NULL; + UINT len; + + len = lstrlenW( class ) + ARRAY_SIZE(select_allW); + if (!(query = SysAllocStringLen( NULL, len ))) goto done; + lstrcpyW( query, select_allW ); + lstrcatW( query, class ); + + if (!(wql = SysAllocString( L"WQL" ))) goto done; + hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); + if (hr != S_OK) goto done; + + for (;;) + { + IWbemClassObject *obj; + ULONG count; + unsigned int i; + + IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); + if (!count) break; + + for (i = 0; i < map_size; i++) + { + BSTR str = NULL; + CIMTYPE cimtype; + VARIANT v; + + if (!(str = SysAllocString( map[i].wmi_propname ))) break; + if (IWbemClassObject_Get( obj, str, 0, &v, &cimtype, NULL ) == WBEM_S_NO_ERROR) + { + if (V_VT( &v ) == VT_UI1) + { + DWORD dw = V_UI1( &v ); + RegSetValueExW( bios_key, map[i].registry_valname, 0, REG_DWORD, (const BYTE *)&dw, sizeof(dw) ); + } + else if (V_VT( &v ) == VT_BSTR) + { + if (cimtype == CIM_DATETIME) + { + /* WMI/CIM datetime starts with "YYYYMMDD", but BIOSReleaseDate uses "MM/DD/YYYY" */ + WCHAR date[] = L"MM/DD/YYYY"; + const WCHAR *cimdate = V_BSTR( &v ); + memcpy( &date[6], &cimdate[0], 4*sizeof(WCHAR) ); + memcpy( &date[0], &cimdate[4], 2*sizeof(WCHAR) ); + memcpy( &date[3], &cimdate[6], 2*sizeof(WCHAR) ); + set_reg_value( bios_key, map[i].registry_valname, date ); + } + else + set_reg_value( bios_key, map[i].registry_valname, V_BSTR( &v ) ); + } + VariantClear( &v ); + } + SysFreeString( str ); + } + IWbemClassObject_Release( obj ); + } + +done: + if (result) IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + +static void create_bios_key( HKEY system_key ) +{ + HKEY bios_key; + HRESULT hr; + IWbemLocator *locator = NULL; + IWbemServices *services = NULL; + BSTR path = NULL; + + if (RegCreateKeyExW( system_key, L"BIOS", 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &bios_key, NULL )) + return; + + CoInitialize( NULL ); + CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, + RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator ); + if (hr != S_OK) goto done; + + if (!(path = SysAllocString( L"ROOT\\CIMV2" ))) goto done; + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + if (hr != S_OK) goto done; + + create_bios_values( bios_key, services, L"Win32_BaseBoard", baseboard_map, ARRAY_SIZE(baseboard_map) ); + create_bios_values( bios_key, services, L"Win32_BIOS", bios_map, ARRAY_SIZE(bios_map) ); + create_bios_values( bios_key, services, L"Win32_ComputerSystem", computersystem_map, ARRAY_SIZE(computersystem_map) ); + create_bios_values( bios_key, services, L"Win32_ComputerSystemProduct", computersystemproduct_map, ARRAY_SIZE(computersystemproduct_map) ); + +done: + if (services) IWbemServices_Release( services ); + if (locator) IWbemLocator_Release( locator ); + SysFreeString( path ); + CoUninitialize(); + RegCloseKey( bios_key ); +} + /* create the volatile hardware registry keys */ static void create_hardware_registry_keys(void) { @@ -409,6 +549,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

3 2

[PATCH v2 1/5] gdiplus: Refactor to split up encode_image_wic().
by Florian Will 19 Feb '20

19 Feb '20

New functions initialize_encoder_wic(), encode_frame_wic() and terminate_encoder_wic() are useful for implementing GdipSaveAdd() and GdipSaveAddImage() later. The WIC encoder is now stored in the new GpImage "encoder" field instead of a local variable. This makes it possible to keep the encoder active between multiple gdiplus API calls, which is also useful for GdipSaveAdd() and GdipSaveAddImage(). Signed-off-by: Florian Will <florian.will(a)gmail.com> --- v2: Added an encoder field to GpImage and changed the initialize encoder function to accept GpImage* instead of IWICBitmapEncoder*. The encoder is then stored in the image->encoder field. The terminate function now also accepts GpImage* instead of IWICBitmapEncoder*. It checks if image->encoder is set, commits and releases it, then sets it to NULL. That way, it should be more robust against double frees and memleaks. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/image.c | 93 ++++++++++++++++++++++++++-------- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8c4fcceded..39caf1a91e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -72,6 +72,7 @@ extern GpStatus gdip_transform_points(GpGraphics *graphics, GpCoordinateSpace ds extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; extern GpStatus encode_image_png(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) DECLSPEC_HIDDEN; +extern GpStatus terminate_encoder_wic(GpImage *image) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; @@ -346,6 +347,7 @@ struct GpAdjustableArrowCap{ struct GpImage{ IWICBitmapDecoder *decoder; + IWICBitmapEncoder *encoder; ImageType type; GUID format; UINT flags; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index dcdc49c6d6..6fee7c3854 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1827,6 +1827,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->height = height; (*bitmap)->format = format; (*bitmap)->image.decoder = NULL; + (*bitmap)->image.encoder = NULL; (*bitmap)->hbitmap = hbitmap; (*bitmap)->hdc = NULL; (*bitmap)->bits = bits; @@ -2046,6 +2047,8 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) if (dst->image.decoder) IWICBitmapDecoder_Release(dst->image.decoder); dst->image.decoder = src->image.decoder; + terminate_encoder_wic(&dst->image); /* terminate active encoder before overwriting with src */ + dst->image.encoder = src->image.encoder; dst->image.frame_count = src->image.frame_count; dst->image.current_frame = src->image.current_frame; dst->image.format = src->image.format; @@ -2078,6 +2081,7 @@ static GpStatus free_image_data(GpImage *image) } if (image->decoder) IWICBitmapDecoder_Release(image->decoder); + terminate_encoder_wic(image); heap_free(image->palette); return Ok; @@ -3744,6 +3748,8 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) new_image->busy = image->busy; memcpy(&new_image->format, &image->format, sizeof(GUID)); + new_image->encoder = image->encoder; + image->encoder = NULL; free_image_data(image); if (image->type == ImageTypeBitmap) *(GpBitmap *)image = *(GpBitmap *)new_image; @@ -4435,13 +4441,52 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam * These functions encode an image in different image file formats. */ -static GpStatus encode_image_wic(GpImage *image, IStream* stream, - REFGUID container, GDIPCONST EncoderParameters* params) +static GpStatus initialize_encoder_wic(IStream *stream, REFGUID container, GpImage *image) +{ + IWICImagingFactory *factory; + HRESULT hr; + + TRACE("%p,%s\n", stream, wine_dbgstr_guid(container)); + + terminate_encoder_wic(image); /* terminate previous encoder if it exists */ + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) return hresult_to_status(hr); + hr = IWICImagingFactory_CreateEncoder(factory, container, NULL, &image->encoder); + IWICImagingFactory_Release(factory); + if (FAILED(hr)) + { + image->encoder = NULL; + return hresult_to_status(hr); + } + + hr = IWICBitmapEncoder_Initialize(image->encoder, stream, WICBitmapEncoderNoCache); + if (FAILED(hr)) + { + IWICBitmapEncoder_Release(image->encoder); + image->encoder = NULL; + return hresult_to_status(hr); + } + return Ok; +} + +GpStatus terminate_encoder_wic(GpImage *image) +{ + if (!image->encoder) + return Ok; + else + { + HRESULT hr = IWICBitmapEncoder_Commit(image->encoder); + IWICBitmapEncoder_Release(image->encoder); + image->encoder = NULL; + return hresult_to_status(hr); + } +} + +static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) { GpStatus stat; GpBitmap *bitmap; - IWICImagingFactory *factory; - IWICBitmapEncoder *encoder; IWICBitmapFrameEncode *frameencode; IPropertyBag2 *encoderoptions; HRESULT hr; @@ -4466,20 +4511,7 @@ static GpStatus encode_image_wic(GpImage *image, IStream* stream, rc.Width = width; rc.Height = height; - hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); - if (FAILED(hr)) - return hresult_to_status(hr); - hr = IWICImagingFactory_CreateEncoder(factory, container, NULL, &encoder); - IWICImagingFactory_Release(factory); - if (FAILED(hr)) - return hresult_to_status(hr); - - hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, &encoderoptions); - } + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, &encoderoptions); if (SUCCEEDED(hr)) /* created frame */ { @@ -4563,13 +4595,30 @@ static GpStatus encode_image_wic(GpImage *image, IStream* stream, IPropertyBag2_Release(encoderoptions); } - if (SUCCEEDED(hr)) - hr = IWICBitmapEncoder_Commit(encoder); - - IWICBitmapEncoder_Release(encoder); return hresult_to_status(hr); } +static GpStatus encode_image_wic(GpImage *image, IStream *stream, + REFGUID container, GDIPCONST EncoderParameters *params) +{ + GpStatus status, terminate_status; + + if (image->type != ImageTypeBitmap) + return GenericError; + + status = initialize_encoder_wic(stream, container, image); + + if (status == Ok) + status = encode_frame_wic(image->encoder, image); + + /* always try to terminate, but if something already failed earlier, keep the old status. */ + terminate_status = terminate_encoder_wic(image); + if (status == Ok) + status = terminate_status; + + return status; +} + static GpStatus encode_image_BMP(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) { -- 2.20.1

2 9

[PATCH 1/6] gdiplus/tests: Test path-widening on capped lines.
by Jeff Smith 19 Feb '20

19 Feb '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Note: LineCapArrowAnchor and LineCapCustom implementations are not in this series as they are still WIP. dlls/gdiplus/tests/graphicspath.c | 179 ++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 096fbc600a..e12d9e2c49 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1245,6 +1245,184 @@ static void test_widen(void) GdipDeletePath(path); } +static path_test_t widenline_capflat_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ + }; + +static path_test_t widenline_capsquare_path[] = { + {0.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {55.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {55.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {0.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ + }; + +static path_test_t widenline_capround_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 2}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 1}, /*1*/ + {52.761421, 5.0, PathPointTypeBezier, 0, 0}, /*2*/ + {55.0, 7.238576, PathPointTypeBezier, 0, 0}, /*3*/ + {55.0, 10.0, PathPointTypeBezier, 0, 0}, /*4*/ + {55.0, 12.761423, PathPointTypeBezier, 0, 0}, /*5*/ + {52.761421, 15.0, PathPointTypeBezier, 0, 0}, /*6*/ + {50.0, 15.0, PathPointTypeBezier, 0, 0}, /*7*/ + {5.0, 15.0, PathPointTypeLine, 0, 0}, /*8*/ + {2.238576, 15.0, PathPointTypeBezier, 0, 0}, /*9*/ + {0.0, 12.761423, PathPointTypeBezier, 0, 0}, /*10*/ + {0.0, 10.0, PathPointTypeBezier, 0, 0}, /*11*/ + {0.0, 7.238576, PathPointTypeBezier, 0, 0}, /*12*/ + {2.238576, 5.0, PathPointTypeBezier, 0, 0}, /*13*/ + {5.0, 5.0, PathPointTypeBezier|PathPointTypeCloseSubpath, 0, 0}, /*14*/ + }; + +static path_test_t widenline_captriangle_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {55.0, 10.0, PathPointTypeLine, 0, 0}, /*2*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*3*/ + {5.0, 15.0, PathPointTypeLine, 0, 0}, /*4*/ + {0.0, 10.0, PathPointTypeLine, 0, 1}, /*5*/ + {5.0, 5.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 2} /*6*/ + }; + +static path_test_t widenline_capsquareanchor_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {12.071068, 2.928932, PathPointTypeStart, 0, 0}, /*4*/ + {12.071068, 17.071066, PathPointTypeLine, 0, 0}, /*5*/ + {-2.071068, 17.071066, PathPointTypeLine, 0, 0}, /*6*/ + {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + {42.928928, 17.071068, PathPointTypeStart, 0, 0}, /*8*/ + {42.928928, 2.928932, PathPointTypeLine, 0, 0}, /*9*/ + {57.071068, 2.928932, PathPointTypeLine, 0, 0}, /*10*/ + {57.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*11*/ + }; + +static path_test_t widenline_caproundanchor_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {5.0, 20.0, PathPointTypeStart, 0, 0}, /*4*/ + {-0.522847, 20.0, PathPointTypeBezier, 0, 0}, /*5*/ + {-5.0, 15.522846, PathPointTypeBezier, 0, 0}, /*6*/ + {-5.0, 10.0, PathPointTypeBezier, 0, 0}, /*7*/ + {-5.0, 4.477152, PathPointTypeBezier, 0, 0}, /*8*/ + {-0.522847, 0.0, PathPointTypeBezier, 0, 0}, /*9*/ + {5.0, 0.0, PathPointTypeBezier, 0, 0}, /*10*/ + {10.522847, 0.0, PathPointTypeBezier, 0, 0}, /*11*/ + {15.0, 4.477152, PathPointTypeBezier, 0, 0}, /*12*/ + {15.0, 10.0, PathPointTypeBezier, 0, 0}, /*13*/ + {15.0, 15.522846, PathPointTypeBezier, 0, 0}, /*14*/ + {10.522847, 20.0, PathPointTypeBezier, 0, 0}, /*15*/ + {5.0, 20.0, PathPointTypeBezier|PathPointTypeCloseSubpath, 0, 0}, /*16*/ + {50.0, 0.0, PathPointTypeStart, 0, 0}, /*17*/ + {55.522846, 0.0, PathPointTypeBezier, 0, 0}, /*18*/ + {60.0, 4.477153, PathPointTypeBezier, 0, 0}, /*19*/ + {60.0, 10.0, PathPointTypeBezier, 0, 0}, /*20*/ + {60.0, 15.522847, PathPointTypeBezier, 0, 0}, /*21*/ + {55.522846, 20.0, PathPointTypeBezier, 0, 0}, /*22*/ + {50.0, 20.0, PathPointTypeBezier, 0, 0}, /*23*/ + {44.477150, 20.0, PathPointTypeBezier, 0, 0}, /*24*/ + {40.0, 15.522847, PathPointTypeBezier, 0, 0}, /*25*/ + {40.0, 10.0, PathPointTypeBezier, 0, 0}, /*26*/ + {40.0, 4.477153, PathPointTypeBezier, 0, 0}, /*27*/ + {44.477150, 0.0, PathPointTypeBezier, 0, 0}, /*28*/ + {50.0, 0.0, PathPointTypeBezier|PathPointTypeCloseSubpath, 0, 0}, /*29*/ + }; + +static path_test_t widenline_capdiamondanchor_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {-5.0, 10.0, PathPointTypeStart, 0, 0}, /*4*/ + {5.0, 0.0, PathPointTypeLine, 0, 0}, /*5*/ + {15.0, 10.0, PathPointTypeLine, 0, 0}, /*6*/ + {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + {60.0, 10.0, PathPointTypeStart, 0, 0}, /*8*/ + {50.0, 20.0, PathPointTypeLine, 0, 0}, /*9*/ + {40.0, 10.0, PathPointTypeLine, 0, 0}, /*10*/ + {50.0, 0.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*11*/ + }; + +static path_test_t widenline_caparrowanchor_path[] = { + {15.0, 5.0, PathPointTypeStart, 0, 1}, /*0*/ + {40.0, 5.0, PathPointTypeLine, 0, 1}, /*1*/ + {40.0, 15.0, PathPointTypeLine, 0, 1}, /*2*/ + {15.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*3*/ + {5.0, 10.0, PathPointTypeStart, 0, 0}, /*4*/ + {22.320507, 0.0, PathPointTypeLine, 0, 0}, /*5*/ + {22.320507, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*6*/ + {50.0, 10.0, PathPointTypeStart, 0, 0}, /*7*/ + {32.679489, 20.0, PathPointTypeLine, 0, 0}, /*8*/ + {32.679489, 0.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*9*/ + }; + +static void test_widen_cap(void) +{ + struct + { + LineCap type; + const path_test_t *expected; + INT expected_size; + BOOL todo_size; + } + caps[] = + { + { LineCapFlat, widenline_capflat_path, + ARRAY_SIZE(widenline_capflat_path) }, + { LineCapSquare, widenline_capsquare_path, + ARRAY_SIZE(widenline_capsquare_path) }, + { LineCapRound, widenline_capround_path, + ARRAY_SIZE(widenline_capround_path), TRUE }, + { LineCapTriangle, widenline_captriangle_path, + ARRAY_SIZE(widenline_captriangle_path), TRUE }, + { LineCapNoAnchor, widenline_capflat_path, + ARRAY_SIZE(widenline_capflat_path) }, + { LineCapSquareAnchor, widenline_capsquareanchor_path, + ARRAY_SIZE(widenline_capsquareanchor_path), TRUE }, + { LineCapRoundAnchor, widenline_caproundanchor_path, + ARRAY_SIZE(widenline_caproundanchor_path), TRUE }, + { LineCapDiamondAnchor, widenline_capdiamondanchor_path, + ARRAY_SIZE(widenline_capdiamondanchor_path), TRUE }, + { LineCapArrowAnchor, widenline_caparrowanchor_path, + ARRAY_SIZE(widenline_caparrowanchor_path), TRUE }, + }; + GpStatus status; + GpPath *path; + GpPen *pen; + int i; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); + expect(Ok, status); + + for (i = 0; i < ARRAY_SIZE(caps); i++) + { + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + status = GdipSetPenStartCap(pen, caps[i].type); + expect(Ok, status); + status = GdipSetPenEndCap(pen, caps[i].type); + expect(Ok, status); + + status = GdipWidenPath(path, pen, NULL, FlatnessDefault); + expect(Ok, status); + ok_path(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size); + } + + GdipDeletePen(pen); + GdipDeletePath(path); +} + static void test_isvisible(void) { GpPath *path; @@ -1385,6 +1563,7 @@ START_TEST(graphicspath) test_addpie(); test_flatten(); test_widen(); + test_widen_cap(); test_isvisible(); test_empty_rect(); -- 2.23.0

2 11

[PATCH] mscoree: Remove appdomain tracking.
by Vincent Povirk 19 Feb '20

19 Feb '20

This didn't work correctly with multiple runtime versions. We should rely on Mono to keep track of AppDomains. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 73 ++++------------------------------ dlls/mscoree/metahost.c | 22 ++++++++++ dlls/mscoree/mscoree_private.h | 4 +- 3 files changed, 31 insertions(+), 68 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index a900ed6a3e2..a8fc2674ace 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -127,54 +127,19 @@ static void domain_restore(MonoDomain *prev_domain) mono_domain_set(prev_domain, FALSE); } -static HRESULT RuntimeHost_AddDefaultDomain(RuntimeHost *This, MonoDomain **result) -{ - struct DomainEntry *entry; - HRESULT res=S_OK; - - EnterCriticalSection(&This->lock); - - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); - if (!entry) - { - res = E_OUTOFMEMORY; - goto end; - } - - /* FIXME: Use exe filename to name the domain? */ - entry->domain = mono_jit_init_version("mscorlib.dll", "v4.0.30319"); - - if (!entry->domain) - { - HeapFree(GetProcessHeap(), 0, entry); - res = E_FAIL; - goto end; - } - - is_mono_started = TRUE; - - list_add_tail(&This->domains, &entry->entry); - - *result = entry->domain; - -end: - LeaveCriticalSection(&This->lock); - - return res; -} - static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *config_path, MonoDomain **result) { WCHAR config_dir[MAX_PATH]; WCHAR base_dir[MAX_PATH]; char *base_dirA, *config_pathA, *slash; HRESULT res=S_OK; + static BOOL configured_domain; - EnterCriticalSection(&This->lock); + *result = get_root_domain(); - if (This->default_domain) goto end; + EnterCriticalSection(&This->lock); - res = RuntimeHost_AddDefaultDomain(This, &This->default_domain); + if (configured_domain) goto end; if (!config_path) { @@ -213,40 +178,20 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf *(slash + 1) = 0; TRACE("setting base_dir: %s, config_path: %s\n", base_dirA, config_pathA); - mono_domain_set_config(This->default_domain, base_dirA, config_pathA); + mono_domain_set_config(*result, base_dirA, config_pathA); HeapFree(GetProcessHeap(), 0, config_pathA); HeapFree(GetProcessHeap(), 0, base_dirA); end: - *result = This->default_domain; + + configured_domain = TRUE; LeaveCriticalSection(&This->lock); return res; } -static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) -{ - struct DomainEntry *entry; - - EnterCriticalSection(&This->lock); - - LIST_FOR_EACH_ENTRY(entry, &This->domains, struct DomainEntry, entry) - { - if (entry->domain == domain) - { - list_remove(&entry->entry); - if (This->default_domain == domain) - This->default_domain = NULL; - HeapFree(GetProcessHeap(), 0, entry); - break; - } - } - - LeaveCriticalSection(&This->lock); -} - static BOOL RuntimeHost_GetMethod(MonoDomain *domain, const char *assemblyname, const char *namespace, const char *typename, const char *methodname, int arg_count, MonoMethod **method) @@ -1529,8 +1474,6 @@ __int32 WINAPI _CorExeMain(void) ERR("couldn't load %s, status=%d\n", debugstr_w(filename), status); exit_code = -1; } - - RuntimeHost_DeleteDomain(host, domain); } else exit_code = -1; @@ -1616,8 +1559,6 @@ HRESULT RuntimeHost_Construct(CLRRuntimeInfo *runtime_version, RuntimeHost** res This->ref = 1; This->version = runtime_version; - list_init(&This->domains); - This->default_domain = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RuntimeHost.lock"); diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 4c1e4e97c1e..3786f3afc5c 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -298,6 +298,28 @@ fail: return E_FAIL; } +MonoDomain* get_root_domain(void) +{ + static MonoDomain* root_domain; + + if (root_domain != NULL) + return root_domain; + + EnterCriticalSection(&runtime_list_cs); + + if (root_domain == NULL) + { + /* FIXME: Use exe filename to name the domain? */ + root_domain = mono_jit_init_version("mscorlib.dll", "v4.0.30319"); + + is_mono_started = TRUE; + } + + LeaveCriticalSection(&runtime_list_cs); + + return root_domain; +} + static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof) { is_mono_shutdown = TRUE; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index d5f78b61f0b..5b6c3987615 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -76,8 +76,6 @@ struct RuntimeHost ICorRuntimeHost ICorRuntimeHost_iface; ICLRRuntimeHost ICLRRuntimeHost_iface; CLRRuntimeInfo *version; - struct list domains; - MonoDomain *default_domain; CRITICAL_SECTION lock; LONG ref; }; @@ -110,6 +108,8 @@ extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config extern BOOL get_mono_path(LPWSTR path, BOOL skip_local) DECLSPEC_HIDDEN; +extern MonoDomain* get_root_domain(void); + extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN; -- 2.17.1

1 0

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

19 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..2f9a076481 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 8

[PATCH] kernel32/tests: Clarify the process's quotes handling comment.
by Francois Gouget 19 Feb '20

19 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- This also removes a diacritic character from the source file. Please apply this patch instead of the STARTUPINFO / PROCESS_INFORMATION one. The latter can wait until the situation with kernel32:process is clearer. dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH v2] user32: Add EnableNonClientDpiScaling stub.
by Sven Baars 19 Feb '20

19 Feb '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- v2: Set ERROR_CALL_NOT_IMPLEMENTED dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ include/winuser.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1aedc32de2..d2a1487971 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -205,6 +205,7 @@ @ stdcall EmptyClipboard() @ stdcall EnableMenuItem(long long long) @ stdcall EnableMouseInPointer(long) +@ stdcall EnableNonClientDpiScaling(long) @ stdcall EnableScrollBar(long long long) @ stdcall EnableWindow(long long) @ stdcall EndDeferWindowPos(long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3323ed3e41..73cd93de9a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4244,3 +4244,13 @@ BOOL WINAPI SetWindowCompositionAttribute(HWND hwnd, void *data) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * EnableNonClientDpiScaling (USER32.@) + */ +BOOL WINAPI EnableNonClientDpiScaling(HWND hwnd) +{ + FIXME("(%p): stub\n", hwnd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winuser.h b/include/winuser.h index 718f6e1c54..5fd774d295 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3702,6 +3702,7 @@ WINUSERAPI INT WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTP WINUSERAPI BOOL WINAPI EmptyClipboard(void); WINUSERAPI BOOL WINAPI EnableMenuItem(HMENU,UINT,UINT); WINUSERAPI BOOL WINAPI EnableMouseInPointer(BOOL); +WINUSERAPI BOOL WINAPI EnableNonClientDpiScaling(HWND); WINUSERAPI BOOL WINAPI EnableScrollBar(HWND,UINT,UINT); WINUSERAPI BOOL WINAPI EnableWindow(HWND,BOOL); WINUSERAPI BOOL WINAPI EndDeferWindowPos(HDWP); -- 2.24.0

1 0

[PATCH] user32: Add EnableNonClientDpiScaling stub.
by Sven Baars 19 Feb '20

19 Feb '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- This stops No Man Sky from crashing on start with Proton. dlls/user32/user32.spec | 1 + dlls/user32/win.c | 9 +++++++++ include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1aedc32de2..d2a1487971 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -205,6 +205,7 @@ @ stdcall EmptyClipboard() @ stdcall EnableMenuItem(long long long) @ stdcall EnableMouseInPointer(long) +@ stdcall EnableNonClientDpiScaling(long) @ stdcall EnableScrollBar(long long long) @ stdcall EnableWindow(long long) @ stdcall EndDeferWindowPos(long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3323ed3e41..eb2fa70edd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4244,3 +4244,12 @@ BOOL WINAPI SetWindowCompositionAttribute(HWND hwnd, void *data) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * EnableNonClientDpiScaling (USER32.@) + */ +BOOL WINAPI EnableNonClientDpiScaling(HWND hwnd) +{ + FIXME("(%p): stub\n", hwnd); + return FALSE; +} diff --git a/include/winuser.h b/include/winuser.h index 718f6e1c54..5fd774d295 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3702,6 +3702,7 @@ WINUSERAPI INT WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTP WINUSERAPI BOOL WINAPI EmptyClipboard(void); WINUSERAPI BOOL WINAPI EnableMenuItem(HMENU,UINT,UINT); WINUSERAPI BOOL WINAPI EnableMouseInPointer(BOOL); +WINUSERAPI BOOL WINAPI EnableNonClientDpiScaling(HWND); WINUSERAPI BOOL WINAPI EnableScrollBar(HWND,UINT,UINT); WINUSERAPI BOOL WINAPI EnableWindow(HWND,BOOL); WINUSERAPI BOOL WINAPI EndDeferWindowPos(HDWP); -- 2.24.0

2 1

[PATCH] [RFC] winex11.drv: Initialize variable properly (valgrind)
by Fabian Maurer 19 Feb '20

19 Feb '20

This silences the warning, but I'm not sure if it's entirely right. Your thoughts? --- dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd..778470068e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -546,6 +546,7 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biBitCount = 0; + info->bmiHeader.biCompression = BI_RGB; if (!(lines = GetDIBits( hdc, icon->hbmColor, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; if (!GetDIBits( hdc, icon->hbmColor, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; -- 2.25.1

2 2

[PATCH 5/7] user32: Add wsprintfW %C tests.
by Akihiro Sagawa 19 Feb '20

19 Feb '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)

2 1

[PATCH] riched20: Properly initialize variable (valgrind)
by Fabian Maurer 19 Feb '20

19 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48628 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/riched20/editor.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c4a6902733..29e17180d4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -416,10 +416,8 @@ static void ME_ApplyBorderProperties(RTF_Info *info, void ME_RTFCharAttrHook(RTF_Info *info) { - CHARFORMAT2W fmt; + CHARFORMAT2W fmt = {0}; fmt.cbSize = sizeof(fmt); - fmt.dwMask = 0; - fmt.dwEffects = 0; switch(info->rtfMinor) { -- 2.25.1

2 2

[PATCH v2] riched20: Properly initialize variable (valgrind)
by Fabian Maurer 19 Feb '20

19 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48628 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/riched20/editor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c4a6902733..dc28f05f23 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -420,6 +420,7 @@ void ME_RTFCharAttrHook(RTF_Info *info) fmt.cbSize = sizeof(fmt); fmt.dwMask = 0; fmt.dwEffects = 0; + memset(fmt.szFaceName, 0, sizeof(fmt.szFaceName)); switch(info->rtfMinor) { -- 2.25.1

1 0

[PATCH 7/7] shlwapi: Fix wnsprintfW/wvnsprintfW %C conversion.
by Akihiro Sagawa 19 Feb '20

19 Feb '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/shlwapi/wsprintf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] user32: Fix wsprintfW %C conversion.
by Akihiro Sagawa 19 Feb '20

19 Feb '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 6 +++--- dlls/user32/wsprintf.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[PATCH 4/7] shlwapi: Fix wnsprintfA/wvnsprintfA %C conversion.
by Akihiro Sagawa 19 Feb '20

19 Feb '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/shlwapi/wsprintf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH 3/7] user32: Fix wsprintfA %C conversion.
by Akihiro Sagawa 19 Feb '20

19 Feb '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 2 -- dlls/user32/wsprintf.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-)

1 0

[PATCH 2/7] user32/tests: Add wsprintfA %C conversion tests.
by Akihiro Sagawa 19 Feb '20

19 Feb '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 1/7] user32/tests: Use wide string literals in wsprintf tests.
by Akihiro Sagawa 19 Feb '20

19 Feb '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)

1 0

[PATCH 1/5] d3d8: Set the primary stateblock when executing draw calls.
by Zebediah Figura 19 Feb '20

19 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 132 +++++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 63 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 71717852bb..ea3653f4de 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1979,12 +1979,11 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD token) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + const struct wined3d_stateblock_state *state; struct wined3d_stateblock *stateblock; struct wined3d_buffer *wined3d_buffer; struct d3d8_vertexbuffer *buffer; - unsigned int i, offset, stride; - enum wined3d_format_id format; - HRESULT hr; + unsigned int i; TRACE("iface %p, token %#x.\n", iface, token); @@ -2007,17 +2006,16 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD } wined3d_stateblock_apply(stateblock, device->state); device->sysmem_vb = 0; + state = wined3d_stateblock_get_state(device->state); for (i = 0; i < D3D8_MAX_STREAMS; ++i) { - if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - continue; + wined3d_buffer = state->streams[i].buffer; if (!wined3d_buffer || !(buffer = wined3d_buffer_get_parent(wined3d_buffer))) continue; if (buffer->draw_buffer) device->sysmem_vb |= 1u << i; } - device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) + device->sysmem_ib = (wined3d_buffer = state->index_buffer) && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; wined3d_mutex_unlock(); @@ -2366,35 +2364,36 @@ static HRESULT WINAPI d3d8_device_GetCurrentTexturePalette(IDirect3DDevice8 *ifa static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, unsigned int start_vertex, unsigned int vertex_count) { + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); struct wined3d_vertex_declaration *wined3d_decl; struct wined3d_box box = {0, 0, 0, 1, 0, 1}; + const struct wined3d_stream_state *stream; struct d3d8_vertexbuffer *d3d8_buffer; struct wined3d_resource *dst_resource; struct d3d8_vertex_declaration *decl; - unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; struct wined3d_resource_desc desc; + unsigned int stride, map; HRESULT hr; if (!device->sysmem_vb) return; - wined3d_decl = wined3d_device_get_vertex_declaration(device->wined3d_device); - if (!wined3d_decl) + if (!(wined3d_decl = state->vertex_declaration)) return; decl = wined3d_vertex_declaration_get_parent(wined3d_decl); map = decl->stream_map & device->sysmem_vb; while (map) { - i = wined3d_bit_scan(&map); + stream = &state->streams[wined3d_bit_scan(&map)]; + dst_buffer = stream->buffer; + stride = stream->stride; - if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); d3d8_buffer = wined3d_buffer_get_parent(dst_buffer); dst_resource = wined3d_buffer_get_resource(dst_buffer); wined3d_resource_get_desc(dst_resource, &desc); - box.left = offset + start_vertex * stride; + box.left = stream->offset + start_vertex * stride; box.right = min(box.left + vertex_count * stride, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, dst_resource, 0, box.left, 0, 0, @@ -2406,25 +2405,26 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, static void d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device, unsigned int start_idx, unsigned int idx_count) { + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct wined3d_resource *dst_resource; struct d3d8_indexbuffer *d3d8_buffer; struct wined3d_buffer *dst_buffer; struct wined3d_resource_desc desc; enum wined3d_format_id format; - unsigned int offset, idx_size; + unsigned int idx_size; HRESULT hr; if (!device->sysmem_ib) return; - if (!(dst_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset))) - ERR("Failed to get index buffer.\n"); + dst_buffer = state->index_buffer; + format = state->index_format; d3d8_buffer = wined3d_buffer_get_parent(dst_buffer); dst_resource = wined3d_buffer_get_resource(dst_buffer); wined3d_resource_get_desc(dst_resource, &desc); idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; - box.left = offset + start_idx * idx_size; + box.left = start_idx * idx_size; box.right = min(box.left + idx_count * idx_size, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, dst_resource, 0, box.left, 0, 0, @@ -2444,9 +2444,9 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); wined3d_mutex_unlock(); @@ -2467,11 +2467,11 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); + base_vertex_index = wined3d_stateblock_get_state(device->state)->base_vertex_index; d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); wined3d_mutex_unlock(); @@ -2538,7 +2538,6 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, } wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d8_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -2561,13 +2560,14 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); if (FAILED(hr)) goto done; wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); - wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); done: wined3d_mutex_unlock(); @@ -2640,7 +2640,6 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d8_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -2685,20 +2684,21 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, vertex_stride); if (FAILED(hr)) goto done; - wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, - wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, + wined3dformat_from_d3dformat(index_format)); + wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); - wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); - wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, 0); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); + wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); + wined3d_stateblock_set_base_vertex_index(device->state, 0); done: wined3d_mutex_unlock(); @@ -2710,9 +2710,10 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertexbuffer *dst = unsafe_impl_from_IDirect3DVertexBuffer8(dst_buffer); + const struct wined3d_stateblock_state *state; + const struct wined3d_stream_state *stream; struct d3d8_vertexbuffer *d3d8_buffer; - struct wined3d_buffer *wined3d_buffer; - unsigned int i, offset, stride, map; + unsigned int i, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, flags %#x.\n", @@ -2720,7 +2721,7 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); + state = wined3d_stateblock_get_state(device->state); /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we @@ -2731,16 +2732,15 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT while (map) { i = wined3d_bit_scan(&map); + stream = &state->streams[i]; - if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); - d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); - if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, - i, d3d8_buffer->wined3d_buffer, offset, stride))) + d3d8_buffer = wined3d_buffer_get_parent(stream->buffer); + if (FAILED(wined3d_stateblock_set_stream_source(device->state, + i, d3d8_buffer->wined3d_buffer, stream->offset, stream->stride))) ERR("Failed to set stream source.\n"); } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst->wined3d_buffer, NULL, flags, dst->fvf); @@ -2748,13 +2748,11 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT while (map) { i = wined3d_bit_scan(&map); + stream = &state->streams[i]; - if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); - d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); - if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, - i, d3d8_buffer->draw_buffer, offset, stride))) + d3d8_buffer = wined3d_buffer_get_parent(stream->buffer); + if (FAILED(wined3d_stateblock_set_stream_source(device->state, + i, d3d8_buffer->draw_buffer, stream->offset, stream->stride))) ERR("Failed to set stream source.\n"); } @@ -2936,7 +2934,7 @@ static HRESULT WINAPI d3d8_device_GetVertexShader(IDirect3DDevice8 *iface, DWORD TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + if ((wined3d_declaration = wined3d_stateblock_get_state(device->state)->vertex_declaration)) { d3d8_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); *shader = d3d8_declaration->shader_handle; @@ -3137,7 +3135,7 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, IDirect3DIndexBuffer8 **buffer, UINT *base_vertex_index) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - enum wined3d_format_id wined3d_format; + const struct wined3d_stateblock_state *state; struct wined3d_buffer *wined3d_buffer; struct d3d8_indexbuffer *buffer_impl; @@ -3148,8 +3146,9 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, /* The case from UINT to INT is safe because d3d8 will never set negative values */ wined3d_mutex_lock(); - *base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, NULL))) + state = wined3d_stateblock_get_state(device->state); + *base_vertex_index = state->base_vertex_index; + if ((wined3d_buffer = state->index_buffer)) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer8_iface; @@ -3391,13 +3390,18 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *iface, TRACE("iface %p, stream_idx %u, buffer %p, stride %u.\n", iface, stream_idx, buffer, stride); + if (stream_idx >= WINED3D_MAX_STREAMS) + { + WARN("Stream index %u out of range.\n", stream_idx); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); if (!buffer_impl) { - wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - NULL, &stride); wined3d_buffer = NULL; + stride = wined3d_stateblock_get_state(device->state)->streams[stream_idx].stride; } else if (buffer_impl->draw_buffer) wined3d_buffer = buffer_impl->draw_buffer; @@ -3426,9 +3430,8 @@ static HRESULT WINAPI d3d8_device_GetStreamSource(IDirect3DDevice8 *iface, UINT stream_idx, IDirect3DVertexBuffer8 **buffer, UINT *stride) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + const struct wined3d_stream_state *stream; struct d3d8_vertexbuffer *buffer_impl; - struct wined3d_buffer *wined3d_buffer = NULL; - HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, stride %p.\n", iface, stream_idx, buffer, stride); @@ -3436,23 +3439,26 @@ static HRESULT WINAPI d3d8_device_GetStreamSource(IDirect3DDevice8 *iface, if (!buffer) return D3DERR_INVALIDCALL; + if (stream_idx > WINED3D_MAX_STREAMS) + { + WARN("Stream index %u out of range.\n", stream_idx); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, 0, stride); - if (SUCCEEDED(hr) && wined3d_buffer) + stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + if (stream->buffer) { - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffer_impl = wined3d_buffer_get_parent(stream->buffer); *buffer = &buffer_impl->IDirect3DVertexBuffer8_iface; IDirect3DVertexBuffer8_AddRef(*buffer); } else - { - if (FAILED(hr)) - ERR("Failed to get wined3d stream source, hr %#x.\n", hr); *buffer = NULL; - } + *stride = stream->stride; wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static const struct IDirect3DDevice8Vtbl d3d8_device_vtbl = -- 2.25.0

2 5

[PATCH] ntdll: Add semi-stub for RtlGetNativeSystemInformation().
by Paul Gofman 19 Feb '20

19 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40334 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/nt.c | 20 ++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/info.c | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b89602cee8..9b2844fc61 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3045,6 +3045,26 @@ NTSTATUS WINAPI NtQuerySystemInformation( return ret; } + +/****************************************************************************** + * RtlGetNativeSystemInformation [NTDLL.@] + */ +NTSTATUS WINAPI /* DECLSPEC_HOTPATCH */ RtlGetNativeSystemInformation( + IN SYSTEM_INFORMATION_CLASS SystemInformationClass, + OUT PVOID SystemInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + FIXME( "semi-stub, SystemInformationClass %#x, SystemInformation %p, Length %#x, ResultLength %p.\n", + SystemInformationClass, SystemInformation, Length, ResultLength ); + + /* RtlGetNativeSystemInformation function is the same as NtQuerySystemInformation on some Win7 + * versions but there are differences for earlier and newer versions, at least: + * - HighestUserAddress field for SystemBasicInformation; + * - Some information classes are not supported by RtlGetNativeSystemInformation. */ + return NtQuerySystemInformation( SystemInformationClass, SystemInformation, Length, ResultLength ); +} + /****************************************************************************** * NtQuerySystemInformationEx [NTDLL.@] * ZwQuerySystemInformationEx [NTDLL.@] diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 177271e182..ceaeaf12f5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -700,7 +700,7 @@ # Yes, Microsoft really misspelled this one! # @ stub RtlGetLengthWithoutTrailingPathSeperators @ stdcall RtlGetLongestNtPathLength() -# @ stub RtlGetNativeSystemInformation +@ stdcall -private RtlGetNativeSystemInformation(long ptr long ptr) # @ stub RtlGetNextRange @ stdcall RtlGetNtGlobalFlags() @ stdcall RtlGetNtProductType(ptr) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 76de56810c..8dc8bad645 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -23,6 +23,7 @@ #include <stdio.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -75,6 +76,7 @@ static BOOL InitFunctionPtrs(void) } NTDLL_GET_PROC(NtQuerySystemInformation); + NTDLL_GET_PROC(RtlGetNativeSystemInformation); NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); NTDLL_GET_PROC(NtQueryInformationThread); @@ -111,7 +113,7 @@ static void test_query_basic(void) { NTSTATUS status; ULONG ReturnLength; - SYSTEM_BASIC_INFORMATION sbi; + SYSTEM_BASIC_INFORMATION sbi, sbi2; /* This test also covers some basic parameter testing that should be the same for * every information class @@ -153,6 +155,38 @@ static void test_query_basic(void) /* Check if we have some return values */ trace("Number of Processors : %d\n", sbi.NumberOfProcessors); ok( sbi.NumberOfProcessors > 0, "Expected more than 0 processors, got %d\n", sbi.NumberOfProcessors); + + memset(&sbi2, 0, sizeof(sbi2)); + status = pRtlGetNativeSystemInformation(SystemBasicInformation, &sbi2, sizeof(sbi2), &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status); + ok( sizeof(sbi2) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + + ok( sbi.unknown == sbi2.unknown, "Expected unknown %#x, got %#x.\n", sbi.unknown, sbi2.unknown); + ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %u, got %u.\n", + sbi.KeMaximumIncrement, sbi2.KeMaximumIncrement); + ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %u, %u.\n", sbi.PageSize, sbi2.PageSize); + ok( sbi.MmNumberOfPhysicalPages == sbi2.MmNumberOfPhysicalPages, + "Expected MmNumberOfPhysicalPages %u, got %u.\n", + sbi.MmNumberOfPhysicalPages, sbi2.MmNumberOfPhysicalPages); + ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %u, got %u.\n", + sbi.MmLowestPhysicalPage, sbi2.MmLowestPhysicalPage); + ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %u, got %u.\n", + sbi.MmHighestPhysicalPage, sbi2.MmHighestPhysicalPage); + /* Higher 32 bits of AllocationGranularity is sometimes garbage on Windows. */ + ok( (ULONG)sbi.AllocationGranularity == (ULONG)sbi2.AllocationGranularity, + "Expected AllocationGranularity %#lx, got %#lx.\n", + sbi.AllocationGranularity, sbi2.AllocationGranularity); + ok( sbi.LowestUserAddress == sbi2.LowestUserAddress, "Expected LowestUserAddress %p, got %p.\n", + (void *)sbi.LowestUserAddress, (void *)sbi2.LowestUserAddress); + /* Not testing HighestUserAddress. The field is different from NtQuerySystemInformation result + * on 32 bit Windows (some of Win8 versions are the exception). Whenever it is different, + * NtQuerySystemInformation returns user space limit (0x0x7ffeffff) and RtlGetNativeSystemInformation + * returns address space limit (0xfffeffff). */ + ok( sbi.ActiveProcessorsAffinityMask == sbi2.ActiveProcessorsAffinityMask, + "Expected ActiveProcessorsAffinityMask %#lx, got %#lx.\n", + sbi.ActiveProcessorsAffinityMask, sbi2.ActiveProcessorsAffinityMask); + ok( sbi.NumberOfProcessors == sbi2.NumberOfProcessors, "Expected NumberOfProcessors %u, got %u.\n", + sbi.NumberOfProcessors, sbi2.NumberOfProcessors); } static void test_query_cpu(void) -- 2.24.1

2 1

[PATCH] include: Add corecrt_wio.h header.
by Jacek Caban 19 Feb '20

19 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wio.h | 57 ++++++++++++++++++++++++++++++++++++ include/msvcrt/io.h | 43 +-------------------------- include/msvcrt/wchar.h | 45 +--------------------------- 3 files changed, 59 insertions(+), 86 deletions(-) create mode 100644 include/msvcrt/corecrt_wio.h

1 0

[PATCH 1/3] tools: Add unsigned __int64 type to make_requests
by brock＠polynubstudios.com 19 Feb '20

19 Feb '20

From: Brock York <twunknown(a)gmail.com> Signed-off-by: Brock York <brock(a)polynubstudios.com> --- tools/make_requests | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/make_requests b/tools/make_requests index 4e39bb65a9..77353b4e7d 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -53,6 +53,7 @@ my %formats = "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], "client_cpu_t" => [ 4, 4, "&dump_client_cpu" ], "hw_input_t" => [ 32, 8, "&dump_hw_input" ], + "unsigned __int64" => [ 8, 8, "&dump_uint64" ], ); my @requests = (); -- 2.25.0

1 2

[PATCH 1/3] tools: Add unsigned __int64 type to make_requests
by brock＠polynubstudios.com 19 Feb '20

19 Feb '20

From: Brock York <twunknown(a)gmail.com> --- tools/make_requests | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/make_requests b/tools/make_requests index 4e39bb65a9..77353b4e7d 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -53,6 +53,7 @@ my %formats = "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], "client_cpu_t" => [ 4, 4, "&dump_client_cpu" ], "hw_input_t" => [ 32, 8, "&dump_hw_input" ], + "unsigned __int64" => [ 8, 8, "&dump_uint64" ], ); my @requests = (); -- 2.25.0

1 2

[PATCH] include: Fix compile error with C++ winelib.
by Daniel Lehman 19 Feb '20

19 Feb '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- /home/me/stuff/wine/64/output/include/wine/msvcrt/wchar.h: In function 'wchar_t* wmemcpy(wchar_t*, const wchar_t*, size_t)': /home/me/stuff/wine/64/output/include/wine/msvcrt/wchar.h:529:18: error: invalid conversion from 'void*' to 'wchar_t*' [-fpermissive] return memcpy(dst, src, n * sizeof(wchar_t)); ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/me/stuff/wine/64/output/include/wine/msvcrt/wchar.h: In function 'wchar_t* wmemmove(wchar_t*, const wchar_t*, size_t)': /home/me/stuff/wine/64/output/include/wine/msvcrt/wchar.h:534:19: error: invalid conversion from 'void*' to 'wchar_t*' [-fpermissive] return memmove(dst, src, n * sizeof(wchar_t)); ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- include/msvcrt/wchar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 119f8a2a41..e6a5e57fd2 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -421,12 +421,12 @@ static inline int wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n) static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t n) { - return memcpy(dst, src, n * sizeof(wchar_t)); + return (wchar_t*)memcpy(dst, src, n * sizeof(wchar_t)); } static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t n) { - return memmove(dst, src, n * sizeof(wchar_t)); + return (wchar_t*)memmove(dst, src, n * sizeof(wchar_t)); } static inline wchar_t* __cdecl wmemset(wchar_t *s, wchar_t c, size_t n) -- 2.17.1

1 0

[PATCH v2 2/2] server: Ignore low word of a class instance when looking up for a window class.
by Dmitry Timoshkov 19 Feb '20

19 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/class.c | 3 --- server/class.c | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index b07ff8548f..ceb3483285 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -128,14 +128,11 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, 0, hInstance2, 0); -todo_wine_if (!global) ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); -todo_wine_if (!global) ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, "Wrong GCL instance %p != %p\n", (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); -todo_wine_if (!global) ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, "Wrong GWL instance %p != %p\n", (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); diff --git a/server/class.c b/server/class.c index b8240bd568..92cbfa2d7e 100644 --- a/server/class.c +++ b/server/class.c @@ -100,9 +100,12 @@ static struct window_class *find_class( struct process *process, atom_t atom, mo LIST_FOR_EACH( ptr, &process->classes ) { + int is_win16; struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); if (class->atom != atom) continue; - if (!instance || !class->local || class->instance == instance) return class; + is_win16 = !(class->instance >> 16); + if (!instance || !class->local || class->instance == instance || + (!is_win16 && ((class->instance & ~0xffff) == (instance & ~0xffff)))) return class; } return NULL; } -- 2.20.1

2 1

[PATCH v2 1/5] qasf/dmowrapper: Create sink and source pins for each stream.
by Zebediah Figura 19 Feb '20

19 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/qasf/dmowrapper.c | 166 +++++++++++ dlls/qasf/tests/Makefile.in | 2 +- dlls/qasf/tests/dmowrapper.c | 518 ++++++++++++++++++++++++++++++++++- 3 files changed, 677 insertions(+), 9 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 1f11c9ff7ef..6e703e90d0c 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -22,12 +22,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(qasf); +struct dmo_wrapper_source +{ + struct strmbase_source pin; +}; + struct dmo_wrapper { struct strmbase_filter filter; IDMOWrapperFilter IDMOWrapperFilter_iface; IUnknown *dmo; + + DWORD sink_count, source_count; + struct strmbase_sink *sinks; + struct dmo_wrapper_source *sources; }; static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -35,6 +44,106 @@ static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filt return CONTAINING_RECORD(iface, struct dmo_wrapper, filter); } +static inline struct strmbase_sink *impl_sink_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct strmbase_sink, pin); +} + +static HRESULT dmo_wrapper_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct strmbase_sink *sink = impl_sink_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &sink->IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT dmo_wrapper_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + hr = IMediaObject_SetInputType(dmo, impl_sink_from_strmbase_pin(iface) - filter->sinks, + (const DMO_MEDIA_TYPE *)mt, DMO_SET_TYPEF_TEST_ONLY); + + IMediaObject_Release(dmo); + + return hr; +} + +static HRESULT dmo_wrapper_sink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + hr = IMediaObject_GetInputType(dmo, impl_sink_from_strmbase_pin(iface) - filter->sinks, + index, (DMO_MEDIA_TYPE *)mt); + + IMediaObject_Release(dmo); + + return hr == S_OK ? S_OK : VFW_S_NO_MORE_ITEMS; +} + +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = dmo_wrapper_sink_query_interface, + .base.pin_query_accept = dmo_wrapper_sink_query_accept, + .base.pin_get_media_type = dmo_wrapper_sink_get_media_type, +}; + +static inline struct dmo_wrapper_source *impl_source_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_wrapper_source, pin.pin); +} + +static HRESULT dmo_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + hr = IMediaObject_SetOutputType(dmo, impl_source_from_strmbase_pin(iface) - filter->sources, + (const DMO_MEDIA_TYPE *)mt, DMO_SET_TYPEF_TEST_ONLY); + + IMediaObject_Release(dmo); + + return hr; +} + +static HRESULT dmo_wrapper_source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + hr = IMediaObject_GetOutputType(dmo, impl_source_from_strmbase_pin(iface) - filter->sources, + index, (DMO_MEDIA_TYPE *)mt); + + IMediaObject_Release(dmo); + + return hr == S_OK ? S_OK : VFW_S_NO_MORE_ITEMS; +} + +static const struct strmbase_source_ops source_ops = +{ + .base.pin_query_accept = dmo_wrapper_source_query_accept, + .base.pin_get_media_type = dmo_wrapper_source_get_media_type, +}; + static inline struct dmo_wrapper *impl_from_IDMOWrapperFilter(IDMOWrapperFilter *iface) { return CONTAINING_RECORD(iface, struct dmo_wrapper, IDMOWrapperFilter_iface); @@ -61,8 +170,14 @@ static ULONG WINAPI dmo_wrapper_filter_Release(IDMOWrapperFilter *iface) static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID clsid, REFCLSID category) { struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); + struct dmo_wrapper_source *sources; + DWORD input_count, output_count; + struct strmbase_sink *sinks; + IMediaObject *dmo; IUnknown *unk; + WCHAR id[14]; HRESULT hr; + DWORD i; TRACE("filter %p, clsid %s, category %s.\n", filter, debugstr_guid(clsid), debugstr_guid(category)); @@ -70,12 +185,50 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk))) return hr; + if (FAILED(hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&dmo))) + { + IUnknown_Release(unk); + return hr; + } + + if (FAILED(IMediaObject_GetStreamCount(dmo, &input_count, &output_count))) + input_count = output_count = 0; + + sinks = calloc(sizeof(*sinks), input_count); + sources = calloc(sizeof(*sources), output_count); + if (!sinks || !sources) + { + free(sinks); + free(sources); + IMediaObject_Release(dmo); + IUnknown_Release(unk); + return hr; + } + + for (i = 0; i < input_count; ++i) + { + swprintf(id, ARRAY_SIZE(id), L"in%u", i); + strmbase_sink_init(&sinks[i], &filter->filter, id, &sink_ops, NULL); + } + + for (i = 0; i < output_count; ++i) + { + swprintf(id, ARRAY_SIZE(id), L"out%u", i); + strmbase_source_init(&sources[i].pin, &filter->filter, id, &source_ops); + } + EnterCriticalSection(&filter->filter.csFilter); filter->dmo = unk; + filter->sink_count = input_count; + filter->source_count = output_count; + filter->sinks = sinks; + filter->sources = sources; LeaveCriticalSection(&filter->filter.csFilter); + IMediaObject_Release(dmo); + return S_OK; } @@ -89,15 +242,28 @@ static const IDMOWrapperFilterVtbl dmo_wrapper_filter_vtbl = static struct strmbase_pin *dmo_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) { + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); + + if (index < filter->sink_count) + return &filter->sinks[index].pin; + else if (index < filter->sink_count + filter->source_count) + return &filter->sources[index - filter->sink_count].pin.pin; return NULL; } static void dmo_wrapper_destroy(struct strmbase_filter *iface) { struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); + DWORD i; if (filter->dmo) IUnknown_Release(filter->dmo); + for (i = 0; i < filter->sink_count; ++i) + strmbase_sink_cleanup(&filter->sinks[i]); + for (i = 0; i < filter->source_count; ++i) + strmbase_source_cleanup(&filter->sources[i].pin); + free(filter->sinks); + free(filter->sources); strmbase_filter_cleanup(&filter->filter); free(filter); } diff --git a/dlls/qasf/tests/Makefile.in b/dlls/qasf/tests/Makefile.in index 47bb22e78ab..793f0d2c4b2 100644 --- a/dlls/qasf/tests/Makefile.in +++ b/dlls/qasf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = qasf.dll -IMPORTS = dmoguids strmiids uuid msdmo ole32 +IMPORTS = strmbase dmoguids strmiids uuid msdmo ole32 C_SRCS = \ dmowrapper.c diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 9345b91a178..59cd50d39e3 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -22,11 +22,40 @@ #include "dshow.h" #include "dmo.h" #include "dmodshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static const GUID testdmo_clsid = {0x1234}; static const GUID test_iid = {0x33333333}; +static int mt1_format = 0xdeadbeef; +static const AM_MEDIA_TYPE mt1 = +{ + .majortype = {0x123}, + .subtype = {0x456}, + .lSampleSize = 789, + .formattype = {0xabc}, + .cbFormat = sizeof(mt1_format), + .pbFormat = (BYTE *)&mt1_format, +}; + +static int mt2_format = 0xdeadf00d; +static const AM_MEDIA_TYPE mt2 = +{ + .majortype = {0x987}, + .subtype = {0x654}, + .lSampleSize = 321, + .formattype = {0xcba}, + .cbFormat = sizeof(mt2_format), + .pbFormat = (BYTE *)&mt2_format, +}; + +static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static const IMediaObjectVtbl dmo_vtbl; static IMediaObject testdmo = {&dmo_vtbl}; @@ -105,26 +134,44 @@ static HRESULT WINAPI dmo_GetOutputStreamInfo(IMediaObject *iface, DWORD index, static HRESULT WINAPI dmo_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("GetInputType(index %u, type_index %u)\n", index, type_index); + if (!type_index) + { + memset(type, 0, sizeof(*type)); /* cover up the holes */ + MoCopyMediaType(type, (const DMO_MEDIA_TYPE *)&mt1); + return S_OK; + } + return E_OUTOFMEMORY; } static HRESULT WINAPI dmo_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("GetOutputType(index %u, type_index %u)\n", index, type_index); + if (!type_index) + { + memset(type, 0, sizeof(*type)); /* cover up the holes */ + MoCopyMediaType(type, (const DMO_MEDIA_TYPE *)&mt2); + return S_OK; + } + return E_OUTOFMEMORY; } static HRESULT WINAPI dmo_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("SetInputType(index %u, flags %#x)\n", index, flags); + strmbase_dump_media_type((AM_MEDIA_TYPE *)type); + if (flags & DMO_SET_TYPEF_TEST_ONLY) + return type->lSampleSize == 123 ? S_OK : S_FALSE; + return S_OK; } static HRESULT WINAPI dmo_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("SetOutputType(index %u, flags %#x)\n", index, flags); + strmbase_dump_media_type((AM_MEDIA_TYPE *)type); + if (flags & DMO_SET_TYPEF_TEST_ONLY) + return type->lSampleSize == 321 ? S_OK : S_FALSE; + return S_OK; } static HRESULT WINAPI dmo_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) @@ -332,6 +379,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_dmo_wrapper(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IDMOWrapperFilter, TRUE); @@ -353,6 +401,32 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, L"in0", &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"out0", &pin); + + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); } @@ -460,6 +534,429 @@ static void test_aggregation(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[4]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 4, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + IPin_Release(pins[2]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 4); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_find_pin(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, L"in0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"out0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"out1", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_pin_info(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + PIN_DIRECTION dir; + PIN_INFO info; + ULONG count; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, L"in0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"in0"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(id, L"in0"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"out0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"out0"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(id, L"out0"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"out1", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"out1"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(id, L"out1"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_media_types(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + AM_MEDIA_TYPE *mt, req_mt = {}; + IEnumMediaTypes *enummt; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, L"in0", &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, &mt1), "Media types didn't match.\n"); + DeleteMediaType(mt); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.lSampleSize = 123; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"out0", &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, &mt2), "Media types didn't match.\n"); + DeleteMediaType(mt); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.lSampleSize = 321; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, L"in0", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 2, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dmowrapper) { DWORD cookie; @@ -481,6 +978,11 @@ START_TEST(dmowrapper) test_interfaces(); test_aggregation(); + test_enum_pins(); + test_find_pin(); + test_pin_info(); + test_media_types(); + test_enum_media_types(); CoRevokeClassObject(cookie); DMOUnregister(&testdmo_clsid, &DMOCATEGORY_AUDIO_DECODER); -- 2.25.0

1 4

[PATCH 1/2] user32/tests: Add some tests for classes with non-zero low word instance.
by Dmitry Timoshkov 19 Feb '20

19 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/class.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 2702fa00b9..b07ff8548f 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -98,6 +98,7 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) LONG i; WCHAR str[20]; ATOM classatom; + HINSTANCE hInstance2; cls.style = CS_HREDRAW | CS_VREDRAW | (global?CS_GLOBALCLASS:0); cls.lpfnWndProc = ClassTest_WndProc; @@ -121,6 +122,26 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) "RegisterClass of the same class should fail for the second time\n"); /* Setup windows */ + hInstance2 = (HINSTANCE)(((ULONG_PTR)hInstance & ~0xffff) | 0xdead); + + hTestWnd = CreateWindowW (className, winName, + WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, + 0, hInstance2, 0); +todo_wine_if (!global) + ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); + +todo_wine_if (!global) + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p != %p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); +todo_wine_if (!global) + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, + "Wrong GWL instance %p != %p\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); + + DestroyWindow(hTestWnd); + hTestWnd = CreateWindowW (className, winName, WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, @@ -128,6 +149,14 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) ok(hTestWnd!=0, "Failed to create window\n"); + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p/%p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance, + "Wrong GWL instance %p/%p for window %s\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance); + + /* test initial values of valid classwords */ for(i=0; i<NUMCLASSWORDS; i++) { @@ -1491,6 +1520,8 @@ START_TEST(class) ClassTest(hInstance,FALSE); ClassTest(hInstance,TRUE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), FALSE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), TRUE); CreateDialogParamTest(hInstance); test_styles(); test_builtinproc(); -- 2.20.1

2 1

[PATCH 2/2] advapi32/tests: Check RegGetValue() RRF_SUBKEY_WOW64*KEY validation.
by Serge Gautherie 19 Feb '20

19 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Suggested follow-up TODO: Add a testcase where these flags make a difference, which I am not familiar with. --- dlls/advapi32/tests/registry.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index e4d4893..7eec709 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -772,10 +772,28 @@ static void test_get_value(void) ok(type == REG_DWORD, "type=%d\n", type); ok(dw == 0x12345678, "dw=%d\n", dw); + /* Check RRF_SUBKEY_WOW64*KEY validation on a case without a subkey */ + ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY | RRF_SUBKEY_WOW6432KEY, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER || broken(ret == ERROR_SUCCESS), /* Before Win10 */ + "ret=%d\n", ret); + ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6432KEY, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* Query by subkey-name */ ret = pRegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "DWORD", RRF_RT_REG_DWORD, NULL, NULL, NULL); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* Check RRF_SUBKEY_WOW64*KEY validation on a case with a subkey */ + ret = pRegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY | RRF_SUBKEY_WOW6432KEY, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER || broken(ret == ERROR_SUCCESS), /* Before Win10 */ + "ret=%d\n", ret); + ret = pRegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + ret = pRegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6432KEY, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* Query REG_DWORD using RRF_RT_REG_BINARY (restricted) */ size = type = dw = 0xdeadbeef; ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_BINARY, &type, &dw, &size); -- 2.10.0.windows.1

1 0

[PATCH 1/5] qasf/dmowrapper: Create sink and source pins for each stream.
by Zebediah Figura 19 Feb '20

19 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/qasf/dmowrapper.c | 166 +++++++++++ dlls/qasf/tests/Makefile.in | 2 +- dlls/qasf/tests/dmowrapper.c | 518 ++++++++++++++++++++++++++++++++++- 3 files changed, 677 insertions(+), 9 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 1f11c9ff7ef..6e703e90d0c 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -22,12 +22,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(qasf); +struct dmo_wrapper_source +{ + struct strmbase_source pin; +}; + struct dmo_wrapper { struct strmbase_filter filter; IDMOWrapperFilter IDMOWrapperFilter_iface; IUnknown *dmo; + + DWORD sink_count, source_count; + struct strmbase_sink *sinks; + struct dmo_wrapper_source *sources; }; static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -35,6 +44,106 @@ static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filt return CONTAINING_RECORD(iface, struct dmo_wrapper, filter); } +static inline struct strmbase_sink *impl_sink_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct strmbase_sink, pin); +} + +static HRESULT dmo_wrapper_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct strmbase_sink *sink = impl_sink_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &sink->IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT dmo_wrapper_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + hr = IMediaObject_SetInputType(dmo, impl_sink_from_strmbase_pin(iface) - filter->sinks, + (const DMO_MEDIA_TYPE *)mt, DMO_SET_TYPEF_TEST_ONLY); + + IMediaObject_Release(dmo); + + return hr; +} + +static HRESULT dmo_wrapper_sink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + hr = IMediaObject_GetInputType(dmo, impl_sink_from_strmbase_pin(iface) - filter->sinks, + index, (DMO_MEDIA_TYPE *)mt); + + IMediaObject_Release(dmo); + + return hr == S_OK ? S_OK : VFW_S_NO_MORE_ITEMS; +} + +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = dmo_wrapper_sink_query_interface, + .base.pin_query_accept = dmo_wrapper_sink_query_accept, + .base.pin_get_media_type = dmo_wrapper_sink_get_media_type, +}; + +static inline struct dmo_wrapper_source *impl_source_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_wrapper_source, pin.pin); +} + +static HRESULT dmo_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + hr = IMediaObject_SetOutputType(dmo, impl_source_from_strmbase_pin(iface) - filter->sources, + (const DMO_MEDIA_TYPE *)mt, DMO_SET_TYPEF_TEST_ONLY); + + IMediaObject_Release(dmo); + + return hr; +} + +static HRESULT dmo_wrapper_source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + hr = IMediaObject_GetOutputType(dmo, impl_source_from_strmbase_pin(iface) - filter->sources, + index, (DMO_MEDIA_TYPE *)mt); + + IMediaObject_Release(dmo); + + return hr == S_OK ? S_OK : VFW_S_NO_MORE_ITEMS; +} + +static const struct strmbase_source_ops source_ops = +{ + .base.pin_query_accept = dmo_wrapper_source_query_accept, + .base.pin_get_media_type = dmo_wrapper_source_get_media_type, +}; + static inline struct dmo_wrapper *impl_from_IDMOWrapperFilter(IDMOWrapperFilter *iface) { return CONTAINING_RECORD(iface, struct dmo_wrapper, IDMOWrapperFilter_iface); @@ -61,8 +170,14 @@ static ULONG WINAPI dmo_wrapper_filter_Release(IDMOWrapperFilter *iface) static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID clsid, REFCLSID category) { struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); + struct dmo_wrapper_source *sources; + DWORD input_count, output_count; + struct strmbase_sink *sinks; + IMediaObject *dmo; IUnknown *unk; + WCHAR id[14]; HRESULT hr; + DWORD i; TRACE("filter %p, clsid %s, category %s.\n", filter, debugstr_guid(clsid), debugstr_guid(category)); @@ -70,12 +185,50 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk))) return hr; + if (FAILED(hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&dmo))) + { + IUnknown_Release(unk); + return hr; + } + + if (FAILED(IMediaObject_GetStreamCount(dmo, &input_count, &output_count))) + input_count = output_count = 0; + + sinks = calloc(sizeof(*sinks), input_count); + sources = calloc(sizeof(*sources), output_count); + if (!sinks || !sources) + { + free(sinks); + free(sources); + IMediaObject_Release(dmo); + IUnknown_Release(unk); + return hr; + } + + for (i = 0; i < input_count; ++i) + { + swprintf(id, ARRAY_SIZE(id), L"in%u", i); + strmbase_sink_init(&sinks[i], &filter->filter, id, &sink_ops, NULL); + } + + for (i = 0; i < output_count; ++i) + { + swprintf(id, ARRAY_SIZE(id), L"out%u", i); + strmbase_source_init(&sources[i].pin, &filter->filter, id, &source_ops); + } + EnterCriticalSection(&filter->filter.csFilter); filter->dmo = unk; + filter->sink_count = input_count; + filter->source_count = output_count; + filter->sinks = sinks; + filter->sources = sources; LeaveCriticalSection(&filter->filter.csFilter); + IMediaObject_Release(dmo); + return S_OK; } @@ -89,15 +242,28 @@ static const IDMOWrapperFilterVtbl dmo_wrapper_filter_vtbl = static struct strmbase_pin *dmo_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) { + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); + + if (index < filter->sink_count) + return &filter->sinks[index].pin; + else if (index < filter->sink_count + filter->source_count) + return &filter->sources[index - filter->sink_count].pin.pin; return NULL; } static void dmo_wrapper_destroy(struct strmbase_filter *iface) { struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); + DWORD i; if (filter->dmo) IUnknown_Release(filter->dmo); + for (i = 0; i < filter->sink_count; ++i) + strmbase_sink_cleanup(&filter->sinks[i]); + for (i = 0; i < filter->source_count; ++i) + strmbase_source_cleanup(&filter->sources[i].pin); + free(filter->sinks); + free(filter->sources); strmbase_filter_cleanup(&filter->filter); free(filter); } diff --git a/dlls/qasf/tests/Makefile.in b/dlls/qasf/tests/Makefile.in index 47bb22e78ab..793f0d2c4b2 100644 --- a/dlls/qasf/tests/Makefile.in +++ b/dlls/qasf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = qasf.dll -IMPORTS = dmoguids strmiids uuid msdmo ole32 +IMPORTS = strmbase dmoguids strmiids uuid msdmo ole32 C_SRCS = \ dmowrapper.c diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 9345b91a178..59cd50d39e3 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -22,11 +22,40 @@ #include "dshow.h" #include "dmo.h" #include "dmodshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static const GUID testdmo_clsid = {0x1234}; static const GUID test_iid = {0x33333333}; +static int mt1_format = 0xdeadbeef; +static const AM_MEDIA_TYPE mt1 = +{ + .majortype = {0x123}, + .subtype = {0x456}, + .lSampleSize = 789, + .formattype = {0xabc}, + .cbFormat = sizeof(mt1_format), + .pbFormat = (BYTE *)&mt1_format, +}; + +static int mt2_format = 0xdeadf00d; +static const AM_MEDIA_TYPE mt2 = +{ + .majortype = {0x987}, + .subtype = {0x654}, + .lSampleSize = 321, + .formattype = {0xcba}, + .cbFormat = sizeof(mt2_format), + .pbFormat = (BYTE *)&mt2_format, +}; + +static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static const IMediaObjectVtbl dmo_vtbl; static IMediaObject testdmo = {&dmo_vtbl}; @@ -105,26 +134,44 @@ static HRESULT WINAPI dmo_GetOutputStreamInfo(IMediaObject *iface, DWORD index, static HRESULT WINAPI dmo_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("GetInputType(index %u, type_index %u)\n", index, type_index); + if (!type_index) + { + memset(type, 0, sizeof(*type)); /* cover up the holes */ + MoCopyMediaType(type, (const DMO_MEDIA_TYPE *)&mt1); + return S_OK; + } + return E_OUTOFMEMORY; } static HRESULT WINAPI dmo_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("GetOutputType(index %u, type_index %u)\n", index, type_index); + if (!type_index) + { + memset(type, 0, sizeof(*type)); /* cover up the holes */ + MoCopyMediaType(type, (const DMO_MEDIA_TYPE *)&mt2); + return S_OK; + } + return E_OUTOFMEMORY; } static HRESULT WINAPI dmo_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("SetInputType(index %u, flags %#x)\n", index, flags); + strmbase_dump_media_type((AM_MEDIA_TYPE *)type); + if (flags & DMO_SET_TYPEF_TEST_ONLY) + return type->lSampleSize == 123 ? S_OK : S_FALSE; + return S_OK; } static HRESULT WINAPI dmo_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("SetOutputType(index %u, flags %#x)\n", index, flags); + strmbase_dump_media_type((AM_MEDIA_TYPE *)type); + if (flags & DMO_SET_TYPEF_TEST_ONLY) + return type->lSampleSize == 321 ? S_OK : S_FALSE; + return S_OK; } static HRESULT WINAPI dmo_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) @@ -332,6 +379,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_dmo_wrapper(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IDMOWrapperFilter, TRUE); @@ -353,6 +401,32 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, L"in0", &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"out0", &pin); + + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); } @@ -460,6 +534,429 @@ static void test_aggregation(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[4]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 4, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + IPin_Release(pins[2]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 4); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_find_pin(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, L"in0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"out0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"out1", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_pin_info(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + PIN_DIRECTION dir; + PIN_INFO info; + ULONG count; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, L"in0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"in0"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(id, L"in0"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"out0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"out0"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(id, L"out0"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"out1", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"out1"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(id, L"out1"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_media_types(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + AM_MEDIA_TYPE *mt, req_mt = {}; + IEnumMediaTypes *enummt; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, L"in0", &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, &mt1), "Media types didn't match.\n"); + DeleteMediaType(mt); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.lSampleSize = 123; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"out0", &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, &mt2), "Media types didn't match.\n"); + DeleteMediaType(mt); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.lSampleSize = 321; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_dmo_wrapper(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, L"in0", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 2, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dmowrapper) { DWORD cookie; @@ -481,6 +978,11 @@ START_TEST(dmowrapper) test_interfaces(); test_aggregation(); + test_enum_pins(); + test_find_pin(); + test_pin_info(); + test_media_types(); + test_enum_media_types(); CoRevokeClassObject(cookie); DMOUnregister(&testdmo_clsid, &DMOCATEGORY_AUDIO_DECODER); -- 2.25.0

2 6

[tools] testbot: Limit chomping of log lines to CR and LF.
by Francois Gouget 19 Feb '20

19 Feb '20

This fixes handling of failures (and todos, etc) where the message starts with a linefeed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 453ec29a99..fd0a845955 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -254,7 +254,8 @@ sub ParseTaskLog($) foreach my $Line (<$LogFile>) { $LineNo++; - $Line =~ s/\s*$//; # chomp \r, \n and more + chomp $Line; + $Line =~ s/\r+$//; if (GetLogLineCategory($Line) eq "error") { @@ -525,7 +526,8 @@ sub ParseWineTestReport($$$) { $LineNo++; $Cur->{UnitSize} += length($Line); - $Line =~ s/\s*$//; # chomp \r, \n and more + chomp $Line; + $Line =~ s/\r+$//; if (GetReportLineCategory($Line) eq "error") { -- 2.20.1

1 0

[PATCH v2 1/9] shell32: Move _SHCreateSymbolicLinks() above shell folders lookup functions.
by Olivier F. R. Dierick 18 Feb '20

18 Feb '20

Looking up shell folders creates real directories when the folder is inexistant, but the intended behavior for some folders is to create symbolic links by default. Prepare that change by moving the helper function above shell folders lookup functions. Also fix whitespace issues in the moved code. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> --- dlls/shell32/shellpath.c | 534 +++++++++++++++++++++++------------------------ 1 file changed, 267 insertions(+), 267 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index b6350ea..9bec709 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3949,9 +3949,274 @@ end: } /************************************************************************* + * _SHAppendToUnixPath [Internal] + * + * Helper function for _SHCreateSymbolicLinks. Appends pwszSubPath (or the + * corresponding resource, if IS_INTRESOURCE) to the unix base path 'szBasePath' + * and replaces backslashes with slashes. + * + * PARAMS + * szBasePath [IO] The unix base path, which will be appended to (CP_UNXICP). + * pwszSubPath [I] Sub-path or resource id (use MAKEINTRESOURCEW). + * + * RETURNS + * Success: TRUE, + * Failure: FALSE + */ +static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { + WCHAR wszSubPath[MAX_PATH]; + int cLen = strlen(szBasePath); + char *pBackslash; + + if (IS_INTRESOURCE(pwszSubPath)) { + if (!LoadStringW(shell32_hInstance, LOWORD(pwszSubPath), wszSubPath, MAX_PATH)) { + /* Fall back to hard coded defaults. */ + switch (LOWORD(pwszSubPath)) { + case IDS_PERSONAL: + lstrcpyW(wszSubPath, DocumentsW); + break; + case IDS_MYMUSIC: + lstrcpyW(wszSubPath, My_MusicW); + break; + case IDS_MYPICTURES: + lstrcpyW(wszSubPath, My_PicturesW); + break; + case IDS_MYVIDEOS: + lstrcpyW(wszSubPath, My_VideosW); + break; + case IDS_DOWNLOADS: + lstrcpyW(wszSubPath, DownloadsW); + break; + case IDS_TEMPLATES: + lstrcpyW(wszSubPath, TemplatesW); + break; + default: + ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); + return FALSE; + } + } + } else { + lstrcpyW(wszSubPath, pwszSubPath); + } + + if (szBasePath[cLen-1] != '/') szBasePath[cLen++] = '/'; + + if (!WideCharToMultiByte(CP_UNIXCP, 0, wszSubPath, -1, szBasePath + cLen, + FILENAME_MAX - cLen, NULL, NULL)) + { + return FALSE; + } + + pBackslash = szBasePath + cLen; + while ((pBackslash = strchr(pBackslash, '\\'))) *pBackslash = '/'; + + return TRUE; +} + +/****************************************************************************** + * _SHCreateSymbolicLinks [Internal] + * + * Sets up symbol links for various shell folders to point into the user's home + * directory. We do an educated guess about what the user would probably want: + * - If there is a 'My Documents' directory in $HOME, the user probably wants + * wine's 'My Documents' to point there. Furthermore, we infer that the user + * is a Windows lover and has no problem with wine creating subfolders for + * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if + * those do not already exist. We put appropriate symbolic links in place for + * those, too. + * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' + * point directly to $HOME. We assume the user to be a unix hacker who does not + * want wine to create anything anywhere besides the .wine directory. So, if + * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' + * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" + * directory, and try to link to that. If that fails, then we symlink to + * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. + * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not + * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave + * it alone. + * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + */ +static void _SHCreateSymbolicLinks(void) +{ + static const UINT aidsMyStuff[] = { + IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES + }; + static const WCHAR * const MyOSXStuffW[] = { + PicturesW, MoviesW, MusicW, DownloadsW, TemplatesW + }; + static const int acsidlMyStuff[] = { + CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES + }; + static const char * const xdg_dirs[] = { + "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DOCUMENTS", "DESKTOP" + }; + static const unsigned int num = ARRAY_SIZE(xdg_dirs); + WCHAR wszTempPath[MAX_PATH]; + char szPersonalTarget[FILENAME_MAX], *pszPersonal; + char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; + char szDesktopTarget[FILENAME_MAX], *pszDesktop; + struct stat statFolder; + const char *pszHome; + HRESULT hr; + char ** xdg_results; + char * xdg_desktop_dir; + UINT i; + + /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ + hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, wszTempPath); + if (FAILED(hr)) return; + pszPersonal = wine_get_unix_file_name(wszTempPath); + if (!pszPersonal) return; + + hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); + if (FAILED(hr)) xdg_results = NULL; + + pszHome = getenv("HOME"); + if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + while (1) + { + /* Check if there's already a Wine-specific 'My Documents' folder */ + strcpy(szPersonalTarget, pszHome); + if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && + !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + /* '$HOME/My Documents' exists. Create subfolders for + * 'My Pictures', 'My Videos', 'My Music' etc. or fail silently + * if they already exist. + */ + for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) + { + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) + mkdir(szMyStuffTarget, 0777); + } + break; + } + + /* Try to point to the XDG Documents folder */ + if (xdg_results && xdg_results[num-2] && + !stat(xdg_results[num-2], &statFolder) && + S_ISDIR(statFolder.st_mode)) + { + strcpy(szPersonalTarget, xdg_results[num-2]); + break; + } + + /* Or the hardcoded / OS X Documents folder */ + strcpy(szPersonalTarget, pszHome); + if (_SHAppendToUnixPath(szPersonalTarget, DocumentsW) && + !stat(szPersonalTarget, &statFolder) && + S_ISDIR(statFolder.st_mode)) + break; + + /* As a last resort point to $HOME. */ + strcpy(szPersonalTarget, pszHome); + break; + } + + /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */ + remove(pszPersonal); + symlink(szPersonalTarget, pszPersonal); + } + else + { + /* '$HOME' doesn't exist. Create subdirs for 'My Pictures', 'My Videos', + * 'My Music' etc. in '%USERPROFILE%\My Documents' or fail silently if + * they already exist. */ + pszHome = NULL; + strcpy(szPersonalTarget, pszPersonal); + for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) + mkdir(szMyStuffTarget, 0777); + } + } + + /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ + for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) + { + /* Create the current 'My Whatever' folder and get its unix path. */ + hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, wszTempPath); + if (FAILED(hr)) continue; + + pszMyStuff = wine_get_unix_file_name(wszTempPath); + if (!pszMyStuff) continue; + + while (1) + { + /* Check for the Wine-specific '$HOME/My Documents' subfolder */ + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && + !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + break; + + /* Try the XDG_XXX_DIR folder */ + if (xdg_results && xdg_results[i]) + { + strcpy(szMyStuffTarget, xdg_results[i]); + break; + } + + /* Or the OS X folder (these are never localized) */ + if (pszHome) + { + strcpy(szMyStuffTarget, pszHome); + if (_SHAppendToUnixPath(szMyStuffTarget, MyOSXStuffW[i]) && + !stat(szMyStuffTarget, &statFolder) && + S_ISDIR(statFolder.st_mode)) + break; + } + + /* As a last resort point to the same location as 'My Documents' */ + strcpy(szMyStuffTarget, szPersonalTarget); + break; + } + remove(pszMyStuff); + symlink(szMyStuffTarget, pszMyStuff); + heap_free(pszMyStuff); + } + + /* Last but not least, the Desktop folder */ + if (pszHome) + strcpy(szDesktopTarget, pszHome); + else + strcpy(szDesktopTarget, pszPersonal); + heap_free(pszPersonal); + + xdg_desktop_dir = xdg_results ? xdg_results[num - 1] : NULL; + if (xdg_desktop_dir || + (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && + !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) + { + hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, wszTempPath); + if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) + { + remove(pszDesktop); + if (xdg_desktop_dir) + symlink(xdg_desktop_dir, pszDesktop); + else + symlink(szDesktopTarget, pszDesktop); + heap_free(pszDesktop); + } + } + + /* Free resources allocated by XDG_UserDirLookup() */ + if (xdg_results) + { + for (i = 0; i < num; i++) + heap_free(xdg_results[i]); + heap_free(xdg_results); + } +} + +/****************************************************************************** * SHGetFolderPathW [SHELL32.@] * - * Convert nFolder to path. + * Convert nFolder to path. * * RETURNS * Success: S_OK @@ -4046,7 +4311,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( DWORD folder = nFolder & CSIDL_FOLDER_MASK; CSIDL_Type type; int ret; - + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_w(pszSubPath), pszPath); /* Windows always NULL-terminates the resulting path regardless of success @@ -4382,271 +4647,6 @@ static HRESULT _SHRegisterCommonShellFolders(void) } /****************************************************************************** - * _SHAppendToUnixPath [Internal] - * - * Helper function for _SHCreateSymbolicLinks. Appends pwszSubPath (or the - * corresponding resource, if IS_INTRESOURCE) to the unix base path 'szBasePath' - * and replaces backslashes with slashes. - * - * PARAMS - * szBasePath [IO] The unix base path, which will be appended to (CP_UNXICP). - * pwszSubPath [I] Sub-path or resource id (use MAKEINTRESOURCEW). - * - * RETURNS - * Success: TRUE, - * Failure: FALSE - */ -static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { - WCHAR wszSubPath[MAX_PATH]; - int cLen = strlen(szBasePath); - char *pBackslash; - - if (IS_INTRESOURCE(pwszSubPath)) { - if (!LoadStringW(shell32_hInstance, LOWORD(pwszSubPath), wszSubPath, MAX_PATH)) { - /* Fall back to hard coded defaults. */ - switch (LOWORD(pwszSubPath)) { - case IDS_PERSONAL: - lstrcpyW(wszSubPath, DocumentsW); - break; - case IDS_MYMUSIC: - lstrcpyW(wszSubPath, My_MusicW); - break; - case IDS_MYPICTURES: - lstrcpyW(wszSubPath, My_PicturesW); - break; - case IDS_MYVIDEOS: - lstrcpyW(wszSubPath, My_VideosW); - break; - case IDS_DOWNLOADS: - lstrcpyW(wszSubPath, DownloadsW); - break; - case IDS_TEMPLATES: - lstrcpyW(wszSubPath, TemplatesW); - break; - default: - ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); - return FALSE; - } - } - } else { - lstrcpyW(wszSubPath, pwszSubPath); - } - - if (szBasePath[cLen-1] != '/') szBasePath[cLen++] = '/'; - - if (!WideCharToMultiByte(CP_UNIXCP, 0, wszSubPath, -1, szBasePath + cLen, - FILENAME_MAX - cLen, NULL, NULL)) - { - return FALSE; - } - - pBackslash = szBasePath + cLen; - while ((pBackslash = strchr(pBackslash, '\\'))) *pBackslash = '/'; - - return TRUE; -} - -/****************************************************************************** - * _SHCreateSymbolicLinks [Internal] - * - * Sets up symbol links for various shell folders to point into the user's home - * directory. We do an educated guess about what the user would probably want: - * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we infer that the user - * is a Windows lover and has no problem with wine creating subfolders for - * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if - * those do not already exist. We put appropriate symbolic links in place for - * those, too. - * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' - * point directly to $HOME. We assume the user to be a unix hacker who does not - * want wine to create anything anywhere besides the .wine directory. So, if - * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" - * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. - * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not - * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave - * it alone. - * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) - */ -static void _SHCreateSymbolicLinks(void) -{ - static const UINT aidsMyStuff[] = { - IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES - }; - static const WCHAR * const MyOSXStuffW[] = { - PicturesW, MoviesW, MusicW, DownloadsW, TemplatesW - }; - static const int acsidlMyStuff[] = { - CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES - }; - static const char * const xdg_dirs[] = { - "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DOCUMENTS", "DESKTOP" - }; - static const unsigned int num = ARRAY_SIZE(xdg_dirs); - WCHAR wszTempPath[MAX_PATH]; - char szPersonalTarget[FILENAME_MAX], *pszPersonal; - char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; - char szDesktopTarget[FILENAME_MAX], *pszDesktop; - struct stat statFolder; - const char *pszHome; - HRESULT hr; - char ** xdg_results; - char * xdg_desktop_dir; - UINT i; - - /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ - hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) return; - pszPersonal = wine_get_unix_file_name(wszTempPath); - if (!pszPersonal) return; - - hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); - if (FAILED(hr)) xdg_results = NULL; - - pszHome = getenv("HOME"); - if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - while (1) - { - /* Check if there's already a Wine-specific 'My Documents' folder */ - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && - !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - /* '$HOME/My Documents' exists. Create subfolders for - * 'My Pictures', 'My Videos', 'My Music' etc. or fail silently - * if they already exist. - */ - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) - { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } - break; - } - - /* Try to point to the XDG Documents folder */ - if (xdg_results && xdg_results[num-2] && - !stat(xdg_results[num-2], &statFolder) && - S_ISDIR(statFolder.st_mode)) - { - strcpy(szPersonalTarget, xdg_results[num-2]); - break; - } - - /* Or the hardcoded / OS X Documents folder */ - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, DocumentsW) && - !stat(szPersonalTarget, &statFolder) && - S_ISDIR(statFolder.st_mode)) - break; - - /* As a last resort point to $HOME. */ - strcpy(szPersonalTarget, pszHome); - break; - } - - /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */ - remove(pszPersonal); - symlink(szPersonalTarget, pszPersonal); - } - else - { - /* '$HOME' doesn't exist. Create subdirs for 'My Pictures', 'My Videos', - * 'My Music' etc. in '%USERPROFILE%\My Documents' or fail silently if - * they already exist. */ - pszHome = NULL; - strcpy(szPersonalTarget, pszPersonal); - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } - } - - /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ - for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) - { - /* Create the current 'My Whatever' folder and get its unix path. */ - hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) continue; - - pszMyStuff = wine_get_unix_file_name(wszTempPath); - if (!pszMyStuff) continue; - - while (1) - { - /* Check for the Wine-specific '$HOME/My Documents' subfolder */ - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && - !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - break; - - /* Try the XDG_XXX_DIR folder */ - if (xdg_results && xdg_results[i]) - { - strcpy(szMyStuffTarget, xdg_results[i]); - break; - } - - /* Or the OS X folder (these are never localized) */ - if (pszHome) - { - strcpy(szMyStuffTarget, pszHome); - if (_SHAppendToUnixPath(szMyStuffTarget, MyOSXStuffW[i]) && - !stat(szMyStuffTarget, &statFolder) && - S_ISDIR(statFolder.st_mode)) - break; - } - - /* As a last resort point to the same location as 'My Documents' */ - strcpy(szMyStuffTarget, szPersonalTarget); - break; - } - remove(pszMyStuff); - symlink(szMyStuffTarget, pszMyStuff); - heap_free(pszMyStuff); - } - - /* Last but not least, the Desktop folder */ - if (pszHome) - strcpy(szDesktopTarget, pszHome); - else - strcpy(szDesktopTarget, pszPersonal); - heap_free(pszPersonal); - - xdg_desktop_dir = xdg_results ? xdg_results[num - 1] : NULL; - if (xdg_desktop_dir || - (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && - !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) - { - hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) - { - remove(pszDesktop); - if (xdg_desktop_dir) - symlink(xdg_desktop_dir, pszDesktop); - else - symlink(szDesktopTarget, pszDesktop); - heap_free(pszDesktop); - } - } - - /* Free resources allocated by XDG_UserDirLookup() */ - if (xdg_results) - { - for (i = 0; i < num; i++) - heap_free(xdg_results[i]); - heap_free(xdg_results); - } -} - -/****************************************************************************** * create_extra_folders [Internal] * * Create some extra folders that don't have a standard CSIDL definition. -- 2.1.4

1 8

[PATCH] kernel/tests: Get rid of strcmp_aw() / strlen_aw()
by Michael Stefaniuc 18 Feb '20

18 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 40 ++++++++++++------------------------ 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 99f3e1c3d2..1f458aa637 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -560,20 +560,6 @@ static const WCHAR wndClass3W[] = static WCHAR app_dir[MAX_PATH], exe_path[MAX_PATH], work_dir[MAX_PATH], work_dir_subdir[MAX_PATH]; static WCHAR app_manifest_path[MAX_PATH], manifest_path[MAX_PATH], depmanifest_path[MAX_PATH]; -static int strcmp_aw(LPCWSTR strw, const char *stra) -{ - WCHAR buf[1024]; - - if (!stra) return 1; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - -static DWORD strlen_aw(const char *str) -{ - return MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0) - 1; -} - static BOOL create_manifest_file(const char *filename, const char *manifest, int manifest_len, const char *depfile, const char *depmanifest) { @@ -746,57 +732,57 @@ typedef struct { ULONG flags; /* ULONG manifest_path_type; FIXME */ LPCWSTR manifest_path; - LPCSTR encoded_assembly_id; + LPCWSTR encoded_assembly_id; BOOL has_assembly_dir; } info_in_assembly; static const info_in_assembly manifest1_info = { 1, manifest_path, - "Wine.Test,type=\"win32\",version=\"1.0.0.0\"", + L"Wine.Test,type=\"win32\",version=\"1.0.0.0\"", FALSE }; static const info_in_assembly manifest1_child_info = { 1, app_manifest_path, - "Wine.Test,type=\"win32\",version=\"1.0.0.0\"", + L"Wine.Test,type=\"win32\",version=\"1.0.0.0\"", FALSE }; static const info_in_assembly manifest2_info = { 1, manifest_path, - "Wine.Test,type=\"win32\",version=\"1.2.3.4\"", + L"Wine.Test,type=\"win32\",version=\"1.2.3.4\"", FALSE }; static const info_in_assembly manifest3_info = { 1, manifest_path, - "Wine.Test,publicKeyToken=\"6595b6414666f1df\",type=\"win32\",version=\"1.2.3.4\"", + L"Wine.Test,publicKeyToken=\"6595b6414666f1df\",type=\"win32\",version=\"1.2.3.4\"", FALSE }; static const info_in_assembly manifest4_info = { 1, manifest_path, - "Wine.Test,type=\"win32\",version=\"1.2.3.4\"", + L"Wine.Test,type=\"win32\",version=\"1.2.3.4\"", FALSE }; static const info_in_assembly depmanifest1_info = { 0x10, depmanifest_path, - "testdep,processorArchitecture=\"" ARCH "\"," + L"testdep,processorArchitecture=\"" ARCH "\"," "type=\"win32\",version=\"6.5.4.3\"", TRUE }; static const info_in_assembly depmanifest2_info = { 0x10, depmanifest_path, - "testdep,processorArchitecture=\"" ARCH "\"," + L"testdep,processorArchitecture=\"" ARCH "\"," "type=\"win32\",version=\"6.5.4.3\"", TRUE }; static const info_in_assembly depmanifest3_info = { 0x10, depmanifest_path, - "testdep,processorArchitecture=\"" ARCH "\",type=\"win32\",version=\"6.5.4.3\"", + L"testdep,processorArchitecture=\"" ARCH "\",type=\"win32\",version=\"6.5.4.3\"", TRUE }; @@ -813,7 +799,7 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl exsize = sizeof(ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION); if (exinfo->manifest_path) exsize += (lstrlenW(exinfo->manifest_path)+1) * sizeof(WCHAR); - if (exinfo->encoded_assembly_id) exsize += (strlen_aw(exinfo->encoded_assembly_id) + 1) * sizeof(WCHAR); + if (exinfo->encoded_assembly_id) exsize += (lstrlenW(exinfo->encoded_assembly_id) + 1) * sizeof(WCHAR); size = 0xdeadbeef; b = pQueryActCtxW(0, handle, &id, @@ -851,7 +837,7 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl info->ulFlags, exinfo->flags); } if(exinfo->encoded_assembly_id) { - len = strlen_aw(exinfo->encoded_assembly_id)*sizeof(WCHAR); + len = lstrlenW(exinfo->encoded_assembly_id)*sizeof(WCHAR); ok_(__FILE__, line)(info->ulEncodedAssemblyIdentityLength == len, "info->ulEncodedAssemblyIdentityLength = %u, expected %u\n", info->ulEncodedAssemblyIdentityLength, len); @@ -893,9 +879,9 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl ok_(__FILE__, line)(info->lpAssemblyEncodedAssemblyIdentity != NULL, "info->lpAssemblyEncodedAssemblyIdentity == NULL\n"); if(info->lpAssemblyEncodedAssemblyIdentity && exinfo->encoded_assembly_id) { - ok_(__FILE__, line)(!strcmp_aw(info->lpAssemblyEncodedAssemblyIdentity, exinfo->encoded_assembly_id), + ok_(__FILE__, line)(!lstrcmpW(info->lpAssemblyEncodedAssemblyIdentity, exinfo->encoded_assembly_id), "unexpected info->lpAssemblyEncodedAssemblyIdentity %s / %s\n", - strw(info->lpAssemblyEncodedAssemblyIdentity), exinfo->encoded_assembly_id); + strw(info->lpAssemblyEncodedAssemblyIdentity), wine_dbgstr_w(exinfo->encoded_assembly_id)); } if(exinfo->manifest_path) { ok_(__FILE__, line)(info->lpAssemblyManifestPath != NULL, "info->lpAssemblyManifestPath == NULL\n"); -- 2.24.1

2 1

[PATCH v2 1/2] find.exe/tests: Add test for multiple files at once
by Fabian Maurer 18 Feb '20

18 Feb '20

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/tests/find.c | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index b8345034b5..76f023f5e8 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -264,6 +264,47 @@ static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_ run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); } +static void run_find_file_multi(void) +{ + char path_temp_file1[MAX_PATH]; + char path_temp_file2[MAX_PATH]; + char path_temp_dir[MAX_PATH]; + HANDLE handle_file; + WCHAR commandline_new[MAX_PATH]; + char out_expected[500]; + const char* input = "ab\nbd"; + + GetTempPathA(ARRAY_SIZE(path_temp_dir), path_temp_dir); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file1); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file2); + handle_file = CreateFileA(path_temp_file1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, (BYTE*)input, strlen(input)); + CloseHandle(handle_file); + handle_file = CreateFileA(path_temp_file2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, (BYTE*)input, strlen(input)); + CloseHandle(handle_file); + + wsprintfW(commandline_new, L"\"b\" C:\\doesnotexist1 %hs C:\\doesnotexist1 %hs C:\\doesnotexist1", path_temp_file1, path_temp_file2); + + CharUpperA(path_temp_file1); + CharUpperA(path_temp_file2); + wsprintfA(out_expected, + "File not found - C:\\DOESNOTEXIST1\r\n" + "\r\n---------- %s\r\n" + "ab\r\nbd\r\n" + "File not found - C:\\DOESNOTEXIST1\r\n" + "\r\n---------- %s\r\n" + "ab\r\nbd\r\n" + "File not found - C:\\DOESNOTEXIST1\r\n", + path_temp_file1, path_temp_file2); + + todo_wine + run_find_stdin_(commandline_new, (BYTE*)"", 0, (BYTE*)out_expected, strlen(out_expected), 0, __FILE__, __LINE__); + + DeleteFileA(path_temp_file1); + DeleteFileA(path_temp_file2); +} + static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); @@ -417,4 +458,5 @@ START_TEST(find) test_unicode_support_stdin(); test_file_search(); test_unicode_support_file(); + run_find_file_multi(); } -- 2.25.1

4 8

[PATCH] oledb32: Ensure provider is selected before changing tabs.
by Alistair Leslie-Hughes 18 Feb '20

18 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 35 +++++++++++++++++++++++++++++++---- dlls/oledb32/resource.h | 2 ++ dlls/oledb32/version.rc | 3 +++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 11ee76cddb..006330b004 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -274,13 +274,40 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA break; } - case WM_COMMAND: + case WM_NOTIFY: { - if (LOWORD(wp) == IDC_BTN_NEXT) + NMHDR *hdr = ((LPNMHDR)lp); + switch(hdr->code) { - /* TODO: Implement Connection dialog */ - MessageBoxA(hwnd, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION); + case PSN_KILLACTIVE: + { + /* + * FIXME: This needs to replace the connection page based off the selection. + * We only care about the ODBC for now which is the default. + */ + + HWND lv = GetDlgItem(hwnd, IDC_LST_CONNECTIONS); + if (!SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0)) + { + WCHAR title[256], msg[256]; + + LoadStringW(instance, IDS_PROVIDER_TITLE, title, ARRAY_SIZE(title)); + LoadStringW(instance, IDS_PROVIDER_ERROR, msg, ARRAY_SIZE(msg)); + MessageBoxW(hwnd, msg, title, MB_OK | MB_ICONEXCLAMATION); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, TRUE); + return TRUE; + } + + return FALSE; + } } + + break; + } + case WM_COMMAND: + { + if (LOWORD(wp) == IDC_BTN_NEXT) + SendMessageW(GetParent(hwnd), PSM_SETCURSEL, 1, 0); break; } default: diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index 3760a38487..dfedb34a54 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -19,6 +19,8 @@ #define IDD_PROVIDER 1000 #define IDC_BTN_NEXT 1001 #define IDC_LST_CONNECTIONS 1002 +#define IDS_PROVIDER_TITLE 1003 +#define IDS_PROVIDER_ERROR 1004 #define IDS_PROPSHEET_TITLE 2000 #define IDS_COL_PROVIDER 2001 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 97714086eb..080e444eb7 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -45,6 +45,9 @@ STRINGTABLE IDS_PERM_SHAREDENYWRITE "Share Deny Write" IDS_PERM_SHAREEXCLUSIVE "Share Exclusive" IDS_PERM_WRITE "Write" + + IDS_PROVIDER_TITLE "Data Link Error" + IDS_PROVIDER_ERROR "Please select a provider." } IDD_PROVIDER DIALOG 0, 0, 227, 225 -- 2.25.0

1 0

[PATCH 2/2] server: Ignore low word of a class instance when looking up for a window class.
by Dmitry Timoshkov 18 Feb '20

18 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/class.c | 3 --- server/class.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index b07ff8548f..ceb3483285 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -128,14 +128,11 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, 0, hInstance2, 0); -todo_wine_if (!global) ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); -todo_wine_if (!global) ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, "Wrong GCL instance %p != %p\n", (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); -todo_wine_if (!global) ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, "Wrong GWL instance %p != %p\n", (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); diff --git a/server/class.c b/server/class.c index b8240bd568..21903f90d0 100644 --- a/server/class.c +++ b/server/class.c @@ -102,7 +102,7 @@ static struct window_class *find_class( struct process *process, atom_t atom, mo { struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); if (class->atom != atom) continue; - if (!instance || !class->local || class->instance == instance) return class; + if (!instance || !class->local || (class->instance & ~0xffff) == (instance & ~0xffff)) return class; } return NULL; } -- 2.20.1

4 3

[PATCH 1/4] d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test.
by Zebediah Figura 18 Feb '20

18 Feb '20

From: Zebediah Figura <zfigura(a)codeweavers.com> This brings the d3dcompiler tests more in line with existing d3d9 tests, and allows potentially running the tests in parallel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl.c | 787 +++++++++++++++---------------- 1 file changed, 377 insertions(+), 410 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 868693838cc..7ab91bc3d5a 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Travis Athougies + * Copyright (C) 2020 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,290 +26,265 @@ static pD3DCompile ppD3DCompile; static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); -static D3DMATRIX *(WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); -struct vertex +struct vec2 { - float x, y, z; - float tx, ty; + float x, y; }; -/* Tells compute_shader_probe* which pixels should be what colors */ -struct hlsl_probe_info +struct vec4 { - unsigned int x, y; - /* The expected values in this region */ - D3DXCOLOR c; - /* The max error for any value */ - float epsilon; - /* An error message to print if this test fails */ - const char *message; + float x, y, z, w; }; -static HWND create_window(void) +#define compile_shader(a, b) compile_shader_(__LINE__, a, b) +static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) { - WNDCLASSA wc = {0}; - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d9_test_wc"; - RegisterClassA(&wc); + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; - return CreateWindowA("d3d9_test_wc", "d3d9_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + hr = ppD3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#x.\n", hr); + if (errors) + { + if (winetest_debug > 1) + trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + return blob; } -static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, - IDirect3DVertexBuffer9 **quad_geometry, IDirect3DVertexShader9 **vshader_passthru) +static IDirect3DDevice9 *create_d3d9_device(HWND window) { - static const struct vertex quad_vertices[4] = + D3DPRESENT_PARAMETERS present_parameters = { - {-1.0f, -1.0f, 0.0f, 0.0f, 1.0f}, - {-1.0f, 1.0f, 0.0f, 0.0f, 0.0f}, - { 1.0f, -1.0f, 0.0f, 1.0f, 1.0f}, - { 1.0f, 1.0f, 0.0f, 1.0f, 0.0f} + .Windowed = TRUE, + .hDeviceWindow = window, + .SwapEffect = D3DSWAPEFFECT_DISCARD, + .BackBufferWidth = 640, + .BackBufferHeight = 480, + .BackBufferFormat = D3DFMT_A8R8G8B8, }; - - static const D3DVERTEXELEMENT9 vdeclelements[] = - { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - D3DDECL_END() - }; - - static const char *vshader_passthru_hlsl = - "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION\n" - "{\n" - " return pos;\n" - "}"; - - IDirect3D9 *d3d9_ptr; - IDirect3DDevice9 *device_ptr = NULL; - D3DPRESENT_PARAMETERS present_parameters; - - void *temp_geometry_vertices; - - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d; + D3DCAPS9 caps; HRESULT hr; - d3d9_ptr = Direct3DCreate9(D3D_SDK_VERSION); - if (!d3d9_ptr) + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) { - skip("could not create D3D9\n"); + skip("Failed to create a 3D device, hr %#x.\n", hr); return NULL; } - hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - 0, D3DRTYPE_SURFACE, D3DFMT_A32B32G32R32F); - if (FAILED(hr)) + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) { - skip("A32B32G32R32F format not available on this device\n"); - IDirect3D9_Release(d3d9_ptr); + skip("No shader model 2 support.\n"); + IDirect3DDevice9_Release(device); return NULL; } - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - IDirect3D9_Release(d3d9_ptr); - if (FAILED(hr)) + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A32B32G32R32F, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL))) { - skip("could not create Direct3D9 device\n"); + skip("Failed to create an A32B32G32R32F surface, hr %#x.\n", hr); + IDirect3DDevice9_Release(device); return NULL; } + ok(hr == D3D_OK, "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface9_Release(rt); - /* Create the quad geometry */ - hr = IDirect3DDevice9_CreateVertexBuffer(device_ptr, 4 * sizeof(struct vertex), - D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, quad_geometry, NULL); - ok(SUCCEEDED(hr), - "Could not create vertex buffer, IDirect3DDevice9_CreateVertexBuffer returned: %08x\n", hr); - - hr = IDirect3DVertexBuffer9_Lock(*quad_geometry, 0, sizeof(quad_vertices), &temp_geometry_vertices, 0); - ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock returned: %08x\n", hr); - memcpy(temp_geometry_vertices, quad_vertices, sizeof(quad_vertices)); - IDirect3DVertexBuffer9_Unlock(*quad_geometry); + return device; +} - hr = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, vdeclelements, vdeclaration); - ok(SUCCEEDED(hr), "Could not create vertex declaration: " - "IDirect3DDevice9_CreateVertexDeclaration returned: %08x\n", hr); +#define draw_quad(device, ps_code) draw_quad_(__LINE__, device, ps_code) +static void draw_quad_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *ps_code) +{ + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + ID3D10Blob *vs_code; + HRESULT hr; - hr = IDirect3DDevice9_SetVertexDeclaration(device_ptr, *vdeclaration); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned: %08x\n", hr); + static const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 8, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + D3DDECL_END() + }; - /* Create a simple vertex shader to just pass through the values */ - hr = ppD3DCompile(vshader_passthru_hlsl, strlen(vshader_passthru_hlsl), NULL, - NULL, NULL, "vshader", "vs_1_1", 0, 0, &compiled, &errors); - if (FAILED(hr)) + static const struct { - skip("not compiling vertex shader due to lacking wine HLSL support!\n"); - if (errors) - ID3D10Blob_Release(errors); - return NULL; + struct vec2 position; + struct vec2 t0; } + quad[] = + { + {{-1.0f, -1.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f}, {1.0f, 0.0f}}, + }; - hr = IDirect3DDevice9_CreateVertexShader(device_ptr, ID3D10Blob_GetBufferPointer(compiled), - vshader_passthru); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); + static const char vs_source[] = + "float4 main(float4 pos : POSITION, inout float2 texcoord : TEXCOORD0) : POSITION\n" + "{\n" + " return pos;\n" + "}"; - return device_ptr; -} + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#x.\n", hr); -/* Convenience functions */ -static void set_float4_d3d9(IDirect3DDevice9 *device, ID3DXConstantTable *constants, const char *name, - float x, float y, float z, float w) -{ - D3DXVECTOR4 vector; - vector.x = x; - vector.y = y; - vector.z = z; - vector.w = w; - ID3DXConstantTable_SetVector(constants, device, name, &vector); -} + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#x.\n", hr); -/* Compile our pixel shader and get back the compiled version and a constant table */ -static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, const char *shader, - const char *profile, ID3DXConstantTable **constants) -{ - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - IDirect3DPixelShader9 *pshader; - HRESULT hr; + vs_code = compile_shader(vs_source, "vs_2_0"); + + hr = IDirect3DDevice9_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), &vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), &ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); - hr = ppD3DCompile(shader, strlen(shader), NULL, NULL, - NULL, "test", profile, /* test is the name of the entry point of our shader */ - 0, 0, &compiled, &errors); - ok(hr == D3D_OK, "Pixel shader %s compilation failed: %s\n", shader, - errors ? (char *)ID3D10Blob_GetBufferPointer(errors) : ""); - if (FAILED(hr)) return NULL; + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); - ok(hr == D3D_OK, "Could not get constant table from compiled pixel shader\n"); + hr = IDirect3DDevice9_EndScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); - return pshader; + IDirect3DVertexShader9_Release(vs); + IDirect3DPixelShader9_Release(ps); + ID3D10Blob_Release(vs_code); } -/* Draw a full screen quad */ -static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry) +static struct vec4 get_readback_vec4_d3d9(IDirect3DDevice9 *device, unsigned int x, unsigned int y) { + IDirect3DSurface9 *surface = NULL, *target = NULL; + RECT rect = {x, y, x + 1, y + 1}; + D3DLOCKED_RECT locked_rect; + D3DSURFACE_DESC desc; + struct vec4 ret; HRESULT hr; - D3DXMATRIX projection_matrix; - pD3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); - IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &projection_matrix); + hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &target); + ok(hr == D3D_OK, "Failed to get render target, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned: %08x\n", hr); + hr = IDirect3DSurface9_GetDesc(target, &desc); + ok(hr == D3D_OK, "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + desc.Format, D3DPOOL_SYSTEMMEM, &surface, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned: %08x\n", hr); + hr = IDirect3DDevice9Ex_GetRenderTargetData(device, target, surface); + ok(hr == D3D_OK, "Failed to get render target data, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, quad_geometry, 0, sizeof(struct vertex)); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource returned: %08x\n", hr); - hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); - ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive returned: %08x\n", hr); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock surface, hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned: %08x\n", hr); + ret = ((struct vec4 *)locked_rect.pBits)[0]; + + IDirect3DSurface9_UnlockRect(surface); + + IDirect3DSurface9_Release(target); + IDirect3DSurface9_Release(surface); + return ret; } -static void setup_device9(IDirect3DDevice9 *device, IDirect3DSurface9 **render_target, - IDirect3DSurface9 **readback, D3DFORMAT format, unsigned int width, unsigned int height, - IDirect3DVertexShader9 *vshader, IDirect3DPixelShader9 *pshader) +#define set_float_d3d9(a, b, c, d) set_float_d3d9_(__LINE__, a, b, c, d) +static void set_float_d3d9_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *blob, const char *name, float f) { + ID3DXConstantTable *constants; HRESULT hr; - hr = IDirect3DDevice9_CreateRenderTarget(device, width, height, format, - D3DMULTISAMPLE_NONE, 0, FALSE, render_target, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateRenderTarget returned: %08x\n", hr); - - /* The Direct3D 9 docs state that we cannot lock a render target surface, - instead we must copy the render target onto this surface to lock it */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, format, - D3DPOOL_SYSTEMMEM, readback, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetRenderTarget(device, 0, *render_target); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetVertexShader(device, vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned: %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned: %08x\n", hr); + + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(blob), &constants); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + + hr = ID3DXConstantTable_SetFloat(constants, device, name, f); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + + ID3DXConstantTable_Release(constants); } -static BOOL colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) +#define set_float4_d3d9(a, b, c, d, e, f, g) set_float4_d3d9_(__LINE__, a, b, c, d, e, f, g) +static void set_float4_d3d9_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *blob, + const char *name, float x, float y, float z, float w) { - return (fabs(a.r - b.r) < epsilon && fabs(a.g - b.g) < epsilon && fabs(a.b - b.b) < epsilon && - fabs(a.a - b.a) < epsilon); + ID3DXConstantTable *constants; + D3DXVECTOR4 v = {x, y, z, w}; + HRESULT hr; + + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(blob), &constants); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + + hr = ID3DXConstantTable_SetVector(constants, device, name, &v); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + + ID3DXConstantTable_Release(constants); } -/* Compute a shader on a width by height buffer and probes certain locations - to see if they are as expected. */ -static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShader9 *vshader, - IDirect3DPixelShader9 *pshader, IDirect3DVertexBuffer9 *quad_geometry, - const struct hlsl_probe_info *probes, unsigned int count, - unsigned int width, unsigned int height, unsigned int line_number) +static BOOL compare_float(float f, float g, unsigned int ulps) { - IDirect3DSurface9 *render_target; - IDirect3DSurface9 *readback; + int x = *(int *)&f; + int y = *(int *)&g; - HRESULT hr; - D3DLOCKED_RECT lr; - D3DXCOLOR *pbits_data; - unsigned int i; + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; - setup_device9(device, &render_target, &readback, D3DFMT_A32B32G32R32F, - width, height, vshader, pshader); - - /* Draw the quad with the shader and read back the data */ - draw_quad_with_shader9(device, quad_geometry); - IDirect3DDevice9_GetRenderTargetData(device, render_target, readback); - hr = IDirect3DSurface9_LockRect(readback, &lr, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned: %08x\n", hr); - pbits_data = lr.pBits; - - /* Now go through the probes and check each one */ - for (i = 0; i < count; i++, probes++) { - int index = probes->x + (probes->y * lr.Pitch / sizeof(D3DXCOLOR)); - ok(colors_match(probes->c, pbits_data[index], probes->epsilon), - "Line %d: At (%d, %d): %s: Expected (%.04f,%.04f,%.04f, %.04f), got " - "(%.04f,%.04f,%.04f,%.04f)\n", line_number, probes->x, probes->y, probes->message, - probes->c.r, probes->c.g, probes->c.b, probes->c.a, pbits_data[index].r, - pbits_data[index].g, pbits_data[index].b, pbits_data[index].a); - } + if (abs(x - y) > ulps) + return FALSE; - hr = IDirect3DSurface9_UnlockRect(readback); - ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect returned: %08x\n", hr); + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} - /* We now present the scene. This is mostly for debugging purposes, since GetRenderTargetData - also waits for drawing commands to complete. The reason this call is here and not in a - draw function is because the contents of the render target surface are invalidated after - this call. */ - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present returned: %08x\n", hr); +static HWND create_window(void) +{ + WNDCLASSA wc = {0}; + wc.lpfnWndProc = DefWindowProcA; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClassA(&wc); - IDirect3DSurface9_Release(render_target); - IDirect3DSurface9_Release(readback); + return CreateWindowA("d3d9_test_wc", "d3d9_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); } -/* Now the actual test functions */ -static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_swizzle(void) { - static const struct hlsl_probe_info probes[] = - { - {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test"} - }; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + struct vec4 v; + HWND window; static const char *swizzle_test_shader = "uniform float4 color;\n" - "float4 test(): COLOR\n" + "float4 main() : COLOR\n" "{\n" " float4 ret = color;\n" " ret.gb = ret.ra;\n" @@ -316,36 +292,40 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ " return ret;\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); - pshader = compile_pixel_shader9(device, swizzle_test_shader, "ps_2_0", &constants); - if (pshader != NULL) + if (!(device = create_d3d9_device(window))) { - set_float4_d3d9(device, constants, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); + DestroyWindow(window); + return; + } + + todo_wine ps_code = compile_shader(swizzle_test_shader, "ps_2_0"); + if (ps_code) + { + set_float4_d3d9(device, ps_code, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); + draw_quad(device, ps_code); - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); + v = get_readback_vec4_d3d9(device, 0, 0); + ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + ID3D10Blob_Release(ps_code); } + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_math(void) { - /* Tests order of operations */ - static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; - - static const struct hlsl_probe_info probes[] = - { - {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, - "order of operations test"} - }; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + struct vec4 v; + HWND window; static const char *order_of_operations_shader = - "float4 test(uniform float u, uniform float v, uniform float w, uniform float x,\n" + "float4 main(uniform float u, uniform float v, uniform float w, uniform float x,\n" " uniform float y, uniform float z): COLOR\n" "{\n" " return float4(x * y - z / w + --u / -v,\n" @@ -354,101 +334,127 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo " x / y / w);\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); - pshader = compile_pixel_shader9(device, order_of_operations_shader, "ps_2_0", &constants); - if (pshader != NULL) + if (!(device = create_d3d9_device(window))) { - ID3DXConstantTable_SetFloat(constants, device, "$u", u); - ID3DXConstantTable_SetFloat(constants, device, "$v", v); - ID3DXConstantTable_SetFloat(constants, device, "$w", w); - ID3DXConstantTable_SetFloat(constants, device, "$x", x); - ID3DXConstantTable_SetFloat(constants, device, "$y", y); - ID3DXConstantTable_SetFloat(constants, device, "$z", z); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); + DestroyWindow(window); + return; + } - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + todo_wine ps_code = compile_shader(order_of_operations_shader, "ps_2_0"); + if (ps_code) + { + set_float_d3d9(device, ps_code, "$u", 2.5f); + set_float_d3d9(device, ps_code, "$v", 0.3f); + set_float_d3d9(device, ps_code, "$w", 0.2f); + set_float_d3d9(device, ps_code, "$x", 0.7f); + set_float_d3d9(device, ps_code, "$y", 0.1f); + set_float_d3d9(device, ps_code, "$z", 1.5f); + draw_quad(device, ps_code); + + v = get_readback_vec4_d3d9(device, 0, 0); + ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); } + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_conditionals(void) { - static const struct hlsl_probe_info if_greater_probes[] = - { - { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"}, - {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"} - }; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + unsigned int i; + struct vec4 v; + HWND window; static const char *if_greater_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" "{\n" - " if((pos.x * 32.0) > 20.0)\n" + " if((pos.x * 640.0) > 200.0)\n" " return float4(0.1, 0.2, 0.3, 0.4);\n" " else\n" " return float4(0.9, 0.8, 0.7, 0.6);\n" "}"; - static const struct hlsl_probe_info ternary_operator_probes[] = - { - {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"} - }; - static const char *ternary_operator_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" "{\n" " return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2));\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_d3d9_device(window))) + { + DestroyWindow(window); + return; + } - pshader = compile_pixel_shader9(device, if_greater_shader, "ps_2_0", &constants); - if (pshader != NULL) + todo_wine ps_code = compile_shader(if_greater_shader, "ps_2_0"); + if (ps_code) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, - ARRAY_SIZE(if_greater_probes), 32, 1, __LINE__); + draw_quad(device, ps_code); - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + for (i = 0; i < 200; i += 40) + { + v = get_readback_vec4_d3d9(device, i, 0); + ok(compare_vec4(&v, 0.9f, 0.8f, 0.7f, 0.6f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + } + + for (i = 240; i < 640; i += 40) + { + v = get_readback_vec4_d3d9(device, i, 0); + ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + } + + ID3D10Blob_Release(ps_code); } - pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); - if (pshader != NULL) + todo_wine ps_code = compile_shader(ternary_operator_shader, "ps_2_0"); + if (ps_code) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, - ARRAY_SIZE(ternary_operator_probes), 8, 1, __LINE__); + draw_quad(device, ps_code); - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + for (i = 0; i < 320; i += 40) + { + v = get_readback_vec4_d3d9(device, i, 0); + ok(compare_vec4(&v, 0.5f, 0.25f, 0.5f, 0.75f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + } + + for (i = 360; i < 640; i += 40) + { + v = get_readback_vec4_d3d9(device, i, 0); + ok(compare_vec4(&v, 0.6f, 0.8f, 0.1f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + } + + ID3D10Blob_Release(ps_code); } + + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_float_vectors(void) { - static const struct hlsl_probe_info vec4_indexing_test1_probes[] = - { - {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1"} - }; + ID3DXConstantTable *constants; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + struct vec4 v; + HWND window; + HRESULT hr; static const char *vec4_indexing_test1_shader = - "float4 test(): COLOR\n" + "float4 main() : COLOR\n" "{\n" " float4 color;\n" " color[0] = 0.020;\n" @@ -458,15 +464,10 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 " return color;\n" "}"; - static const struct hlsl_probe_info vec4_indexing_test2_probes[] = - { - {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2"} - }; - - /* We have this uniform i here so the compiler can't optimize */ + /* A uniform index is used so that the compiler can't optimize. */ static const char *vec4_indexing_test2_shader = "uniform int i;\n" - "float4 test(): COLOR\n" + "float4 main() : COLOR\n" "{\n" " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" " color.g = color[i];\n" @@ -474,73 +475,58 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 " return color;\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); - pshader = compile_pixel_shader9(device, vec4_indexing_test1_shader, "ps_2_0", &constants); - if (pshader != NULL) + if (!(device = create_d3d9_device(window))) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, - ARRAY_SIZE(vec4_indexing_test1_probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + DestroyWindow(window); + return; } - pshader = compile_pixel_shader9(device, vec4_indexing_test2_shader, "ps_2_0", &constants); - if (pshader != NULL) + todo_wine ps_code = compile_shader(vec4_indexing_test1_shader, "ps_2_0"); + if (ps_code) { - ID3DXConstantTable_SetInt(constants, device, "i", 2); + draw_quad(device, ps_code); + + v = get_readback_vec4_d3d9(device, 0, 0); + ok(compare_vec4(&v, 0.02f, 0.245f, 0.351f, 1.0f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, - ARRAY_SIZE(vec4_indexing_test2_probes), 32, 1, __LINE__); + ID3D10Blob_Release(ps_code); + } + todo_wine ps_code = compile_shader(vec4_indexing_test2_shader, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constants, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetInt(constants, device, "i", 2); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + draw_quad(device, ps_code); + + v = get_readback_vec4_d3d9(device, 0, 0); + ok(compare_vec4(&v, 0.5f, 0.3f, 0.8f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); } + + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_trig(void) { - static const struct hlsl_probe_info sincos_probes[] = - { - {0, 0, {0.5000f, 1.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {1, 0, {0.5975f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {2, 0, {0.6913f, 0.9620f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {3, 0, {0.7778f, 0.9160f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {4, 0, {0.8536f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {5, 0, {0.9157f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {6, 0, {0.9620f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {7, 0, {0.9904f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {8, 0, {1.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {9, 0, {0.9904f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {10, 0, {0.9619f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {11, 0, {0.9157f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {12, 0, {0.8536f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {13, 0, {0.7778f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {14, 0, {0.6913f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {15, 0, {0.5975f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {16, 0, {0.5000f, 0.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {17, 0, {0.4025f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {18, 0, {0.3087f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {19, 0, {0.2222f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {20, 0, {0.1464f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {21, 0, {0.0843f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {22, 0, {0.0381f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {23, 0, {0.0096f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {24, 0, {0.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {25, 0, {0.0096f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {26, 0, {0.0381f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {27, 0, {0.0843f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {28, 0, {0.1464f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {29, 0, {0.2222f, 0.9157f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {30, 0, {0.3087f, 0.9619f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {31, 0, {0.4025f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - }; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + unsigned int i; + struct vec4 v; + HWND window; static const char *sincos_shader = - "float4 test(float x: TEXCOORD0): COLOR\n" + "float4 main(float x : TEXCOORD0) : COLOR\n" "{\n" " const float pi2 = 6.2831853;\n" " float calcd_sin = (sin(x * pi2) + 1)/2;\n" @@ -548,22 +534,37 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo " return float4(calcd_sin, calcd_cos, 0, 0);\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_d3d9_device(window))) + { + DestroyWindow(window); + return; + } - pshader = compile_pixel_shader9(device, sincos_shader, "ps_2_0", &constants); - if (pshader != NULL) + todo_wine ps_code = compile_shader(sincos_shader, "ps_2_0"); + if (ps_code) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, sincos_probes, - ARRAY_SIZE(sincos_probes), 32, 1, __LINE__); + draw_quad(device, ps_code); - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + for (i = 0; i < 32; ++i) + { + float expect_x = (sinf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + float expect_y = (cosf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + v = get_readback_vec4_d3d9(device, i * 640 / 32, 0); + ok(compare_vec4(&v, expect_x, expect_y, 0.0f, 0.0f, 4096), + "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + i, v.x, v.y, v.z, v.w, expect_x, expect_y, 0.0f, 0.0f); + } + + ID3D10Blob_Release(ps_code); } + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_fail(void) { static const char *tests[] = { @@ -619,10 +620,11 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge { compiled = errors = NULL; hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); - ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); - ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); + todo_wine ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); + todo_wine_if (i == 1) ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); ok(!compiled, "Test %u, expected no compiled shader blob.\n", i); - ID3D10Blob_Release(errors); + if (errors) + ID3D10Blob_Release(errors); } } @@ -642,12 +644,6 @@ static BOOL load_d3dcompiler(void) START_TEST(hlsl) { - D3DCAPS9 caps; - ULONG refcount; - IDirect3DDevice9 *device; - IDirect3DVertexDeclaration9 *vdeclaration; - IDirect3DVertexBuffer9 *quad_geometry; - IDirect3DVertexShader9 *vshader_passthru; HMODULE mod; if (!load_d3dcompiler()) @@ -662,40 +658,11 @@ START_TEST(hlsl) return; } pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); - pD3DXMatrixOrthoLH = (void *)GetProcAddress(mod, "D3DXMatrixOrthoLH"); - - device = init_d3d9(&vdeclaration, &quad_geometry, &vshader_passthru); - if (!device) return; - - /* Make sure we support pixel shaders, before trying to compile them! */ - /* Direct3D 9 (Shader model 1-3 tests) */ - IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) - { - todo_wine - { - test_swizzle(device, quad_geometry, vshader_passthru); - test_math(device, quad_geometry, vshader_passthru); - test_conditionals(device, quad_geometry, vshader_passthru); - test_float_vectors(device, quad_geometry, vshader_passthru); - test_trig(device, quad_geometry, vshader_passthru); - test_fail(device, quad_geometry, vshader_passthru); - } - } else skip("no pixel shader support\n"); - - /* Reference counting sanity checks */ - if (vshader_passthru) - { - refcount = IDirect3DVertexShader9_Release(vshader_passthru); - ok(!refcount, "Pass-through vertex shader has %u references left\n", refcount); - } - - refcount = IDirect3DVertexBuffer9_Release(quad_geometry); - ok(!refcount, "Vertex buffer has %u references left\n", refcount); - - refcount = IDirect3DVertexDeclaration9_Release(vdeclaration); - ok(!refcount, "Vertex declaration has %u references left\n", refcount); - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); + test_swizzle(); + test_math(); + test_conditionals(); + test_float_vectors(); + test_trig(); + test_fail(); } -- 2.25.0

2 4

[PATCH 2/2] msxml3/tests: Just use a wchar string literal instead of _bstr_()
by Michael Stefaniuc 18 Feb '20

18 Feb '20

lstrcmpW and memcmp can deal just fine with WCHAR* and don't need a BSTR. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 326 +++++++++++++++++----------------- dlls/msxml3/tests/httpreq.c | 4 +- dlls/msxml3/tests/saxreader.c | 76 ++++---- 3 files changed, 203 insertions(+), 203 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 51bd1b47ca..a6acdba366 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1726,19 +1726,19 @@ if (0) /* get data Tests */ r = IXMLDOMText_get_data(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect put_data string\n"); + ok(!lstrcmpW(str, L"This &is a ; test <>\\"), "incorrect put_data string\n"); SysFreeString(str); /* Confirm XML text is good */ r = IXMLDOMText_get_xml(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); + ok(!lstrcmpW(str, L"This &is a ; test <>\\"), "incorrect xml string\n"); SysFreeString(str); /* Confirm we get the put_data Text back */ r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); + ok(!lstrcmpW(str, L"This &is a ; test <>\\"), "incorrect xml string\n"); SysFreeString(str); /* test substringData */ @@ -1772,19 +1772,19 @@ if (0) /* test substringData - Start of string */ r = IXMLDOMText_substringData(nodetext, 0, 4, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("This") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"This"), "incorrect substringData string\n"); SysFreeString(str); /* test substringData - Middle of string */ r = IXMLDOMText_substringData(nodetext, 13, 4, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("test") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"test"), "incorrect substringData string\n"); SysFreeString(str); /* test substringData - End of string */ r = IXMLDOMText_substringData(nodetext, 20, 4, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"\\"), "incorrect substringData string\n"); SysFreeString(str); /* test appendData */ @@ -1799,7 +1799,7 @@ if (0) r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"This &is a ; test <>\\Append"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* test insertData */ @@ -1840,7 +1840,7 @@ if (0) r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"Begin This &is a Middle; test <>\\Append End"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete data */ @@ -1874,7 +1874,7 @@ if (0) r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"This &is a Middle; test <>\\Append End"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete from end */ @@ -1887,7 +1887,7 @@ if (0) r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"This &is a Middle; test <>\\Append"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete from inside */ @@ -1900,7 +1900,7 @@ if (0) r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L""), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete whole data ... */ @@ -1934,7 +1934,7 @@ if (0) r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("99") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"99"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* ::replaceData() */ @@ -1948,14 +1948,14 @@ if (0) ok(r == E_INVALIDARG, "ret %08x\n", r ); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"str1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); r = IXMLDOMText_replaceData(nodetext, 0, 0, NULL); ok(r == S_OK, "ret %08x\n", r ); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"str1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* NULL pointer means delete */ @@ -1963,7 +1963,7 @@ if (0) ok(r == S_OK, "ret %08x\n", r ); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"tr1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* empty string means delete */ @@ -1971,7 +1971,7 @@ if (0) ok(r == S_OK, "ret %08x\n", r ); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"r1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* zero count means insert */ @@ -1979,7 +1979,7 @@ if (0) ok(r == S_OK, "ret %08x\n", r ); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"ar1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); r = IXMLDOMText_replaceData(nodetext, 0, 2, NULL); @@ -1989,7 +1989,7 @@ if (0) ok(r == S_OK, "ret %08x\n", r ); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"m1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* nonempty string, count greater than its length */ @@ -1997,7 +1997,7 @@ if (0) ok(r == S_OK, "ret %08x\n", r ); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"a1.2"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* nonempty string, count less than its length */ @@ -2005,7 +2005,7 @@ if (0) ok(r == S_OK, "ret %08x\n", r ); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"wine1.2"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMText_Release( nodetext ); @@ -2094,26 +2094,26 @@ if (0) /* test nodeName */ r = IXMLDOMProcessingInstruction_get_nodeName(nodePI, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); + ok(!lstrcmpW(str, L"xml"), "incorrect nodeName string\n"); SysFreeString(str); /* test baseName */ str = NULL; r = IXMLDOMProcessingInstruction_get_baseName(nodePI, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); + ok(!lstrcmpW(str, L"xml"), "incorrect nodeName string\n"); SysFreeString(str); /* test Target */ r = IXMLDOMProcessingInstruction_get_target(nodePI, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect target string\n"); + ok(!lstrcmpW(str, L"xml"), "incorrect target string\n"); SysFreeString(str); /* test get_data */ r = IXMLDOMProcessingInstruction_get_data(nodePI, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("version=\"1.0\"") ), "incorrect data string\n"); + ok(!lstrcmpW(str, L"version=\"1.0\""), "incorrect data string\n"); SysFreeString(str); /* test put_data */ @@ -2129,7 +2129,7 @@ if (0) /* test get nodeName */ r = IXMLDOMProcessingInstruction_get_nodeName(nodePI, &str); - ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); + ok(!lstrcmpW(str, L"xml"), "incorrect nodeName string\n"); ok(r == S_OK, "ret %08x\n", r ); SysFreeString(str); @@ -3609,7 +3609,7 @@ static void test_get_childNodes(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("bs")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"bs"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); @@ -3617,7 +3617,7 @@ static void test_get_childNodes(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("bs")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"bs"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); @@ -3629,7 +3629,7 @@ static void test_get_childNodes(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("bs")), "got node name %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"bs"), "got node name %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); VariantClear(&v); @@ -3638,7 +3638,7 @@ static void test_get_childNodes(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("pr")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"pr"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); @@ -3669,7 +3669,7 @@ static void test_get_childNodes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("xml")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"xml"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* it returns empty but valid node list */ @@ -5021,7 +5021,7 @@ if (0) hr = IXMLDOMNode_get_nodeName(rootNode, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("root")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"root"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(rootNode); @@ -5168,7 +5168,7 @@ static void test_cloneNode(void ) hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &v); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("XSLPattern")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"XSLPattern"), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = _bstr_("XPath"); @@ -5196,7 +5196,7 @@ static void test_cloneNode(void ) /* cloned document inherits properties */ hr = IXMLDOMDocument2_getProperty(doc_clone, _bstr_("SelectionLanguage"), &v); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("XPath")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"XPath"), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IXMLDOMDocument2_Release(doc_clone); @@ -5436,19 +5436,19 @@ static void test_xmlTypes(void) /* get data Tests */ hr = IXMLDOMComment_get_data(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect get_data string\n"); + ok(!lstrcmpW(str, L"This &is a ; test <>\\"), "incorrect get_data string\n"); SysFreeString(str); /* Confirm XML text is good */ hr = IXMLDOMComment_get_xml(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("") ), "incorrect xml string\n"); + ok(!lstrcmpW(str, L""), "incorrect xml string\n"); SysFreeString(str); /* Confirm we get the put_data Text back */ hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); + ok(!lstrcmpW(str, L"This &is a ; test <>\\"), "incorrect xml string\n"); SysFreeString(str); /* test length property */ @@ -5487,19 +5487,19 @@ static void test_xmlTypes(void) /* test substringData - Start of string */ hr = IXMLDOMComment_substringData(pComment, 0, 4, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"This"), "incorrect substringData string\n"); SysFreeString(str); /* test substringData - Middle of string */ hr = IXMLDOMComment_substringData(pComment, 13, 4, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("test") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"test"), "incorrect substringData string\n"); SysFreeString(str); /* test substringData - End of string */ hr = IXMLDOMComment_substringData(pComment, 20, 4, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"\\"), "incorrect substringData string\n"); SysFreeString(str); /* test appendData */ @@ -5514,7 +5514,7 @@ static void test_xmlTypes(void) hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"This &is a ; test <>\\Append"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* test insertData */ @@ -5555,7 +5555,7 @@ static void test_xmlTypes(void) hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"Begin This &is a Middle; test <>\\Append End"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete data */ @@ -5589,7 +5589,7 @@ static void test_xmlTypes(void) hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L" This &is a Middle; test <>\\Append End"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete from end */ @@ -5602,7 +5602,7 @@ static void test_xmlTypes(void) hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L" This &is a Middle; test <>\\Append "), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete from inside */ @@ -5615,7 +5615,7 @@ static void test_xmlTypes(void) hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_(" ") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L" "), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete whole data ... */ @@ -5639,14 +5639,14 @@ static void test_xmlTypes(void) ok(hr == E_INVALIDARG, "ret %08x\n", hr ); hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"str1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMComment_replaceData(pComment, 0, 0, NULL); ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"str1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* NULL pointer means delete */ @@ -5654,7 +5654,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"tr1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* empty string means delete */ @@ -5662,7 +5662,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"r1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* zero count means insert */ @@ -5670,7 +5670,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"ar1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMComment_replaceData(pComment, 0, 2, NULL); @@ -5680,7 +5680,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"m1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* nonempty string, count greater than its length */ @@ -5688,7 +5688,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"a1.2"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* nonempty string, count less than its length */ @@ -5696,7 +5696,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMComment_get_text(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"wine1.2"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMComment_Release(pComment); @@ -5874,13 +5874,13 @@ static void test_xmlTypes(void) /* Confirm XML text is good */ hr = IXMLDOMCDATASection_get_xml(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("<![CDATA[This &is a ; test <>\\]]>") ), "incorrect xml string\n"); + ok(!lstrcmpW(str, L"<![CDATA[This &is a ; test <>\\]]>"), "incorrect xml string\n"); SysFreeString(str); /* Confirm we get the put_data Text back */ hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); + ok(!lstrcmpW(str, L"This &is a ; test <>\\"), "incorrect text string\n"); SysFreeString(str); /* test length property */ @@ -5891,7 +5891,7 @@ static void test_xmlTypes(void) /* test get data */ hr = IXMLDOMCDATASection_get_data(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); + ok(!lstrcmpW(str, L"This &is a ; test <>\\"), "incorrect text string\n"); SysFreeString(str); /* test substringData */ @@ -5925,19 +5925,19 @@ static void test_xmlTypes(void) /* test substringData - Start of string */ hr = IXMLDOMCDATASection_substringData(pCDataSec, 0, 4, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"This"), "incorrect substringData string\n"); SysFreeString(str); /* test substringData - Middle of string */ hr = IXMLDOMCDATASection_substringData(pCDataSec, 13, 4, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("test") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"test"), "incorrect substringData string\n"); SysFreeString(str); /* test substringData - End of string */ hr = IXMLDOMCDATASection_substringData(pCDataSec, 20, 4, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); + ok(!lstrcmpW(str, L"\\"), "incorrect substringData string\n"); SysFreeString(str); /* test appendData */ @@ -5952,7 +5952,7 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"This &is a ; test <>\\Append"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* test insertData */ @@ -5993,7 +5993,7 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"Begin This &is a Middle; test <>\\Append End"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete data */ @@ -6027,7 +6027,7 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L" This &is a Middle; test <>\\Append End"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete from end */ @@ -6040,7 +6040,7 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L" This &is a Middle; test <>\\Append "), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete from inside */ @@ -6053,7 +6053,7 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_(" ") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L" "), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* delete whole data ... */ @@ -6078,14 +6078,14 @@ static void test_xmlTypes(void) ok(hr == E_INVALIDARG, "ret %08x\n", hr ); hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"str1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMCDATASection_replaceData(pCDataSec, 0, 0, NULL); ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"str1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* NULL pointer means delete */ @@ -6093,7 +6093,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"tr1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* empty string means delete */ @@ -6101,7 +6101,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"r1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* zero count means insert */ @@ -6109,7 +6109,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"ar1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMCDATASection_replaceData(pCDataSec, 0, 2, NULL); @@ -6119,7 +6119,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"m1"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* nonempty string, count greater than its length */ @@ -6127,7 +6127,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"a1.2"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); /* nonempty string, count less than its length */ @@ -6135,7 +6135,7 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok(!lstrcmpW(str, L"wine1.2"), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMCDATASection_Release(pCDataSec); @@ -6603,7 +6603,7 @@ static void test_namespaces_change(void) hr = IXMLDOMElement_get_xml(elem, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s for %s\n", + ok(!lstrcmpW(str, L"<ns:elem xmlns:ns=\"ns/uri\"/>"), "got element %s for %s\n", wine_dbgstr_w(str), class_ptr->name); SysFreeString(str); @@ -6663,12 +6663,12 @@ static void test_namespaces_basic(void) hr = IXMLDOMNode_get_prefix(node2, &str); EXPECT_HR(hr, S_OK); - ok( !lstrcmpW( str, _bstr_("Model")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"Model"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMNode_get_nodeName(node2, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"Model:Package"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* Test get_namespaceURI */ @@ -6678,7 +6678,7 @@ static void test_namespaces_basic(void) hr = IXMLDOMNode_get_namespaceURI(node2, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW( str, _bstr_("http://omg.org/mof.Model/1.3")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"http://omg.org/mof.Model/1.3"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMNode_QueryInterface(node2, &IID_IXMLDOMElement, (void**)&elem); @@ -6689,12 +6689,12 @@ static void test_namespaces_basic(void) hr = IXMLDOMAttribute_get_nodeName(attr, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"Model:name2"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMAttribute_get_prefix(attr, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW( str, _bstr_("Model")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"Model"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMAttribute_Release(attr); @@ -6855,7 +6855,7 @@ static void test_nodeTypedValue(void) hr = IXMLDOMProcessingInstruction_get_nodeTypedValue(pi, &value); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); - ok(!lstrcmpW(V_BSTR(&value), _bstr_("value")), "got wrong value\n"); + ok(!lstrcmpW(V_BSTR(&value), L"value"), "got wrong value\n"); IXMLDOMProcessingInstruction_Release(pi); VariantClear(&value); } @@ -6868,7 +6868,7 @@ static void test_nodeTypedValue(void) hr = IXMLDOMCDATASection_get_nodeTypedValue(cdata, &value); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); - ok(!lstrcmpW(V_BSTR(&value), _bstr_("[1]*2=3; &gee that's not right!")), "got wrong value\n"); + ok(!lstrcmpW(V_BSTR(&value), L"[1]*2=3; &gee that's not right!"), "got wrong value\n"); IXMLDOMCDATASection_Release(cdata); VariantClear(&value); } @@ -6881,7 +6881,7 @@ static void test_nodeTypedValue(void) hr = IXMLDOMComment_get_nodeTypedValue(comment, &value); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); - ok(!lstrcmpW(V_BSTR(&value), _bstr_("comment")), "got wrong value\n"); + ok(!lstrcmpW(V_BSTR(&value), L"comment"), "got wrong value\n"); IXMLDOMComment_Release(comment); VariantClear(&value); } @@ -7804,11 +7804,11 @@ static inline void _check_default_props(int line, IXMLDOMDocument2* doc) VariantInit(&var); helper_ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &var)); - ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), _bstr_("XSLPattern")) == 0, "expected XSLPattern\n"); + ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), L"XSLPattern") == 0, "expected XSLPattern\n"); VariantClear(&var); helper_ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var)); - ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), _bstr_("")) == 0, "expected empty string\n"); + ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), L"") == 0, "expected empty string\n"); VariantClear(&var); helper_ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc, &b)); @@ -7827,11 +7827,11 @@ static inline void _check_set_props(int line, IXMLDOMDocument2* doc) VariantInit(&var); helper_ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &var)); - ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), _bstr_("XPath")) == 0, "expected XPath\n"); + ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), L"XPath") == 0, "expected XPath\n"); VariantClear(&var); helper_ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var)); - ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), _bstr_("xmlns:wi=\'www.winehq.org\'")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), L"xmlns:wi=\'www.winehq.org\'") == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); helper_ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc, &b)); @@ -8104,7 +8104,7 @@ static void test_setAttributeNode(void) str = NULL; hr = IXMLDOMAttribute_get_xml(attr, &str); ok( hr == S_OK, "got 0x%08x\n", hr); - ok( lstrcmpW(str, _bstr_("attr=\"attrvalue1\"")) == 0, + ok(lstrcmpW(str, L"attr=\"attrvalue1\"") == 0, "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -8120,7 +8120,7 @@ static void test_setAttributeNode(void) hr = IXMLDOMElement_get_xml(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); - ok( lstrcmpW(str, _bstr_("<test attr=\"attrvalue1\"/>")) == 0, + ok(lstrcmpW(str, L"<test attr=\"attrvalue1\"/>") == 0, "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -8131,7 +8131,7 @@ static void test_setAttributeNode(void) hr = IXMLDOMElement_get_xml(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok( lstrcmpW(str, _bstr_("<test attr=\"attrvalue2\"/>")) == 0, + todo_wine ok(lstrcmpW(str, L"<test attr=\"attrvalue2\"/>") == 0, "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -8187,7 +8187,7 @@ todo_wine { prefix = NULL; hr = IXMLDOMNode_get_prefix(node, &prefix); ok( hr == S_OK, "got 0x%08x\n", hr); - ok(lstrcmpW(prefix, _bstr_("ns1")) == 0, "wrong prefix\n"); + ok(lstrcmpW(prefix, L"ns1") == 0, "wrong prefix\n"); SysFreeString(prefix); IXMLDOMNode_Release(node); @@ -8201,7 +8201,7 @@ todo_wine { /* check dump */ hr = IXMLDOMNode_get_xml(node, &str); ok( hr == S_OK, "got 0x%08x\n", hr); - ok( lstrcmpW(str, _bstr_("<test xmlns=\"http://winehq.org/default\"/>")) == 0, + ok(lstrcmpW(str, L"<test xmlns=\"http://winehq.org/default\"/>") == 0, "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -8216,7 +8216,7 @@ todo_wine { str = NULL; hr = IXMLDOMElement_get_namespaceURI(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); - ok( lstrcmpW(str, _bstr_("http://winehq.org/default")) == 0, "expected default namespace\n"); + ok(lstrcmpW(str, L"http://winehq.org/default") == 0, "expected default namespace\n"); SysFreeString(str); IXMLDOMElement_Release(elem); @@ -8313,7 +8313,7 @@ static void test_get_prefix(void) str = (void*)0xdeadbeef; hr = IXMLDOMElement_get_prefix(element, &str); ok( hr == S_OK, "got 0x%08x\n", hr); - ok( lstrcmpW(str, _bstr_("a")) == 0, "expected prefix \"a\"\n"); + ok(lstrcmpW(str, L"a") == 0, "expected prefix \"a\"\n"); SysFreeString(str); str = (void*)0xdeadbeef; @@ -8537,7 +8537,7 @@ static void test_put_nodeTypedValue(void) hr = IXMLDOMElement_get_nodeTypedValue(elem, &type); EXPECT_HR(hr, S_OK); ok(V_VT(&type) == VT_BSTR, "got %d, expected VT_BSTR\n", V_VT(&type)); - ok(memcmp(V_BSTR(&type), _bstr_("1"), 2*sizeof(WCHAR)) == 0, + ok(memcmp(V_BSTR(&type), L"1", 2*sizeof(WCHAR)) == 0, "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type))); VariantClear(&type); @@ -8585,7 +8585,7 @@ static void test_put_nodeTypedValue(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_text(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("ABCD")), "%s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"ABCD"), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SysFreeString(str); @@ -8624,7 +8624,7 @@ static void test_put_nodeTypedValue(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_text(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"ZEdWemRBPQ=="), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); SysFreeString(str); @@ -8673,7 +8673,7 @@ static void test_put_nodeTypedValue(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_text(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("000102030405060708090a0b0c0d0e0f")), "%s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"000102030405060708090a0b0c0d0e0f"), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); SysFreeString(str); @@ -9317,13 +9317,13 @@ static void test_insertBefore(void) p = NULL; hr = IXMLDOMElement_get_xml(elem1, &p); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(p, _bstr_("<elem1 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + ok(!lstrcmpW(p, L"<elem1 xmlns=\"http://winehq.org/default\"/>"), "got %s\n", wine_dbgstr_w(p)); SysFreeString(p); p = NULL; hr = IXMLDOMElement_get_xml(elem2, &p); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(p, _bstr_("<elem2 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + ok(!lstrcmpW(p, L"<elem2 xmlns=\"http://winehq.org/default\"/>"), "got %s\n", wine_dbgstr_w(p)); SysFreeString(p); V_VT(&v) = VT_NULL; @@ -9335,14 +9335,14 @@ static void test_insertBefore(void) p = NULL; hr = IXMLDOMElement_get_xml(elem1, &p); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(!lstrcmpW(p, _bstr_("<elem1 xmlns=\"http://winehq.org/default\"><elem2/></elem1>")), + todo_wine ok(!lstrcmpW(p, L"<elem1 xmlns=\"http://winehq.org/default\"><elem2/></elem1>"), "got %s\n", wine_dbgstr_w(p)); SysFreeString(p); p = NULL; hr = IXMLDOMElement_get_xml(elem2, &p); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(p, _bstr_("<elem2 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + ok(!lstrcmpW(p, L"<elem2 xmlns=\"http://winehq.org/default\"/>"), "got %s\n", wine_dbgstr_w(p)); SysFreeString(p); IXMLDOMElement_Release(elem1); @@ -9372,7 +9372,7 @@ static void test_insertBefore(void) p = NULL; hr = IXMLDOMElement_get_xml(elem2, &p); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p)); + ok(!lstrcmpW(p, L"<elem2/>"), "got %s\n", wine_dbgstr_w(p)); SysFreeString(p); hr = IXMLDOMElement_removeChild(elem1, (IXMLDOMNode*)elem2, NULL); @@ -9381,7 +9381,7 @@ static void test_insertBefore(void) p = NULL; hr = IXMLDOMElement_get_xml(elem2, &p); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p)); + ok(!lstrcmpW(p, L"<elem2/>"), "got %s\n", wine_dbgstr_w(p)); SysFreeString(p); IXMLDOMElement_Release(elem1); @@ -9497,7 +9497,7 @@ static void test_get_tagName(void) str = NULL; hr = IXMLDOMElement_get_tagName(elem, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, _bstr_("element")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"element"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMDocument_createElement(doc, _bstr_("s:element"), &elem2); @@ -9506,7 +9506,7 @@ static void test_get_tagName(void) str = NULL; hr = IXMLDOMElement_get_tagName(elem2, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, _bstr_("s:element")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"s:element"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMElement_Release(elem); @@ -9600,7 +9600,7 @@ static void test_get_nodeTypeString(void) hr = IXMLDOMDocument_get_nodeTypeString(doc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, _bstr_("document")), "got string %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"document"), "got string %s\n", wine_dbgstr_w(str)); SysFreeString(str); while (entry->type) @@ -9702,7 +9702,7 @@ static void test_get_attributes(void) hr = IXMLDOMNode_get_nodeName(node2, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("version")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"version"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); length = -1; @@ -9717,12 +9717,12 @@ static void test_get_attributes(void) hr = IXMLDOMNode_get_xml(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"<?xml version=\"1.0\"?>"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMNode_get_text(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("version=\"1.0\"")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"version=\"1.0\""), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMNamedNodeMap_removeNamedItem(map, _bstr_("version"), NULL); @@ -9735,12 +9735,12 @@ static void test_get_attributes(void) hr = IXMLDOMNode_get_xml(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"<?xml version=\"1.0\"?>"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMNode_get_text(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L""), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNamedNodeMap_Release(map); @@ -9776,12 +9776,12 @@ static void test_get_attributes(void) hr = IXMLDOMNode_get_xml(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"<?xml version=\"1.0\"?>"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMNode_get_text(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("encoding=\"UTF-8\"")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"encoding=\"UTF-8\""), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNamedNodeMap_Release(map); @@ -10095,7 +10095,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(name, _bstr_("a")), "got node name %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"a"), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); VariantClear(&v); @@ -10105,7 +10105,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(name, _bstr_("c")), "got node name %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"c"), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); SysFreeString(name); @@ -10117,7 +10117,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(name, _bstr_("b")), "got node name %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"b"), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); VariantClear(&v); @@ -10127,7 +10127,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(name, _bstr_("d")), "got node name %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); SysFreeString(name); @@ -10564,7 +10564,7 @@ todo_wine { hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len); EXPECT_HR(hr, S_OK); ok(len == 3, "got %d\n", len); - ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"xml"), "got prefix %s\n", wine_dbgstr_w(buffW)); /* getURI */ hr = IMXNamespaceManager_getURI(nsmgr, NULL, NULL, NULL, NULL); @@ -10652,14 +10652,14 @@ todo_wine { buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns1"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("http://www.w3.org/XML/1998/namespace"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("xml")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"xml"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); /* with null buffer it's possible to get required length */ @@ -10730,14 +10730,14 @@ todo_wine { buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns1"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns2"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); len = 100; @@ -10772,7 +10772,7 @@ todo_wine { buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns1"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); hr = IMXNamespaceManager_pushContext(nsmgr); @@ -10782,7 +10782,7 @@ todo_wine { buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns1"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns2"), _bstr_("ns2 uri")); @@ -10792,7 +10792,7 @@ todo_wine { buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns2"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); hr = IMXNamespaceManager_pushContext(nsmgr); @@ -10804,14 +10804,14 @@ todo_wine { buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns2"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns1"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); hr = IMXNamespaceManager_popContext(nsmgr); @@ -10831,7 +10831,7 @@ todo_wine { buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns1"), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); IMXNamespaceManager_Release(nsmgr); @@ -10855,7 +10855,7 @@ static void test_mxnamespacemanager_override(void) buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"xml"), "got prefix %s\n", wine_dbgstr_w(buffW)); len = ARRAY_SIZE(buffW); buffW[0] = 0; @@ -10880,7 +10880,7 @@ static void test_mxnamespacemanager_override(void) buffW[0] = 0; hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns0 uri")), "got uri %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns0 uri"), "got uri %s\n", wine_dbgstr_w(buffW)); hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns0"), _bstr_("ns0 uri")); EXPECT_HR(hr, S_OK); @@ -10889,19 +10889,19 @@ static void test_mxnamespacemanager_override(void) buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"xml"), "got prefix %s\n", wine_dbgstr_w(buffW)); len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns0")), "got prefix %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns0"), "got prefix %s\n", wine_dbgstr_w(buffW)); len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 2, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("")), "got prefix %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L""), "got prefix %s\n", wine_dbgstr_w(buffW)); /* new prefix placed at index 1 always */ hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns1"), _bstr_("ns1 uri")); @@ -10911,7 +10911,7 @@ static void test_mxnamespacemanager_override(void) buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns1")), "got prefix %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns1"), "got prefix %s\n", wine_dbgstr_w(buffW)); hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_(""), NULL); todo_wine EXPECT_HR(hr, E_FAIL); @@ -10932,13 +10932,13 @@ static void test_mxnamespacemanager_override(void) buffW[0] = 0; hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("ns0 uri override")), "got uri %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"ns0 uri override"), "got uri %s\n", wine_dbgstr_w(buffW)); len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 3, buffW, &len); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(buffW, _bstr_("")), "got prefix %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L""), "got prefix %s\n", wine_dbgstr_w(buffW)); IMXNamespaceManager_Release(nsmgr); @@ -11471,19 +11471,19 @@ static void test_getAttribute(void) hr = IXMLDOMElement_getAttribute( elem, _bstr_("xmlns:foo"), &var ); EXPECT_HR(hr, S_OK); ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); - ok( !lstrcmpW(V_BSTR(&var), _bstr_("urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29"), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IXMLDOMElement_getAttribute( elem, _bstr_("a"), &var ); EXPECT_HR(hr, S_OK); ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); - ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr a")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"attr a"), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IXMLDOMElement_getAttribute( elem, _bstr_("foo:b"), &var ); EXPECT_HR(hr, S_OK); ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); - ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr b")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"attr b"), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IXMLDOMElement_getAttribute( elem, _bstr_("b"), &var ); @@ -11771,7 +11771,7 @@ static void test_xmlns_attribute(void) str = NULL; hr = IXMLDOMElement_get_xml(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, + todo_wine ok(lstrcmpW(str, L"<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>") == 0, "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -11886,12 +11886,12 @@ static void test_get_namespaces(void) hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 0, &s); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(s, _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"http://blah.org"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 1, &s); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(s, _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); s = (void*)0xdeadbeef; @@ -11922,14 +11922,14 @@ static void test_get_namespaces(void) hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); EXPECT_HR(hr, S_OK); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"http://blah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_EMPTY; hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); EXPECT_HR(hr, S_OK); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_NULL; @@ -12005,12 +12005,12 @@ static void test_get_namespaces(void) hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 0, &s); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(s, _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"http://blah.org"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 1, &s); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(s, _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); s = (void*)0xdeadbeef; @@ -12028,14 +12028,14 @@ static void test_get_namespaces(void) hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); EXPECT_HR(hr, S_OK); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"http://blah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_EMPTY; hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); EXPECT_HR(hr, S_OK); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_NULL; @@ -12202,7 +12202,7 @@ static void test_newline_normalization(void) hr = IXMLDOMText_get_data(text, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"\n"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMText_get_length(text, &length); @@ -12211,7 +12211,7 @@ static void test_newline_normalization(void) hr = IXMLDOMText_get_xml(text, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"\r\n"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ @@ -12221,7 +12221,7 @@ static void test_newline_normalization(void) hr = IXMLDOMText_get_data(text, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"\n\n"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMText_get_length(text, &length); @@ -12230,7 +12230,7 @@ static void test_newline_normalization(void) hr = IXMLDOMText_get_xml(text, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"\r\n\r\n"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); /* the same normalizations are applied when loading a document as a whole */ @@ -12240,12 +12240,12 @@ static void test_newline_normalization(void) hr = IXMLDOMDocument_get_text(doc, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"foo\n\n\n\nbar"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMDocument_get_xml(doc, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + ok(!lstrcmpW(s, L"<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); @@ -12257,7 +12257,7 @@ static void test_newline_normalization(void) hr = IXMLDOMDocument_get_text(doc, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"foo\n\n\n\nbar"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMDocument_get_xml(doc, &s); @@ -12277,7 +12277,7 @@ static void test_newline_normalization(void) hr = IXMLDOMDocument_get_text(doc, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"foo\n\n\n\nbar"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMDocument_get_xml(doc, &s); @@ -12286,12 +12286,12 @@ static void test_newline_normalization(void) { /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ todo_wine - ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>")), + ok(!lstrcmpW(s, L"<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>"), "got %s\n", wine_dbgstr_w(s)); } else { - ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + ok(!lstrcmpW(s, L"<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n"), "got %s\n", wine_dbgstr_w(s)); } SysFreeString(s); @@ -12448,7 +12448,7 @@ static void test_namedmap_newenum(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("attr1")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"attr1"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); @@ -12456,7 +12456,7 @@ static void test_namedmap_newenum(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("attr1")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"attr1"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); @@ -12468,7 +12468,7 @@ static void test_namedmap_newenum(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("attr1")), "got node name %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"attr1"), "got node name %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); VariantClear(&v); @@ -12477,7 +12477,7 @@ static void test_namedmap_newenum(void) EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("attr2")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"attr2"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); @@ -12537,7 +12537,7 @@ static void test_xsltext(void) hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(ret, _bstr_("testdata")), "transform result %s\n", wine_dbgstr_w(ret)); + ok(!lstrcmpW(ret, L"testdata"), "transform result %s\n", wine_dbgstr_w(ret)); SysFreeString(ret); /* omit-xml-declaration */ @@ -12548,7 +12548,7 @@ static void test_xsltext(void) hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(ret, _bstr_("<node>item1</node><node>item2</node>")), "transform result %s\n", wine_dbgstr_w(ret)); + ok(!lstrcmpW(ret, L"<node>item1</node><node>item2</node>"), "transform result %s\n", wine_dbgstr_w(ret)); SysFreeString(ret); IXMLDOMDocument_Release(doc2); @@ -12641,7 +12641,7 @@ static void test_create_attribute(void) /* for some reason default namespace uri is not reported */ hr = IXMLDOMNode_get_namespaceURI(node, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, _bstr_("")), "got uri %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L""), "got uri %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 33e6bd6581..8a2ed2c73a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1588,7 +1588,7 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); EXPECT_HR(hr, S_OK); /* status line is stripped already */ - ok(memcmp(str, _bstr_("HTTP"), 4*sizeof(WCHAR)), "got response headers %s\n", wine_dbgstr_w(str)); + ok(memcmp(str, L"HTTP", 4*sizeof(WCHAR)), "got response headers %s\n", wine_dbgstr_w(str)); ok(*str, "got empty headers\n"); hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str1); EXPECT_HR(hr, S_OK); @@ -1616,7 +1616,7 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_get_statusText(xhr, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("OK")), "got status %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"OK"), "got status %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* another ::send() after completed request */ diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 44b5e1bcb5..986f429cc1 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2764,7 +2764,7 @@ static void test_saxreader_properties(void) hr = ISAXXMLReader_getProperty(reader, _bstr_("xmldecl-version"), &v); EXPECT_HR(hr, S_OK); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("1.0")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"1.0"), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); ISAXXMLReader_Release(reader); @@ -3163,7 +3163,7 @@ static void test_mxwriter_properties(void) str = (void*)0xdeadbeef; hr = IMXWriter_get_encoding(writer, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("UTF-16")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"UTF-16"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* invalid encoding name */ @@ -3178,7 +3178,7 @@ static void test_mxwriter_properties(void) str = (void*)0xdeadbeef; hr = IMXWriter_get_encoding(writer, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("utf-8")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"utf-8"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IMXWriter_put_encoding(writer, _bstr_("uTf-16")); @@ -3186,7 +3186,7 @@ static void test_mxwriter_properties(void) str = (void*)0xdeadbeef; hr = IMXWriter_get_encoding(writer, &str); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("uTf-16")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"uTf-16"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* how it affects document creation */ @@ -3202,7 +3202,7 @@ static void test_mxwriter_properties(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"yes\"?>\r\n"), + ok(!lstrcmpW(L"<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"yes\"?>\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content); @@ -3212,7 +3212,7 @@ static void test_mxwriter_properties(void) /* default version is 'surprisingly' 1.0 */ hr = IMXWriter_get_version(writer, &str); ok(hr == S_OK, "got %08x\n", hr); - ok(!lstrcmpW(str, _bstr_("1.0")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"1.0"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* store version string as is */ @@ -3226,21 +3226,21 @@ static void test_mxwriter_properties(void) ok(hr == S_OK, "got %08x\n", hr); hr = IMXWriter_get_version(writer, &str); ok(hr == S_OK, "got %08x\n", hr); - ok(!lstrcmpW(str, _bstr_("")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L""), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IMXWriter_put_version(writer, _bstr_("a.b")); ok(hr == S_OK, "got %08x\n", hr); hr = IMXWriter_get_version(writer, &str); ok(hr == S_OK, "got %08x\n", hr); - ok(!lstrcmpW(str, _bstr_("a.b")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"a.b"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IMXWriter_put_version(writer, _bstr_("2.0")); ok(hr == S_OK, "got %08x\n", hr); hr = IMXWriter_get_version(writer, &str); ok(hr == S_OK, "got %08x\n", hr); - ok(!lstrcmpW(str, _bstr_("2.0")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"2.0"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IMXWriter_Release(writer); @@ -3471,7 +3471,7 @@ static void test_mxwriter_startenddocument(void) hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + ok(!lstrcmpW(L"<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -3512,7 +3512,7 @@ static void test_mxwriter_startenddocument(void) hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_(""), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content); @@ -3863,7 +3863,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1, NULL); @@ -3873,7 +3873,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_endElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3); @@ -3893,7 +3893,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_endDocument(content); @@ -3907,7 +3907,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_(""), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_startDocument(content); @@ -3920,7 +3920,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<abc>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<abc>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_endDocument(content); @@ -3933,7 +3933,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<abc></abd>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<abc></abd>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); V_VT(&dest) = VT_EMPTY; @@ -3947,7 +3947,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<a>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content); @@ -4015,7 +4015,7 @@ static void test_mxwriter_characters(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("VbCharsTESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"VbCharsTESTCHARDATA .", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_endDocument(content); @@ -4052,7 +4052,7 @@ static void test_mxwriter_characters(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<a></a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<a></a>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content); @@ -4339,7 +4339,7 @@ static void test_mxwriter_stream(void) hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "get_output failed: %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + ok(!lstrcmpW(L"<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n", V_BSTR(&dest)), "Got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -4428,7 +4428,7 @@ static void test_mxwriter_encoding(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + ok(!lstrcmpW(L"<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n", V_BSTR(&dest)), "got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -4468,7 +4468,7 @@ static void test_mxwriter_encoding(void) /* so output is unaffected, encoding name is stored however */ hr = IMXWriter_get_encoding(writer, &s); EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(s, _bstr_("UTF-16")), "got %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(s, L"UTF-16"), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); IStream_Release(stream); @@ -4729,7 +4729,7 @@ static void test_mxwriter_comment(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXLexicalHandler_comment(lexical, commentW, ARRAY_SIZE(commentW) - 1); @@ -4739,7 +4739,7 @@ static void test_mxwriter_comment(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("\r\n\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"\r\n\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content); @@ -4784,7 +4784,7 @@ static void test_mxwriter_cdata(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<![CDATA["), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<![CDATA[", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = IVBSAXLexicalHandler_startCDATA(vblexical); @@ -4801,7 +4801,7 @@ static void test_mxwriter_cdata(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<![CDATA[<![CDATA[< > & \"]]>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<![CDATA[<![CDATA[< > & \"]]>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content); @@ -4840,7 +4840,7 @@ static void test_mxwriter_pi(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<?\?>\r\n<?target?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<?\?>\r\n<?target?>\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_processingInstruction(content, targetW, 4, dataW, 4); @@ -4850,7 +4850,7 @@ static void test_mxwriter_pi(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<?\?>\r\n<?target?>\r\n<?targ data?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<?\?>\r\n<?target?>\r\n<?targ data?>\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); V_VT(&dest) = VT_EMPTY; @@ -4864,7 +4864,7 @@ static void test_mxwriter_pi(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<?target?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<?target?>\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -4903,7 +4903,7 @@ static void test_mxwriter_ignorablespaces(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("datad"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"datad", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content); @@ -4973,7 +4973,7 @@ static void test_mxwriter_dtd(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<!DOCTYPE name [\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<!DOCTYPE name [\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); /* system id is required if public is present */ @@ -5028,7 +5028,7 @@ static void test_mxwriter_dtd(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<!ELEMENT name content>\r\n"), + ok(!lstrcmpW(L"<!ELEMENT name content>\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -5043,7 +5043,7 @@ static void test_mxwriter_dtd(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<!ELEMENT name >\r\n"), + ok(!lstrcmpW(L"<!ELEMENT name >\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -5061,7 +5061,7 @@ static void test_mxwriter_dtd(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<!ATTLIST element attribute CDATA #REQUIRED \"value\">\r\n"), + ok(!lstrcmpW(L"<!ATTLIST element attribute CDATA #REQUIRED \"value\">\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -5106,7 +5106,7 @@ static void test_mxwriter_dtd(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<!ENTITY name \"value\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(L"<!ENTITY name \"value\">\r\n", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); /* external entities */ @@ -5517,7 +5517,7 @@ static void test_mxattr_clear(void) hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); EXPECT_HR(hr, S_OK); ok(len == 5, "got %d\n", len); - ok(!lstrcmpW(ptr, _bstr_("qname")), "got %s\n", wine_dbgstr_w(ptr)); + ok(!lstrcmpW(ptr, L"qname"), "got %s\n", wine_dbgstr_w(ptr)); hr = IMXAttributes_clear(mxattr); EXPECT_HR(hr, S_OK); @@ -5741,7 +5741,7 @@ static void test_mxwriter_indent(void) hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n<a>\r\n\t\t<c/>\r\n\t\r\n</a>"), V_BSTR(&dest)), + ok(!lstrcmpW(L"<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n<a>\r\n\t\t<c/>\r\n\t\r\n</a>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); -- 2.24.1

2 1

[PATCH 1/2] msxml3/tests: Get rid of a2bstr()
by Michael Stefaniuc 18 Feb '20

18 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index ae0a95a2f1..33e6bd6581 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -130,21 +130,6 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - /* test IHTMLElementCollection */ static HRESULT WINAPI htmlecoll_QueryInterface(IHTMLElementCollection *iface, REFIID riid, void **ppvObject) @@ -496,7 +481,7 @@ static HRESULT WINAPI htmldoc2_put_URL(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI htmldoc2_get_URL(IHTMLDocument2 *iface, BSTR *p) { CHECK_EXPECT2(htmldoc2_get_url); - *p = a2bstr("http://test.winehq.org/"); + *p = SysAllocString(L"http://test.winehq.org/"); return S_OK; } @@ -1747,7 +1732,7 @@ static void test_XMLHTTP(void) set_xhr_site(xhr); test_open(xhr, "GET", "tests/referer.php", S_OK); - str1 = a2bstr("http://test.winehq.org/"); + str1 = SysAllocString(L"http://test.winehq.org/"); V_VT(&varbody) = VT_EMPTY; hr = IXMLHttpRequest_send(xhr, varbody); -- 2.24.1

2 1

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

18 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/misc.c | 289 +++++++++++++++++++-------------------- 1 file changed, 141 insertions(+), 148 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6f4da47e6e..07ab52407e 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -84,13 +84,6 @@ static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static HRESULT (WINAPI *pIEInstallScope)(DWORD*); -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - static WCHAR *a2w(const char *str) { WCHAR *ret; @@ -484,17 +477,17 @@ static void test_CoInternetQueryInfo(void) static const struct { const char *url; - const char *mime; + const WCHAR *mime; HRESULT hres; BOOL broken_failure; - const char *broken_mime; + const WCHAR *broken_mime; } mime_tests[] = { - {"res://mshtml.dll/blank.htm", "text/html", S_OK}, - {"index.htm", "text/html", S_OK}, - {"file://c:\\Index.htm", "text/html", S_OK}, - {"file://c:\\Index.htm?q=test", "text/html", S_OK, TRUE}, - {"file://c:\\Index.htm#hash_part", "text/html", S_OK, TRUE}, - {"file://c:\\Index.htm#hash_part.txt", "text/html", S_OK, FALSE, "text/plain"}, + {"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}, @@ -603,121 +596,121 @@ static BYTE data98[] = "blah<BoDyblahblah"; static const struct { BYTE *data; DWORD size; - const char *mime; - const char *mime_pjpeg; - const char *broken_mime; + const WCHAR *mime; + const WCHAR *mime_pjpeg; + const WCHAR *broken_mime; const char *url; const char *proposed_mime; } mime_tests2[] = { - {data1, sizeof(data1), "text/plain"}, - {data2, sizeof(data2), "application/octet-stream", "image/pjpeg"}, - {data3, sizeof(data3), "application/octet-stream", "image/pjpeg"}, - {data4, sizeof(data4), "application/octet-stream", "image/pjpeg"}, - {data5, sizeof(data5), "text/plain"}, - {data6, sizeof(data6), "text/plain"}, - {data7, sizeof(data7), "text/html", "text/plain"}, - {data8, sizeof(data8), "text/html", "text/plain"}, - {data9, sizeof(data9), "text/html", "image/pjpeg"}, - {data10, sizeof(data10), "text/html", "text/plain"}, - {data11, sizeof(data11), "text/html", "text/plain"}, - {data12, sizeof(data12), "text/html", "text/plain"}, - {data13, sizeof(data13), "text/plain"}, - {data14, sizeof(data14), "text/plain"}, - {data15, sizeof(data15), "text/plain"}, - {data16, sizeof(data16), "image/pjpeg"}, - {data17, sizeof(data17), "application/octet-stream", "image/pjpeg"}, - {data18, sizeof(data18), "text/html", "image/pjpeg"}, - {data19, sizeof(data19), "image/gif"}, - {data20, sizeof(data20), "image/gif"}, - {data21, sizeof(data21), "text/plain"}, - {data22, sizeof(data22), "image/gif"}, - {data23, sizeof(data23), "text/plain"}, - {data24, sizeof(data24), "image/gif"}, - {data25, sizeof(data25), "image/gif"}, - {data26, sizeof(data26), "text/html", "image/gif"}, - {data27, sizeof(data27), "text/plain"}, - {data28, sizeof(data28), "image/bmp"}, - {data29, sizeof(data29), "image/bmp"}, - {data30, sizeof(data30), "application/octet-stream", "image/pjpeg"}, - {data31, sizeof(data31), "text/html", "image/bmp"}, - {data32, sizeof(data32), "application/octet-stream", "image/pjpeg"}, - {data33, sizeof(data33), "application/octet-stream", "image/pjpeg"}, - {data34, sizeof(data34), "image/x-png"}, - {data35, sizeof(data35), "image/x-png"}, - {data36, sizeof(data36), "application/octet-stream", "image/pjpeg"}, - {data37, sizeof(data37), "text/html", "image/x-png"}, - {data38, sizeof(data38), "application/octet-stream", "image/pjpeg"}, - {data39, sizeof(data39), "image/tiff"}, - {data40, sizeof(data40), "text/html", "image/tiff"}, - {data41, sizeof(data41), "text/plain", NULL, "image/tiff"}, - {data42, sizeof(data42), "text/plain"}, - {data43, sizeof(data43), "application/octet-stream", "image/pjpeg"}, - {data44, sizeof(data44), "video/avi"}, - {data45, sizeof(data45), "text/plain"}, - {data46, sizeof(data46), "text/plain"}, - {data47, sizeof(data47), "text/plain"}, - {data48, sizeof(data48), "text/html", "video/avi"}, - {data49, sizeof(data49), "video/avi"}, - {data50, sizeof(data50), "video/mpeg"}, - {data51, sizeof(data51), "video/mpeg"}, - {data52, sizeof(data52), "application/octet-stream", "image/pjpeg"}, - {data53, sizeof(data53), "application/octet-stream", "image/pjpeg", "image/x-icon"}, - {data54, sizeof(data54), "text/html", "video/mpeg"}, - {data55, sizeof(data55), "application/x-gzip-compressed"}, - {data56, sizeof(data56), "text/plain"}, - {data57, sizeof(data57), "text/html", "application/x-gzip-compressed"}, - {data58, sizeof(data58), "application/octet-stream", "image/pjpeg"}, - {data59, sizeof(data59), "application/x-zip-compressed"}, - {data60, sizeof(data60), "text/plain"}, - {data61, sizeof(data61), "text/html", "application/x-zip-compressed"}, - {data62, sizeof(data62), "application/java"}, - {data63, sizeof(data63), "text/plain"}, - {data64, sizeof(data64), "text/html", "application/java"}, - {data65, sizeof(data65), "application/pdf"}, - {data66, sizeof(data66), "text/plain"}, - {data67, sizeof(data67), "text/html", "application/pdf"}, - {data68, sizeof(data68), "application/x-msdownload"}, - {data69, sizeof(data69), "text/plain"}, - {data70, sizeof(data70), "text/html", "application/x-msdownload"}, - {data71, sizeof(data71), "text/richtext"}, - {data72, sizeof(data72), "text/plain"}, - {data73, sizeof(data73), "text/plain"}, - {data74, sizeof(data74), "text/html", "text/richtext"}, - {data75, sizeof(data75), "audio/wav"}, - {data76, sizeof(data76), "text/plain"}, - {data77, sizeof(data77), "text/plain"}, - {data78, sizeof(data78), "text/html", "text/plain"}, - {data79, sizeof(data79), "application/postscript"}, - {data80, sizeof(data80), "text/plain"}, - {data81, sizeof(data81), "text/html", "application/postscript"}, - {data82, sizeof(data82), "audio/basic"}, - {data83, sizeof(data83), "text/plain"}, - {data84, sizeof(data84), "text/html", "audio/basic"}, - {data85, sizeof(data85), "text/plain"}, - {data86, sizeof(data86), "image/tiff", NULL, "text/plain"}, - {data87, sizeof(data87), "text/plain"}, - {data88, sizeof(data88), "text/html", "text/plain"}, - {data89, sizeof(data89), "text/html", "text/plain"}, - {data90, sizeof(data90), "text/html", "text/plain"}, - {data91, sizeof(data91), "text/xml", "text/plain"}, - {data92, sizeof(data92), "text/xml", "text/plain"}, - {data93, sizeof(data93), "text/xml", "text/plain"}, - {data94, sizeof(data94), "text/html", "text/plain"}, - {data95, sizeof(data95), "text/xml", "text/richtext"}, - {data96, sizeof(data96), "text/plain"}, - {data97, sizeof(data97), "text/html", "text/plain"}, - {data98, sizeof(data98), "text/html", "text/plain"}, - {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {NULL, 0, "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, - {data1, sizeof(data1), "text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, - {NULL, sizeof(data1), "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css"}, - {data2, sizeof(data2), "text/css", NULL, NULL, "http://www.winehq.org/test.css"}, - {data10, sizeof(data10), "text/html", NULL, NULL, "http://www.winehq.org/test.css"}, - {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css", "text/plain"}, - {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css", "application/octet-stream"}, - {data1, sizeof(data1), "text/test", NULL, NULL, "http://www.winehq.org/test.css", "text/test"} + {data1, sizeof(data1), L"text/plain"}, + {data2, sizeof(data2), L"application/octet-stream", L"image/pjpeg"}, + {data3, sizeof(data3), L"application/octet-stream", L"image/pjpeg"}, + {data4, sizeof(data4), L"application/octet-stream", L"image/pjpeg"}, + {data5, sizeof(data5), L"text/plain"}, + {data6, sizeof(data6), L"text/plain"}, + {data7, sizeof(data7), L"text/html", L"text/plain"}, + {data8, sizeof(data8), L"text/html", L"text/plain"}, + {data9, sizeof(data9), L"text/html", L"image/pjpeg"}, + {data10, sizeof(data10), L"text/html", L"text/plain"}, + {data11, sizeof(data11), L"text/html", L"text/plain"}, + {data12, sizeof(data12), L"text/html", L"text/plain"}, + {data13, sizeof(data13), L"text/plain"}, + {data14, sizeof(data14), L"text/plain"}, + {data15, sizeof(data15), L"text/plain"}, + {data16, sizeof(data16), L"image/pjpeg"}, + {data17, sizeof(data17), L"application/octet-stream", L"image/pjpeg"}, + {data18, sizeof(data18), L"text/html", L"image/pjpeg"}, + {data19, sizeof(data19), L"image/gif"}, + {data20, sizeof(data20), L"image/gif"}, + {data21, sizeof(data21), L"text/plain"}, + {data22, sizeof(data22), L"image/gif"}, + {data23, sizeof(data23), L"text/plain"}, + {data24, sizeof(data24), L"image/gif"}, + {data25, sizeof(data25), L"image/gif"}, + {data26, sizeof(data26), L"text/html", L"image/gif"}, + {data27, sizeof(data27), L"text/plain"}, + {data28, sizeof(data28), L"image/bmp"}, + {data29, sizeof(data29), L"image/bmp"}, + {data30, sizeof(data30), L"application/octet-stream", L"image/pjpeg"}, + {data31, sizeof(data31), L"text/html", L"image/bmp"}, + {data32, sizeof(data32), L"application/octet-stream", L"image/pjpeg"}, + {data33, sizeof(data33), L"application/octet-stream", L"image/pjpeg"}, + {data34, sizeof(data34), L"image/x-png"}, + {data35, sizeof(data35), L"image/x-png"}, + {data36, sizeof(data36), L"application/octet-stream", L"image/pjpeg"}, + {data37, sizeof(data37), L"text/html", L"image/x-png"}, + {data38, sizeof(data38), L"application/octet-stream", L"image/pjpeg"}, + {data39, sizeof(data39), L"image/tiff"}, + {data40, sizeof(data40), L"text/html", L"image/tiff"}, + {data41, sizeof(data41), L"text/plain", NULL, L"image/tiff"}, + {data42, sizeof(data42), L"text/plain"}, + {data43, sizeof(data43), L"application/octet-stream", L"image/pjpeg"}, + {data44, sizeof(data44), L"video/avi"}, + {data45, sizeof(data45), L"text/plain"}, + {data46, sizeof(data46), L"text/plain"}, + {data47, sizeof(data47), L"text/plain"}, + {data48, sizeof(data48), L"text/html", L"video/avi"}, + {data49, sizeof(data49), L"video/avi"}, + {data50, sizeof(data50), L"video/mpeg"}, + {data51, sizeof(data51), L"video/mpeg"}, + {data52, sizeof(data52), L"application/octet-stream", L"image/pjpeg"}, + {data53, sizeof(data53), L"application/octet-stream", L"image/pjpeg", L"image/x-icon"}, + {data54, sizeof(data54), L"text/html", L"video/mpeg"}, + {data55, sizeof(data55), L"application/x-gzip-compressed"}, + {data56, sizeof(data56), L"text/plain"}, + {data57, sizeof(data57), L"text/html", L"application/x-gzip-compressed"}, + {data58, sizeof(data58), L"application/octet-stream", L"image/pjpeg"}, + {data59, sizeof(data59), L"application/x-zip-compressed"}, + {data60, sizeof(data60), L"text/plain"}, + {data61, sizeof(data61), L"text/html", L"application/x-zip-compressed"}, + {data62, sizeof(data62), L"application/java"}, + {data63, sizeof(data63), L"text/plain"}, + {data64, sizeof(data64), L"text/html", L"application/java"}, + {data65, sizeof(data65), L"application/pdf"}, + {data66, sizeof(data66), L"text/plain"}, + {data67, sizeof(data67), L"text/html", L"application/pdf"}, + {data68, sizeof(data68), L"application/x-msdownload"}, + {data69, sizeof(data69), L"text/plain"}, + {data70, sizeof(data70), L"text/html", L"application/x-msdownload"}, + {data71, sizeof(data71), L"text/richtext"}, + {data72, sizeof(data72), L"text/plain"}, + {data73, sizeof(data73), L"text/plain"}, + {data74, sizeof(data74), L"text/html", L"text/richtext"}, + {data75, sizeof(data75), L"audio/wav"}, + {data76, sizeof(data76), L"text/plain"}, + {data77, sizeof(data77), L"text/plain"}, + {data78, sizeof(data78), L"text/html", L"text/plain"}, + {data79, sizeof(data79), L"application/postscript"}, + {data80, sizeof(data80), L"text/plain"}, + {data81, sizeof(data81), L"text/html", L"application/postscript"}, + {data82, sizeof(data82), L"audio/basic"}, + {data83, sizeof(data83), L"text/plain"}, + {data84, sizeof(data84), L"text/html", L"audio/basic"}, + {data85, sizeof(data85), L"text/plain"}, + {data86, sizeof(data86), L"image/tiff", NULL, L"text/plain"}, + {data87, sizeof(data87), L"text/plain"}, + {data88, sizeof(data88), L"text/html", L"text/plain"}, + {data89, sizeof(data89), L"text/html", L"text/plain"}, + {data90, sizeof(data90), L"text/html", L"text/plain"}, + {data91, sizeof(data91), L"text/xml", L"text/plain"}, + {data92, sizeof(data92), L"text/xml", L"text/plain"}, + {data93, sizeof(data93), L"text/xml", L"text/plain"}, + {data94, sizeof(data94), L"text/html", L"text/plain"}, + {data95, sizeof(data95), L"text/xml", L"text/richtext"}, + {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"} }; static void test_FindMimeFromData(void) @@ -740,8 +733,8 @@ static void test_FindMimeFromData(void) 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) { - ok(!strcmp_wa(mime, mime_tests[i].mime) - || broken(mime_tests[i].broken_mime && !strcmp_wa(mime, mime_tests[i].broken_mime)), + ok(!lstrcmpW(mime, mime_tests[i].mime) + || broken(mime_tests[i].broken_mime && !lstrcmpW(mime, mime_tests[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); } @@ -755,13 +748,13 @@ static void test_FindMimeFromData(void) mime = (LPWSTR)0xf0f0f0f0; hres = pFindMimeFromData(NULL, url, NULL, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!strcmp_wa(mime, "text/plain"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + 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); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!strcmp_wa(mime, "application/octet-stream"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + ok(!lstrcmpW(mime, L"application/octet-stream"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); heap_free(url); } @@ -772,8 +765,8 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, url, mime_tests2[i].data, mime_tests2[i].size, proposed_mime, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - b = !strcmp_wa(mime, mime_tests2[i].mime); - ok(b || broken(mime_tests2[i].broken_mime && !strcmp_wa(mime, mime_tests2[i].broken_mime)), + 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); @@ -784,34 +777,34 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, app_octet_streamW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!strcmp_wa(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime - && !strcmp_wa(mime, mime_tests2[i].broken_mime)), + ok(!lstrcmpW(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime + && !lstrcmpW(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!strcmp_wa(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime - && !strcmp_wa(mime, mime_tests2[i].broken_mime)), + ok(!lstrcmpW(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime + && !lstrcmpW(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, text_htmlW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - if(!strcmp("application/octet-stream", mime_tests2[i].mime) - || !strcmp("text/plain", mime_tests2[i].mime) || i==92) - ok(!strcmp_wa(mime, "text/html"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + if(!lstrcmpW(L"application/octet-stream", mime_tests2[i].mime) + || !lstrcmpW(L"text/plain", mime_tests2[i].mime) || i==92) + ok(!lstrcmpW(mime, L"text/html"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); else - ok(!strcmp_wa(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, image_pjpegW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!strcmp_wa(mime, mime_tests2[i].mime_pjpeg ? mime_tests2[i].mime_pjpeg : mime_tests2[i].mime) - || broken(!strcmp_wa(mime, mime_tests2[i].mime)), + ok(!lstrcmpW(mime, mime_tests2[i].mime_pjpeg ? mime_tests2[i].mime_pjpeg : mime_tests2[i].mime) + || broken(!lstrcmpW(mime, mime_tests2[i].mime)), "[%d] wrong mime, got %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); } @@ -830,7 +823,7 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, NULL, data1, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); + ok(!lstrcmpW(mime, L"text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, data1, 0, text_plainW, 0, NULL, 0); @@ -2236,12 +2229,12 @@ static void test_bsc_marshaling(void) in_bindinfo.stgmedData.pUnkForRelease); ok(bindinfo.cbSize == sizeof(rem_bindinfo), "cbSize = %u\n", rem_bindinfo.cbSize); - ok(!strcmp_wa(bindinfo.szExtraInfo, "extra info out"), + ok(!lstrcmpW(bindinfo.szExtraInfo, L"extra info out"), "szExtraInfo = %s\n", wine_dbgstr_w(bindinfo.szExtraInfo)); ok(bindinfo.grfBindInfoF == 22, "grfBindInfoF = %u\n", rem_bindinfo.grfBindInfoF); ok(bindinfo.dwBindVerb == 23, "dwBindVerb = %u\n", bindinfo.dwBindVerb); ok(bindinfo.szCustomVerb != verb_out, "szCustomVerb == inbuf\n"); - ok(!strcmp_wa(bindinfo.szCustomVerb, "custom verb out"), "szCustomVerb = %s\n", + ok(!lstrcmpW(bindinfo.szCustomVerb, L"custom verb out"), "szCustomVerb = %s\n", wine_dbgstr_w(bindinfo.szCustomVerb)); ok(bindinfo.cbstgmedData == 29, "cbstgmedData = %u\n", bindinfo.cbstgmedData); ok(bindinfo.dwOptions == 24, "dwOptions = %u\n", bindinfo.dwOptions); @@ -2453,12 +2446,12 @@ static void test_bsc_marshaling(void) in_bindinfo.stgmedData.pUnkForRelease); ok(bindinfo.cbSize == sizeof(rem_bindinfo), "cbSize = %u\n", rem_bindinfo.cbSize); - ok(!strcmp_wa(bindinfo.szExtraInfo, "extra info out"), + ok(!lstrcmpW(bindinfo.szExtraInfo, L"extra info out"), "szExtraInfo = %s\n", wine_dbgstr_w(bindinfo.szExtraInfo)); ok(bindinfo.grfBindInfoF == 22, "grfBindInfoF = %u\n", rem_bindinfo.grfBindInfoF); ok(bindinfo.dwBindVerb == 23, "dwBindVerb = %u\n", bindinfo.dwBindVerb); ok(bindinfo.szCustomVerb != verb_out, "szCustomVerb == inbuf\n"); - ok(!strcmp_wa(bindinfo.szCustomVerb, "custom verb out"), "szCustomVerb = %s\n", + ok(!lstrcmpW(bindinfo.szCustomVerb, L"custom verb out"), "szCustomVerb = %s\n", wine_dbgstr_w(bindinfo.szCustomVerb)); ok(bindinfo.cbstgmedData == 29, "cbstgmedData = %u\n", bindinfo.cbstgmedData); ok(bindinfo.dwOptions == 24, "dwOptions = %u\n", bindinfo.dwOptions); -- 2.24.1

3 2

[PATCH] urlmon/tests: Get rid of strcmp_wa() in protocol.c
by Michael Stefaniuc 18 Feb '20

18 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 84dd5345be..6fc864f777 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -223,13 +223,6 @@ static LONG obj_refcount(void *obj) return IUnknown_Release((IUnknown *)obj); } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static const char *w2a(LPCWSTR str) { static char buf[INTERNET_MAX_URL_LENGTH]; @@ -859,7 +852,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, !memcmp(szStatusText, text_plain, lstrlenW(text_plain)*sizeof(WCHAR)), "szStatusText != text/plain\n"); else if(empty_file) - ok(!strcmp_wa(szStatusText, "application/javascript"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"application/javascript"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else if((pi & PI_MIMEVERIFICATION) && emulate_prot && !mimefilter_test && tested_protocol==HTTP_TEST && !short_read) ok(lstrlenW(gifW) <= lstrlenW(szStatusText) && @@ -915,7 +908,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_VERIFIEDMIMETYPEAVAILABLE); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!strcmp_wa(szStatusText, "text/html"), "szStatusText != text/html\n"); + ok(!lstrcmpW(szStatusText, L"text/html"), "szStatusText != text/html\n"); break; case BINDSTATUS_PROTOCOLCLASSID: CHECK_EXPECT(ReportProgress_PROTOCOLCLASSID); @@ -929,13 +922,13 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_REDIRECTING: CHECK_EXPECT(ReportProgress_REDIRECTING); if(test_redirect) - ok(!strcmp_wa(szStatusText, "http://test.winehq.org/tests/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"http://test.winehq.org/tests/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else ok(szStatusText == NULL, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_ENCODING: CHECK_EXPECT(ReportProgress_ENCODING); - ok(!strcmp_wa(szStatusText, "gzip"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"gzip"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_ACCEPTRANGES: CHECK_EXPECT(ReportProgress_ACCEPTRANGES); @@ -1200,7 +1193,7 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR "dwError == ERROR_SUCCESS\n"); if(hrResult == INET_E_REDIRECT_FAILED) - ok(!strcmp_wa(szResult, "http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); + ok(!lstrcmpW(szResult, L"http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); else ok(!szResult, "szResult = %s\n", wine_dbgstr_w(szResult)); -- 2.24.1

3 2

[PATCH v6 1/4] vbscript: Move the named_item_t definition.
by Gabriel Ivăncescu 18 Feb '20

18 Feb '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/vbscript.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index f37b0ce..589abc3 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -55,14 +55,6 @@ typedef struct _vbscode_t vbscode_t; typedef struct _script_ctx_t script_ctx_t; typedef struct _vbdisp_t vbdisp_t; -typedef struct named_item_t { - IDispatch *disp; - DWORD flags; - LPWSTR name; - - struct list entry; -} named_item_t; - typedef enum { VBDISP_CALLGET, VBDISP_LET, @@ -156,6 +148,14 @@ typedef struct { script_ctx_t *ctx; } BuiltinDisp; +typedef struct named_item_t { + IDispatch *disp; + DWORD flags; + LPWSTR name; + + struct list entry; +} named_item_t; + HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; -- 2.21.0

2 7

[PATCH v3 1/2] find.exe/tests: Add test for multiple files at once
by Fabian Maurer 18 Feb '20

18 Feb '20

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v3: Fix test error --- programs/find/tests/find.c | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index b8345034b5..55896baeaf 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -264,6 +264,47 @@ static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_ run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); } +static void run_find_file_multi(void) +{ + char path_temp_file1[MAX_PATH]; + char path_temp_file2[MAX_PATH]; + char path_temp_dir[MAX_PATH]; + HANDLE handle_file; + WCHAR commandline_new[MAX_PATH]; + char out_expected[500]; + const char* input = "ab\nbd"; + + GetTempPathA(ARRAY_SIZE(path_temp_dir), path_temp_dir); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file1); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file2); + handle_file = CreateFileA(path_temp_file1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, (BYTE*)input, strlen(input)); + CloseHandle(handle_file); + handle_file = CreateFileA(path_temp_file2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, (BYTE*)input, strlen(input)); + CloseHandle(handle_file); + + wsprintfW(commandline_new, L"\"b\" C:\\doesnotexist1 %hs C:\\doesnotexist1 %hs C:\\doesnotexist1", path_temp_file1, path_temp_file2); + + CharUpperA(path_temp_file1); + CharUpperA(path_temp_file2); + wsprintfA(out_expected, + "File not found - C:\\DOESNOTEXIST1\r\n" + "\r\n---------- %s\r\n" + "ab\r\nbd\r\n" + "File not found - C:\\DOESNOTEXIST1\r\n" + "\r\n---------- %s\r\n" + "ab\r\nbd\r\n" + "File not found - C:\\DOESNOTEXIST1\r\n", + path_temp_file1, path_temp_file2); + + todo_wine + run_find_stdin_(commandline_new, (BYTE*)"", 0, (BYTE*)out_expected, strlen(out_expected), 0, __FILE__, __LINE__); + + DeleteFileA(path_temp_file1); + DeleteFileA(path_temp_file2); +} + static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); @@ -411,6 +452,7 @@ START_TEST(find) else { test_errors(); + run_find_file_multi(); } test_singleline_without_switches(); test_multiline(); -- 2.25.1

3 4

[PATCH v5] d3dcompiler: Return an instruction list instead of a single instruction from nodes representing expressions.
by Zebediah Figura 18 Feb '20

18 Feb '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: don't drop all of the struct initializer elements on the floor v3: style tweak, clarify loop_condition() v4: fix append_conditional_break(); remove confusing uses of append_unop() v5: don't drop all of the variable initializer instructions on the floor This supersedes <https://source.winehq.org/patches/data/178616>; other patches in that series should still apply. dlls/d3dcompiler_43/d3dcompiler_private.h | 6 + dlls/d3dcompiler_43/hlsl.y | 328 ++++++++++++---------- dlls/d3dcompiler_43/utils.c | 46 +-- 3 files changed, 185 insertions(+), 195 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5fc3161f5f0..9c58830ffe2 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -984,6 +984,7 @@ struct parse_initializer { struct hlsl_ir_node **args; unsigned int args_count; + struct list *instrs; }; struct parse_variable_def @@ -1120,6 +1121,11 @@ static inline struct hlsl_ir_loop *loop_from_node(const struct hlsl_ir_node *nod return CONTAINING_RECORD(node, struct hlsl_ir_loop, node); } +static inline struct hlsl_ir_node *node_from_list(struct list *list) +{ + return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d81d6afa9cc..f9e091af51c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -255,56 +255,49 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } -static struct hlsl_ir_if *loop_condition(struct list *cond_list) +static BOOL append_conditional_break(struct list *cond_list) { - struct hlsl_ir_node *cond, *not_cond; - struct hlsl_ir_if *out_cond; + struct hlsl_ir_node *condition, *not; struct hlsl_ir_jump *jump; - unsigned int count = list_count(cond_list); + struct hlsl_ir_if *iff; - if (!count) - return NULL; - if (count != 1) - ERR("Got multiple expressions in a for condition.\n"); + /* E.g. "for (i = 0; ; ++i)". */ + if (!list_count(cond_list)) + return TRUE; - cond = LIST_ENTRY(list_head(cond_list), struct hlsl_ir_node, entry); - out_cond = d3dcompiler_alloc(sizeof(*out_cond)); - if (!out_cond) + condition = node_from_list(cond_list); + if (!(not = new_unary_expr(HLSL_IR_UNOP_LOGIC_NOT, condition, condition->loc))) { ERR("Out of memory.\n"); - return NULL; + return FALSE; } - out_cond->node.type = HLSL_IR_IF; - if (!(not_cond = new_unary_expr(HLSL_IR_UNOP_LOGIC_NOT, cond, cond->loc))) + list_add_tail(cond_list, &not->entry); + + if (!(iff = d3dcompiler_alloc(sizeof(*iff)))) { ERR("Out of memory.\n"); - d3dcompiler_free(out_cond); - return NULL; + return FALSE; } - out_cond->condition = not_cond; - jump = d3dcompiler_alloc(sizeof(*jump)); - if (!jump) + iff->node.type = HLSL_IR_IF; + iff->condition = not; + list_add_tail(cond_list, &iff->node.entry); + + if (!(iff->then_instrs = d3dcompiler_alloc(sizeof(*iff->then_instrs)))) { ERR("Out of memory.\n"); - d3dcompiler_free(out_cond); - d3dcompiler_free(not_cond); - return NULL; + return FALSE; } - jump->node.type = HLSL_IR_JUMP; - jump->type = HLSL_IR_JUMP_BREAK; - out_cond->then_instrs = d3dcompiler_alloc(sizeof(*out_cond->then_instrs)); - if (!out_cond->then_instrs) + list_init(iff->then_instrs); + + if (!(jump = d3dcompiler_alloc(sizeof(*jump)))) { ERR("Out of memory.\n"); - d3dcompiler_free(out_cond); - d3dcompiler_free(not_cond); - d3dcompiler_free(jump); - return NULL; + return FALSE; } - list_init(out_cond->then_instrs); - list_add_head(out_cond->then_instrs, &jump->node.entry); - - return out_cond; + jump->node.type = HLSL_IR_JUMP; + jump->type = HLSL_IR_JUMP_BREAK; + list_add_head(iff->then_instrs, &jump->node.entry); + return TRUE; } enum loop_type @@ -315,7 +308,7 @@ enum loop_type }; static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, - struct hlsl_ir_node *iter, struct list *body, struct source_location *loc) + struct list *iter, struct list *body, struct source_location *loc) { struct list *list = NULL; struct hlsl_ir_loop *loop = NULL; @@ -340,20 +333,19 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l goto oom; list_init(loop->body); - cond_jump = loop_condition(cond); - if (!cond_jump) + if (!append_conditional_break(cond)) goto oom; if (type != LOOP_DO_WHILE) - list_add_tail(loop->body, &cond_jump->node.entry); + list_move_tail(loop->body, cond); list_move_tail(loop->body, body); if (iter) - list_add_tail(loop->body, &iter->entry); + list_move_tail(loop->body, iter); if (type == LOOP_DO_WHILE) - list_add_tail(loop->body, &cond_jump->node.entry); + list_move_tail(loop->body, cond); d3dcompiler_free(init); d3dcompiler_free(cond); @@ -369,7 +361,7 @@ oom: d3dcompiler_free(list); free_instr_list(init); free_instr_list(cond); - free_instr(iter); + free_instr_list(iter); free_instr_list(body); return NULL; } @@ -388,9 +380,7 @@ static unsigned int initializer_size(const struct parse_initializer *initializer static void free_parse_initializer(struct parse_initializer *initializer) { - unsigned int i; - for (i = 0; i < initializer->args_count; ++i) - free_instr(initializer->args[i]); + free_instr_list(initializer->instrs); d3dcompiler_free(initializer->args); } @@ -508,6 +498,9 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, return; } + list_move_tail(list, initializer->instrs); + d3dcompiler_free(initializer->instrs); + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; @@ -526,6 +519,7 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, break; } deref->node.loc = node->loc; + list_add_tail(list, &deref->node.entry); assignment = make_assignment(&deref->node, ASSIGN_OP_ASSIGN, BWRITERSP_WRITEMASK_ALL, node); list_add_tail(list, &assignment->entry); } @@ -533,9 +527,6 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, FIXME("Initializing with \"mismatched\" fields is not supported yet.\n"); } - /* Free initializer elements in excess. */ - for (; i < initializer->args_count; ++i) - free_instr(initializer->args[i]); d3dcompiler_free(initializer->args); } @@ -609,6 +600,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, if (v->initializer.args_count) { unsigned int size = initializer_size(&v->initializer); + struct hlsl_ir_deref *deref; TRACE("Variable with initializer.\n"); if (type->type <= HLSL_CLASS_LAST_NUMERIC @@ -661,7 +653,12 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, continue; } - assignment = make_assignment(&new_var_deref(var)->node, ASSIGN_OP_ASSIGN, + list_move_tail(statements_list, v->initializer.instrs); + d3dcompiler_free(v->initializer.instrs); + + deref = new_var_deref(var); + list_add_tail(statements_list, &deref->node.entry); + assignment = make_assignment(&deref->node, ASSIGN_OP_ASSIGN, BWRITERSP_WRITEMASK_ALL, v->initializer.args[0]); d3dcompiler_free(v->initializer.args); list_add_tail(statements_list, &assignment->entry); @@ -880,6 +877,35 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr return NULL; } +static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) +{ + list_add_tail(list, &node->entry); + return list; +} + +static struct list *append_binop(struct list *first, struct list *second, struct hlsl_ir_node *node) +{ + list_move_tail(first, second); + d3dcompiler_free(second); + list_add_tail(first, &node->entry); + return first; +} + +static struct list *make_list(struct hlsl_ir_node *node) +{ + struct list *list; + + if (!(list = d3dcompiler_alloc(sizeof(*list)))) + { + ERR("Out of memory.\n"); + free_instr(node); + return NULL; + } + list_init(list); + list_add_tail(list, &node->entry); + return list; +} + %} %locations @@ -1024,12 +1050,12 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %type <variable_def> type_spec %type <initializer> complex_initializer %type <initializer> initializer_expr_list -%type <instr> initializer_expr +%type <list> initializer_expr %type <modifiers> var_modifiers %type <list> field %type <list> parameters %type <list> param_list -%type <instr> expr +%type <list> expr %type <intval> array %type <list> statement %type <list> statement_list @@ -1048,21 +1074,21 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %type <list> variables_def %type <list> variables_def_optional %type <if_body> if_body -%type <instr> primary_expr -%type <instr> postfix_expr -%type <instr> unary_expr -%type <instr> mul_expr -%type <instr> add_expr -%type <instr> shift_expr -%type <instr> relational_expr -%type <instr> equality_expr -%type <instr> bitand_expr -%type <instr> bitxor_expr -%type <instr> bitor_expr -%type <instr> logicand_expr -%type <instr> logicor_expr -%type <instr> conditional_expr -%type <instr> assignment_expr +%type <list> primary_expr +%type <list> postfix_expr +%type <list> unary_expr +%type <list> mul_expr +%type <list> add_expr +%type <list> shift_expr +%type <list> relational_expr +%type <list> equality_expr +%type <list> bitand_expr +%type <list> bitxor_expr +%type <list> bitor_expr +%type <list> logicand_expr +%type <list> logicor_expr +%type <list> conditional_expr +%type <list> assignment_expr %type <list> expr_statement %type <unary_op> unary_op %type <assign_op> assign_op @@ -1615,7 +1641,7 @@ array: /* Empty */ { FIXME("Array.\n"); $$ = 0; - free_instr($2); + free_instr_list($2); } var_modifiers: /* Empty */ @@ -1672,7 +1698,8 @@ complex_initializer: initializer_expr $$.args_count = 1; if (!($$.args = d3dcompiler_alloc(sizeof(*$$.args)))) YYABORT; - $$.args[0] = $1; + $$.args[0] = node_from_list($1); + $$.instrs = $1; } | '{' initializer_expr_list '}' { @@ -1693,14 +1720,17 @@ initializer_expr_list: initializer_expr $$.args_count = 1; if (!($$.args = d3dcompiler_alloc(sizeof(*$$.args)))) YYABORT; - $$.args[0] = $1; + $$.args[0] = node_from_list($1); + $$.instrs = $1; } | initializer_expr_list ',' initializer_expr { $$ = $1; if (!($$.args = d3dcompiler_realloc($$.args, ($$.args_count + 1) * sizeof(*$$.args)))) YYABORT; - $$.args[$$.args_count++] = $3; + $$.args[$$.args_count++] = node_from_list($3); + list_move_tail($$.instrs, $3); + d3dcompiler_free($3); } boolean: KW_TRUE @@ -1742,15 +1772,14 @@ jump_statement: KW_RETURN expr ';' jump->node.type = HLSL_IR_JUMP; set_location(&jump->node.loc, &@1); jump->type = HLSL_IR_JUMP_RETURN; - jump->node.data_type = $2->data_type; - jump->return_value = $2; + jump->node.data_type = node_from_list($2)->data_type; + jump->return_value = node_from_list($2); FIXME("Check for valued return on void function.\n"); FIXME("Implicit conversion to the return type if needed, " "error out if conversion not possible.\n"); - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); + $$ = $2; list_add_tail($$, &jump->node.entry); } @@ -1764,18 +1793,17 @@ selection_statement: KW_IF '(' expr ')' if_body } instr->node.type = HLSL_IR_IF; set_location(&instr->node.loc, &@1); - instr->condition = $3; + instr->condition = node_from_list($3); instr->then_instrs = $5.then_instrs; instr->else_instrs = $5.else_instrs; - if ($3->data_type->dimx > 1 || $3->data_type->dimy > 1) + if (instr->condition->data_type->dimx > 1 || instr->condition->data_type->dimy > 1) { hlsl_report_message(instr->node.loc.file, instr->node.loc.line, instr->node.loc.col, HLSL_LEVEL_ERROR, "if condition requires a scalar"); } - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); - list_add_head($$, &instr->node.entry); + $$ = $3; + list_add_tail($$, &instr->node.entry); } if_body: statement @@ -1792,32 +1820,14 @@ if_body: statement loop_statement: KW_WHILE '(' expr ')' statement { struct source_location loc; - struct list *cond = d3dcompiler_alloc(sizeof(*cond)); - - if (!cond) - { - ERR("Out of memory.\n"); - YYABORT; - } - list_init(cond); - list_add_head(cond, &$3->entry); set_location(&loc, &@1); - $$ = create_loop(LOOP_WHILE, NULL, cond, NULL, $5, &loc); + $$ = create_loop(LOOP_WHILE, NULL, $3, NULL, $5, &loc); } | KW_DO statement KW_WHILE '(' expr ')' ';' { struct source_location loc; - struct list *cond = d3dcompiler_alloc(sizeof(*cond)); - - if (!cond) - { - ERR("Out of memory.\n"); - YYABORT; - } - list_init(cond); - list_add_head(cond, &$5->entry); set_location(&loc, &@1); - $$ = create_loop(LOOP_DO_WHILE, NULL, cond, NULL, $2, &loc); + $$ = create_loop(LOOP_DO_WHILE, NULL, $5, NULL, $2, &loc); } | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement { @@ -1846,10 +1856,7 @@ expr_statement: ';' } | expr ';' { - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); - if ($1) - list_add_head($$, &$1->entry); + $$ = $1; } primary_expr: C_FLOAT @@ -1864,7 +1871,8 @@ primary_expr: C_FLOAT set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("float"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); c->v.value.f[0] = $1; - $$ = &c->node; + if (!($$ = make_list(&c->node))) + YYABORT; } | C_INTEGER { @@ -1878,7 +1886,8 @@ primary_expr: C_FLOAT set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("int"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); c->v.value.i[0] = $1; - $$ = &c->node; + if (!($$ = make_list(&c->node))) + YYABORT; } | boolean { @@ -1892,7 +1901,8 @@ primary_expr: C_FLOAT set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("bool"), HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); c->v.value.b[0] = $1; - $$ = &c->node; + if (!($$ = make_list(&c->node))) + YYABORT; } | VAR_IDENTIFIER { @@ -1908,8 +1918,9 @@ primary_expr: C_FLOAT } if ((deref = new_var_deref(var))) { - $$ = &deref->node; - set_location(&$$->loc, &@1); + set_location(&deref->node.loc, &@1); + if (!($$ = make_list(&deref->node))) + YYABORT; } else $$ = NULL; @@ -1926,43 +1937,48 @@ postfix_expr: primary_expr | postfix_expr OP_INC { struct source_location loc; + struct hlsl_ir_node *inc; set_location(&loc, &@2); - if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "modifying a const expression"); YYABORT; } - $$ = new_unary_expr(HLSL_IR_UNOP_POSTINC, $1, loc); + inc = new_unary_expr(HLSL_IR_UNOP_POSTINC, node_from_list($1), loc); /* Post increment/decrement expressions are considered const */ - $$->data_type = clone_hlsl_type($$->data_type); - $$->data_type->modifiers |= HLSL_MODIFIER_CONST; + inc->data_type = clone_hlsl_type(inc->data_type); + inc->data_type->modifiers |= HLSL_MODIFIER_CONST; + $$ = append_unop($1, inc); } | postfix_expr OP_DEC { struct source_location loc; + struct hlsl_ir_node *inc; set_location(&loc, &@2); - if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "modifying a const expression"); YYABORT; } - $$ = new_unary_expr(HLSL_IR_UNOP_POSTDEC, $1, loc); + inc = new_unary_expr(HLSL_IR_UNOP_POSTDEC, node_from_list($1), loc); /* Post increment/decrement expressions are considered const */ - $$->data_type = clone_hlsl_type($$->data_type); - $$->data_type->modifiers |= HLSL_MODIFIER_CONST; + inc->data_type = clone_hlsl_type(inc->data_type); + inc->data_type->modifiers |= HLSL_MODIFIER_CONST; + $$ = append_unop($1, inc); } | postfix_expr '.' any_identifier { + struct hlsl_ir_node *node = node_from_list($1); struct source_location loc; set_location(&loc, &@2); - if ($1->data_type->type == HLSL_CLASS_STRUCT) + if (node->data_type->type == HLSL_CLASS_STRUCT) { - struct hlsl_type *type = $1->data_type; + struct hlsl_type *type = node->data_type; struct hlsl_struct_field *field; $$ = NULL; @@ -1970,7 +1986,7 @@ postfix_expr: primary_expr { if (!strcmp($3, field->name)) { - struct hlsl_ir_deref *deref = new_record_deref($1, field); + struct hlsl_ir_deref *deref = new_record_deref(node, field); if (!deref) { @@ -1978,7 +1994,7 @@ postfix_expr: primary_expr YYABORT; } deref->node.loc = loc; - $$ = &deref->node; + $$ = append_unop($1, &deref->node); break; } } @@ -1989,18 +2005,18 @@ postfix_expr: primary_expr YYABORT; } } - else if ($1->data_type->type <= HLSL_CLASS_LAST_NUMERIC) + else if (node->data_type->type <= HLSL_CLASS_LAST_NUMERIC) { struct hlsl_ir_swizzle *swizzle; - swizzle = get_swizzle($1, $3, &loc); + swizzle = get_swizzle(node, $3, &loc); if (!swizzle) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "invalid swizzle %s", debugstr_a($3)); YYABORT; } - $$ = &swizzle->node; + $$ = append_unop($1, &swizzle->node); } else { @@ -2015,7 +2031,7 @@ postfix_expr: primary_expr * subcomponent access. * We store it as an array dereference in any case. */ struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); - struct hlsl_type *expr_type = $1->data_type; + struct hlsl_type *expr_type = node_from_list($1)->data_type; struct source_location loc; TRACE("Array dereference from type %s\n", debug_hlsl_type(expr_type)); @@ -2048,24 +2064,24 @@ postfix_expr: primary_expr hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "expression is not array-indexable"); d3dcompiler_free(deref); - free_instr($1); - free_instr($3); + free_instr_list($1); + free_instr_list($3); YYABORT; } - if ($3->data_type->type != HLSL_CLASS_SCALAR) + if (node_from_list($3)->data_type->type != HLSL_CLASS_SCALAR) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "array index is not scalar"); d3dcompiler_free(deref); - free_instr($1); - free_instr($3); + free_instr_list($1); + free_instr_list($3); YYABORT; } deref->type = HLSL_IR_DEREF_ARRAY; - deref->v.array.array = $1; - deref->v.array.index = $3; + deref->v.array.array = node_from_list($1); + deref->v.array.index = node_from_list($3); - $$ = &deref->node; + $$ = append_binop($1, $3, &deref->node); } /* "var_modifiers" doesn't make sense in this case, but it's needed in the grammar to avoid shift/reduce conflicts. */ @@ -2104,7 +2120,7 @@ postfix_expr: primary_expr constructor->args_count = $4.args_count; memcpy(constructor->args, $4.args, $4.args_count * sizeof(*$4.args)); d3dcompiler_free($4.args); - $$ = &constructor->node; + $$ = append_unop($4.instrs, &constructor->node); } unary_expr: postfix_expr @@ -2116,26 +2132,26 @@ unary_expr: postfix_expr struct source_location loc; set_location(&loc, &@1); - if ($2->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "modifying a const expression"); YYABORT; } - $$ = new_unary_expr(HLSL_IR_UNOP_PREINC, $2, loc); + $$ = append_unop($2, new_unary_expr(HLSL_IR_UNOP_PREINC, node_from_list($2), loc)); } | OP_DEC unary_expr { struct source_location loc; set_location(&loc, &@1); - if ($2->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "modifying a const expression"); YYABORT; } - $$ = new_unary_expr(HLSL_IR_UNOP_PREDEC, $2, loc); + $$ = append_unop($2, new_unary_expr(HLSL_IR_UNOP_PREDEC, node_from_list($2), loc)); } | unary_op unary_expr { @@ -2150,14 +2166,13 @@ unary_expr: postfix_expr else { set_location(&loc, &@1); - $$ = new_unary_expr(ops[$1], $2, loc); + $$ = append_unop($2, new_unary_expr(ops[$1], node_from_list($2), loc)); } } /* var_modifiers just to avoid shift/reduce conflicts */ | '(' var_modifiers type array ')' unary_expr { - struct hlsl_ir_expr *expr; - struct hlsl_type *src_type = $6->data_type; + struct hlsl_type *src_type = node_from_list($6)->data_type; struct hlsl_type *dst_type; struct source_location loc; @@ -2182,8 +2197,7 @@ unary_expr: postfix_expr YYABORT; } - expr = new_cast($6, dst_type, &loc); - $$ = expr ? &expr->node : NULL; + $$ = append_unop($6, &new_cast(node_from_list($6), dst_type, &loc)->node); } unary_op: '+' @@ -2212,21 +2226,21 @@ mul_expr: unary_expr struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_MUL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MUL, node_from_list($1), node_from_list($3), loc)); } | mul_expr '/' unary_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_DIV, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_DIV, node_from_list($1), node_from_list($3), loc)); } | mul_expr '%' unary_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_MOD, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MOD, node_from_list($1), node_from_list($3), loc)); } add_expr: mul_expr @@ -2238,14 +2252,14 @@ add_expr: mul_expr struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_ADD, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_ADD, node_from_list($1), node_from_list($3), loc)); } | add_expr '-' mul_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_SUB, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_SUB, node_from_list($1), node_from_list($3), loc)); } shift_expr: add_expr @@ -2270,28 +2284,28 @@ relational_expr: shift_expr struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_LESS, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LESS, node_from_list($1), node_from_list($3), loc)); } | relational_expr '>' shift_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_GREATER, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GREATER, node_from_list($1), node_from_list($3), loc)); } | relational_expr OP_LE shift_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_LEQUAL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LEQUAL, node_from_list($1), node_from_list($3), loc)); } | relational_expr OP_GE shift_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_GEQUAL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GEQUAL, node_from_list($1), node_from_list($3), loc)); } equality_expr: relational_expr @@ -2303,14 +2317,14 @@ equality_expr: relational_expr struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_EQUAL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_EQUAL, node_from_list($1), node_from_list($3), loc)); } | equality_expr OP_NE relational_expr { struct source_location loc; set_location(&loc, &@2); - $$ = new_binary_expr(HLSL_IR_BINOP_NEQUAL, $1, $3, loc); + $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_NEQUAL, node_from_list($1), node_from_list($3), loc)); } bitand_expr: equality_expr @@ -2374,18 +2388,20 @@ assignment_expr: conditional_expr | unary_expr assign_op assignment_expr { struct source_location loc; + struct hlsl_ir_node *instr; set_location(&loc, &@2); - if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) { hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, "l-value is const"); YYABORT; } - $$ = make_assignment($1, $2, BWRITERSP_WRITEMASK_ALL, $3); - if (!$$) + if (!(instr = make_assignment(node_from_list($1), $2, + BWRITERSP_WRITEMASK_ALL, node_from_list($3)))) YYABORT; - $$->loc = loc; + instr->loc = loc; + $$ = append_binop($3, $1, instr); } assign_op: '=' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0cae62b60fc..3f5a57ffa40 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1278,10 +1278,14 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type static struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) { + struct hlsl_ir_expr *cast; + if (compare_hlsl_types(node->data_type, type)) return node; TRACE("Implicit conversion of expression to %s\n", debug_hlsl_type(type)); - return &new_cast(node, type, loc)->node; + if ((cast = new_cast(node, type, loc))) + list_add_after(&node->entry, &cast->node.entry); + return &cast->node; } struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands, @@ -1468,8 +1472,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig hlsl_report_message(rhs->loc.file, rhs->loc.line, rhs->loc.col, HLSL_LEVEL_ERROR, "can't implicitly convert %s to %s", debug_hlsl_type(rhs->data_type), debug_hlsl_type(type)); - free_instr(lhs); - free_instr(rhs); d3dcompiler_free(assign); return NULL; } @@ -1481,8 +1483,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig if (!converted_rhs) { ERR("Couldn't implicitly convert expression to %s.\n", debug_hlsl_type(type)); - free_instr(lhs); - free_instr(rhs); d3dcompiler_free(assign); return NULL; } @@ -1502,11 +1502,9 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig } else { - struct hlsl_ir_deref *lhs_deref = deref_from_node(lhs), *new_deref; - TRACE("Adding an expression for the compound assignment.\n"); - new_deref = new_var_deref(lhs_deref->v.var); - expr = new_binary_expr(op, &new_deref->node, rhs, left->loc); + expr = new_binary_expr(op, lhs, rhs, lhs->loc); + list_add_after(&rhs->entry, &expr->entry); assign->rhs = expr; } } @@ -2173,60 +2171,32 @@ static void free_ir_constant(struct hlsl_ir_constant *constant) static void free_ir_deref(struct hlsl_ir_deref *deref) { - switch (deref->type) - { - case HLSL_IR_DEREF_VAR: - /* Variables are shared among nodes in the tree. */ - break; - case HLSL_IR_DEREF_ARRAY: - free_instr(deref->v.array.array); - free_instr(deref->v.array.index); - break; - case HLSL_IR_DEREF_RECORD: - free_instr(deref->v.record.record); - break; - } d3dcompiler_free(deref); } static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) { - free_instr(swizzle->val); d3dcompiler_free(swizzle); } static void free_ir_constructor(struct hlsl_ir_constructor *constructor) { - unsigned int i; - for (i = 0; i < constructor->args_count; ++i) - free_instr(constructor->args[i]); d3dcompiler_free(constructor); } static void free_ir_expr(struct hlsl_ir_expr *expr) { - unsigned int i; - - for (i = 0; i < 3; ++i) - { - if (!expr->operands[i]) - break; - free_instr(expr->operands[i]); - } free_instr_list(expr->subexpressions); d3dcompiler_free(expr); } static void free_ir_assignment(struct hlsl_ir_assignment *assignment) { - free_instr(assignment->lhs); - free_instr(assignment->rhs); d3dcompiler_free(assignment); } static void free_ir_if(struct hlsl_ir_if *if_node) { - free_instr(if_node->condition); free_instr_list(if_node->then_instrs); free_instr_list(if_node->else_instrs); d3dcompiler_free(if_node); @@ -2234,8 +2204,6 @@ static void free_ir_if(struct hlsl_ir_if *if_node) static void free_ir_jump(struct hlsl_ir_jump *jump) { - if (jump->type == HLSL_IR_JUMP_RETURN) - free_instr(jump->return_value); d3dcompiler_free(jump); } -- 2.25.0

4 3

[PATCH 5/5] d3d9/tests: Do not use NVIDIA mode in test_alpha_to_coverage() if the reported GPU is AMD.
by Henri Verbeet 18 Feb '20

18 Feb '20

From: Paul Gofman <gofmanp(a)gmail.com> Otherwise, if Wine exposes the ATOC format the test will always trigger the NVIDIA path regardless of the reported GPU. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7379d5db5a1..cb84ef6f284 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26591,19 +26591,20 @@ static void test_alpha_to_coverage(void) return; } - if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_SURFACE, MAKEFOURCC('A','T','O','C')) == D3D_OK) + + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + if (adapter_is_amd(&identifier)) { - /* ATOC pseudo format is introduced by Nvidia. Some Intel GPUs support - * alpha to coverage the same way as Nvidia. */ - nvidia_mode = TRUE; + nvidia_mode = FALSE; } else { - nvidia_mode = FALSE; - hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (!adapter_is_amd(&identifier)) + /* The ATOC pseudo format is introduced by NVIDIA. Some Intel GPUs + * support alpha to coverage the same way as NVIDIA. */ + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, + D3DRTYPE_SURFACE, MAKEFOURCC('A','T','O','C')) != D3D_OK) { win_skip("Alpha to coverage is not supported.\n"); refcount = IDirect3DDevice9_Release(device); @@ -26612,6 +26613,7 @@ static void test_alpha_to_coverage(void) DestroyWindow(window); return; } + nvidia_mode = TRUE; } hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, -- 2.20.1

1 0

[PATCH 4/5] d3d9/tests: Test alpha to coverage state capture.
by Henri Verbeet 18 Feb '20

18 Feb '20

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8db30467ee5..7379d5db5a1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26560,6 +26560,7 @@ static void test_alpha_to_coverage(void) D3DADAPTER_IDENTIFIER9 identifier; struct surface_readback rb; IDirect3DTexture9 *texture; + IDirect3DStateBlock9 *sb; IDirect3DDevice9 *device; DWORD quality_levels; BOOL nvidia_mode; @@ -26669,6 +26670,9 @@ static void test_alpha_to_coverage(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_VERTEXSTATE, &sb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fill_surface(surface, 0x40608000, 0); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); @@ -26705,6 +26709,23 @@ static void test_alpha_to_coverage(void) ok(colour == 0x40608000, "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff2000ff, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DStateBlock9_Apply(sb); + IDirect3DStateBlock9_Release(sb); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); -- 2.20.1

1 0

[PATCH 3/5] wined3d: Support NVIDIA alpha to coverage state.
by Henri Verbeet 18 Feb '20

18 Feb '20

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/device.c | 11 ++++++++--- dlls/wined3d/stateblock.c | 17 +++++++++++------ dlls/wined3d/utils.c | 10 ++++++++++ include/wine/wined3d.h | 1 + 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3151efaf330..8db30467ee5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26604,7 +26604,7 @@ static void test_alpha_to_coverage(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); if (!adapter_is_amd(&identifier)) { - skip("Alpha to coverage is not supported.\n"); + win_skip("Alpha to coverage is not supported.\n"); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1e6ec5d0981..17d71b3b1a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3842,6 +3842,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_blend_state *blend_state; struct wined3d_color colour; unsigned int i, j, count; + BOOL set_blend_state; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3945,14 +3946,18 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - if (changed->blend_state) + if ((set_blend_state = changed->blend_state + || wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_ADAPTIVETESS_Y))) { + blend_state = state->rs[WINED3D_RS_ADAPTIVETESS_Y] == WINED3DFMT_ATOC + ? device->blend_state_atoc_enabled : state->blend_state; + if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[WINED3D_RS_BLENDFACTOR]); else wined3d_device_get_blend_state(device, &colour); - wined3d_device_set_blend_state(device, state->blend_state, &colour); + wined3d_device_set_blend_state(device, blend_state, &colour); } for (i = 0; i < ARRAY_SIZE(state->rs); ++i) @@ -3966,7 +3971,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, continue; } - if (!changed->blend_state) + if (!set_blend_state) { blend_state = wined3d_device_get_blend_state(device, &colour); wined3d_color_from_d3dcolor(&colour, state->rs[i]); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 71d88bf1949..a09c020f3f7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1052,6 +1052,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, struct wined3d_device *device = stateblock->device; struct wined3d_blend_state *blend_state; struct wined3d_color colour; + BOOL set_blend_state; unsigned int i; DWORD map; @@ -1140,21 +1141,25 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); } - if (stateblock->changed.blend_state) + if ((set_blend_state = stateblock->changed.blend_state + || wined3d_bitmap_is_set(stateblock->changed.renderState, WINED3D_RS_ADAPTIVETESS_Y))) { - if (stateblock->stateblock_state.blend_state) - wined3d_blend_state_incref(stateblock->stateblock_state.blend_state); + blend_state = stateblock->stateblock_state.rs[WINED3D_RS_ADAPTIVETESS_Y] == WINED3DFMT_ATOC + ? device->blend_state_atoc_enabled : stateblock->stateblock_state.blend_state; + + if (blend_state) + wined3d_blend_state_incref(blend_state); if (state->blend_state) wined3d_blend_state_decref(state->blend_state); - state->blend_state = stateblock->stateblock_state.blend_state; + state->blend_state = blend_state; if (wined3d_bitmap_is_set(stateblock->changed.renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[WINED3D_RS_BLENDFACTOR]); else wined3d_device_get_blend_state(device, &colour); - wined3d_device_set_blend_state(device, stateblock->stateblock_state.blend_state, &colour); + wined3d_device_set_blend_state(device, blend_state, &colour); } /* Render states. */ @@ -1169,7 +1174,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, continue; } - if (!stateblock->changed.blend_state) + if (!set_blend_state) { blend_state = wined3d_device_get_blend_state(device, &colour); wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[rs]); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd239d7659f..f696b922140 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -65,6 +65,7 @@ format_index_remap[] = {WINED3DFMT_R16, WINED3D_FORMAT_FOURCC_BASE + 20}, {WINED3DFMT_AL16, WINED3D_FORMAT_FOURCC_BASE + 21}, {WINED3DFMT_NV12, WINED3D_FORMAT_FOURCC_BASE + 22}, + {WINED3DFMT_ATOC, WINED3D_FORMAT_FOURCC_BASE + 23}, }; #define WINED3D_FORMAT_COUNT (WINED3D_FORMAT_FOURCC_BASE + ARRAY_SIZE(format_index_remap)) @@ -135,6 +136,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_NVDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {WINED3DFMT_ATOC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INST, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INTZ, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, {WINED3DFMT_RESZ, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -339,6 +341,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_INST, WINED3DFMT_FLAG_EXTENSION}, {WINED3DFMT_NULL, WINED3DFMT_FLAG_EXTENSION}, {WINED3DFMT_NVDB, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_ATOC, WINED3DFMT_FLAG_EXTENSION}, {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, }; @@ -3673,6 +3676,12 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format_set_flag(&format->f, WINED3DFMT_FLAG_TEXTURE); } + if (gl_info->supported[ARB_MULTISAMPLE]) + { + format = get_format_gl_internal(adapter, WINED3DFMT_ATOC); + format_set_flag(&format->f, WINED3DFMT_FLAG_TEXTURE); + } + /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ * support by checking for availability of MAKEFOURCC('R','E','S','Z') surfaces with * RENDERTARGET usage. */ @@ -4591,6 +4600,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R16); FMT_TO_STR(WINED3DFMT_AL16); FMT_TO_STR(WINED3DFMT_NV12); + FMT_TO_STR(WINED3DFMT_ATOC); #undef FMT_TO_STR default: { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d783e64a26d..734380b0adc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -269,6 +269,7 @@ enum wined3d_format_id WINED3DFMT_NV12 = WINEMAKEFOURCC('N','V','1','2'), WINED3DFMT_DF16 = WINEMAKEFOURCC('D','F','1','6'), WINED3DFMT_DF24 = WINEMAKEFOURCC('D','F','2','4'), + WINED3DFMT_ATOC = WINEMAKEFOURCC('A','T','O','C'), WINED3DFMT_FORCE_DWORD = 0xffffffff }; -- 2.20.1

1 0

[PATCH 2/5] wined3d: Support AMD alpha to coverage state.
by Henri Verbeet 18 Feb '20

18 Feb '20

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 4 +- dlls/wined3d/device.c | 49 ++++++++++++++++++---- dlls/wined3d/stateblock.c | 77 +++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 7 +++- include/wine/wined3d.h | 1 + 5 files changed, 120 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 366862a05aa..3151efaf330 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26679,8 +26679,8 @@ static void test_alpha_to_coverage(void) get_rt_readback(rt, &rb); colour = get_readback_color(&rb, 64, 64); - /* Nvidia is probably using some proprietary algorithm for averaging sample colour values. */ - todo_wine ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + /* NVIDIA is probably using some proprietary algorithm for averaging sample colour values. */ + ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* NVIDIA */, "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d709ca189c2..1e6ec5d0981 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -529,6 +529,8 @@ void wined3d_device_cleanup(struct wined3d_device *device) if (device->swapchain_count) wined3d_device_uninit_3d(device); + wined3d_blend_state_decref(device->blend_state_atoc_enabled); + wined3d_cs_destroy(device->cs); for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) @@ -3837,6 +3839,8 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; const struct wined3d_saved_states *changed = &stateblock->changed; + struct wined3d_blend_state *blend_state; + struct wined3d_color colour; unsigned int i, j, count; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3941,18 +3945,32 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } + if (changed->blend_state) + { + if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) + wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[WINED3D_RS_BLENDFACTOR]); + else + wined3d_device_get_blend_state(device, &colour); + + wined3d_device_set_blend_state(device, state->blend_state, &colour); + } + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) { - if (wined3d_bitmap_is_set(changed->renderState, i)) + if (!wined3d_bitmap_is_set(changed->renderState, i)) + continue; + + if (i != WINED3D_RS_BLENDFACTOR) { - if (i == WINED3D_RS_BLENDFACTOR) - { - struct wined3d_color color; - wined3d_color_from_d3dcolor(&color, state->rs[i]); - wined3d_device_set_blend_state(device, NULL, &color); - } - else - wined3d_device_set_render_state(device, i, state->rs[i]); + wined3d_device_set_render_state(device, i, state->rs[i]); + continue; + } + + if (!changed->blend_state) + { + blend_state = wined3d_device_get_blend_state(device, &colour); + wined3d_color_from_d3dcolor(&colour, state->rs[i]); + wined3d_device_set_blend_state(device, blend_state, &colour); } } @@ -5760,6 +5778,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; const struct wined3d_fragment_pipe_ops *fragment_pipeline; const struct wined3d_vertex_pipe_ops *vertex_pipeline; + struct wined3d_blend_state_desc blend_state_desc; unsigned int i; HRESULT hr; @@ -5814,6 +5833,18 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined goto err; } + memset(&blend_state_desc, 0, sizeof(blend_state_desc)); + blend_state_desc.alpha_to_coverage = TRUE; + + if (FAILED(hr = wined3d_blend_state_create(device, &blend_state_desc, + NULL, &wined3d_null_parent_ops, &device->blend_state_atoc_enabled))) + { + ERR("Failed to create blend state object, hr %#x.\n", hr); + wined3d_cs_destroy(device->cs); + state_cleanup(&device->state); + goto err; + } + return WINED3D_OK; err: diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 499d23fbbd3..71d88bf1949 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -209,6 +209,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->pixelShader = 1; states->vertexShader = 1; states->scissorRect = 1; + states->blend_state = 1; /* Fixed size arrays */ states->streamSource = 0xffff; @@ -263,6 +264,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state states->vertexDecl = 1; states->vertexShader = 1; + states->blend_state = 1; for (i = 0; i < ARRAY_SIZE(vertex_states_render); ++i) { @@ -426,6 +428,7 @@ void state_unbind_resources(struct wined3d_state *state) struct wined3d_unordered_access_view *uav; struct wined3d_shader_resource_view *srv; struct wined3d_vertex_declaration *decl; + struct wined3d_blend_state *blend_state; struct wined3d_sampler *sampler; struct wined3d_texture *texture; struct wined3d_buffer *buffer; @@ -519,12 +522,19 @@ void state_unbind_resources(struct wined3d_state *state) } } } + + if ((blend_state = state->blend_state)) + { + state->blend_state = NULL; + wined3d_blend_state_decref(blend_state); + } } void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { struct wined3d_light_info *light, *cursor; struct wined3d_vertex_declaration *decl; + struct wined3d_blend_state *blend_state; struct wined3d_texture *texture; struct wined3d_buffer *buffer; struct wined3d_shader *shader; @@ -580,6 +590,12 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) heap_free(light); } } + + if ((blend_state = state->blend_state)) + { + state->blend_state = NULL; + wined3d_blend_state_decref(blend_state); + } } void state_cleanup(struct wined3d_state *state) @@ -1017,6 +1033,15 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); + if (stateblock->changed.blend_state && stateblock->stateblock_state.blend_state != state->blend_state) + { + if (state->blend_state) + wined3d_blend_state_incref(state->blend_state); + if (stateblock->stateblock_state.blend_state) + wined3d_blend_state_decref(stateblock->stateblock_state.blend_state); + stateblock->stateblock_state.blend_state = state->blend_state; + } + TRACE("Capture done.\n"); } @@ -1025,6 +1050,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, { struct wined3d_stateblock_state *state = &device_state->stateblock_state; struct wined3d_device *device = stateblock->device; + struct wined3d_blend_state *blend_state; + struct wined3d_color colour; unsigned int i; DWORD map; @@ -1113,20 +1140,41 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); } + if (stateblock->changed.blend_state) + { + if (stateblock->stateblock_state.blend_state) + wined3d_blend_state_incref(stateblock->stateblock_state.blend_state); + if (state->blend_state) + wined3d_blend_state_decref(state->blend_state); + + state->blend_state = stateblock->stateblock_state.blend_state; + + if (wined3d_bitmap_is_set(stateblock->changed.renderState, WINED3D_RS_BLENDFACTOR)) + wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[WINED3D_RS_BLENDFACTOR]); + else + wined3d_device_get_blend_state(device, &colour); + + wined3d_device_set_blend_state(device, stateblock->stateblock_state.blend_state, &colour); + } + /* Render states. */ for (i = 0; i < stateblock->num_contained_render_states; ++i) { enum wined3d_render_state rs = stateblock->contained_render_states[i]; state->rs[rs] = stateblock->stateblock_state.rs[rs]; - if (rs == WINED3D_RS_BLENDFACTOR) + if (rs != WINED3D_RS_BLENDFACTOR) { - struct wined3d_color color; - wined3d_color_from_d3dcolor(&color, stateblock->stateblock_state.rs[rs]); - wined3d_device_set_blend_state(device, NULL, &color); - } - else wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); + continue; + } + + if (!stateblock->changed.blend_state) + { + blend_state = wined3d_device_get_blend_state(device, &colour); + wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[rs]); + wined3d_device_set_blend_state(device, blend_state, &colour); + } } /* Texture states. */ @@ -1426,6 +1474,23 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb stateblock->stateblock_state.rs[state] = value; stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); + + if (state == WINED3D_RS_POINTSIZE + && (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE || value == WINED3D_ALPHA_TO_COVERAGE_DISABLE)) + { + stateblock->changed.blend_state = 1; + + if (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE && !stateblock->stateblock_state.blend_state) + { + wined3d_blend_state_incref(stateblock->device->blend_state_atoc_enabled); + stateblock->stateblock_state.blend_state = stateblock->device->blend_state_atoc_enabled; + } + else if (value == WINED3D_ALPHA_TO_COVERAGE_DISABLE && stateblock->stateblock_state.blend_state) + { + wined3d_blend_state_decref(stateblock->stateblock_state.blend_state); + stateblock->stateblock_state.blend_state = NULL; + } + } } void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 92634b71551..d29dfc312b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -76,6 +76,9 @@ #define WINED3D_MAX_DIRTY_REGION_COUNT 7 +#define WINED3D_ALPHA_TO_COVERAGE_ENABLE MAKEFOURCC('A','2','M','1') +#define WINED3D_ALPHA_TO_COVERAGE_DISABLE MAKEFOURCC('A','2','M','0') + struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; @@ -3314,6 +3317,7 @@ struct wined3d_device /* Context management */ struct wined3d_context **contexts; UINT context_count; + struct wined3d_blend_state *blend_state_atoc_enabled; }; void wined3d_device_cleanup(struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -3932,7 +3936,8 @@ struct wined3d_saved_states DWORD vertexShader : 1; DWORD scissorRect : 1; DWORD store_stream_offset : 1; - DWORD padding : 4; + DWORD blend_state : 1; + DWORD padding : 3; }; struct StageState { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d313c7aec86..d783e64a26d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2168,6 +2168,7 @@ struct wined3d_stateblock_state RECT scissor_rect; struct wined3d_light_state *light_state; + struct wined3d_blend_state *blend_state; }; struct wined3d_parent_ops -- 2.20.1

1 0

[PATCH 1/5] wined3d: Introduce wined3d_bitmap_is_set().
by Henri Verbeet 18 Feb '20

18 Feb '20

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 4 +-- dlls/wined3d/device.c | 43 ++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 5 ++++ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 14ca883e761..c39694f441e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -807,9 +807,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader for (i = 0; i < shader->limits->constant_float; ++i) { - DWORD idx = i >> 5; - DWORD shift = i & 0x1f; - if (reg_maps->constf[idx] & (1u << shift)) + if (wined3d_bitmap_is_set(reg_maps->constf, i)) highest_constf = i; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84056437414..d709ca189c2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3836,19 +3836,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + const struct wined3d_saved_states *changed = &stateblock->changed; unsigned int i, j, count; TRACE("device %p, stateblock %p.\n", device, stateblock); - if (stateblock->changed.vertexShader) + if (changed->vertexShader) wined3d_device_set_vertex_shader(device, state->vs); - if (stateblock->changed.pixelShader) + if (changed->pixelShader) wined3d_device_set_pixel_shader(device, state->ps); count = 0; for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) { - if (stateblock->changed.vs_consts_f[i]) + if (changed->vs_consts_f[i]) ++count; else if (count) { @@ -3862,7 +3863,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) { - if (stateblock->changed.vertexShaderConstantsB & (1u << i)) + if (changed->vertexShaderConstantsB & (1u << i)) ++count; else if (count) { @@ -3876,7 +3877,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) { - if (stateblock->changed.vertexShaderConstantsI & (1u << i)) + if (changed->vertexShaderConstantsI & (1u << i)) ++count; else if (count) { @@ -3890,7 +3891,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) { - if (stateblock->changed.ps_consts_f[i]) + if (changed->ps_consts_f[i]) ++count; else if (count) { @@ -3904,7 +3905,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) { - if (stateblock->changed.pixelShaderConstantsB & (1u << i)) + if (changed->pixelShaderConstantsB & (1u << i)) ++count; else if (count) { @@ -3918,7 +3919,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) { - if (stateblock->changed.pixelShaderConstantsI & (1u << i)) + if (changed->pixelShaderConstantsI & (1u << i)) ++count; else if (count) { @@ -3942,7 +3943,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(state->rs); ++i) { - if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + if (wined3d_bitmap_is_set(changed->renderState, i)) { if (i == WINED3D_RS_BLENDFACTOR) { @@ -3959,7 +3960,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) { - if (stateblock->changed.textureState[i] & (1u << j)) + if (changed->textureState[i] & (1u << j)) wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); } } @@ -3971,35 +3972,35 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) { - if (stateblock->changed.samplerState[i] & (1 << j)) + if (changed->samplerState[i] & (1 << j)) wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); } } for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) { - if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + if (wined3d_bitmap_is_set(changed->transform, i)) wined3d_device_set_transform(device, i, &state->transforms[i]); } - if (stateblock->changed.indices) + if (changed->indices) wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); wined3d_device_set_base_vertex_index(device, state->base_vertex_index); - if (stateblock->changed.vertexDecl) + if (changed->vertexDecl) wined3d_device_set_vertex_declaration(device, state->vertex_declaration); - if (stateblock->changed.material) + if (changed->material) wined3d_device_set_material(device, &state->material); - if (stateblock->changed.viewport) + if (changed->viewport) wined3d_device_set_viewports(device, 1, &state->viewport); - if (stateblock->changed.scissorRect) + if (changed->scissorRect) wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); for (i = 0; i < ARRAY_SIZE(state->streams); ++i) { - if (stateblock->changed.streamSource & (1u << i)) + if (changed->streamSource & (1u << i)) wined3d_device_set_stream_source(device, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); - if (stateblock->changed.streamFreq & (1u << i)) + if (changed->streamFreq & (1u << i)) wined3d_device_set_stream_source_freq(device, i, state->streams[i].frequency | state->streams[i].flags); } @@ -4009,13 +4010,13 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, DWORD stage = i; if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - if (stateblock->changed.textures & (1u << i)) + if (changed->textures & (1u << i)) wined3d_device_set_texture(device, stage, state->textures[i]); } for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) { - if (stateblock->changed.clipplane & (1u << i)) + if (changed->clipplane & (1u << i)) wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e1e55d52bf..92634b71551 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5327,6 +5327,11 @@ static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *v *max_z = max(vp->max_z, vp->min_z + 0.001f); } +static inline BOOL wined3d_bitmap_is_set(const uint32_t *map, unsigned int idx) +{ + return map[idx >> 5] & (1u << (idx & 0x1f)); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.20.1

1 0

[PATCH 1/4] d3d9: Retrieve the material from the primary stateblock.
by Zebediah Figura 18 Feb '20

18 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 447aa26844..802a974f34 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2208,7 +2208,7 @@ static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATE /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK; -- 2.25.0

2 7

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