December 2018 - Wine-Commits

Eberhard Beilharz : Add .editorconfig file.
by Alexandre Julliard Dec. 18, 2018

Dec. 18, 2018

Module: wine Branch: master Commit: 530df61f2f93270905f19c1318d03d985f77337c URL: https://source.winehq.org/git/wine.git/?a=commit;h=530df61f2f93270905f19c13… Author: Eberhard Beilharz <eb1(a)sil.org> Date: Thu Dec 13 09:04:00 2018 +0100 Add .editorconfig file. This allows editors and IDEs to automatically adjust settings to the coding style prefered by Wine (cf. https://editorconfig.org/) Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5f1c49f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +# Defaults +[*] +indent_style = space +indent_size = 4 +tab_width = 8 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +max_line_length = 100

1 0

Francois Gouget : wined3d: Make wined3d_adapter_init_format_info() static.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 1177d08245baa070fd3b66145ee42847f456efde URL: https://source.winehq.org/git/wine.git/?a=commit;h=1177d08245baa070fd3b6614… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:41:51 2018 +0100 wined3d: Make wined3d_adapter_init_format_info() static. It is no longer referenced in other source files. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index aa68799..f8da256 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3971,7 +3971,7 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, } } -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) +static BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) { unsigned int count = WINED3D_FORMAT_COUNT + ARRAY_SIZE(typeless_depth_stencil_formats); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a6715a..6e39db4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2707,7 +2707,6 @@ struct wined3d_caps_gl_ctx GLuint test_program_id; }; -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) DECLSPEC_HIDDEN; BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN;

1 0

