August 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw: Use wined3d_resource_unmap() in d3d_vertex_buffer7_Unlock().
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: bd7d8fc04f0c59241863c1518cbabf1a947c9f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7d8fc04f0c59241863c1518… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:01 2016 +0200 ddraw: Use wined3d_resource_unmap() in d3d_vertex_buffer7_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index a0cc3f6..797afe2 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -309,7 +309,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : wined3d: Use wined3d_resource_map() in d3d_vertex_buffer7_Lock().
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 7834f00be5a1b0e764de3e85bc3146945bbdf330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7834f00be5a1b0e764de3e85b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:00 2016 +0200 wined3d: Use wined3d_resource_map() in d3d_vertex_buffer7_Lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index a88d5b5..a0cc3f6 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -227,6 +227,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, struct d3d_vertex_buffer *buffer = impl_from_IDirect3DVertexBuffer7(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; + struct wined3d_map_desc wined3d_map_desc; HRESULT hr; DWORD wined3d_flags = 0; @@ -273,7 +274,9 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, *data_size = wined3d_desc.size; } - hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, wined3d_flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, NULL, wined3d_flags); + *data = wined3d_map_desc.data; wined3d_mutex_unlock();

1 0

Hugh McMaster : reg/tests: Remove embedded BOM tests and add other tests for 'reg import'.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: ae7398e3a498488996e764bd585d6a85de15460c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7398e3a498488996e764bd5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Aug 28 09:35:54 2016 +0000 reg/tests: Remove embedded BOM tests and add other tests for 'reg import'. BOM may only appear at the start of the data stream. Use of an embedded BOM was deprecated in Unicode 3.2. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index bd25a94..1dab72b 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -927,6 +927,18 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfREGEDIT4\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_wstr("\xef\xbb\xbf REGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbf\tREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbf\nREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -971,18 +983,6 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr(" \xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, - "got exit code %d, expected 1\n", r); - - test_import_wstr("\t\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, - "got exit code %d, expected 1\n", r); - - test_import_wstr("\n\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, - "got exit code %d, expected 1\n", r); - test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Andrew Eikum : mmdevapi/tests: Fix failure on Vista.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 25dbca10dcf6a67628f336dbd959ecfd1181e9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dbca10dcf6a67628f336dbd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 26 11:44:27 2016 -0500 mmdevapi/tests: Fix failure on Vista. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/propstore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 6447113..02340ba 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -118,7 +118,8 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_name || + broken(!found_name) /* vista */, "DEVPKEY_Device_FriendlyName not found\n"); ok(found_desc, "DEVPKEY_Device_DeviceDesc not found\n"); }

1 0

