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

Zebediah Figura : ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment().
by Alexandre Julliard 07 May '20

07 May '20

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 : kernelbase: Implement SetEnvironmentStrings().
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 877bf2a7a09b9fb21f1aeb7a576a033bf5910f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=877bf2a7a09b9fb21f1aeb7a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 09:40:28 2020 -0500 kernelbase: Implement SetEnvironmentStrings(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48308 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processenvironment-l1-1-0.spec | 2 +- .../api-ms-win-core-processenvironment-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/tests/environ.c | 86 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 3 +- dlls/kernelbase/process.c | 66 +++++++++++++++++ include/winbase.h | 3 + 7 files changed, 161 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=877bf2a7a09b9fb21f1a…

1 0

Alexandre Julliard : api-ms-win-core-windowserrorreporting-l1-1-0: Add WerUnregisterFile().
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 1b4c00d67c32efdc87833743d29b23e1569b25f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b4c00d67c32efdc87833743… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 11:30:26 2020 +0200 api-ms-win-core-windowserrorreporting-l1-1-0: Add WerUnregisterFile(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-windowserrorreporting-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec index 0404830f7b..8201b14cfb 100644 --- a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -3,7 +3,7 @@ @ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile @ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule -@ stub WerUnregisterFile +@ stdcall WerUnregisterFile(wstr) kernel32.WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock @ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule @ stub WerpNotifyLoadStringResource

1 0

Alexandre Julliard : kernel32/tests: Use wide character string literals in FormatMessage() tests.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: a946e7fbbe7151615eabfa5465ca741008e01c7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a946e7fbbe7151615eabfa54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 11:52:49 2020 +0200 kernel32/tests: Use wide character string literals in FormatMessage() tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 485 +++++++++++++++------------------------ 1 file changed, 187 insertions(+), 298 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a946e7fbbe7151615eab…

1 0

Alexandre Julliard : kernel32/tests: Fix some incorrect FormatMessage() tests.
by Alexandre Julliard 07 May '20

07 May '20

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

Zhiyi Zhang : user32/tests: Test restoring a full screen window with WS_THICKFRAME style.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 36b720357bcaf0a1e625f488e0c981ce10e8affa URL: https://source.winehq.org/git/wine.git/?a=commit;h=36b720357bcaf0a1e625f488… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 16:17:07 2020 +0800 user32/tests: Test restoring a full screen window with WS_THICKFRAME style. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 25d643f54a..9845f9830d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8306,6 +8306,7 @@ static void test_fullscreen(void) 0, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW }; WNDCLASSA cls; + int timeout; HWND hwnd; int i, j; POINT pt; @@ -8429,6 +8430,35 @@ static void test_fullscreen(void) } } + /* Test restoring a full screen window with WS_THICKFRAME style to normal */ + /* Add WS_THICKFRAME style later so that the window can cover the entire monitor */ + hwnd = CreateWindowA("fullscreen_class", NULL, WS_POPUP | WS_VISIBLE, 0, 0, mi.rcMonitor.right, + mi.rcMonitor.bottom, NULL, NULL, GetModuleHandleA(NULL), NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + /* Add WS_THICKFRAME and exit full screen */ + SetWindowLongA(hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE) | WS_THICKFRAME); + SetWindowPos(hwnd, 0, 0, 0, 100, 100, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS); + flush_events(TRUE); + + /* TestBots need about 1000ms to exit full screen */ + timeout = 1000; + while (timeout > 0) + { + timeout -= 200; + flush_events(TRUE); + GetWindowRect(hwnd, &rc); + 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); + UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); }

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

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

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

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