April 2019 - Wine-Commits - list.winehq.org

Akihiro Sagawa : comctl32/edit: Implement EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: ef94a9fc6c52fdbc76092e73964a1ed1082a7d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef94a9fc6c52fdbc76092e73… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:19 2019 +0900 comctl32/edit: Implement EC_USEFONTINFO margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/edit.c | 2 -- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 38a0d97..fc3742d 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2685,6 +2685,36 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) es->buffer_limit = limit; } +static BOOL is_cjk(HDC dc) +{ + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + + switch (GdiGetCodePage(dc)) { + case 932: case 936: case 949: case 950: case 1361: + return TRUE; + default: + return (GetTextCharsetInfo(dc, &fs, 0) != DEFAULT_CHARSET && + (fs.fsCsb[0] & FS_DBCS_MASK)); + } +} + +static int get_cjk_fontinfo_margin(int width, int side_bearing) +{ + int margin; + if (side_bearing < 0) + margin = min(-side_bearing, width/2); + else + margin = 0; + return margin; +} + +struct char_width_info { + INT min_lsb, min_rsb, unknown; +}; + +/* Undocumented gdi32 export */ +extern BOOL WINAPI GetCharWidthInfo(HDC, struct char_width_info *); /********************************************************************* * @@ -2714,9 +2744,18 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { - /* FIXME: figure out the CJK values. */ - default_left_margin = width / 2; - default_right_margin = width / 2; + struct char_width_info width_info; + + if (is_cjk(dc) && GetCharWidthInfo(dc, &width_info)) + { + default_left_margin = get_cjk_fontinfo_margin(width, width_info.min_lsb); + default_right_margin = get_cjk_fontinfo_margin(width, width_info.min_rsb); + } + else + { + default_left_margin = width / 2; + default_right_margin = width / 2; + } GetClientRect(es->hwndSelf, &rc); rc_width = !IsRectEmpty(&rc) ? rc.right - rc.left : 80; diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index b76a419..fa273a4 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1686,7 +1686,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk && expect != MAKELONG(size.cx / 2, size.cx / 2)) ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1706,7 +1705,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk && expect != MAKELONG(size.cx / 2, size.cx / 2)) ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Akihiro Sagawa : comctl32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 28400eff292796afcfaf73278cfd0bb444fc78a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28400eff292796afcfaf7327… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:17 2019 +0900 comctl32/tests: Use calculated EC_USEFONTINFO margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index fedd8dd..b76a419 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1603,6 +1603,16 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +static INT get_cjk_fontinfo_margin(INT width, INT side_bearing) +{ + INT margin; + if (side_bearing < 0) + margin = min(-side_bearing, width/2); + else + margin = 0; + return margin; +} + static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; @@ -1616,6 +1626,14 @@ static void test_margins_default(const char* facename, UINT charset) INT margins, expect; const UINT small_margins = MAKELONG(1, 5); const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; + struct char_width_info { + INT lsb, rsb, unknown; + } info; + HMODULE hgdi32; + BOOL (WINAPI *pGetCharWidthInfo)(HDC, struct char_width_info *); + + hgdi32 = GetModuleHandleA("gdi32.dll"); + pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1644,8 +1662,16 @@ static void test_margins_default(const char* facename, UINT charset) DeleteObject(hfont); return; } - expect = MAKELONG(size.cx / 2, size.cx / 2); cjk = is_cjk(hdc); + if (cjk && pGetCharWidthInfo && pGetCharWidthInfo(hdc, &info)) { + short left, right; + + left = get_cjk_fontinfo_margin(size.cx, info.lsb); + right = get_cjk_fontinfo_margin(size.cx, info.rsb); + expect = MAKELONG(left, right); + } + else + expect = MAKELONG(size.cx / 2, size.cx / 2); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1660,13 +1686,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); - } + todo_wine_if(cjk && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); /* ANSI version */ @@ -1685,13 +1706,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); - } + todo_wine_if(cjk && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); DeleteObject(hfont);

1 0

Akihiro Sagawa : comctl32/tests: Add Unicode version tests for Edit control margins.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 5012c1b18b1b80d24be6a094155f289305830236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5012c1b18b1b80d24be6a094… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:13 2019 +0900 comctl32/tests: Add Unicode version tests for Edit control margins. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 2a333c2..aa5ee66 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1611,6 +1611,7 @@ static void test_margins_default(UINT charset) RECT rect; INT margins, expect; const UINT small_margins = MAKELONG(1, 5); + const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1621,8 +1622,8 @@ static void test_margins_default(UINT charset) hfont = CreateFontIndirectA(&lf); ok(hfont != NULL, "got %p\n", hfont); - /* Big window rectangle */ - hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + /* Unicode version */ + hwnd = CreateWindowExW(0, EditW, strW, WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); @@ -1664,6 +1665,31 @@ static void test_margins_default(UINT charset) } DestroyWindow(hwnd); + /* ANSI version */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + } + DestroyWindow(hwnd); + DeleteObject(hfont); }

1 0