Nikolay Sivov : winegstreamer: Remove some casts that are not needed.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 6dc6f7fe4d1b7f7b40500bb6055e9cc53d76dde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc6f7fe4d1b7f7b40500bb60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 23:16:09 2016 +0300 winegstreamer: Remove some casts that are not needed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 67 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f257202..5db99c8 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -788,7 +788,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) TRACE("%p %p %p\n", This, bin, pad); piOutput.dir = PINDIR_OUTPUT; - piOutput.pFilter = (IBaseFilter *)This; + piOutput.pFilter = &This->filter.IBaseFilter_iface; name = gst_pad_get_name(pad); MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1); TRACE("Name: %s\n", name); @@ -1193,20 +1193,20 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) { GSTImpl *This = (GSTImpl *)iface; + IPin *pin; + TRACE("%p: Asking for pos %x\n", This, pos); if (pos > This->cStreams || pos < 0) return NULL; + if (!pos) - { - IPin_AddRef((IPin*)&This->pInputPin); - return (IPin*)&This->pInputPin; - } + pin = &This->pInputPin.pin.IPin_iface; else - { - IPin_AddRef((IPin*)This->ppPins[pos - 1]); - return (IPin*)This->ppPins[pos - 1]; - } + pin = &This->ppPins[pos - 1]->pin.pin.IPin_iface; + + IPin_AddRef(pin); + return pin; } static LONG WINAPI GST_GetPinCount(BaseFilter *iface) @@ -1238,13 +1238,13 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) mark_wine_thread(); This = CoTaskMemAlloc(sizeof(*This)); - obj = (IUnknown*)This; if (!This) { *phr = E_OUTOFMEMORY; return NULL; } + obj = (IUnknown*)&This->filter.IBaseFilter_iface; BaseFilter_Init(&This->filter, &GST_Vtbl, &CLSID_Gstreamer_Splitter, (DWORD_PTR)(__FILE__ ": GSTImpl.csFilter"), &BaseFuncTable); This->cStreams = 0; @@ -1255,7 +1255,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; - piInput->pFilter = (IBaseFilter *)This; + piInput->pFilter = &This->filter.IBaseFilter_iface; lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; @@ -1285,17 +1285,17 @@ static void GST_Destroy(GSTImpl *This) hr = IPin_Disconnect(connected); assert(hr == S_OK); IPin_Release(connected); - hr = IPin_Disconnect((IPin *)&This->pInputPin); + hr = IPin_Disconnect(&This->pInputPin.pin.IPin_iface); assert(hr == S_OK); } - pinref = IPin_Release((IPin *)&This->pInputPin); + pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); if (pinref) { /* Valgrind could find this, if I kill it here */ ERR("pinref should be null, is %u, destroying anyway\n", pinref); assert((LONG)pinref > 0); while (pinref) - pinref = IPin_Release((IPin *)&This->pInputPin); + pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); } if (This->bus) { gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL); @@ -1313,14 +1313,13 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IPersist) || + IsEqualIID(riid, &IID_IMediaFilter) || + IsEqualIID(riid, &IID_IBaseFilter)) + { + *ppv = &This->filter.IBaseFilter_iface; + } if (*ppv) { IUnknown_AddRef((IUnknown *)(*ppv)); @@ -1426,7 +1425,7 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) This->filter.rtStreamStart = tStart; for (i = 0; i < This->cStreams; i++) { - hr = BaseOutputPinImpl_Active((BaseOutputPin *)This->ppPins[i]); + hr = BaseOutputPinImpl_Active(&This->ppPins[i]->pin); if (SUCCEEDED(hr)) { hr_any = hr; } @@ -1518,19 +1517,19 @@ static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) static HRESULT WINAPI GST_Seeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppv) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); + return IPin_QueryInterface(&This->pin.pin.IPin_iface, riid, ppv); } static ULONG WINAPI GST_Seeking_AddRef(IMediaSeeking *iface) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_AddRef((IUnknown *)This); + return IPin_AddRef(&This->pin.pin.IPin_iface); } static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_Release((IUnknown *)This); + return IPin_Release(&This->pin.pin.IPin_iface); } static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFERENCE_TIME *pos) @@ -1650,25 +1649,25 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = static inline GSTOutPin *impl_from_IQualityControl( IQualityControl *iface ) { - return (GSTOutPin*)CONTAINING_RECORD(iface, GSTOutPin, IQualityControl_iface); + return CONTAINING_RECORD(iface, GSTOutPin, IQualityControl_iface); } static HRESULT WINAPI GST_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_QueryInterface((IPin*)pin, riid, ppv); + return IPin_QueryInterface(&pin->pin.pin.IPin_iface, riid, ppv); } static ULONG WINAPI GST_QualityControl_AddRef(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_AddRef((IPin*)pin); + return IPin_AddRef(&pin->pin.pin.IPin_iface); } static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_Release((IPin*)pin); + return IPin_Release(&pin->pin.pin.IPin_iface); } static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) @@ -1889,13 +1888,13 @@ static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDI memset((char*)pin + sizeof(pin->pin), 0, sizeof(GSTOutPin) - sizeof(pin->pin)); pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; pin->caps_event = CreateEventW(NULL, 0, 0, NULL); pin->segment = gst_segment_new(); This->cStreams++; pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); - BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); + BaseFilterImpl_IncrementPinVersion(&This->filter); } else ERR("Failed with error %x\n", hr); return hr; @@ -1921,14 +1920,14 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) for (i = 0; i < This->cStreams; i++) { hr = BaseOutputPinImpl_BreakConnect(&ppOldPins[i]->pin); TRACE("Disconnect: %08x\n", hr); - IPin_Release((IPin*)ppOldPins[i]); + IPin_Release(&ppOldPins[i]->pin.pin.IPin_iface); } This->cStreams = 0; This->ppPins = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; - BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); + BaseFilterImpl_IncrementPinVersion(&This->filter); CoTaskMemFree(ppOldPins); return S_OK; }

1 0

Henri Verbeet : d3d8: Use wined3d_resource_map() in d3d8_indexbuffer_Lock( ).
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 9a82f0efa22d45460583f6b2824560ff204289dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a82f0efa22d45460583f6b28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:04 2016 +0200 d3d8: Use wined3d_resource_map() in d3d8_indexbuffer_Lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 7d0421d..2404506 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -465,14 +465,20 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o BYTE **data, DWORD flags) { struct d3d8_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer8(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); + wined3d_box.left = offset; + wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, offset, size, data, flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, &wined3d_box, flags); wined3d_mutex_unlock(); + *data = wined3d_map_desc.data; return hr; }

1 0

