wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Zebediah Figura : quartz: Get rid of the resize callback.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 013c024b2b1247727e20c83a2e0f190728c80df5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=013c024b2b1247727e20c83a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:22 2020 -0500 quartz: Get rid of the resize callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 4 ---- dlls/quartz/videorenderer.c | 11 ----------- dlls/quartz/vmr9.c | 11 ----------- dlls/quartz/window.c | 4 ++-- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index d3f3a8915a..33cfb5671f 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -106,11 +106,7 @@ struct video_window struct video_window_ops { - /* Required */ RECT (*get_default_rect)(struct video_window *window); - /* Optional, WinProc Related */ - BOOL (*resize)(struct video_window *window, LONG height, LONG width); - HRESULT (*get_current_image)(struct video_window *window, LONG *size, LONG *image); }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 8504a51d74..e004d0fc21 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -245,16 +245,6 @@ static RECT video_renderer_get_default_rect(struct video_window *iface) return defRect; } -static BOOL video_renderer_resize(struct video_window *iface, LONG Width, LONG Height) -{ - struct video_renderer *filter = impl_from_video_window(iface); - - TRACE("WM_SIZE %d %d\n", Width, Height); - GetClientRect(iface->hwnd, &filter->window.dst); - - return TRUE; -} - static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = VideoRenderer_CheckMediaType, @@ -317,7 +307,6 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG static const struct video_window_ops window_ops = { .get_default_rect = video_renderer_get_default_rect, - .resize = video_renderer_resize, .get_current_image = video_renderer_get_current_image, }; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 64ef4a53e3..758ede6155 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -663,16 +663,6 @@ static RECT vmr_get_default_rect(struct video_window *This) return defRect; } -static BOOL vmr_resize(struct video_window *This, LONG Width, LONG Height) -{ - struct quartz_vmr *pVMR9 = impl_from_video_window(This); - - TRACE("WM_SIZE %d %d\n", Width, Height); - GetClientRect(This->hwnd, &pVMR9->window.dst); - - return TRUE; -} - static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LONG *image) { struct quartz_vmr *filter = impl_from_video_window(iface); @@ -737,7 +727,6 @@ out: static const struct video_window_ops window_ops = { .get_default_rect = vmr_get_default_rect, - .resize = vmr_resize, .get_current_image = vmr_get_current_image, }; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index d383370e5d..ada6b99ddb 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -68,8 +68,8 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM } break; case WM_SIZE: - if (window->ops->resize) - return window->ops->resize(window, LOWORD(lparam), HIWORD(lparam)); + GetClientRect(window->hwnd, &window->dst); + break; } return DefWindowProcW(hwnd, message, wparam, lparam);

1 0