Vlad Bespalov : user32: Make LoadString[AW] patchable.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: fd5f03035c2e5c60178d4f74ec1d8a4a376f3c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5f03035c2e5c60178d4f74… Author: Vlad Bespalov <vlad.botanic(a)gmail.com> Date: Tue Feb 12 04:25:09 2019 -0500 user32: Make LoadString[AW] patchable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46626 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Vlad Bespalov <vlad.botanic(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 83442d8..8dad3d5 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -234,7 +236,7 @@ BOOL WINAPI DestroyAcceleratorTable( HACCEL handle ) /********************************************************************** * LoadStringW (USER32.@) */ -INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, +INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen ) { HGLOBAL hmem; @@ -289,7 +291,7 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, /********************************************************************** * LoadStringA (USER32.@) */ -INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) +INT WINAPI DECLSPEC_HOTPATCH LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) { HGLOBAL hmem; HRSRC hrsrc;

1 0

Alexandre Julliard : configure: Add check for recent enough bison.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: a4c93936c9493f7619e1877b522eeb809a390dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4c93936c9493f7619e1877b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 22:31:31 2019 +0200 configure: Add check for recent enough bison. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 20 ++++++++++++++++++++ configure.ac | 13 +++++++++++++ 2 files changed, 33 insertions(+) diff --git a/configure b/configure index 1ed30b9..e97f57f 100755 --- a/configure +++ b/configure @@ -5892,6 +5892,26 @@ if test "$BISON" = "none" then as_fn_error $? "no suitable bison found. Please install the 'bison' package." "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bison is recent enough" >&5 +$as_echo_n "checking whether bison is recent enough... " >&6; } +if ${wine_cv_recent_bison+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.y <<EOF +%define parse.error verbose +%% +empty: ; +EOF + if $BISON conftest.y >/dev/null 2>&5 + then + wine_cv_recent_bison=yes + else + wine_cv_recent_bison=no + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_recent_bison" >&5 +$as_echo "$wine_cv_recent_bison" >&6; } +test $wine_cv_recent_bison != no || as_fn_error $? "Your bison version is too old. Please install bison version 3.0 or newer." "$LINENO" 5 if test -n "$ac_tool_prefix"; then for ac_prog in ar gar diff --git a/configure.ac b/configure.ac index 68d52a8..d1502ba 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,19 @@ if test "$BISON" = "none" then AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.]) fi +AC_CACHE_CHECK([whether bison is recent enough],wine_cv_recent_bison, + [cat >conftest.y <<EOF +%define parse.error verbose +%% +empty: ; +EOF + if $BISON conftest.y >/dev/null 2>&AS_MESSAGE_LOG_FD + then + wine_cv_recent_bison=yes + else + wine_cv_recent_bison=no + fi]) +test $wine_cv_recent_bison != no || AC_MSG_ERROR([Your bison version is too old. Please install bison version 3.0 or newer.]) AC_CHECK_TOOLS(AR,[ar gar],ar) AC_CHECK_TOOL(STRIP,strip,strip)

1 0

Akihiro Sagawa : comctl32/tests: Tests default margin size with various font face and charset.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 95f7ad03e39946ee4d05c94e67b7d5bf7c7742f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95f7ad03e39946ee4d05c94e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:15 2019 +0900 comctl32/tests: Tests default margin size with various font face and charset. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 100 ++++++++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index aa5ee66..fedd8dd 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1485,13 +1485,17 @@ static void test_edit_control_scroll(void) DestroyWindow (hwEdit); } -static BOOL is_cjk_charset(HDC dc) +static BOOL is_cjk(HDC dc) { + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + switch (GdiGetCodePage(dc)) { case 932: case 936: case 949: case 950: case 1361: return TRUE; default: - return FALSE; + return (GetTextCharsetInfo(dc, &fs, 0) != DEFAULT_CHARSET && + (fs.fsCsb[0] & FS_DBCS_MASK)); } } @@ -1599,13 +1603,13 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } -static void test_margins_default(UINT charset) +static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk_charset; + BOOL cjk; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1617,7 +1621,7 @@ static void test_margins_default(UINT charset) lf.lfHeight = -11; lf.lfWeight = FW_NORMAL; lf.lfCharSet = charset; - strcpy(lf.lfFaceName, "Tahoma"); + strcpy(lf.lfFaceName, facename); hfont = CreateFontIndirectA(&lf); ok(hfont != NULL, "got %p\n", hfont); @@ -1641,7 +1645,7 @@ static void test_margins_default(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - cjk_charset = is_cjk_charset(hdc); + cjk = is_cjk(hdc); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1651,17 +1655,17 @@ static void test_margins_default(UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + if (!cjk) + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + if (!cjk) + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); } DestroyWindow(hwnd); @@ -1676,23 +1680,40 @@ static void test_margins_default(UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + if (!cjk) + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + if (!cjk) + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); } DestroyWindow(hwnd); DeleteObject(hfont); } +static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static BOOL is_font_installed(const char*name) +{ + HDC hdc = GetDC(NULL); + BOOL ret = FALSE; + + if (!EnumFontFamiliesA(hdc, name, find_font_proc, 0)) + ret = TRUE; + + ReleaseDC(NULL, hdc); + return ret; +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -1768,33 +1789,44 @@ static void test_margins(void) test_margins_usefontinfo(DEFAULT_CHARSET); - test_margins_default(ANSI_CHARSET); - test_margins_default(EASTEUROPE_CHARSET); + test_margins_default("Tahoma", ANSI_CHARSET); + test_margins_default("Tahoma", EASTEUROPE_CHARSET); - test_margins_default(SHIFTJIS_CHARSET); - test_margins_default(HANGUL_CHARSET); - test_margins_default(CHINESEBIG5_CHARSET); -} + test_margins_default("Tahoma", HANGUL_CHARSET); + test_margins_default("Tahoma", CHINESEBIG5_CHARSET); -static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) -{ - return 0; + if (is_font_installed("MS PGothic")) { + test_margins_default("MS PGothic", SHIFTJIS_CHARSET); + test_margins_default("MS PGothic", GREEK_CHARSET); + } + else + skip("MS PGothic is not available, skipping some margin tests\n"); + + if (is_font_installed("Ume P Gothic")) { + test_margins_default("Ume P Gothic", SHIFTJIS_CHARSET); + test_margins_default("Ume P Gothic", GREEK_CHARSET); + } + else + skip("Ume P Gothic is not available, skipping some margin tests\n"); + + if (is_font_installed("SimSun")) { + test_margins_default("SimSun", GB2312_CHARSET); + test_margins_default("SimSun", ANSI_CHARSET); + } + else + skip("SimSun is not available, skipping some margin tests\n"); } static void test_margins_font_change(void) { - DWORD margins, font_margins, ret; + DWORD margins, font_margins; HFONT hfont, hfont2; HWND hwEdit; LOGFONTA lf; - HDC hdc; - hdc = GetDC(0); - ret = EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0); - ReleaseDC(0, hdc); - if (ret) + if (!is_font_installed("Arial")) { - trace("Arial not found - skipping font change margin tests\n"); + skip("Arial not found - skipping font change margin tests\n"); return; }

1 0

Akihiro Sagawa : comctl32/tests: Move the default margin size tests into a separate function.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 21dcb1ec87f90b005d485fa5dac1c1e6fd1ff257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21dcb1ec87f90b005d485fa5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:11 2019 +0900 comctl32/tests: Move the default margin size tests into a separate function. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 93 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 70cb94e..2a333c2 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1501,7 +1501,6 @@ static void test_margins_usefontinfo(UINT charset) HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1536,29 +1535,14 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - cjk_charset = is_cjk_charset(hdc); - hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == 0, "got %x\n", margins); - SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); - margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); - margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); - expect = margins; - } + expect = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); DestroyWindow(hwnd); threshold = HIWORD(expect) + LOWORD(expect) + size.cx * 2; @@ -1615,6 +1599,74 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +static void test_margins_default(UINT charset) +{ + HWND hwnd; + HDC hdc; + TEXTMETRICW tm; + SIZE size; + BOOL cjk_charset; + LOGFONTA lf; + HFONT hfont; + RECT rect; + INT margins, expect; + const UINT small_margins = MAKELONG(1, 5); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -11; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = charset; + strcpy(lf.lfFaceName, "Tahoma"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "got %p\n", hfont); + + /* Big window rectangle */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + hdc = GetDC(hwnd); + hfont = SelectObject(hdc, hfont); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } + expect = MAKELONG(size.cx / 2, size.cx / 2); + cjk_charset = is_cjk_charset(hdc); + + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + } + DestroyWindow(hwnd); + + DeleteObject(hfont); +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -1689,6 +1741,13 @@ static void test_margins(void) but not by < Win 8 and Win 10. */ test_margins_usefontinfo(DEFAULT_CHARSET); + + test_margins_default(ANSI_CHARSET); + test_margins_default(EASTEUROPE_CHARSET); + + test_margins_default(SHIFTJIS_CHARSET); + test_margins_default(HANGUL_CHARSET); + test_margins_default(CHINESEBIG5_CHARSET); } static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)

