wine-devel April 2020

wine-devel@winehq.org

87 participants
854 discussions

[PATCH 4/4] qasf: Implement IFileSourceFilter_GetCurFile() for WM ASF reader.
by Jactry Zeng 01 Apr '20

01 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qasf/tests/wmasf.c | 20 +++++++------------- dlls/qasf/wmasf.c | 21 +++++++++++++++++++-- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/qasf/tests/wmasf.c b/dlls/qasf/tests/wmasf.c index 7cf11c6c9f..1620a24aa1 100644 --- a/dlls/qasf/tests/wmasf.c +++ b/dlls/qasf/tests/wmasf.c @@ -207,11 +207,11 @@ static void test_filesourcefilter(void) olepath = (void *)0xdeadbeef; memset(&type, 0x22, sizeof(type)); hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &type); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!olepath, "Got %s.\n", wine_dbgstr_w(olepath)); - todo_wine ok(IsEqualGUID(&type.majortype, &MEDIATYPE_NULL), "Got majortype %s.\n", + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!olepath, "Got %s.\n", wine_dbgstr_w(olepath)); + ok(IsEqualGUID(&type.majortype, &MEDIATYPE_NULL), "Got majortype %s.\n", wine_dbgstr_guid(&type.majortype)); - todo_wine ok(IsEqualGUID(&type.subtype, &MEDIASUBTYPE_NULL), "Got subtype %s.\n", + ok(IsEqualGUID(&type.subtype, &MEDIASUBTYPE_NULL), "Got subtype %s.\n", wine_dbgstr_guid(&type.subtype)); CoTaskMemFree(olepath); @@ -219,7 +219,7 @@ static void test_filesourcefilter(void) hr = IFileSourceFilter_Load(filesource, path, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFileSourceFilter_GetCurFile(filesource, NULL, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); path = L"nonexistent2.wmv"; hr = IFileSourceFilter_Load(filesource, path, NULL); @@ -229,16 +229,13 @@ static void test_filesourcefilter(void) olepath = (void *)0xdeadbeef; memset(&type, 0x22, sizeof(type)); hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &type); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!wcscmp(olepath, path), "Expected path %s, got %s.\n", wine_dbgstr_w(path), wine_dbgstr_w(olepath)); ok(IsEqualGUID(&type.majortype, &MEDIATYPE_NULL), "Got majortype %s.\n", wine_dbgstr_guid(&type.majortype)); ok(IsEqualGUID(&type.subtype, &MEDIASUBTYPE_NULL), "Got subtype %s.\n", wine_dbgstr_guid(&type.subtype)); - } CoTaskMemFree(olepath); hr = IFileSourceFilter_QueryInterface(filesource, &IID_IBaseFilter, (void **)&filter); @@ -265,16 +262,13 @@ static void test_filesourcefilter(void) olepath = (void *)0xdeadbeef; memset(&type, 0x22, sizeof(type)); hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &type); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!wcscmp(olepath, path), "Expected path %s, got %s.\n", wine_dbgstr_w(path), wine_dbgstr_w(olepath)); ok(IsEqualGUID(&type.majortype, &MEDIATYPE_NULL), "Got majortype %s.\n", wine_dbgstr_guid(&type.majortype)); ok(IsEqualGUID(&type.subtype, &MEDIASUBTYPE_NULL), "Got subtype %s.\n", wine_dbgstr_guid(&type.subtype)); - } CoTaskMemFree(olepath); IFilterGraph2_Release(graph); diff --git a/dlls/qasf/wmasf.c b/dlls/qasf/wmasf.c index e8d1363170..4fc0726879 100644 --- a/dlls/qasf/wmasf.c +++ b/dlls/qasf/wmasf.c @@ -126,9 +126,26 @@ static HRESULT WINAPI filesourcefilter_Load(IFileSourceFilter * iface, LPCOLESTR static HRESULT WINAPI filesourcefilter_GetCurFile(IFileSourceFilter *iface, LPOLESTR *filename, AM_MEDIA_TYPE *type) { - FIXME("(%p, %p, %p): stub.\n", iface, filename, type); + struct wmasf_reader *This = impl_reader_from_IFileSourceFilter(iface); + + TRACE("(%p, %p, %p).\n", iface, filename, type); + + if (!filename) + return E_POINTER; + + *filename = NULL; + if (type) + memset(type, 0, sizeof(*type)); - return E_NOTIMPL; + if (This->filename) + { + *filename = CoTaskMemAlloc((wcslen(This->filename) + 1) * sizeof(WCHAR)); + wcscpy(*filename, This->filename); + if (type) + CopyMediaType(type, &This->type); + } + + return S_OK; } static const IFileSourceFilterVtbl filesourcefilter_vtbl = -- 2.26.0

3 2

[PATCH 3/4] qasf: Partially implement IFileSourceFilter_Load() for WM ASF reader.
by Jactry Zeng 01 Apr '20

01 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qasf/tests/wmasf.c | 84 +++++++++++++++++++++++++++++++++++++++++ dlls/qasf/wmasf.c | 28 +++++++++++++- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/tests/wmasf.c b/dlls/qasf/tests/wmasf.c index 3bf1e4ce4e..7cf11c6c9f 100644 --- a/dlls/qasf/tests/wmasf.c +++ b/dlls/qasf/tests/wmasf.c @@ -174,7 +174,13 @@ static void test_aggregation(void) static void test_filesourcefilter(void) { IFileSourceFilter *filesource; + IFilterGraph2 *graph; + IEnumPins *enumpins; IBaseFilter *filter; + AM_MEDIA_TYPE type; + const WCHAR *path; + LPOLESTR olepath; + IPin *pins[4]; HRESULT hr; hr = CoCreateInstance(&CLSID_WMAsfReader, NULL, CLSCTX_INPROC_SERVER, @@ -195,6 +201,84 @@ static void test_filesourcefilter(void) ok(hr == S_OK, "Got hr %#x.\n", hr); expected_ref(filesource, 1); + hr = IFileSourceFilter_Load(filesource, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + olepath = (void *)0xdeadbeef; + memset(&type, 0x22, sizeof(type)); + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &type); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!olepath, "Got %s.\n", wine_dbgstr_w(olepath)); + todo_wine ok(IsEqualGUID(&type.majortype, &MEDIATYPE_NULL), "Got majortype %s.\n", + wine_dbgstr_guid(&type.majortype)); + todo_wine ok(IsEqualGUID(&type.subtype, &MEDIASUBTYPE_NULL), "Got subtype %s.\n", + wine_dbgstr_guid(&type.subtype)); + CoTaskMemFree(olepath); + + path = L"nonexistent.wmv"; + hr = IFileSourceFilter_Load(filesource, path, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFileSourceFilter_GetCurFile(filesource, NULL, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + path = L"nonexistent2.wmv"; + hr = IFileSourceFilter_Load(filesource, path, NULL); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + path = L"nonexistent.wmv"; + olepath = (void *)0xdeadbeef; + memset(&type, 0x22, sizeof(type)); + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &type); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(olepath, path), "Expected path %s, got %s.\n", + wine_dbgstr_w(path), wine_dbgstr_w(olepath)); + ok(IsEqualGUID(&type.majortype, &MEDIATYPE_NULL), "Got majortype %s.\n", + wine_dbgstr_guid(&type.majortype)); + ok(IsEqualGUID(&type.subtype, &MEDIASUBTYPE_NULL), "Got subtype %s.\n", + wine_dbgstr_guid(&type.subtype)); + } + CoTaskMemFree(olepath); + + hr = IFileSourceFilter_QueryInterface(filesource, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_EnumPins(filter, &enumpins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enumpins, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + IEnumPins_Release(enumpins); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_AddFilter(graph, filter, NULL); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* win2008 */, + "Got hr %#x.\n", hr); + + path = L"nonexistent2.wmv"; + hr = IFileSourceFilter_Load(filesource, path, NULL); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + path = L"nonexistent.wmv"; + olepath = (void *)0xdeadbeef; + memset(&type, 0x22, sizeof(type)); + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &type); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(olepath, path), "Expected path %s, got %s.\n", + wine_dbgstr_w(path), wine_dbgstr_w(olepath)); + ok(IsEqualGUID(&type.majortype, &MEDIATYPE_NULL), "Got majortype %s.\n", + wine_dbgstr_guid(&type.majortype)); + ok(IsEqualGUID(&type.subtype, &MEDIASUBTYPE_NULL), "Got subtype %s.\n", + wine_dbgstr_guid(&type.subtype)); + } + CoTaskMemFree(olepath); + + IFilterGraph2_Release(graph); + IBaseFilter_Release(filter); IFileSourceFilter_Release(filesource); } diff --git a/dlls/qasf/wmasf.c b/dlls/qasf/wmasf.c index ad7bb5be8f..e8d1363170 100644 --- a/dlls/qasf/wmasf.c +++ b/dlls/qasf/wmasf.c @@ -26,6 +26,9 @@ struct wmasf_reader { struct strmbase_filter filter; IFileSourceFilter IFileSourceFilter_iface; + + AM_MEDIA_TYPE type; + LPOLESTR filename; }; static inline struct wmasf_reader *impl_reader_from_strmbase_filter(struct strmbase_filter *iface) @@ -47,6 +50,12 @@ static void wmasf_reader_destroy(struct strmbase_filter *iface) { struct wmasf_reader *filter = impl_reader_from_strmbase_filter(iface); + if (filter->filename) + { + CoTaskMemFree(filter->filename); + FreeMediaType(&filter->type); + } + strmbase_filter_cleanup(&filter->filter); free(filter); } @@ -95,9 +104,24 @@ static ULONG WINAPI filesourcefilter_Release(IFileSourceFilter *iface) static HRESULT WINAPI filesourcefilter_Load(IFileSourceFilter * iface, LPCOLESTR filename, const AM_MEDIA_TYPE *type) { - FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(filename), type); + struct wmasf_reader *This = impl_reader_from_IFileSourceFilter(iface); + static const AM_MEDIA_TYPE empty_type = {0}; - return E_NOTIMPL; + TRACE("(%p, %s, %p).\n", iface, debugstr_w(filename), type); + + if (!filename) + return E_POINTER; + + if (This->filename) + return E_FAIL; + + This->filename = wcsdup(filename); + if (!This->filename) + return E_OUTOFMEMORY; + + CopyMediaType(&This->type, type ? type : &empty_type); + + return S_OK; } static HRESULT WINAPI filesourcefilter_GetCurFile(IFileSourceFilter *iface, LPOLESTR *filename, AM_MEDIA_TYPE *type) -- 2.26.0