Zebediah Figura : quartz: Get rid of the SetDefault*Rect callbacks.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: 69011b371122722ce45fef117343e9c23d0e6747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69011b371122722ce45fef11… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 20:50:21 2020 -0500 quartz: Get rid of the SetDefault*Rect callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 2 -- dlls/quartz/videorenderer.c | 24 ------------------------ dlls/quartz/vmr9.c | 24 ------------------------ dlls/quartz/window.c | 7 +++++-- 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7e49367a93..d3f3a8915a 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -112,8 +112,6 @@ struct video_window_ops BOOL (*resize)(struct video_window *window, LONG height, LONG width); HRESULT (*get_current_image)(struct video_window *window, LONG *size, LONG *image); - HRESULT (WINAPI *pfnSetDefaultSourceRect)(struct video_window *window); - HRESULT (WINAPI *pfnSetDefaultTargetRect)(struct video_window *window); }; void video_window_cleanup(struct video_window *window) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ea5142e321..8504a51d74 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -314,35 +314,11 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG return S_OK; } -static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(struct video_window *iface) -{ - struct video_renderer *This = impl_from_video_window(iface); - - SetRect(&This->window.src, 0, 0, This->VideoWidth, This->VideoHeight); - - return S_OK; -} - -static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(struct video_window *iface) -{ - struct video_renderer *This = impl_from_video_window(iface); - RECT rect; - - if (!GetClientRect(This->window.hwnd, &rect)) - return E_FAIL; - - SetRect(&This->window.dst, 0, 0, rect.right, rect.bottom); - - return S_OK; -} - static const struct video_window_ops window_ops = { .get_default_rect = video_renderer_get_default_rect, .resize = video_renderer_resize, .get_current_image = video_renderer_get_current_image, - .pfnSetDefaultSourceRect = VideoRenderer_SetDefaultSourceRect, - .pfnSetDefaultTargetRect = VideoRenderer_SetDefaultTargetRect, }; static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4fb8ddc32f..64ef4a53e3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -734,35 +734,11 @@ out: return hr; } -static HRESULT WINAPI VMR9_SetDefaultSourceRect(struct video_window *iface) -{ - struct quartz_vmr *filter = impl_from_video_window(iface); - - SetRect(&filter->window.src, 0, 0, filter->VideoWidth, filter->VideoHeight); - - return S_OK; -} - -static HRESULT WINAPI VMR9_SetDefaultTargetRect(struct video_window *iface) -{ - RECT rect; - struct quartz_vmr *filter = impl_from_video_window(iface); - - if (!GetClientRect(filter->window.hwnd, &rect)) - return E_FAIL; - - SetRect(&filter->window.dst, 0, 0, rect.right, rect.bottom); - - return S_OK; -} - static const struct video_window_ops window_ops = { .get_default_rect = vmr_get_default_rect, .resize = vmr_resize, .get_current_image = vmr_get_current_image, - .pfnSetDefaultSourceRect = VMR9_SetDefaultSourceRect, - .pfnSetDefaultTargetRect = VMR9_SetDefaultTargetRect, }; static const IVideoWindowVtbl IVideoWindow_VTable = diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index ebd3ffe302..d383370e5d 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -1055,10 +1055,12 @@ static HRESULT WINAPI basic_video_GetSourcePosition(IBasicVideo *iface, static HRESULT WINAPI basic_video_SetDefaultSourcePosition(IBasicVideo *iface) { struct video_window *window = impl_from_IBasicVideo(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(window); TRACE("window %p.\n", window); - return window->ops->pfnSetDefaultSourceRect(window); + SetRect(&window->src, 0, 0, bitmap_header->biWidth, bitmap_header->biHeight); + return S_OK; } static HRESULT WINAPI basic_video_SetDestinationPosition(IBasicVideo *iface, @@ -1098,7 +1100,8 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa TRACE("window %p.\n", window); - return window->ops->pfnSetDefaultTargetRect(window); + GetClientRect(window->hwnd, &window->dst); + return S_OK; } static HRESULT WINAPI basic_video_GetVideoSize(IBasicVideo *iface, LONG *width, LONG *height)

1 0

Zebediah Figura : http.sys: Use a separate file and preprocessor directives to avoid duplication.
by Alexandre Julliard 08 May '20

08 May '20

Module: wine Branch: master Commit: cab14ee04c185061f986907f583d54b31fd3d737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cab14ee04c185061f986907f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 7 18:47:21 2020 -0500 http.sys: Use a separate file and preprocessor directives to avoid duplication. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 531 +++--------------------------------------------- dlls/http.sys/request.h | 310 ++++++++++++++++++++++++++++ 2 files changed, 336 insertions(+), 505 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cab14ee04c185061f986…

1 0

Alistair Leslie-Hughes : dmime: Support more common chunks.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: a897d858e4671e10e64ebf0bc3c0df6cb35944fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a897d858e4671e10e64ebf0b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 7 23:32:02 2020 +0200 dmime: Support more common chunks. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmobject.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 9ea31ab32a..1c9c1020ba 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -529,15 +529,30 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { switch (chunk.id) { + case DMUS_FOURCC_CATEGORY_CHUNK: + if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk, + desc->wszCategory, sizeof(desc->wszCategory)) == S_OK) + desc->dwValidData |= DMUS_OBJ_CATEGORY; + break; + case DMUS_FOURCC_DATE_CHUNK: + if ((supported & DMUS_OBJ_DATE) && stream_chunk_get_data(stream, &chunk, + &desc->ftDate, sizeof(desc->ftDate)) == S_OK) + desc->dwValidData |= DMUS_OBJ_DATE; + break; + case DMUS_FOURCC_FILE_CHUNK: + if ((supported & DMUS_OBJ_FILENAME) && stream_chunk_get_wstr(stream, &chunk, + desc->wszFileName, sizeof(desc->wszFileName)) == S_OK) + desc->dwValidData |= DMUS_OBJ_FILENAME; + break; case DMUS_FOURCC_GUID_CHUNK: if ((supported & DMUS_OBJ_OBJECT) && stream_chunk_get_data(stream, &chunk, &desc->guidObject, sizeof(desc->guidObject)) == S_OK) desc->dwValidData |= DMUS_OBJ_OBJECT; break; - case DMUS_FOURCC_CATEGORY_CHUNK: - if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk, - desc->wszCategory, sizeof(desc->wszCategory)) == S_OK) - desc->dwValidData |= DMUS_OBJ_CATEGORY; + case DMUS_FOURCC_NAME_CHUNK: + if ((supported & DMUS_OBJ_NAME) && stream_chunk_get_wstr(stream, &chunk, + desc->wszName, sizeof(desc->wszName)) == S_OK) + desc->dwValidData |= DMUS_OBJ_NAME; break; case DMUS_FOURCC_VERSION_CHUNK: if ((supported & DMUS_OBJ_VERSION) && stream_chunk_get_data(stream, &chunk,

1 0

Nikolay Sivov : mfplat: Add I420 format support for frame size helpers.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 6dc14ce6257a30960962555211d2d4cc89af0ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc14ce6257a309609625552… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 22:27:03 2020 +0300 mfplat: Add I420 format support for frame size helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 26 +++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 620e144d34..f92577a9cb 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1791,6 +1791,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_RGB8, 1, 3, 1, 0 }, { &MFVideoFormat_L8, 1, 3, 1, 0 }, { &MFVideoFormat_AYUV, 4, 3, 0, 1 }, + { &MFVideoFormat_I420, 1, 0, 0, 1 }, { &MFVideoFormat_IMC1, 2, 3, 0, 1 }, { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, @@ -1876,6 +1877,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('I','M','C','4'): case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -1917,6 +1919,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('I','M','C','4'): case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4bc0813624..8a52279a08 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3553,41 +3553,56 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_NV12, 1, 2, 6, 3 }, { &MFVideoFormat_NV12, 2, 2, 6, 6 }, { &MFVideoFormat_NV12, 3, 2, 12, 9 }, - { &MFVideoFormat_NV12, 4, 2, 12, 12 }, + { &MFVideoFormat_NV12, 4, 2, 12 }, + { &MFVideoFormat_NV12, 320, 240, 115200 }, { &MFVideoFormat_AYUV, 1, 1, 4 }, { &MFVideoFormat_AYUV, 2, 1, 8 }, { &MFVideoFormat_AYUV, 1, 2, 8 }, { &MFVideoFormat_AYUV, 4, 3, 48 }, + { &MFVideoFormat_AYUV, 320, 240, 307200 }, { &MFVideoFormat_IMC1, 1, 1, 4 }, { &MFVideoFormat_IMC1, 2, 1, 4 }, { &MFVideoFormat_IMC1, 1, 2, 8 }, { &MFVideoFormat_IMC1, 4, 3, 24 }, + { &MFVideoFormat_IMC1, 320, 240, 153600 }, { &MFVideoFormat_IMC3, 1, 1, 4 }, { &MFVideoFormat_IMC3, 2, 1, 4 }, { &MFVideoFormat_IMC3, 1, 2, 8 }, { &MFVideoFormat_IMC3, 4, 3, 24 }, + { &MFVideoFormat_IMC3, 320, 240, 153600 }, { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC2, 4, 2, 12, 12 }, + { &MFVideoFormat_IMC2, 4, 2, 12 }, + { &MFVideoFormat_IMC2, 320, 240, 115200 }, { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC4, 4, 2, 12, 12 }, + { &MFVideoFormat_IMC4, 4, 2, 12 }, + { &MFVideoFormat_IMC4, 320, 240, 115200 }, { &MFVideoFormat_YV12, 1, 1, 3, 1 }, { &MFVideoFormat_YV12, 2, 1, 3 }, { &MFVideoFormat_YV12, 1, 2, 6, 3 }, { &MFVideoFormat_YV12, 4, 3, 18 }, + { &MFVideoFormat_YV12, 320, 240, 115200 }, + + { &MFVideoFormat_I420, 1, 1, 3, 1 }, + { &MFVideoFormat_I420, 2, 1, 3 }, + { &MFVideoFormat_I420, 1, 2, 6, 3 }, + { &MFVideoFormat_I420, 4, 3, 18 }, + { &MFVideoFormat_I420, 320, 240, 115200 }, { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, + { &MFVideoFormat_YUY2, 320, 240, 153600 }, { &MFVideoFormat_UYVY, 2, 1, 4 }, { &MFVideoFormat_UYVY, 4, 3, 24 }, { &MFVideoFormat_UYVY, 128, 128, 32768 }, + { &MFVideoFormat_UYVY, 320, 240, 153600 }, }; unsigned int i; UINT32 size; @@ -4716,6 +4731,11 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_YV12, 1, 1 }, { &MFVideoFormat_YV12, 2, 2 }, { &MFVideoFormat_YV12, 3, 3 }, + { &MFVideoFormat_YV12, 320, 320 }, + { &MFVideoFormat_I420, 1, 1 }, + { &MFVideoFormat_I420, 2, 2 }, + { &MFVideoFormat_I420, 3, 3 }, + { &MFVideoFormat_I420, 320, 320 }, }; unsigned int i; LONG stride;

