April 2020 - Wine-Devel - list.winehq.org

[PATCH 7/7] dbghelp: Build with ucrtbase.
by Jacek Caban April 6, 2020

April 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/Makefile.in | 2 ++ dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/dwarf.c | 4 +-- dlls/dbghelp/elf_module.c | 14 ++++---- dlls/dbghelp/macho_module.c | 20 +++++------ dlls/dbghelp/module.c | 62 ++++++++++++++++---------------- dlls/dbghelp/path.c | 64 +++++++++++++++++----------------- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/symbol.c | 8 ++--- 9 files changed, 89 insertions(+), 88 deletions(-)

1 0

[PATCH 6/7] dbghelp: Don't use PATH to search for libraries.
by Jacek Caban April 6, 2020

April 6, 2020

It should be used only for the main executable, for which we get full path anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 3 +-- dlls/dbghelp/macho_module.c | 10 ++-------- 2 files changed, 3 insertions(+), 10 deletions(-)

1 0

[PATCH 5/7] dbghelp: Remove unneeded includes.
by Jacek Caban April 6, 2020

April 6, 2020

1 0

[PATCH 4/7] dbghelp: Import zlib inflate code.
by Jacek Caban April 6, 2020

April 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/Makefile.in | 3 +- dlls/dbghelp/dwarf.c | 17 +- dlls/dbghelp/inflate.c | 1916 ++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/zlib.h | 162 ++++ 4 files changed, 2080 insertions(+), 18 deletions(-) create mode 100644 dlls/dbghelp/inflate.c create mode 100644 dlls/dbghelp/zlib.h

1 0

[PATCH 3/7] dbghelp: Always build all loader backends.
by Jacek Caban April 6, 2020

April 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 28 ---------------------------- dlls/dbghelp/macho_module.c | 14 -------------- 2 files changed, 42 deletions(-)

1 0

[PATCH 2/7] dbghelp: Fix GCC warnings in macho_module.c.
by Jacek Caban April 6, 2020

April 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/macho_module.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[PATCH 1/7] dbghelp: Introduce read_process_memory helper.
by Jacek Caban April 6, 2020

April 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/cpu_x86_64.c | 4 +--- dlls/dbghelp/dbghelp_private.h | 5 +++++ dlls/dbghelp/elf_module.c | 19 ++++++------------- dlls/dbghelp/macho_module.c | 16 +++++++--------- dlls/dbghelp/minidump.c | 8 ++------ 5 files changed, 21 insertions(+), 31 deletions(-)

1 0

[PATCH v3 1/4] qasf: Implement WM ASF reader stub.
by Zebediah Figura April 6, 2020