1 0

Stefan Dösinger : winemac: Add +fps support for Vulkan.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: f5e00b0a3e621f493430cf111beea5a16feb0159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e00b0a3e621f493430cf11… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 20 16:05:40 2019 +0200 winemac: Add +fps support for Vulkan. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d49c9a1..ea785c9 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBMOLTENVK +WINE_DECLARE_DEBUG_CHANNEL(fps); + typedef VkFlags VkMacOSSurfaceCreateFlagsMVK; #define VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK 1000123000 @@ -463,7 +465,30 @@ static VkResult macdrv_vkGetSwapchainImagesKHR(VkDevice device, static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { TRACE("%p, %p\n", queue, present_info); - return pvkQueuePresentKHR(queue, present_info); + VkResult res = pvkQueuePresentKHR(queue, present_info); + + if (TRACE_ON(fps)) + { + static unsigned long frames, frames_total; + static long prev_time, start_time; + DWORD time; + + time = GetTickCount(); + frames++; + frames_total++; + if (time - prev_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", + queue, 1000.0 * frames / (time - prev_time), + 1000.0 * frames_total / (time - start_time)); + prev_time = time; + frames = 0; + if (!start_time) + start_time = time; + } + } + + return res; } static const struct vulkan_funcs vulkan_funcs =

1 0

Vijay Kiran Kamuju : include: Add CAL_UMALQURA definition to winnls.h.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 370441b33ddb8d9564028759fb267ba1d2ad0b9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=370441b33ddb8d9564028759… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 24 15:12:57 2019 +0200 include: Add CAL_UMALQURA definition to winnls.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index c8580bd..5e5d8d1 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -553,6 +553,8 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define CAL_GREGORIAN_ARABIC 10 #define CAL_GREGORIAN_XLIT_ENGLISH 11 #define CAL_GREGORIAN_XLIT_FRENCH 12 +#define CAL_PERSIAN 22 +#define CAL_UMALQURA 23 /* EnumCalendarInfo Flags */ #define ENUM_ALL_CALENDARS 0xffffffff /* Enumerate all calendars within a locale */

1 0

Erich E. Hoover : server: Add default security descriptor DACL for processes.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 5a79077250061662a68ae55e343000354b4b927d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a79077250061662a68ae55e… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon Apr 22 23:45:30 2019 +0200 server: Add default security descriptor DACL for processes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15980 Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 50 ++++++++++++++++++++++++++++++++++++++++++ server/process.c | 28 +++++++++++++++++++++-- 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3097a64..1c26228 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4687,10 +4687,12 @@ static void test_GetSecurityInfo(void) char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; PSID domain_users_sid = (PSID) domain_users_ptr, domain_sid; SID_IDENTIFIER_AUTHORITY sia = { SECURITY_NT_AUTHORITY }; + int domain_users_ace_id = -1, admins_ace_id = -1, i; DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; BOOL owner_defaulted, group_defaulted; + BOOL dacl_defaulted, dacl_present; ACL_SIZE_INFORMATION acl_size; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; @@ -4698,6 +4700,7 @@ static void test_GetSecurityInfo(void) PSID owner, group; BOOL bret = TRUE; PACL pDacl; + BYTE flags; DWORD ret; if (!pGetSecurityInfo || !pSetSecurityInfo) @@ -4848,6 +4851,53 @@ static void test_GetSecurityInfo(void) ok(group != NULL, "group should not be NULL\n"); ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n"); LocalFree(pSD); + + /* Test querying the DACL of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorDacl(pSD, &dacl_present, &pDacl, &dacl_defaulted); + ok(bret, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ok(dacl_present, "DACL should be present\n"); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityDescriptorDacl returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount != 0, "GetAclInformation returned no ACLs\n"); + for (i=0; i<acl_size.AceCount; i++) + { + bret = pGetAce(pDacl, i, (VOID **)&ace); + ok(bret, "Failed to get ACE %d.\n", i); + bret = EqualSid(&ace->SidStart, domain_users_sid); + if (bret) domain_users_ace_id = i; + bret = EqualSid(&ace->SidStart, admin_sid); + if (bret) admins_ace_id = i; + } + ok(domain_users_ace_id != -1 || broken(domain_users_ace_id == -1) /* win2k */, + "Domain Users ACE not found.\n"); + if (domain_users_ace_id != -1) + { + bret = pGetAce(pDacl, domain_users_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Domain Users ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE), + "Domain Users ACE has unexpected flags (0x%x != 0x%x)\n", flags, + INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); + ok(ace->Mask == GENERIC_READ, "Domain Users ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, GENERIC_READ); + } + ok(admins_ace_id != -1 || broken(admins_ace_id == -1) /* xp */, + "Builtin Admins ACE not found.\n"); + if (admins_ace_id != -1) + { + bret = pGetAce(pDacl, admins_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Admins ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == 0x0, "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); + ok(ace->Mask == PROCESS_ALL_ACCESS || broken(ace->Mask == 0x1f0fff) /* win2k */, + "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, PROCESS_ALL_ACCESS); + } + LocalFree(pSD); } static void test_GetSidSubAuthority(void) diff --git a/server/process.c b/server/process.c index dc50779..beaa686 100644 --- a/server/process.c +++ b/server/process.c @@ -680,15 +680,39 @@ static struct security_descriptor *process_get_sd( struct object *obj ) { size_t users_sid_len = security_sid_len( security_domain_users_sid ); size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + size_t dacl_len = sizeof(ACL) + 2 * offsetof( ACCESS_ALLOWED_ACE, SidStart ) + + users_sid_len + admins_sid_len; + ACCESS_ALLOWED_ACE *aaa; + ACL *dacl; - process_default_sd = mem_alloc( sizeof(*process_default_sd) + admins_sid_len + users_sid_len ); + process_default_sd = mem_alloc( sizeof(*process_default_sd) + admins_sid_len + users_sid_len + + dacl_len ); process_default_sd->control = SE_DACL_PRESENT; process_default_sd->owner_len = admins_sid_len; process_default_sd->group_len = users_sid_len; process_default_sd->sacl_len = 0; - process_default_sd->dacl_len = 0; + process_default_sd->dacl_len = dacl_len; memcpy( process_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); memcpy( (char *)(process_default_sd + 1) + admins_sid_len, security_domain_users_sid, users_sid_len ); + + dacl = (ACL *)((char *)(process_default_sd + 1) + admins_sid_len + users_sid_len); + dacl->AclRevision = ACL_REVISION; + dacl->Sbz1 = 0; + dacl->AclSize = dacl_len; + dacl->AceCount = 2; + dacl->Sbz2 = 0; + aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); + aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + aaa->Header.AceFlags = INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE; + aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + aaa->Mask = GENERIC_READ; + memcpy( &aaa->SidStart, security_domain_users_sid, users_sid_len ); + aaa = (ACCESS_ALLOWED_ACE *)((char *)aaa + aaa->Header.AceSize); + aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + aaa->Header.AceFlags = 0; + aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + admins_sid_len; + aaa->Mask = PROCESS_ALL_ACCESS; + memcpy( &aaa->SidStart, security_builtin_admins_sid, admins_sid_len ); } return process_default_sd; }

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.SystemDrive.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: fb26388b0a8efc05b3e479db837a380759153267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb26388b0a8efc05b3e479db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 24 12:58:11 2019 +0200 wbemprox: Implement Win32_OperatingSystem.SystemDrive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47065 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 12 ++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d4c2630..862e17f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -396,6 +396,8 @@ static const WCHAR prop_suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; +static const WCHAR prop_systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR prop_systemnameW[] = {'S','y','s','t','e','m','N','a','m','e',0}; static const WCHAR prop_tagW[] = @@ -601,6 +603,7 @@ static const struct column col_os[] = { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_systemdriveW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_totalvirtualmemorysizeW, CIM_UINT64 }, { prop_totalvisiblememorysizeW, CIM_UINT64 }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } @@ -1029,6 +1032,7 @@ struct record_operatingsystem UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + const WCHAR *systemdrive; UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; @@ -3102,6 +3106,13 @@ static WCHAR *get_systemdirectory(void) Wow64RevertWow64FsRedirection( redir ); return ret; } +static WCHAR *get_systemdrive(void) +{ + WCHAR *ret = heap_alloc( 3 * sizeof(WCHAR) ); /* "c:" */ + if (ret && GetEnvironmentVariableW( prop_systemdriveW, ret, 3 )) return ret; + heap_free( ret ); + return NULL; +} static WCHAR *get_codeset(void) { static const WCHAR fmtW[] = {'%','u',0}; @@ -3243,6 +3254,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); + rec->systemdrive = get_systemdrive(); rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 510e7aa..3453358 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1243,6 +1243,8 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR totalvisiblememorysizeW[] = {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR totalvirtualmemorysizeW[] = @@ -1398,6 +1400,15 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) trace( "totalvirtualmemorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, systemdriveW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get version %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "systemdrive: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query );