1 0

Nikolay Sivov : rtworkq: Invoke cancelled waiting item with RTWQ_E_OPERATION_CANCELLED.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: fde3bc0677ef984076bedeab1254deb34aaf0606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde3bc0677ef984076bedeab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 19:04:49 2020 +0300 rtworkq: Invoke cancelled waiting item with RTWQ_E_OPERATION_CANCELLED. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index ce06df1c8c..07d124cfb7 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -866,7 +866,11 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) { key >>= 32; if ((key & WAIT_ITEM_KEY_MASK) == WAIT_ITEM_KEY_MASK) + { + IRtwqAsyncResult_SetStatus(item->result, RTWQ_E_OPERATION_CANCELLED); + invoke_async_callback(item->result); CloseThreadpoolWait(item->u.wait_object); + } else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) CloseThreadpoolTimer(item->u.timer_object); else

1 0

Stefan Dösinger : configure: Try -lgnutls as gnutls default lib.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 7e0e556726deff3c93b2172de15cc1c523571b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0e556726deff3c93b2172d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:22:02 2020 +0200 configure: Try -lgnutls as gnutls default lib. This allows configure on MacOS to pick up a homebrew installed gnutls without PKGCONFIG and manually added GNUTLS_LIBS var. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3c6c360a44..809abefdec 100755 --- a/configure +++ b/configure @@ -13565,7 +13565,7 @@ if ${GNUTLS_LIBS:+false} :; then : fi fi - +GNUTLS_LIBS=${GNUTLS_LIBS:-"-lgnutls"} $as_echo "$as_me:${as_lineno-$LINENO}: gnutls cflags: $GNUTLS_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: gnutls libs: $GNUTLS_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS diff --git a/configure.ac b/configure.ac index d4a92d3cbb..3e0511325c 100644 --- a/configure.ac +++ b/configure.ac @@ -1449,7 +1449,7 @@ fi dnl **** Check for libgnutls **** if test "x$with_gnutls" != "xno" then - WINE_PACKAGE_FLAGS(GNUTLS,[gnutls],,,, + WINE_PACKAGE_FLAGS(GNUTLS,[gnutls],[-lgnutls],,, [AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],

