May 2020 - Wine-Commits - list.winehq.org

Jacek Caban : msdmo: Use proper buffer types in IEnumDMO::Next.
by Alexandre Julliard May 7, 2020

May 7, 2020

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

Stefan Dösinger : configure: Try -lgnutls as gnutls default lib.
by Alexandre Julliard May 7, 2020

May 7, 2020

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

Zhiyi Zhang : winex11.drv: Update _NET_WM_STATE before resizing windows.
by Alexandre Julliard May 7, 2020

May 7, 2020

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

Alexandre Julliard : kernel32/tests: Fix some incorrect FormatMessage() tests.
by Alexandre Julliard May 7, 2020

May 7, 2020

Module: wine Branch: master Commit: f00b88eabd6242ac70f37c0640e2d5f4f97b70c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f00b88eabd6242ac70f37c06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 16:16:34 2020 +0200 kernel32/tests: Fix some incorrect FormatMessage() tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 52 +++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index bbc4ac4387..75a8d8c5f7 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -140,24 +140,19 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); - /* s doesn't seem to work in format strings */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%!s!", 0, 0, out, ARRAY_SIZE(out), L"test"); - ok(!lstrcmpW(L"!s!", out), "failed out=%s\n", wine_dbgstr_w(out)); - ok(r==3, "failed: r=%d\n", r); - - /* nor ls */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%!ls!", 0, 0, out, ARRAY_SIZE(out), L"test"); - ok(!lstrcmpW(L"!ls!", out), "failed out=%s\n", wine_dbgstr_w(out)); + /* ls is unicode */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%1!ls!", 0, 0, out, ARRAY_SIZE(out), L"test"); + ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); - /* nor S */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%!S!", 0, 0, out, ARRAY_SIZE(out), L"test"); - ok(!lstrcmpW(L"!S!", out), "failed out=%s\n", wine_dbgstr_w(out)); - ok(r==3, "failed: r=%d\n", r); + /* S is ascii */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%1!S!", 0, 0, out, ARRAY_SIZE(out), "test"); + ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==4, "failed: r=%d\n", r); - /* nor ws */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%!ws!", 0, 0, out, ARRAY_SIZE(out), L"test"); - ok(!lstrcmpW(L"!ws!", out), "failed out=%s\n", wine_dbgstr_w(out)); + /* ws is unicode */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%1!ws!", 0, 0, out, ARRAY_SIZE(out), L"test"); + ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); /* as characters */ @@ -423,10 +418,10 @@ static void test_message_from_string(void) ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); - /* s doesn't seem to work in format strings */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%!s!", 0, 0, out, ARRAY_SIZE(out), "test"); - ok(!strcmp("!s!", out),"failed out=[%s]\n",out); - ok(r==3,"failed: r=%d\n",r); + /* s is ascii */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, 0, out, ARRAY_SIZE(out), "test"); + ok(!strcmp("test", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); /* ls is unicode */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!ls!", 0, 0, out, ARRAY_SIZE(out), L"test"); @@ -1051,9 +1046,6 @@ static void test_message_insufficient_buffer(void) static void test_message_insufficient_buffer_wide(void) { - static const WCHAR broken_buf[] = L"\0xxxxx"; - static const WCHAR broken2_buf[] = L"tes\0x"; - DWORD ret; WCHAR out[8]; @@ -1067,8 +1059,6 @@ static void test_message_insufficient_buffer_wide(void) ok(!lstrcmpW( out, L"xxxxxx" ), "Expected the buffer to be untouched\n"); - /* Windows Server 2003 and newer report failure but copy a - * truncated string to the buffer for non-zero buffer sizes. */ SetLastError(0xdeadbeef); lstrcpyW( out, L"xxxxxx" ); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, L"test", 0, 0, out, 1, NULL); @@ -1076,9 +1066,10 @@ static void test_message_insufficient_buffer_wide(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(!lstrcmpW( out, L"xxxxxx" ) || - broken(!memcmp(broken_buf, out, sizeof(broken_buf))), /* W2K3+ */ - "Expected the buffer to be untouched\n"); + todo_wine + ok(!memcmp(out, L"\0xxxxx", 6 * sizeof(WCHAR)) || + broken(!lstrcmpW( out, L"xxxxxx" )), /* winxp */ + "Expected the buffer to be truncated\n"); SetLastError(0xdeadbeef); lstrcpyW( out, L"xxxxxx" ); @@ -1087,9 +1078,10 @@ static void test_message_insufficient_buffer_wide(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(!lstrcmpW( out, L"xxxxxx" ) || - broken(!memcmp(broken2_buf, out, sizeof(broken2_buf))), /* W2K3+ */ - "Expected the buffer to be untouched\n"); + todo_wine + ok(!memcmp(out, L"tes\0xx", 6 * sizeof(WCHAR)) || + broken(!lstrcmpW( out, L"xxxxxx" )), /* winxp */ + "Expected the buffer to be truncated\n"); } static void test_message_null_buffer(void)

1 0

Zebediah Figura : quartz: Get rid of the IsDefault*Rect callbacks.
by Alexandre Julliard May 7, 2020

May 7, 2020

Module: wine Branch: master Commit: 779edf4def4089c12e4be5c21eb5b431f328ff09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=779edf4def4089c12e4be5c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:50 2020 -0500 quartz: Get rid of the IsDefault*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 | 4 ---- dlls/quartz/video.c | 8 ++++---- dlls/quartz/videorenderer.c | 18 ------------------ dlls/quartz/vmr9.c | 18 ------------------ 4 files changed, 4 insertions(+), 44 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 2aca600074..7f2372ce33 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -175,8 +175,6 @@ typedef struct tagBaseControlVideo typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); -typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultTargetRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); @@ -187,8 +185,6 @@ typedef struct BaseControlVideoFuncTable BaseControlVideo_GetSourceRect pfnGetSourceRect; BaseControlVideo_GetStaticImage pfnGetStaticImage; BaseControlVideo_GetTargetRect pfnGetTargetRect; - BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; - BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; BaseControlVideo_SetDefaultTargetRect pfnSetDefaultTargetRect; BaseControlVideo_SetSourceRect pfnSetSourceRect; diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index 213e3ce92d..2d002d8de4 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -592,16 +592,16 @@ static HRESULT WINAPI basic_video_GetCurrentImage(IBasicVideo *iface, LONG *pBuf static HRESULT WINAPI basic_video_IsUsingDefaultSource(IBasicVideo *iface) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); + FIXME("iface %p, stub!\n", iface); - return This->pFuncsTable->pfnIsDefaultSourceRect(This); + return S_OK; } static HRESULT WINAPI basic_video_IsUsingDefaultDestination(IBasicVideo *iface) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); + FIXME("iface %p, stub!\n", iface); - return This->pFuncsTable->pfnIsDefaultTargetRect(This); + return S_OK; } static const IBasicVideoVtbl basic_video_vtbl = diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b7a82e4faa..39d1586c77 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -352,22 +352,6 @@ static HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT return S_OK; } -static HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) -{ - struct video_renderer *This = impl_from_BaseControlVideo(iface); - FIXME("(%p/%p)->(): stub !!!\n", This, iface); - - return S_OK; -} - -static HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface) -{ - struct video_renderer *This = impl_from_BaseControlVideo(iface); - FIXME("(%p/%p)->(): stub !!!\n", This, iface); - - return S_OK; -} - static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface) { struct video_renderer *This = impl_from_BaseControlVideo(iface); @@ -408,8 +392,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VideoRenderer_GetSourceRect, VideoRenderer_GetStaticImage, VideoRenderer_GetTargetRect, - VideoRenderer_IsDefaultSourceRect, - VideoRenderer_IsDefaultTargetRect, VideoRenderer_SetDefaultSourceRect, VideoRenderer_SetDefaultTargetRect, VideoRenderer_SetSourceRect, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index abca2a03d1..c0d6799eec 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -772,22 +772,6 @@ static HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRe return S_OK; } -static HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) -{ - struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This); - - return S_OK; -} - -static HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This) -{ - struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This); - - return S_OK; -} - static HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) { struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); @@ -828,8 +812,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VMR9_GetSourceRect, VMR9_GetStaticImage, VMR9_GetTargetRect, - VMR9_IsDefaultSourceRect, - VMR9_IsDefaultTargetRect, VMR9_SetDefaultSourceRect, VMR9_SetDefaultTargetRect, VMR9_SetSourceRect,