4 3

[PATCH 2/4] qasf: Implement IFileSourceFilter stub for WM ASF reader.
by Jactry Zeng 01 Apr '20

01 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qasf/tests/wmasf.c | 30 +++++++++++++++++- dlls/qasf/wmasf.c | 67 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/tests/wmasf.c b/dlls/qasf/tests/wmasf.c index b82aa3a053..3bf1e4ce4e 100644 --- a/dlls/qasf/tests/wmasf.c +++ b/dlls/qasf/tests/wmasf.c @@ -68,7 +68,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); - todo_wine check_interface(filter, &IID_IFileSourceFilter, TRUE); + check_interface(filter, &IID_IFileSourceFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IUnknown, TRUE); @@ -171,12 +171,40 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_filesourcefilter(void) +{ + IFileSourceFilter *filesource; + IBaseFilter *filter; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WMAsfReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + expected_ref(filter, 1); + hr = IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "Got hr %#x.\n", hr); + expected_ref(filesource, 2); + expected_ref(filter, 2); + + IFileSourceFilter_Release(filesource); + IBaseFilter_Release(filter); + + hr = CoCreateInstance(&CLSID_WMAsfReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "Got hr %#x.\n", hr); + expected_ref(filesource, 1); + + IFileSourceFilter_Release(filesource); +} + START_TEST(wmasf) { CoInitializeEx(NULL, COINIT_MULTITHREADED); test_interfaces(); test_aggregation(); + test_filesourcefilter(); CoUninitialize(); } diff --git a/dlls/qasf/wmasf.c b/dlls/qasf/wmasf.c index 04aaf21367..ad7bb5be8f 100644 --- a/dlls/qasf/wmasf.c +++ b/dlls/qasf/wmasf.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qasf); struct wmasf_reader { struct strmbase_filter filter; + IFileSourceFilter IFileSourceFilter_iface; }; static inline struct wmasf_reader *impl_reader_from_strmbase_filter(struct strmbase_filter *iface) @@ -32,6 +33,11 @@ static inline struct wmasf_reader *impl_reader_from_strmbase_filter(struct strmb return CONTAINING_RECORD(iface, struct wmasf_reader, filter); } +static inline struct wmasf_reader *impl_reader_from_IFileSourceFilter(IFileSourceFilter *iface) +{ + return CONTAINING_RECORD(iface, struct wmasf_reader, IFileSourceFilter_iface); +} + static struct strmbase_pin *wmasf_reader_get_pin(struct strmbase_filter *iface, unsigned int index) { return NULL; @@ -45,10 +51,69 @@ static void wmasf_reader_destroy(struct strmbase_filter *iface) free(filter); } +static HRESULT wmasf_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) +{ + struct wmasf_reader *filter = impl_reader_from_strmbase_filter(iface); + + if (IsEqualGUID(iid, &IID_IFileSourceFilter)) + { + *out = &filter->IFileSourceFilter_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + return E_NOINTERFACE; +} + static struct strmbase_filter_ops filter_ops = { .filter_get_pin = wmasf_reader_get_pin, .filter_destroy = wmasf_reader_destroy, + .filter_query_interface = wmasf_reader_query_interface, +}; + +static HRESULT WINAPI filesourcefilter_QueryInterface(IFileSourceFilter *iface, REFIID riid, void **out) +{ + struct wmasf_reader *This = impl_reader_from_IFileSourceFilter(iface); + + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, out); +} + +static ULONG WINAPI filesourcefilter_AddRef(IFileSourceFilter *iface) +{ + struct wmasf_reader *This = impl_reader_from_IFileSourceFilter(iface); + + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); +} + +static ULONG WINAPI filesourcefilter_Release(IFileSourceFilter *iface) +{ + struct wmasf_reader *This = impl_reader_from_IFileSourceFilter(iface); + + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); +} + +static HRESULT WINAPI filesourcefilter_Load(IFileSourceFilter * iface, LPCOLESTR filename, const AM_MEDIA_TYPE *type) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(filename), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI filesourcefilter_GetCurFile(IFileSourceFilter *iface, LPOLESTR *filename, AM_MEDIA_TYPE *type) +{ + FIXME("(%p, %p, %p): stub.\n", iface, filename, type); + + return E_NOTIMPL; +} + +static const IFileSourceFilterVtbl filesourcefilter_vtbl = +{ + filesourcefilter_QueryInterface, + filesourcefilter_AddRef, + filesourcefilter_Release, + filesourcefilter_Load, + filesourcefilter_GetCurFile }; HRESULT wmasf_reader_create(IUnknown *outer, IUnknown **out) @@ -60,6 +125,8 @@ HRESULT wmasf_reader_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); + object->IFileSourceFilter_iface.lpVtbl = &filesourcefilter_vtbl; + TRACE("Created WM ASF reader %p.\n", object); *out = &object->filter.IUnknown_inner; -- 2.26.0