Akihiro Sagawa : kernel32: Use Rtl function when the time zone name is useless.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 2ce076a502e97475a330cde793d0a1eb13d051f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ce076a502e97475a330cde7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 18 00:31:45 2018 +0900 kernel32: Use Rtl function when the time zone name is useless. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 69ebd82..c425eb8 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -689,8 +689,7 @@ BOOL WINAPI SystemTimeToTzSpecificLocalTime( } else { - if (GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_INVALID) - return FALSE; + RtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); } if (!SystemTimeToFileTime(lpUniversalTime, &ft)) @@ -735,8 +734,7 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( } else { - if (GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_INVALID) - return FALSE; + RtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); } if (!SystemTimeToFileTime(lpLocalTime, &ft)) @@ -1314,7 +1312,8 @@ VOID WINAPI GetSystemTime(LPSYSTEMTIME systime) BOOL WINAPI GetDaylightFlag(void) { TIME_ZONE_INFORMATION tzinfo; - return GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; + RtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); + return (TIME_ZoneID(&tzinfo) == TIME_ZONE_ID_DAYLIGHT); } /***********************************************************************

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 02d039b559eb02ff373e076a7f7de60bba097213 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d039b559eb02ff373e076a… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Dec 17 22:58:27 2018 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 977 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 479 insertions(+), 498 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02d039b559eb02ff373e…

1 0

Andre Heider : winegcc: Don't add the prefix's include dir using -isystem.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 9bb21d11352783307a978d777dc0ab5d474c09c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bb21d11352783307a978d77… Author: Andre Heider <a.heider(a)gmail.com> Date: Sun Dec 16 09:22:45 2018 +0100 winegcc: Don't add the prefix's include dir using -isystem. Always use -I, this fixes the include search path if the prefix is set to '/usr'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46293 Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b5fa881..71ebf12 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -698,7 +698,7 @@ no_compat_defines: strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR : "-I" INCLUDEDIR ); + strarray_add(comp_args, "-I" INCLUDEDIR ); strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); } else if (opts->wine_objdir)

1 0

Nikolay Sivov : shell32/tests: Fix some leaks (Valgrind).
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 9e99382bc38beea72c6d3fd61057c88dbba48601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e99382bc38beea72c6d3fd6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 08:16:10 2018 +0300 shell32/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bb303f6..beee31f 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5165,6 +5165,8 @@ static void test_GetDefaultColumn(void) hr = IShellFolder2_GetDefaultColumn(folder, 0, &sort, NULL); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(sort == 123, "Unexpected default column.\n"); + + IShellFolder2_Release(folder); } CoUninitialize();

1 0

Matteo Bruni : d3d9: Support drawing from D3DPOOL_SYSTEMMEM index buffers.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: f34a19e68eea12fd0ae0ddd88134031939383f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f34a19e68eea12fd0ae0ddd8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 17 23:17:22 2018 +0330 d3d9: Support drawing from D3DPOOL_SYSTEMMEM index buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 24 ++++++- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 44 +++++++++++-- dlls/d3d9/stateblock.c | 3 + dlls/d3d9/tests/visual.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 234 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f34a19e68eea12fd0ae0…

1 0

Hans Leidekker : winhttp: Fix handling of WINHTTP_OPTION_SECURITY_FLAGS.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 51f7680dccd4698fbceb7520f3e7fdccc293b7f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51f7680dccd4698fbceb7520… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 17 12:26:35 2018 +0100 winhttp: Fix handling of WINHTTP_OPTION_SECURITY_FLAGS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 15 +++++++-------- dlls/winhttp/tests/winhttp.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 39e8d82..82615ad 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -695,7 +695,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void { case WINHTTP_OPTION_SECURITY_FLAGS: { - DWORD flags = 0; + DWORD flags; int bits; if (!buffer || *buflen < sizeof(flags)) @@ -705,9 +705,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return FALSE; } - flags = 0; - if (hdr->flags & WINHTTP_FLAG_SECURE) flags |= SECURITY_FLAG_SECURE; - flags |= request->security_flags; + flags = request->security_flags; if (request->netconn) { bits = netconn_get_cipher_strength( request->netconn ); @@ -929,6 +927,10 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b case WINHTTP_OPTION_SECURITY_FLAGS: { DWORD flags; + static const DWORD accepted = SECURITY_FLAG_IGNORE_CERT_CN_INVALID | + SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | + SECURITY_FLAG_IGNORE_UNKNOWN_CA | + SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE; if (buflen < sizeof(DWORD)) { @@ -937,10 +939,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } flags = *(DWORD *)buffer; TRACE("0x%x\n", flags); - if (!(flags & (SECURITY_FLAG_IGNORE_CERT_CN_INVALID | - SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | - SECURITY_FLAG_IGNORE_UNKNOWN_CA | - SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE))) + if (flags && (flags & ~accepted)) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3f91251..91a9d53 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1033,7 +1033,7 @@ static void test_secure_connection(void) { static const char data_start[] = "<!DOCTYPE html PUBLIC"; HINTERNET ses, con, req; - DWORD size, status, policy, bitness, read_size, err, available_size, protocols; + DWORD size, status, policy, bitness, read_size, err, available_size, protocols, flags; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -1087,6 +1087,33 @@ static void test_secure_connection(void) req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + flags = 0xdeadbeef; + size = sizeof(flags); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, &size); + ok(ret, "failed to query security flags %u\n", GetLastError()); + ok(!flags, "got %08x\n", flags); + + flags = SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(ret, "failed to set security flags %u\n", GetLastError()); + + flags = SECURITY_FLAG_SECURE; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(!ret, "success\n"); + + flags = SECURITY_FLAG_STRENGTH_STRONG; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(!ret, "success\n"); + + flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | + SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(ret, "failed to set security flags %u\n", GetLastError()); + + flags = 0; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(ret, "failed to set security flags %u\n", GetLastError()); + ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); err = GetLastError(); ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %u\n", err);

1 0

Alistair Leslie-Hughes : user32: Don' t reset focus if current dialog is a child.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: d8a27a78dd83f52b26cf8b7711f3ea127c0b34f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8a27a78dd83f52b26cf8b77… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 14 04:00:43 2018 +0000 user32: Don't reset focus if current dialog is a child. The standard File Open Dialog creates an empty WS_EX_CONTROLPARENT child dialog which shouldn't receive focus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 5 +++- dlls/user32/tests/dialog.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 0b33a57..72e6eee 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SetFocus( focus ); } else - SetFocus( hwnd ); + { + if (!(template.style & WS_CHILD)) + SetFocus( hwnd ); + } } } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 631f3d3..8c9bd21 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -907,6 +907,56 @@ static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, return FALSE; } +static INT_PTR CALLBACK EmptyProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) { + case WM_INITDIALOG: + return TRUE; + } + return FALSE; +} + +static INT_PTR CALLBACK focusChildDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, + LPARAM lParam) +{ + static HWND hChildDlg; + + switch (uiMsg) + { + case WM_INITDIALOG: + { + RECT rectHwnd; + struct { + DLGTEMPLATE tmplate; + WORD menu,class,title; + } temp; + + SetFocus( GetDlgItem(hwnd, 200) ); + + GetClientRect(hwnd,&rectHwnd); + temp.tmplate.style = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE | DS_CONTROL | DS_3DLOOK; + temp.tmplate.dwExtendedStyle = 0; + temp.tmplate.cdit = 0; + temp.tmplate.x = 0; + temp.tmplate.y = 0; + temp.tmplate.cx = 0; + temp.tmplate.cy = 0; + temp.menu = temp.class = temp.title = 0; + + hChildDlg = CreateDialogIndirectParamA(g_hinst, &temp.tmplate, + hwnd, (DLGPROC)EmptyProcUserTemplate, 0); + ok(hChildDlg != 0, "Failed to create test dialog.\n"); + + return FALSE; + } + case WM_CLOSE: + DestroyWindow(hChildDlg); + return TRUE; + } + + return FALSE; +} + /* Helper for InitialFocusTest */ static const char * GetHwndString(HWND hw) { @@ -1093,6 +1143,29 @@ static void test_focus(void) DestroyWindow(hDlg); } + + /* Test 6: + * Select textbox's text on creation when WM_INITDIALOG creates a child dialog. */ + { + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + HWND edit; + + hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG_3", (LPCSTR)RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusChildDlgWinProc, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + edit = GetDlgItem(hDlg, 200); + + ok(GetFocus() == edit, "Focus not set to edit, focus=%p, dialog=%p, edit=%p\n", + GetFocus(), hDlg, edit); + + DestroyWindow(hDlg); + } } static void test_GetDlgItemText(void)

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 94c3cd2fe37a9d8d38c393ecf732812dca6c78c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c3cd2fe37a9d8d38c393ec… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 17 21:46:52 2018 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 444 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 207 insertions(+), 237 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94c3cd2fe37a9d8d38c3…

1 0