1 0

Jacek Caban : winuser.h: Add touch event flags.
by Alexandre Julliard May 7, 2020

May 7, 2020

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

Nikolay Sivov : rtworkq: Invoke cancelled waiting item with RTWQ_E_OPERATION_CANCELLED.
by Alexandre Julliard May 7, 2020

May 7, 2020

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

Zebediah Figura : ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment().
by Alexandre Julliard May 7, 2020

May 7, 2020

Module: wine Branch: master Commit: e012bd5811784d953d576a4591c7be14234c92b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e012bd5811784d953d576a45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 09:40:27 2020 -0500 ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..3acf7f52d5 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -996,14 +996,21 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, */ void WINAPI RtlSetCurrentEnvironment(PWSTR new_env, PWSTR* old_env) { + WCHAR *prev; + TRACE("(%p %p)\n", new_env, old_env); RtlAcquirePebLock(); - if (old_env) *old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + prev = NtCurrentTeb()->Peb->ProcessParameters->Environment; NtCurrentTeb()->Peb->ProcessParameters->Environment = new_env; RtlReleasePebLock(); + + if (old_env) + *old_env = prev; + else + RtlDestroyEnvironment( prev ); }

1 0

Zebediah Figura : quartz: Retrieve the video format directly from the pin.
by Alexandre Julliard May 7, 2020