3 2

[PATCH v2 1/7] winedbg: Remove outdated commented code.
by Rémi Bernon 01 Apr '20

01 Apr '20

This doesn't compile anymore, let's get rid of it instead or pretending it can still be useful. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 38 ------------------------------------- 1 file changed, 38 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 02522ea31955..059564d8663c 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -850,14 +850,6 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) } } -#if 0 -static enum packet_return packet_extended(struct gdb_context* gdbctx) -{ - gdbctx->extended = 1; - return packet_ok; -} -#endif - static enum packet_return packet_last_signal(struct gdb_context* gdbctx) { assert(gdbctx->in_packet_len == 0); @@ -1150,10 +1142,6 @@ static enum packet_return packet_write_registers(struct gdb_context* gdbctx) static enum packet_return packet_kill(struct gdb_context* gdbctx) { detach_debuggee(gdbctx, TRUE); -#if 0 - if (!gdbctx->extended) - /* dunno whether GDB cares or not */ -#endif return packet_ok | packet_last_f; } @@ -1674,29 +1662,6 @@ static enum packet_return packet_step(struct gdb_context* gdbctx) return packet_reply_status(gdbctx); } -#if 0 -static enum packet_return packet_step_signal(struct gdb_context* gdbctx) -{ - unsigned char sig; - - /* FIXME: add support for address in packet */ - assert(gdbctx->in_packet_len == 2); - if (dbg_curr_thread->tid != gdbctx->exec_thread && gdbctx->exec_thread) - if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR) - fprintf(stderr, "NIY: step/sig on %u, while last thread is %u\n", - gdbctx->exec_thread, DEBUG_CurrThread->tid); - hex_from(&sig, gdbctx->in_packet, 1); - /* cannot change signals on the fly */ - if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "sigs: %u %u\n", sig, gdbctx->last_sig); - if (sig != gdbctx->last_sig) - return packet_error; - resume_debuggee(gdbctx, DBG_EXCEPTION_NOT_HANDLED); - wait_for_debuggee(gdbctx); - return packet_reply_status(gdbctx); -} -#endif - static enum packet_return packet_thread_alive(struct gdb_context* gdbctx) { char* end; @@ -1723,7 +1688,6 @@ struct packet_entry static struct packet_entry packet_entries[] = { - /*{'!', packet_extended}, */ {'?', packet_last_signal}, {'c', packet_continue}, {'C', packet_continue_signal}, @@ -1738,9 +1702,7 @@ static struct packet_entry packet_entries[] = {'P', packet_write_register}, {'q', packet_query}, {'Q', packet_set}, - /* {'R', packet,restart}, only in extended mode ! */ {'s', packet_step}, - /*{'S', packet_step_signal}, hard(er) to implement */ {'T', packet_thread_alive}, {'v', packet_verbose}, }; -- 2.26.0.rc2