1 0

Jacek Caban : winuser.h: Add touch event flags.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: d4bbda626ae34a63d5eda4963257b4dc3aeb98b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bbda626ae34a63d5eda496… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 7 16:31:25 2020 +0200 winuser.h: Add touch event flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index aa392d636c..311b1481be 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3400,6 +3400,18 @@ typedef struct tagTOUCHINPUT { } TOUCHINPUT, *PTOUCHINPUT; typedef TOUCHINPUT const * PCTOUCHINPUT; +#define TOUCHEVENTF_MOVE 0x0001 +#define TOUCHEVENTF_DOWN 0x0002 +#define TOUCHEVENTF_UP 0x0004 +#define TOUCHEVENTF_INRANGE 0x0008 +#define TOUCHEVENTF_PRIMARY 0x0010 +#define TOUCHEVENTF_NOCOALESCE 0x0020 +#define TOUCHEVENTF_PEN 0x0040 +#define TOUCHEVENTF_PALM 0x0080 + +#define TWF_FINETOUCH 0x0001 +#define TWF_WANTPALM 0x0002 + /* Gesture definitions */ DECLARE_HANDLE(HGESTUREINFO);

1 0

Jacek Caban : msdmo: Use proper buffer types in IEnumDMO::Next.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 8d0b0b7b0cc12fd23f6c5264ff56d84d280cddf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d0b0b7b0cc12fd23f6c5264… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 7 16:31:16 2020 +0200 msdmo: Use proper buffer types in IEnumDMO::Next. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 34532f58cf..1a35b41f46 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -519,6 +519,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( WCHAR szGuidKey[64]; WCHAR szKey[MAX_PATH]; WCHAR szValue[MAX_PATH]; + DMO_PARTIAL_MEDIATYPE types[100]; DWORD len; UINT count = 0; HRESULT hres = S_OK; @@ -572,31 +573,25 @@ static HRESULT WINAPI IEnumDMO_fnNext( { UINT i, j; DWORD cInTypes; - DMO_PARTIAL_MEDIATYPE* pInTypes; - - hres = read_types(hkey, szDMOInputType, &cInTypes, - sizeof(szValue)/sizeof(DMO_PARTIAL_MEDIATYPE), - (DMO_PARTIAL_MEDIATYPE*)szValue); + hres = read_types(hkey, szDMOInputType, &cInTypes, ARRAY_SIZE(types), types); if (FAILED(hres)) { RegCloseKey(hkey); continue; } - pInTypes = (DMO_PARTIAL_MEDIATYPE *)szValue; - TRACE("read %d intypes for %s:\n", cInTypes, debugstr_w(szKey)); for (i = 0; i < cInTypes; i++) { - TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), - debugstr_guid(&pInTypes[i].subtype)); + TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), + debugstr_guid(&types[i].subtype)); } for (i = 0; i < This->cInTypes; i++) { for (j = 0; j < cInTypes; j++) { - if (IsMediaTypeEqual(&pInTypes[j], &This->pInTypes[i])) + if (IsMediaTypeEqual(&types[j], &This->pInTypes[i])) break; } @@ -615,31 +610,25 @@ static HRESULT WINAPI IEnumDMO_fnNext( { UINT i, j; DWORD cOutTypes; - DMO_PARTIAL_MEDIATYPE* pOutTypes; - - hres = read_types(hkey, szDMOOutputType, &cOutTypes, - sizeof(szValue)/sizeof(DMO_PARTIAL_MEDIATYPE), - (DMO_PARTIAL_MEDIATYPE*)szValue); + hres = read_types(hkey, szDMOOutputType, &cOutTypes, ARRAY_SIZE(types), types); if (FAILED(hres)) { RegCloseKey(hkey); continue; } - pOutTypes = (DMO_PARTIAL_MEDIATYPE *)szValue; - TRACE("read %d outtypes for %s:\n", cOutTypes, debugstr_w(szKey)); for (i = 0; i < cOutTypes; i++) { - TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), - debugstr_guid(&pOutTypes[i].subtype)); + TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), + debugstr_guid(&types[i].subtype)); } for (i = 0; i < This->cOutTypes; i++) { for (j = 0; j < cOutTypes; j++) { - if (IsMediaTypeEqual(&pOutTypes[j], &This->pOutTypes[i])) + if (IsMediaTypeEqual(&types[j], &This->pOutTypes[i])) break; }

1 0

Zhiyi Zhang : winex11.drv: Update _NET_WM_STATE before resizing windows.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: c69bb0342ca5e2b30f542ad4e61ae6bc404f22a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69bb0342ca5e2b30f542ad4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 16:17:28 2020 +0800 winex11.drv: Update _NET_WM_STATE before resizing windows. According to the Extended Window Manager Hints (EWMH) spec 1.3 regarding _NET_WM_STATE_FULLSCREEN, "the Window Manager is responsible for restoring the original geometry after a switch from fullscreen back to normal window.", which means that removing _NET_WM_STATE_FULLSCREEN from a window may cause the window to receive a ConfigureNotify event to restore the window size, thus causing a application resize action to be overwritten by the window managers. Fix a game called Mugsters becomes maximized after exiting full screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 3 --- dlls/winex11.drv/window.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9845f9830d..700e60db17 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8452,10 +8452,7 @@ static void test_fullscreen(void) if (rc.right - rc.left == 100 && rc.bottom - rc.top == 100) break; } - /* FVWM used by TestBots are not EWMH compliant. So this bug doesn't appear. */ - todo_wine_if(rc.right - rc.left != 100) ok(rc.right - rc.left == 100, "Expect width %d, got %d.\n", 100, rc.right - rc.left); - todo_wine_if(rc.bottom - rc.top != 100) ok(rc.bottom - rc.top == 100, "Expect height %d, got %d.\n", 100, rc.bottom - rc.top); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 52e345ceb6..c773c278b7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1262,6 +1262,7 @@ static void sync_window_position( struct x11drv_win_data *data, set_size_hints( data, style ); set_mwm_hints( data, style, ex_style ); + update_net_wm_states( data ); data->configure_serial = NextRequest( data->display ); XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); #ifdef HAVE_LIBXSHAPE

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
75
Older →

Jump to page:

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-commits May 2020