May 7, 2020

Module: wine Branch: master Commit: 1ba3f252b5d6c8eb082b6517a10596570282bf38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba3f252b5d6c8eb082b6517… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:49 2020 -0500 quartz: Retrieve the video format directly from the pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 3 +-- dlls/quartz/video.c | 43 ++++++++++++++++++++++++------------------- dlls/quartz/videorenderer.c | 23 ----------------------- dlls/quartz/vmr9.c | 23 ----------------------- 4 files changed, 25 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 9c39b642c4..2aca600074 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "dshow.h" +#include "dvdmedia.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/strmbase.h" @@ -174,7 +175,6 @@ typedef struct tagBaseControlVideo typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); -typedef VIDEOINFOHEADER* (WINAPI *BaseControlVideo_GetVideoFormat)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); @@ -187,7 +187,6 @@ typedef struct BaseControlVideoFuncTable BaseControlVideo_GetSourceRect pfnGetSourceRect; BaseControlVideo_GetStaticImage pfnGetStaticImage; BaseControlVideo_GetTargetRect pfnGetTargetRect; - BaseControlVideo_GetVideoFormat pfnGetVideoFormat; BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index 11baee261d..213e3ce92d 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -120,9 +120,24 @@ static HRESULT WINAPI basic_video_Invoke(IBasicVideo *iface, DISPID id, REFIID i return hr; } +static const VIDEOINFOHEADER *get_video_format(BaseControlVideo *video) +{ + /* Members of VIDEOINFOHEADER up to bmiHeader are identical to those of + * VIDEOINFOHEADER2. */ + return (const VIDEOINFOHEADER *)video->pPin->mt.pbFormat; +} + +static const BITMAPINFOHEADER *get_bitmap_header(BaseControlVideo *video) +{ + const AM_MEDIA_TYPE *mt = &video->pPin->mt; + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIME *pAvgTimePerFrame) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); if (!pAvgTimePerFrame) @@ -132,14 +147,12 @@ static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIM TRACE("(%p/%p)->(%p)\n", This, iface, pAvgTimePerFrame); - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pAvgTimePerFrame = vih->AvgTimePerFrame; + *pAvgTimePerFrame = get_video_format(This)->AvgTimePerFrame; return S_OK; } static HRESULT WINAPI basic_video_get_BitRate(IBasicVideo *iface, LONG *pBitRate) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pBitRate); @@ -149,14 +162,12 @@ static HRESULT WINAPI basic_video_get_BitRate(IBasicVideo *iface, LONG *pBitRate if (!This->pPin->peer) return VFW_E_NOT_CONNECTED; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pBitRate = vih->dwBitRate; + *pBitRate = get_video_format(This)->dwBitRate; return S_OK; } static HRESULT WINAPI basic_video_get_BitErrorRate(IBasicVideo *iface, LONG *pBitErrorRate) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pBitErrorRate); @@ -166,37 +177,32 @@ static HRESULT WINAPI basic_video_get_BitErrorRate(IBasicVideo *iface, LONG *pBi if (!This->pPin->peer) return VFW_E_NOT_CONNECTED; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pBitErrorRate = vih->dwBitErrorRate; + *pBitErrorRate = get_video_format(This)->dwBitErrorRate; return S_OK; } static HRESULT WINAPI basic_video_get_VideoWidth(IBasicVideo *iface, LONG *pVideoWidth) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoWidth); if (!pVideoWidth) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pVideoWidth = vih->bmiHeader.biWidth; + *pVideoWidth = get_bitmap_header(This)->biWidth; return S_OK; } static HRESULT WINAPI basic_video_get_VideoHeight(IBasicVideo *iface, LONG *pVideoHeight) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); if (!pVideoHeight) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pVideoHeight = abs(vih->bmiHeader.biHeight); + *pVideoHeight = abs(get_bitmap_header(This)->biHeight); return S_OK; } @@ -550,16 +556,15 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa static HRESULT WINAPI basic_video_GetVideoSize(IBasicVideo *iface, LONG *pWidth, LONG *pHeight) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(This); TRACE("(%p/%p)->(%p, %p)\n", This, iface, pWidth, pHeight); if (!pWidth || !pHeight) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pHeight = vih->bmiHeader.biHeight; - *pWidth = vih->bmiHeader.biWidth; + *pHeight = bitmap_header->biHeight; + *pWidth = bitmap_header->biWidth; return S_OK; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 6e31e19695..b7a82e4faa 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -352,28 +352,6 @@ static HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT return S_OK; } -static VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) -{ - struct video_renderer *This = impl_from_BaseControlVideo(iface); - AM_MEDIA_TYPE *pmt; - - TRACE("(%p/%p)\n", This, iface); - - pmt = &This->renderer.sink.pin.mt; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { - return (VIDEOINFOHEADER*)pmt->pbFormat; - } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { - static VIDEOINFOHEADER vih; - VIDEOINFOHEADER2 *vih2 = (VIDEOINFOHEADER2*)pmt->pbFormat; - memcpy(&vih,vih2,sizeof(VIDEOINFOHEADER)); - memcpy(&vih.bmiHeader, &vih2->bmiHeader, sizeof(BITMAPINFOHEADER)); - return &vih; - } else { - ERR("Unknown format type %s\n", qzdebugstr_guid(&pmt->formattype)); - return NULL; - } -} - static HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) { struct video_renderer *This = impl_from_BaseControlVideo(iface); @@ -430,7 +408,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VideoRenderer_GetSourceRect, VideoRenderer_GetStaticImage, VideoRenderer_GetTargetRect, - VideoRenderer_GetVideoFormat, VideoRenderer_IsDefaultSourceRect, VideoRenderer_IsDefaultTargetRect, VideoRenderer_SetDefaultSourceRect, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8fdcb3809b..abca2a03d1 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -772,28 +772,6 @@ static HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRe return S_OK; } -static VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) -{ - struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - AM_MEDIA_TYPE *pmt; - - TRACE("(%p/%p)\n", pVMR9, This); - - pmt = &pVMR9->renderer.sink.pin.mt; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { - return (VIDEOINFOHEADER*)pmt->pbFormat; - } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { - static VIDEOINFOHEADER vih; - VIDEOINFOHEADER2 *vih2 = (VIDEOINFOHEADER2*)pmt->pbFormat; - memcpy(&vih,vih2,sizeof(VIDEOINFOHEADER)); - memcpy(&vih.bmiHeader, &vih2->bmiHeader, sizeof(BITMAPINFOHEADER)); - return &vih; - } else { - ERR("Unknown format type %s\n", qzdebugstr_guid(&pmt->formattype)); - return NULL; - } -} - static HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) { struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); @@ -850,7 +828,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VMR9_GetSourceRect, VMR9_GetStaticImage, VMR9_GetTargetRect, - VMR9_GetVideoFormat, VMR9_IsDefaultSourceRect, VMR9_IsDefaultTargetRect, VMR9_SetDefaultSourceRect,

1 0

Zebediah Figura : quartz: Rename "baseControlWindow" to "window".
by Alexandre Julliard May 7, 2020

May 7, 2020

Module: wine Branch: master Commit: 855f17f3498802f8023213127607f37c3a58b88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=855f17f3498802f802321312… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:48 2020 -0500 quartz: Rename "baseControlWindow" to "window". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 57 +++++++++++++++++++++++---------------------- dlls/quartz/vmr9.c | 46 ++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=855f17f3498802f80232…

1 0