1 6

[PATCH 1/7] winedbg: Remove outdated commented code.
by Rémi Bernon 01 Apr '20

01 Apr '20

1 7

[PATCH v3 2/2] ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps.
by Akihiro Sagawa 01 Apr '20

01 Apr '20

In v3, add ddraw4 tests, too. In v2, revise commit message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48844 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ddraw/surface.c | 1 + dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-)

2 1

[PATCH] ntdll: Optimize synchronization primitives.
by Zebediah Figura 01 Apr '20

01 Apr '20

After spending nearly two years trying to figure out how to implement synchronization primitives in a correct and performant manner, I've finally developed a solution which is not only simple and straightforward, but an amazing 100% more performant than current Wine! I've nicknamed this patch "zsync", short for "zero-overhead sync". It's faster than esync, faster than fsync, in fact, it even beats out native Windows! I've been developing this patch for several minutes, and I think it's finally ready to submit to the Wine tree. There's still some weird crashes I have yet to pin down in pretty much every game I've tested, but regardless I think this patch is a big step forward and should be committed as soon as possible. --- dlls/ntdll/sync.c | 75 ++++++++--------------------------------------- 1 file changed, 13 insertions(+), 62 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 2b5b6ce44a5..b5c0ecfcd55 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -328,18 +328,8 @@ NTSTATUS WINAPI NtQuerySemaphore( HANDLE handle, SEMAPHORE_INFORMATION_CLASS cla */ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, PULONG previous ) { - NTSTATUS ret; - SERVER_START_REQ( release_semaphore ) - { - req->handle = wine_server_obj_handle( handle ); - req->count = count; - if (!(ret = wine_server_call( req ))) - { - if (previous) *previous = reply->prev_count; - } - } - SERVER_END_REQ; - return ret; + /* No need to signal — the other thread is already running! */ + return STATUS_SUCCESS; } /* @@ -405,16 +395,8 @@ NTSTATUS WINAPI NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT */ NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state ) { - NTSTATUS ret; - SERVER_START_REQ( event_op ) - { - req->handle = wine_server_obj_handle( handle ); - req->op = SET_EVENT; - ret = wine_server_call( req ); - if (!ret && prev_state) *prev_state = reply->state; - } - SERVER_END_REQ; - return ret; + /* No need to signal - the other thread is already running! */ + return STATUS_SUCCESS; } /****************************************************************************** @@ -422,16 +404,8 @@ NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state ) */ NTSTATUS WINAPI NtResetEvent( HANDLE handle, LONG *prev_state ) { - NTSTATUS ret; - SERVER_START_REQ( event_op ) - { - req->handle = wine_server_obj_handle( handle ); - req->op = RESET_EVENT; - ret = wine_server_call( req ); - if (!ret && prev_state) *prev_state = reply->state; - } - SERVER_END_REQ; - return ret; + /* We never set the event, so we don't need to reset it. */ + return STATUS_SUCCESS; } /****************************************************************************** @@ -453,17 +427,8 @@ NTSTATUS WINAPI NtClearEvent ( HANDLE handle ) */ NTSTATUS WINAPI NtPulseEvent( HANDLE handle, LONG *prev_state ) { - NTSTATUS ret; - - SERVER_START_REQ( event_op ) - { - req->handle = wine_server_obj_handle( handle ); - req->op = PULSE_EVENT; - ret = wine_server_call( req ); - if (!ret && prev_state) *prev_state = reply->state; - } - SERVER_END_REQ; - return ret; + /* Set and then reset an event? We might as well just do nothing. */ + return STATUS_SUCCESS; } /****************************************************************************** @@ -564,16 +529,8 @@ NTSTATUS WINAPI NtOpenMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT_A */ NTSTATUS WINAPI NtReleaseMutant( IN HANDLE handle, OUT PLONG prev_count OPTIONAL) { - NTSTATUS status; - - SERVER_START_REQ( release_mutex ) - { - req->handle = wine_server_obj_handle( handle ); - status = wine_server_call( req ); - if (prev_count) *prev_count = 1 - reply->prev_count; - } - SERVER_END_REQ; - return status; + /* There'll be no mutant enemy, we shall certify. */ + return STATUS_SUCCESS; } /****************************************************************** @@ -1076,15 +1033,9 @@ static NTSTATUS wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { - select_op_t select_op; - UINT i, flags = SELECT_INTERRUPTIBLE; - - if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1; - - if (alertable) flags |= SELECT_ALERTABLE; - select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL; - for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); - return server_select( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); + /* 99% of real time elapsed in all programs is spent sleeping. We can + * optimize by not doing that. */ + return STATUS_SUCCESS; } -- 2.26.0