Henri Verbeet : d3d8: Use wined3d_resource_unmap() in d3d8_vertexbuffer_Unlock().
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 9853b59cd760d397963f6e1e4040c133ee001803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9853b59cd760d397963f6e1e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:03 2016 +0200 d3d8: Use wined3d_resource_unmap() in d3d8_vertexbuffer_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 4826fac..7d0421d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -207,7 +207,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Unlock(IDirect3DVertexBuffer8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

Akihiro Sagawa : user32: Create and destroy the default IME window implicitly.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 911d269be86051cf88337a2b1afe9aa49c3bc6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911d269be86051cf88337a2b1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 23 22:13:27 2016 +0900 user32: Create and destroy the default IME window implicitly. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 97 ++++++++++++++++++++++++++++++++++++++-------- dlls/imm32/imm32.spec | 2 + dlls/imm32/tests/imm32.c | 12 +++--- dlls/user32/misc.c | 4 ++ dlls/user32/user_private.h | 2 + dlls/user32/win.c | 15 +++++++ dlls/user32/win.h | 1 + 7 files changed, 110 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=911d269be86051cf88337…

1 0

Akihiro Sagawa : winex11: Use proper return type for process_events().
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 876d5de0b46d30b7a2977b0b66981345620955dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=876d5de0b46d30b7a2977b0b6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 28 23:30:43 2016 +0900 winex11: Use proper return type for process_events(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 94b70f7..a0bfe05 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -405,7 +405,7 @@ static inline BOOL call_event_handler( Display *display, XEvent *event ) /*********************************************************************** * process_events */ -static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) +static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) { XEvent event, prev_event; int count = 0;

1 0

Piotr Caban : user32: Fix DefWindowProc behavior on WM_NCRBUTTONDOWN message.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 1c73fcdbcba50fc8525371efb8711c1d2b173eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c73fcdbcba50fc8525371efb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 17:53:17 2016 +0200 user32: Fix DefWindowProc behavior on WM_NCRBUTTONDOWN message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 4 +--- dlls/user32/tests/msg.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 4516aa0..55b19cf 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1487,8 +1487,6 @@ LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) { case HTCAPTION: case HTSYSMENU: - if (!GetSystemMenu( hwnd, FALSE )) break; - SetCapture( hwnd ); for (;;) { @@ -1502,7 +1500,7 @@ LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) } ReleaseCapture(); if (hittest == HTCAPTION || hittest == HTSYSMENU) - SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, msg.lParam ); + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(msg.pt.x, msg.pt.y)); break; } return 0; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 61980df..9dc1120 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8199,6 +8199,12 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, return 0; } + if (message == WM_CONTEXTMENU) + { + /* don't create context menu */ + return 0; + } + defwndproc_counter++; ret = unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : DefWindowProcA(hwnd, message, wParam, lParam); @@ -13887,13 +13893,46 @@ static void test_paintingloop(void) DestroyWindow(hwnd); } +static const struct message NCRBUTTONDOWNSeq[] = +{ + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent }, + { WM_CONTEXTMENU, sent, /*hwnd*/0, -1 }, + { 0 } +}; + static void test_defwinproc(void) { HWND hwnd; MSG msg; BOOL gotwmquit = FALSE; - hwnd = CreateWindowExA(0, "static", "test_defwndproc", WS_POPUP, 0,0,0,0,0,0,0, NULL); + POINT pos; + RECT rect; + INT x, y; + LRESULT res; + + hwnd = CreateWindowExA(0, "TestWindowClass", "test_defwndproc", + WS_VISIBLE | WS_CAPTION | WS_OVERLAPPEDWINDOW, 0,0,500,100,0,0,0, NULL); assert(hwnd); + flush_events(); + + GetCursorPos(&pos); + GetWindowRect(hwnd, &rect); + x = (rect.left+rect.right) / 2; + y = rect.top + GetSystemMetrics(SM_CYFRAME) + 1; + SetCursorPos(x, y); + flush_events(); + res = DefWindowProcA( hwnd, WM_NCHITTEST, 0, MAKELPARAM(x, y)); + ok(res == HTCAPTION, "WM_NCHITTEST returned %ld\n", res); + + flush_sequence(); + PostMessageA( hwnd, WM_RBUTTONUP, 0, 0); + DefWindowProcA( hwnd, WM_NCRBUTTONDOWN, HTCAPTION, MAKELPARAM(x, y)); + ok_sequence(NCRBUTTONDOWNSeq, "WM_NCRBUTTONDOWN on caption", FALSE); + + SetCursorPos(pos.x, pos.y); + DefWindowProcA( hwnd, WM_ENDSESSION, 1, 0); while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) { if( msg.message == WM_QUIT) gotwmquit = TRUE;

1 0