April 6, 2020

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Resent with minor style changes (consistent 8-space indentation, use IsEqualGUID()) dlls/qasf/Makefile.in | 1 + dlls/qasf/asfreader.c | 67 +++++++++++++ dlls/qasf/qasf_classes.idl | 7 ++ dlls/qasf/qasf_main.c | 3 + dlls/qasf/qasf_private.h | 1 + dlls/qasf/tests/Makefile.in | 1 + dlls/qasf/tests/asfreader.c | 192 ++++++++++++++++++++++++++++++++++++ 7 files changed, 272 insertions(+) create mode 100644 dlls/qasf/asfreader.c create mode 100644 dlls/qasf/tests/asfreader.c diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index dd02f5a344e..39239d38aea 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + asfreader.c \ dmowrapper.c \ qasf_main.c diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c new file mode 100644 index 00000000000..e5dbd1d052f --- /dev/null +++ b/dlls/qasf/asfreader.c @@ -0,0 +1,67 @@ +/* + * WM ASF reader + * + * Copyright 2020 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qasf_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qasf); + +struct asf_reader +{ + struct strmbase_filter filter; +}; + +static inline struct asf_reader *impl_reader_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct asf_reader, filter); +} + +static struct strmbase_pin *asf_reader_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + return NULL; +} + +static void asf_reader_destroy(struct strmbase_filter *iface) +{ + struct asf_reader *filter = impl_reader_from_strmbase_filter(iface); + + strmbase_filter_cleanup(&filter->filter); + free(filter); +} + +static struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = asf_reader_get_pin, + .filter_destroy = asf_reader_destroy, +}; + +HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) +{ + struct asf_reader *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); + + TRACE("Created WM ASF reader %p.\n", object); + *out = &object->filter.IUnknown_inner; + + return S_OK; +} diff --git a/dlls/qasf/qasf_classes.idl b/dlls/qasf/qasf_classes.idl index 0acf3806910..b6f6c58fedc 100644 --- a/dlls/qasf/qasf_classes.idl +++ b/dlls/qasf/qasf_classes.idl @@ -25,3 +25,10 @@ uuid(94297043-bd82-4dfd-b0de-8177739c6d20), ] coclass DMOWrapperFilter {} + +[ + helpstring("WM ASF Reader"), + threading(both), + uuid(187463a0-5bb7-11d3-acbe-0080c75e246e), +] +coclass WMAsfReader {} diff --git a/dlls/qasf/qasf_main.c b/dlls/qasf/qasf_main.c index 5df23649f0d..2e65b693fa0 100644 --- a/dlls/qasf/qasf_main.c +++ b/dlls/qasf/qasf_main.c @@ -98,6 +98,7 @@ static const IClassFactoryVtbl class_factory_vtbl = class_factory_LockServer, }; +static struct class_factory asf_reader_cf = {{&class_factory_vtbl}, asf_reader_create}; static struct class_factory dmo_wrapper_cf = {{&class_factory_vtbl}, dmo_wrapper_create}; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) @@ -116,6 +117,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) if (IsEqualGUID(clsid, &CLSID_DMOWrapperFilter)) return IClassFactory_QueryInterface(&dmo_wrapper_cf.IClassFactory_iface, iid, out); + if (IsEqualGUID(clsid, &CLSID_WMAsfReader)) + return IClassFactory_QueryInterface(&asf_reader_cf.IClassFactory_iface, iid, out); FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/qasf/qasf_private.h b/dlls/qasf/qasf_private.h index bdb2e433b2f..c7e8e92e2ae 100644 --- a/dlls/qasf/qasf_private.h +++ b/dlls/qasf/qasf_private.h @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "wine/strmbase.h" +HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; #endif /* QASF_PRIVATE_H */ diff --git a/dlls/qasf/tests/Makefile.in b/dlls/qasf/tests/Makefile.in index 793f0d2c4b2..4b8d40671fb 100644 --- a/dlls/qasf/tests/Makefile.in +++ b/dlls/qasf/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = qasf.dll IMPORTS = strmbase dmoguids strmiids uuid msdmo ole32 C_SRCS = \ + asfreader.c \ dmowrapper.c diff --git a/dlls/qasf/tests/asfreader.c b/dlls/qasf/tests/asfreader.c new file mode 100644 index 00000000000..9098d5cfdf5 --- /dev/null +++ b/dlls/qasf/tests/asfreader.c @@ -0,0 +1,192 @@ +/* + * WM ASF reader unit tests + * + * Copyright 2019 Zebediah Figura + * Copyright 2020 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "dshow.h" +#include "wine/strmbase.h" +#include "wine/test.h" + +#include "initguid.h" + +DEFINE_GUID(IID_IWMHeaderInfo, 0x96406bda, 0x2b2b, 0x11d3, 0xb3, 0x6b, 0x00, 0xc0, 0x4f, 0x61, 0x08, 0xff); +DEFINE_GUID(IID_IWMReaderAdvanced, 0x96406bea, 0x2b2b, 0x11d3, 0xb3, 0x6b, 0x00, 0xc0, 0x4f, 0x61, 0x08, 0xff); +DEFINE_GUID(IID_IWMReaderAdvanced2, 0xae14a945, 0xb90c, 0x4d0d, 0x91, 0x27, 0x80, 0xd6, 0x65, 0xf7, 0xd7, 0x3e); + +static IBaseFilter *create_asf_reader(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WMAsfReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + 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) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_asf_reader(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + todo_wine check_interface(filter, &IID_IFileSourceFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + todo_wine check_interface(filter, &IID_IServiceProvider, TRUE); + todo_wine check_interface(filter, &IID_IWMHeaderInfo, TRUE); + todo_wine check_interface(filter, &IID_IWMReaderAdvanced, TRUE); + todo_wine check_interface(filter, &IID_IWMReaderAdvanced2, TRUE); + + IBaseFilter_Release(filter); +} + +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "Unexpected call %s.\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_WMAsfReader, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_WMAsfReader, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + +START_TEST(asfreader) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + test_interfaces(); + test_aggregation(); + + CoUninitialize(); +} -- 2.26.0

2 7

[PATCH] kernel32/tests: Actually run OpenFile tests
by Andrew Eikum April 6, 2020

April 6, 2020

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- sizeof(filename) is already MAX_PATH, so we would always return early. dlls/kernel32/tests/file.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e8a31c6e749..29620654bdc 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3352,17 +3352,6 @@ static void test_OpenFile(void) ofs.szPathName ); } - length = GetCurrentDirectoryA(MAX_PATH, buff) + sizeof(filename); - - if (length >= MAX_PATH) - { - trace("Buffer too small, requested length = %d, but MAX_PATH = %d. Skipping test.\n", length, MAX_PATH); - return; - } - p = buff + strlen(buff); - if (p > buff && p[-1] != '\\') *p++ = '\\'; - strcpy( p, filename ); - memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); /* Create an empty file */ @@ -3389,8 +3378,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3404,8 +3393,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3419,8 +3408,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3434,8 +3423,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); @@ -3447,8 +3436,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); retval = GetFileAttributesA(filename); ok( retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file\n" ); -- 2.25.1

1 0

[PATCH] winex11.drv: Redraw window on Expose event if window surface has no region set.
by Paul Gofman April 6, 2020

April 6, 2020

Otherwise the window (partially) obscured by the other window sometimes fails to update when the obscuring window is moved or destroyed. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/winex11.drv/bitblt.c | 5 +++++ dlls/winex11.drv/event.c | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index b530ba7ba6..ac430ef4c0 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2106,6 +2106,11 @@ HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) region = 0; } } + else + { + region = (HRGN)1; + } + window_surface->funcs->unlock( window_surface ); return region; } diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 10d71c2cb4..6424790a62 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -941,6 +941,7 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev ) { surface_region = expose_surface( data->surface, &rect ); if (!surface_region) flags = 0; + else if(surface_region == (HRGN)1) surface_region = NULL; else OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, data->whole_rect.top - data->client_rect.top ); -- 2.25.1

2 9