1 0

Hans Leidekker : wbemprox/tests: Introduce a helper to check properties.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 34d5f90db68a19ef191092757a3cecb00e227927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d5f90db68a19ef19109275… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 24 12:58:12 2019 +0200 wbemprox/tests: Introduce a helper to check properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 609 +++++++------------------------------------- 1 file changed, 88 insertions(+), 521 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34d5f90db68a19ef1910…

1 0

Erich E. Hoover : server: Add default security descriptor ownership for processes.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: e11e8705eb9fcb7c2ec736cf2f7e5036decf22cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11e8705eb9fcb7c2ec736cf… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon Apr 22 23:45:29 2019 +0200 server: Add default security descriptor ownership for processes. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++++ server/process.c | 26 +++++++++++++++++++++++++- server/security.h | 1 + server/token.c | 2 ++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64..3097a64 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4682,11 +4682,15 @@ static void test_acls(void) static void test_GetSecurityInfo(void) { + char domain_users_ptr[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + PSID domain_users_sid = (PSID) domain_users_ptr, domain_sid; + SID_IDENTIFIER_AUTHORITY sia = { SECURITY_NT_AUTHORITY }; DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + BOOL owner_defaulted, group_defaulted; ACL_SIZE_INFORMATION acl_size; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; @@ -4813,6 +4817,37 @@ static void test_GetSecurityInfo(void) } LocalFree(pSD); CloseHandle(obj); + + /* Obtain the "domain users" SID from the user SID */ + if (!AllocateAndInitializeSid(&sia, 4, *GetSidSubAuthority(user_sid, 0), + *GetSidSubAuthority(user_sid, 1), + *GetSidSubAuthority(user_sid, 2), + *GetSidSubAuthority(user_sid, 3), 0, 0, 0, 0, &domain_sid)) + { + win_skip("Failed to get current domain SID\n"); + return; + } + sid_size = sizeof(domain_users_ptr); + pCreateWellKnownSid(WinAccountDomainUsersSid, domain_sid, domain_users_sid, &sid_size); + FreeSid(domain_sid); + + /* Test querying the ownership of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetNamedSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, user_sid), + "Process owner SID != Administrators SID.\n"); + + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); + ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n"); + LocalFree(pSD); } static void test_GetSidSubAuthority(void) diff --git a/server/process.c b/server/process.c index 4a1cebf..dc50779 100644 --- a/server/process.c +++ b/server/process.c @@ -63,6 +63,7 @@ static void process_dump( struct object *obj, int verbose ); static struct object_type *process_get_type( struct object *obj ); static int process_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int process_map_access( struct object *obj, unsigned int access ); +static struct security_descriptor *process_get_sd( struct object *obj ); static void process_poll_event( struct fd *fd, int event ); static struct list *process_get_kernel_obj_list( struct object *obj ); static void process_destroy( struct object *obj ); @@ -80,7 +81,7 @@ static const struct object_ops process_ops = no_signal, /* signal */ no_get_fd, /* get_fd */ process_map_access, /* map_access */ - default_get_sd, /* get_sd */ + process_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ @@ -669,6 +670,29 @@ static struct list *process_get_kernel_obj_list( struct object *obj ) return &process->kernel_object; } +static struct security_descriptor *process_get_sd( struct object *obj ) +{ + static struct security_descriptor *process_default_sd; + + if (obj->sd) return obj->sd; + + if (!process_default_sd) + { + size_t users_sid_len = security_sid_len( security_domain_users_sid ); + size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + + process_default_sd = mem_alloc( sizeof(*process_default_sd) + admins_sid_len + users_sid_len ); + process_default_sd->control = SE_DACL_PRESENT; + process_default_sd->owner_len = admins_sid_len; + process_default_sd->group_len = users_sid_len; + process_default_sd->sacl_len = 0; + process_default_sd->dacl_len = 0; + memcpy( process_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); + memcpy( (char *)(process_default_sd + 1) + admins_sid_len, security_domain_users_sid, users_sid_len ); + } + return process_default_sd; +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/security.h b/server/security.h index 873bbc6..606dbb2 100644 --- a/server/security.h +++ b/server/security.h @@ -47,6 +47,7 @@ extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; +extern const PSID security_domain_users_sid; extern const PSID security_high_label_sid; diff --git a/server/token.c b/server/token.c index 5c35bcc..895809e 100644 --- a/server/token.c +++ b/server/token.c @@ -83,6 +83,7 @@ static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORIT static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID, 0, 0 } }; +static const SID_N(5) domain_users_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, DOMAIN_GROUP_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -92,6 +93,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; +const PSID security_domain_users_sid = (PSID)&domain_users_sid; const PSID security_high_label_sid = (PSID)&high_label_sid; static luid_t prev_luid_value = { 1000, 0 };

1 0