5 5

[PATCH 1/2] rpcrt4: Add RpcGetAuthorizationContextForClient() stub.
by Serge Gautherie 01 Apr '20

01 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Minimal cherry-pick of https://git.reactos.org/?p=reactos.git;a=commit;h=be460fe03f67e86e9abddc22b… --- dlls/rpcrt4/rpcrt4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 5d558bf..877221c 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -387,6 +387,7 @@ @ stdcall RpcExceptionFilter(long) @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus +@ stub RpcGetAuthorizationContextForClient #(ptr long ptr ptr int64 long ptr ptr) @ stub RpcIfIdVectorFree @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr) -- 2.10.0.windows.1

2 2

[PATCH v3 1/2] ddraw/tests: Add more managed texture tests.
by Akihiro Sagawa 01 Apr '20

01 Apr '20

Henri, thanks for reviewing. In v3, add ddraw4 tests, too. In v2, add render target tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ddraw/tests/ddraw4.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 142 insertions(+), 4 deletions(-)

1 0

[PATCH] comctl32/button: Use duplicated image for drawing.
by Nikolay Sivov 01 Apr '20

01 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47794 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/button.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0078bd0fc6..b615df4a16 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -90,11 +90,12 @@ typedef struct _BUTTON_INFO HIMAGELIST glyph; /* this is a font character code when split_style doesn't have BCSS_IMAGE */ SIZE glyph_size; RECT text_margin; + HANDLE image; /* Original handle set with BM_SETIMAGE and returned with BM_GETIMAGE. */ union { HICON icon; HBITMAP bitmap; - HANDLE image; + HANDLE image; /* Duplicated handle used for drawing. */ } u; } BUTTON_INFO; @@ -488,6 +489,10 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_NCDESTROY: SetWindowLongPtrW( hWnd, 0, 0 ); + if (infoPtr->image_type == IMAGE_BITMAP) + DeleteObject(infoPtr->u.bitmap); + else if (infoPtr->image_type == IMAGE_ICON) + DestroyIcon(infoPtr->u.icon); heap_free(infoPtr->note); heap_free(infoPtr); break; @@ -859,13 +864,14 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case BM_SETIMAGE: infoPtr->image_type = (DWORD)wParam; - oldHbitmap = infoPtr->u.image; - infoPtr->u.image = (HANDLE)lParam; - InvalidateRect( hWnd, NULL, FALSE ); - return (LRESULT)oldHbitmap; + oldHbitmap = infoPtr->image; + infoPtr->u.image = CopyImage((HANDLE)lParam, infoPtr->image_type, 0, 0, 0); + infoPtr->image = (HANDLE)lParam; + InvalidateRect( hWnd, NULL, FALSE ); + return (LRESULT)oldHbitmap; case BM_GETIMAGE: - return (LRESULT)infoPtr->u.image; + return (LRESULT)infoPtr->image; case BCM_SETIMAGELIST: { -- 2.25.1

1 0

Jump to page:

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 April 2020