Alexandre Julliard : makefiles: Don't use -fno-builtin flag with MinGW.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 629f2e10b134982658070497e129f70cc8a424d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=629f2e10b134982658070497… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:54:14 2019 +0200 makefiles: Don't use -fno-builtin flag with MinGW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 60 ++++++++++++++++++++++++++++++--------------------------- configure.ac | 7 ++++++- tools/makedep.c | 1 - 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 158d983..1ed30b9 100755 --- a/configure +++ b/configure @@ -632,8 +632,8 @@ POLL_LIBS DL_LIBS TOOLSEXT UNWINDFLAGS -EXCESS_PRECISION_CFLAGS BUILTINFLAG +EXCESS_PRECISION_CFLAGS EXTRACFLAGS VKD3D_LIBS VKD3D_CFLAGS @@ -16568,33 +16568,7 @@ $as_echo "$ac_cv_c_gcc_strength_bug" >&6; } EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 -$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } -if ${ac_cv_cflags__fno_builtin+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fno-builtin" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__fno_builtin=yes -else - ac_cv_cflags__fno_builtin=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_builtin" >&5 -$as_echo "$ac_cv_cflags__fno_builtin" >&6; } -if test "x$ac_cv_cflags__fno_builtin" = xyes; then : - BUILTINFLAG="-fno-builtin" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the compiler supports -fno-strict-aliasing... " >&6; } if ${ac_cv_cflags__fno_strict_aliasing+:} false; then : $as_echo_n "(cached) " >&6 @@ -17113,6 +17087,36 @@ fi ;; esac done + case $host_os in + cygwin*|mingw32*) ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 +$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } +if ${ac_cv_cflags__fno_builtin+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-builtin" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_builtin=yes +else + ac_cv_cflags__fno_builtin=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_builtin" >&5 +$as_echo "$ac_cv_cflags__fno_builtin" >&6; } +if test "x$ac_cv_cflags__fno_builtin" = xyes; then : + BUILTINFLAG="-fno-builtin" + +fi ;; + esac + case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 $as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } diff --git a/configure.ac b/configure.ac index c2f97e0..68d52a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1937,7 +1937,6 @@ then fi dnl Check for some compiler flags - WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) dnl clang needs to be told to fail on unknown options @@ -1984,6 +1983,12 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= esac done + dnl Disable gcc builtins except for Mingw + case $host_os in + cygwin*|mingw32*) ;; + *) WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) ;; + esac + dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections case $host_cpu in *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; diff --git a/tools/makedep.c b/tools/makedep.c index 2fcb917..e4d48dd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2990,7 +2990,6 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output_filenames( make->include_args ); output_filenames( make->define_args ); output_filenames( extradefs ); - if (make->use_msvcrt) output_filenames( msvcrt_flags ); output_filenames( extra_cross_cflags ); output_filenames( cpp_flags ); output_filename( "$(CROSSCFLAGS)" );

1 0

Alexandre Julliard : makefiles: Build modules that use msvcrt as PE builtins.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 1f0a9c4c29bfa4a87fe8c0da9beb6fdc6b1f6fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0a9c4c29bfa4a87fe8c0da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:42:17 2019 +0200 makefiles: Build modules that use msvcrt as PE builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 584c5a0..2fcb917 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2077,7 +2077,8 @@ static int is_cross_compiled( struct makefile *make ) !make->is_win16 && !strarray_exists( &make->imports, "kernel" ) && (make->testdll || - !make->object_files.count)); + !make->object_files.count || + strarray_exists( &make->extradllflags, "-mno-cygwin" ))); } @@ -2951,6 +2952,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && (make->testdll || + strarray_exists( &make->extradllflags, "-mno-cygwin" ) || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib))); int need_obj = (!need_cross ||

1 0

Alexandre Julliard : makefiles: Build stub programs with msvcrt.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 4ec78dc7b5da680d7df01696bd15975b48471ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ec78dc7b5da680d7df01696… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:27:57 2019 +0200 makefiles: Build stub programs with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/arp/Makefile.in | 3 ++- programs/aspnet_regiis/Makefile.in | 3 ++- programs/cacls/Makefile.in | 3 ++- programs/conhost/Makefile.in | 3 ++- programs/dism/Makefile.in | 3 ++- programs/dpnsvr/Makefile.in | 3 ++- programs/fc/Makefile.in | 3 ++- programs/find/Makefile.in | 3 ++- programs/findstr/Makefile.in | 3 ++- programs/fsutil/Makefile.in | 3 ++- programs/icacls/Makefile.in | 3 ++- programs/lodctr/Makefile.in | 3 ++- programs/mofcomp/Makefile.in | 4 ++-- programs/mshta/Makefile.in | 3 ++- programs/msinfo32/Makefile.in | 3 ++- programs/netsh/Makefile.in | 3 ++- programs/ngen/Makefile.in | 3 ++- programs/powershell/Makefile.in | 3 ++- programs/regasm/Makefile.in | 3 ++- programs/regsvcs/Makefile.in | 3 ++- programs/sdbinst/Makefile.in | 3 ++- programs/secedit/Makefile.in | 3 ++- programs/servicemodelreg/Makefile.in | 3 ++- programs/shutdown/Makefile.in | 3 ++- programs/subst/Makefile.in | 3 ++- programs/systeminfo/Makefile.in | 3 ++- programs/tasklist/Makefile.in | 3 ++- programs/unlodctr/Makefile.in | 3 ++- programs/wevtutil/Makefile.in | 3 ++- programs/wmplayer/Makefile.in | 3 ++- programs/wusa/Makefile.in | 3 ++- 31 files changed, 62 insertions(+), 32 deletions(-) diff --git a/programs/arp/Makefile.in b/programs/arp/Makefile.in index 397848b..2a7d1cd 100644 --- a/programs/arp/Makefile.in +++ b/programs/arp/Makefile.in @@ -1,5 +1,6 @@ MODULE = arp.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/aspnet_regiis/Makefile.in b/programs/aspnet_regiis/Makefile.in index 12b8f71..38c7a2f 100644 --- a/programs/aspnet_regiis/Makefile.in +++ b/programs/aspnet_regiis/Makefile.in @@ -1,5 +1,6 @@ MODULE = aspnet_regiis.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/cacls/Makefile.in b/programs/cacls/Makefile.in index 5307a9d..26cc907 100644 --- a/programs/cacls/Makefile.in +++ b/programs/cacls/Makefile.in @@ -1,5 +1,6 @@ MODULE = cacls.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ cacls_main.c diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in index 821cb5f..75ec7df 100644 --- a/programs/conhost/Makefile.in +++ b/programs/conhost/Makefile.in @@ -1,5 +1,6 @@ MODULE = conhost.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = conhost.c diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in index 834d143..61d9fa4 100644 --- a/programs/dism/Makefile.in +++ b/programs/dism/Makefile.in @@ -1,4 +1,5 @@ MODULE = dism.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = dism.c diff --git a/programs/dpnsvr/Makefile.in b/programs/dpnsvr/Makefile.in index 1dac8a4..9bcf4ad 100644 --- a/programs/dpnsvr/Makefile.in +++ b/programs/dpnsvr/Makefile.in @@ -1,5 +1,6 @@ MODULE = dpnsvr.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/fc/Makefile.in b/programs/fc/Makefile.in index 96d878a..0a8f00f 100644 --- a/programs/fc/Makefile.in +++ b/programs/fc/Makefile.in @@ -1,4 +1,5 @@ MODULE = fc.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = fc.c diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index ef8d61b..0c6b334 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,4 +1,5 @@ MODULE = find.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = find.c diff --git a/programs/findstr/Makefile.in b/programs/findstr/Makefile.in index 10875af..0f29794 100644 --- a/programs/findstr/Makefile.in +++ b/programs/findstr/Makefile.in @@ -1,5 +1,6 @@ MODULE = findstr.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index f339c4c..64307e8 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,5 +1,6 @@ MODULE = fsutil.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/icacls/Makefile.in b/programs/icacls/Makefile.in index af919a5..7e3e50d 100644 --- a/programs/icacls/Makefile.in +++ b/programs/icacls/Makefile.in @@ -1,5 +1,6 @@ MODULE = icacls.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ icacls_main.c diff --git a/programs/lodctr/Makefile.in b/programs/lodctr/Makefile.in index e74b1b8..af26db5 100644 --- a/programs/lodctr/Makefile.in +++ b/programs/lodctr/Makefile.in @@ -1,5 +1,6 @@ MODULE = lodctr.exe -APPMODE = -mconsole IMPORTS = loadperf +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = lodctr_main.c diff --git a/programs/mofcomp/Makefile.in b/programs/mofcomp/Makefile.in index 43d9e38..77fac00 100644 --- a/programs/mofcomp/Makefile.in +++ b/programs/mofcomp/Makefile.in @@ -1,5 +1,5 @@ MODULE = mofcomp.exe -APPMODE = -mconsole -municode -IMPORTS = kernel32 + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = mofcomp.c diff --git a/programs/mshta/Makefile.in b/programs/mshta/Makefile.in index 3a61c3d..f11d8a4 100644 --- a/programs/mshta/Makefile.in +++ b/programs/mshta/Makefile.in @@ -1,5 +1,6 @@ MODULE = mshta.exe -APPMODE = -mwindows -municode + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in index d752c91..e3e657b 100644 --- a/programs/msinfo32/Makefile.in +++ b/programs/msinfo32/Makefile.in @@ -1,7 +1,8 @@ MODULE = msinfo32.exe -APPMODE = -mwindows -municode IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/netsh/Makefile.in b/programs/netsh/Makefile.in index 27e1c3d..a0c1359 100644 --- a/programs/netsh/Makefile.in +++ b/programs/netsh/Makefile.in @@ -1,4 +1,5 @@ MODULE = netsh.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = netsh.c diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in index 3aef1e5..9a8d744 100644 --- a/programs/ngen/Makefile.in +++ b/programs/ngen/Makefile.in @@ -1,5 +1,6 @@ MODULE = ngen.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ ngen_main.c diff --git a/programs/powershell/Makefile.in b/programs/powershell/Makefile.in index 8a8c319..ac596fc 100644 --- a/programs/powershell/Makefile.in +++ b/programs/powershell/Makefile.in @@ -1,5 +1,6 @@ MODULE = powershell.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/regasm/Makefile.in b/programs/regasm/Makefile.in index 45faee9..baa4f83 100644 --- a/programs/regasm/Makefile.in +++ b/programs/regasm/Makefile.in @@ -1,5 +1,6 @@ MODULE = regasm.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/regsvcs/Makefile.in b/programs/regsvcs/Makefile.in index 22eb542..880900a 100644 --- a/programs/regsvcs/Makefile.in +++ b/programs/regsvcs/Makefile.in @@ -1,5 +1,6 @@ MODULE = regsvcs.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/sdbinst/Makefile.in b/programs/sdbinst/Makefile.in index 460dd8f..05c60c0 100644 --- a/programs/sdbinst/Makefile.in +++ b/programs/sdbinst/Makefile.in @@ -1,5 +1,6 @@ MODULE = sdbinst.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in index 06dfd72..6700655 100644 --- a/programs/secedit/Makefile.in +++ b/programs/secedit/Makefile.in @@ -1,5 +1,6 @@ MODULE = secedit.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ main.c diff --git a/programs/servicemodelreg/Makefile.in b/programs/servicemodelreg/Makefile.in index d145650f..bc6e165 100644 --- a/programs/servicemodelreg/Makefile.in +++ b/programs/servicemodelreg/Makefile.in @@ -1,5 +1,6 @@ MODULE = servicemodelreg.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in index 0014021..a84eb89 100644 --- a/programs/shutdown/Makefile.in +++ b/programs/shutdown/Makefile.in @@ -1,5 +1,6 @@ MODULE = shutdown.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/subst/Makefile.in b/programs/subst/Makefile.in index 63d574f..3a1292b 100644 --- a/programs/subst/Makefile.in +++ b/programs/subst/Makefile.in @@ -1,5 +1,6 @@ MODULE = subst.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in index 72e4791..053c52e 100644 --- a/programs/systeminfo/Makefile.in +++ b/programs/systeminfo/Makefile.in @@ -1,5 +1,6 @@ MODULE = systeminfo.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/tasklist/Makefile.in b/programs/tasklist/Makefile.in index 6e97d2e..53e6b79 100644 --- a/programs/tasklist/Makefile.in +++ b/programs/tasklist/Makefile.in @@ -1,5 +1,6 @@ MODULE = tasklist.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = tasklist.c diff --git a/programs/unlodctr/Makefile.in b/programs/unlodctr/Makefile.in index f414ce9..8985ab1 100644 --- a/programs/unlodctr/Makefile.in +++ b/programs/unlodctr/Makefile.in @@ -1,5 +1,6 @@ MODULE = unlodctr.exe -APPMODE = -mconsole IMPORTS = loadperf +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = unlodctr_main.c diff --git a/programs/wevtutil/Makefile.in b/programs/wevtutil/Makefile.in index f6882b2..9dc0839 100644 --- a/programs/wevtutil/Makefile.in +++ b/programs/wevtutil/Makefile.in @@ -1,5 +1,6 @@ MODULE = wevtutil.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/wmplayer/Makefile.in b/programs/wmplayer/Makefile.in index be345a0..1a91e2a 100644 --- a/programs/wmplayer/Makefile.in +++ b/programs/wmplayer/Makefile.in @@ -1,5 +1,6 @@ MODULE = wmplayer.exe -APPMODE = -mwindows -municode + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin RC_SRCS = version.rc diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index 5068456..3042e86 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,5 +1,6 @@ MODULE = wusa.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c

1 0

Alexandre Julliard : makefiles: Allow using EXTRADLLFLAGS instead of APPMODE.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: a58f4abc08212116e39337c745aa6b5d3a7ca212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a58f4abc08212116e39337c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:27:39 2019 +0200 makefiles: Allow using EXTRADLLFLAGS instead of APPMODE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/Makefile.in | 3 ++- programs/reg/Makefile.in | 3 ++- programs/regedit/Makefile.in | 3 ++- programs/taskmgr/Makefile.in | 3 ++- programs/wordpad/Makefile.in | 3 ++- programs/xcopy/Makefile.in | 3 ++- tools/make_makefiles | 10 +++++++--- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 26e977d..06c5ff0 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -1,7 +1,8 @@ MODULE = notepad.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ dialog.c \ main.c diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 7c6a899..248b470 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -1,8 +1,9 @@ MODULE = reg.exe -APPMODE = -mconsole -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ export.c \ import.c \ diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 18602ef..5b9df84 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,8 +1,9 @@ MODULE = regedit.exe -APPMODE = -mwindows -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ about.c \ childwnd.c \ diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 6006ac3..c385e9b 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,7 +1,8 @@ MODULE = taskmgr.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = shell32 shlwapi comctl32 user32 gdi32 advapi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ about.c \ affinity.c \ diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 5778692..ea12d91 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -1,7 +1,8 @@ MODULE = wordpad.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ olecallback.c \ print.c \ diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 05931c5..5059e71 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -1,7 +1,8 @@ MODULE = xcopy.exe -APPMODE = -mconsole -municode -mno-cygwin IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ xcopy.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 111bc8f..7c376ac 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -229,7 +229,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE|EXTRADLLFLAGS)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -438,18 +438,21 @@ sub update_makefiles(@) elsif (defined($make{"MODULE"})) # dll or program { (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; + my $dllflags = $make{"EXTRADLLFLAGS"} || ""; + if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; die "Invalid MODULE in $file" if $name =~ /\./ && $make{"MODULE"} ne $name; if ($file =~ /^programs\//) { - die "APPMODE should be defined in $file" unless defined $make{"APPMODE"} ; - die "APPMODE should contain -mconsole or -mwindows in $file" unless $make{"APPMODE"} =~ /-m(console|windows)/; + die "EXTRADLLFLAGS should be defined in $file" unless $dllflags; + die "EXTRADLLFLAGS should contain -mconsole or -mwindows in $file" unless $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; } else { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; + die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.dll"; } if (defined $make{"IMPORTLIB"}) @@ -462,6 +465,7 @@ sub update_makefiles(@) elsif ($file =~ /^tools.*\/Makefile$/) { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; + die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; $args = ",,[test \"x\$enable_tools\" = xno]"; }

1 0

Nikolay Sivov : dbgeng: Set module timestamp field.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 173c720e59db999852f74011444c1fdb13ca0459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=173c720e59db999852f74011… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:33 2019 +0300 dbgeng: Set module timestamp field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 569b824..95a95b6 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -108,13 +108,28 @@ static WORD debug_target_get_module_machine(struct target_process *target, HMODU ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); if (dos.e_magic == IMAGE_DOS_SIGNATURE) { - ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* signature */, &machine, + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* PE signature */, &machine, sizeof(machine), NULL); } return machine; } +static DWORD debug_target_get_module_timestamp(struct target_process *target, HMODULE module) +{ + IMAGE_DOS_HEADER dos = { 0 }; + DWORD timestamp = 0; + + ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); + if (dos.e_magic == IMAGE_DOS_SIGNATURE) + { + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* PE signature */ + + FIELD_OFFSET(IMAGE_FILE_HEADER, TimeDateStamp), &timestamp, sizeof(timestamp), NULL); + } + + return timestamp; +} + static HRESULT debug_target_init_modules_info(struct target_process *target) { unsigned int i, count; @@ -156,6 +171,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) target->modules.info[i].params.Base = (ULONG_PTR)info.lpBaseOfDll; target->modules.info[i].params.Size = info.SizeOfImage; + target->modules.info[i].params.TimeDateStamp = debug_target_get_module_timestamp(target, modules[i]); GetModuleFileNameExA(target->handle, modules[i], target->modules.info[i].image_name, ARRAY_SIZE(target->modules.info[i].image_name));

1 0

Nikolay Sivov : dbgeng: Add IDebugSystemObjects stub.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 7118bfedd82c74b8f914f758a5dc2e040aff4d51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7118bfedd82c74b8f914f758… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:35 2019 +0300 dbgeng: Add IDebugSystemObjects stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7118bfedd82c74b8f914…

1 0

Nikolay Sivov : dbgeng: Add IDebugAdvanced stub.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: a36e03494e63ffe41cb6ffa8c103fe8b4b1f9706 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a36e03494e63ffe41cb6ffa8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:34 2019 +0300 dbgeng: Add IDebugAdvanced stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 95a95b6..b62e4ad 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -67,6 +67,7 @@ struct debug_client IDebugDataSpaces IDebugDataSpaces_iface; IDebugSymbols3 IDebugSymbols3_iface; IDebugControl2 IDebugControl2_iface; + IDebugAdvanced IDebugAdvanced_iface; LONG refcount; ULONG engine_options; struct list targets; @@ -259,6 +260,11 @@ static struct debug_client *impl_from_IDebugControl2(IDebugControl2 *iface) return CONTAINING_RECORD(iface, struct debug_client, IDebugControl2_iface); } +static struct debug_client *impl_from_IDebugAdvanced(IDebugAdvanced *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugAdvanced_iface); +} + static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugClient(iface); @@ -285,6 +291,10 @@ static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient *iface, { *obj = &debug_client->IDebugControl2_iface; } + else if (IsEqualIID(riid, &IID_IDebugAdvanced)) + { + *obj = &debug_client->IDebugAdvanced_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -3289,6 +3299,53 @@ static const IDebugControl2Vtbl debugcontrolvtbl = debugcontrol_OutputTextReplacements, }; +static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_QueryInterface(unk, riid, obj); +} + +static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced *iface) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_AddRef(unk); +} + +static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced *iface) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_Release(unk); +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *iface, void *context, + ULONG context_size) +{ + FIXME("%p, %p, %u stub.\n", iface, context, context_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced *iface, void *context, + ULONG context_size) +{ + FIXME("%p, %p, %u stub.\n", iface, context, context_size); + + return E_NOTIMPL; +} + +static const IDebugAdvancedVtbl debugadvancedvtbl = +{ + debugadvanced_QueryInterface, + debugadvanced_AddRef, + debugadvanced_Release, + /* IDebugAdvanced */ + debugadvanced_GetThreadContext, + debugadvanced_SetThreadContext, +}; + /************************************************************ * DebugExtensionInitialize (DBGENG.@) * @@ -3333,6 +3390,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->IDebugDataSpaces_iface.lpVtbl = &debugdataspacesvtbl; debug_client->IDebugSymbols3_iface.lpVtbl = &debugsymbolsvtbl; debug_client->IDebugControl2_iface.lpVtbl = &debugcontrolvtbl; + debug_client->IDebugAdvanced_iface.lpVtbl = &debugadvancedvtbl; debug_client->refcount = 1; list_init(&debug_client->targets);

1 0

Alexandre Julliard : makefiles: Build all tests with msvcrt.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: d4ef782db7928e0deed5f0b43a8a1557cae0358e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ef782db7928e0deed5f0b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 12:10:19 2019 +0200 makefiles: Build all tests with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/tests/advpack.c | 8 ++++---- dlls/kernel32/tests/debugger.c | 8 ++++---- dlls/kernel32/tests/process.c | 8 ++++---- dlls/msi/tests/custom.c | 8 ++++---- dlls/msi/tests/db.c | 8 ++++---- dlls/msvcirt/tests/Makefile.in | 1 - dlls/msvcp100/tests/Makefile.in | 1 - dlls/msvcp110/tests/Makefile.in | 1 - dlls/msvcp120/tests/Makefile.in | 1 - dlls/msvcp140/tests/Makefile.in | 1 - dlls/msvcp60/tests/Makefile.in | 1 - dlls/msvcp90/tests/Makefile.in | 1 - dlls/msvcr100/tests/Makefile.in | 1 - dlls/msvcr110/tests/Makefile.in | 1 - dlls/msvcr120/tests/Makefile.in | 1 - dlls/msvcr90/tests/Makefile.in | 1 - dlls/msvcrt/tests/Makefile.in | 1 - dlls/msvcrtd/tests/Makefile.in | 1 - dlls/shell32/tests/shlexec.c | 16 ++++++++-------- dlls/ucrtbase/tests/Makefile.in | 1 - programs/services/tests/service.c | 10 +++++----- tools/makedep.c | 1 + 22 files changed, 34 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4ef782db7928e0deed5…

1 0

Nikolay Sivov : dbgeng: Improve GetDebuggeeType() stub.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 3842fe5ae3957ff0f78f6cc2c83482c1361c0658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3842fe5ae3957ff0f78f6cc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:32 2019 +0300 dbgeng: Improve GetDebuggeeType() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 19 ++++++++++++++++--- include/dbgeng.h | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 287e0d8..569b824 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -2525,11 +2525,24 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputStackTrace(IDebugControl2 *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *_class, ULONG *qualifier) +static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *debug_class, + ULONG *qualifier) { - FIXME("%p, %p, %p stub.\n", iface, _class, qualifier); + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + static struct target_process *target; - return E_NOTIMPL; + FIXME("%p, %p, %p stub.\n", iface, debug_class, qualifier); + + *debug_class = DEBUG_CLASS_UNINITIALIZED; + *qualifier = 0; + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + *debug_class = DEBUG_CLASS_USER_WINDOWS; + *qualifier = DEBUG_USER_WINDOWS_PROCESS; + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugcontrol_GetActualProcessorType(IDebugControl2 *iface, ULONG *type) diff --git a/include/dbgeng.h b/include/dbgeng.h index 3017eda..0c97d2c 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -169,6 +169,27 @@ DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9 #define DEBUG_MODNAME_SYMBOL_FILE 3 #define DEBUG_MODNAME_MAPPED_IMAGE 4 +#define DEBUG_CLASS_UNINITIALIZED 0 +#define DEBUG_CLASS_KERNEL 1 +#define DEBUG_CLASS_USER_WINDOWS 2 +#define DEBUG_CLASS_IMAGE_FILE 3 + +#define DEBUG_DUMP_SMALL 1024 +#define DEBUG_DUMP_DEFAULT 1025 +#define DEBUG_DUMP_FULL 1026 +#define DEBUG_DUMP_IMAGE_FILE 1027 +#define DEBUG_DUMP_TRACE_LOG 1028 +#define DEBUG_DUMP_WINDOWS_CE 1029 +#define DEBUG_DUMP_ACTIVE 1030 + +#define DEBUG_USER_WINDOWS_PROCESS 0 +#define DEBUG_USER_WINDOWS_PROCESS_SERVER 1 +#define DEBUG_USER_WINDOWS_IDNA 2 +#define DEBUG_USER_WINDOWS_REPT 3 +#define DEBUG_USER_WINDOWS_SMALL_DUMP DEBUG_DUMP_SMALL +#define DEBUG_USER_WINDOWS_DUMP DEBUG_DUMP_DEFAULT +#define DEBUG_USER_WINDOWS_DUMP_WINDOWS_CE DEBUG_DUMP_WINDOWS_CE + #define DEBUG_INVALID_OFFSET ((ULONG64)-1) #define DEBUG_ANY_ID 0xffffffff

1 0

Alistair Leslie-Hughes : xinput: Check that we actually received a value before assignment.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 72e62952db9104b03d136d9fa0ebdb1e8aa6ae52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72e62952db9104b03d136d9f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 24 00:58:15 2019 +0000 xinput: Check that we actually received a value before assignment. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46999 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index c0c405f..1ccecb1 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -388,23 +388,29 @@ void HID_update_state(xinput_controller* device) } } - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); LeaveCriticalSection(&private->crit); }

1 0

Alexandre Julliard : makefiles: Build stub services with msvcrt.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 76e6883a5e2befc463911f8932a0d8a75439d670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76e6883a5e2befc463911f89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:32:32 2019 +0200 makefiles: Build stub services with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/plugplay/Makefile.in | 3 ++- programs/presentationfontcache/Makefile.in | 3 ++- programs/spoolsv/Makefile.in | 3 ++- programs/termsv/Makefile.in | 3 ++- programs/winmgmt/Makefile.in | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index 6291b59..e5d37e6 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,6 +1,7 @@ MODULE = plugplay.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in index d7cbfe1..0427090 100644 --- a/programs/presentationfontcache/Makefile.in +++ b/programs/presentationfontcache/Makefile.in @@ -1,6 +1,7 @@ MODULE = presentationfontcache.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index ca468b0..d9fb20a 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -1,6 +1,7 @@ MODULE = spoolsv.exe -APPMODE = -mconsole IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in index 81465f4..ea30120 100644 --- a/programs/termsv/Makefile.in +++ b/programs/termsv/Makefile.in @@ -1,6 +1,7 @@ MODULE = termsv.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/winmgmt/Makefile.in b/programs/winmgmt/Makefile.in index 0a3b08e..3b30f23 100644 --- a/programs/winmgmt/Makefile.in +++ b/programs/winmgmt/Makefile.in @@ -1,6 +1,7 @@ MODULE = winmgmt.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : testbot: Don't hardcode .exe.so extension.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: tools Branch: master Commit: 54520fa3fe29ff73b5d2552eeb42651bc1c42e5a URL: https://source.winehq.org/git/tools.git/?a=commit;h=54520fa3fe29ff73b5d2552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 00:40:25 2019 +0200 testbot: Don't hardcode .exe.so extension. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 6 +++--- testbot/lib/Build/Utils.pm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 7e6b822..f848157 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -99,7 +99,7 @@ sub DailyWineTest($$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$DataDir/$BaseName.report") { @@ -109,7 +109,7 @@ sub DailyWineTest($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; @@ -168,7 +168,7 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); if (!-f "$DataDir/$BaseName.report") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index b204386..254c762 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -383,7 +383,7 @@ sub CreateWinePrefix($;$) rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "reg.exe", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { return "Failed to disable the crash dialogs: $!"; }

1 0