October 2016 - Wine-Commits

Nikolay Sivov : dbghelp: Recognize DW_FORM_flag_present.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 23c24693ddee41b5c758f2e9e3ddc9ea1d4252a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c24693ddee41b5c758f2e9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 26 03:08:17 2016 +0300 dbghelp: Recognize DW_FORM_flag_present. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99f56bf78d68684bd066d599792cec19885c9bee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 655c586..dcbcf0a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -462,6 +462,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, switch (abbrev_attr->form) { + case DW_FORM_flag_present: step = 0; break; case DW_FORM_ref_addr: case DW_FORM_addr: step = ctx->word_size; break; case DW_FORM_flag: @@ -509,6 +510,11 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, TRACE("flag<0x%lx>\n", attr->u.uvalue); break; + case DW_FORM_flag_present: + attr->u.uvalue = 1; + TRACE("flag_present\n"); + break; + case DW_FORM_data1: attr->u.uvalue = dwarf2_get_byte(data); TRACE("data1<%lu>\n", attr->u.uvalue);

1 0

Xiaoshan Sun : comctl32/dsa: Handle overflow in DSA_InsertItem().
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 8f7e06418c06ed41754f9a0b37585ead64cd2ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7e06418c06ed41754f9a0b3… Author: Xiaoshan Sun <sunxs(a)is.iscas.ac.cn> Date: Sun Jul 24 14:44:40 2016 +0300 comctl32/dsa: Handle overflow in DSA_InsertItem(). Signed-off-by: Xiaoshan Sun <sunxs(a)is.iscas.ac.cn> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0d57ff3d1f63f7486733f8619f3916867ebd26c5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/dsa.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index a73a54a..d5e8234 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -267,6 +267,9 @@ INT WINAPI DSA_InsertItem (HDSA hdsa, INT nIndex, LPVOID pSrc) nNewItems = hdsa->nMaxCount + hdsa->nGrow; nSize = hdsa->nItemSize * nNewItems; + if (nSize / hdsa->nItemSize != nNewItems) + return -1; + lpTemp = ReAlloc (hdsa->pData, nSize); if (!lpTemp) return -1;

1 0

Alistair Leslie-Hughes : comctl32/trackbar: Use WM_CTLCOLORSTATIC when painting background.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 124f418bdbdbb7f291a79e44e4b41c8b67d1537c URL: http://source.winehq.org/git/wine.git/?a=commit;h=124f418bdbdbb7f291a79e44e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 24 14:31:52 2016 +0300 comctl32/trackbar: Use WM_CTLCOLORSTATIC when painting background. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 430108c92af50b25e399fc41b15600b13719c26f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/trackbar.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index d534502..880acc7 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -956,8 +956,11 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) if (GetWindowTheme (infoPtr->hwndSelf)) { DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); } - else - FillRect (hdc, &rcClient, GetSysColorBrush(COLOR_BTNFACE)); + else { + HBRUSH brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); + FillRect (hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); + } if (gcdrf != CDRF_DODEFAULT) notify_customdraw(infoPtr, &nmcd, CDDS_POSTERASE); }

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb on range change.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: e2cad8c78d69b057f959d233f3086b15020e77f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cad8c78d69b057f959d233f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 23:39:53 2016 +0300 comctl32/trackbar: Update thumb on range change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cd55d747429980dea37295d0d6ce68e7b3c01686) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 23 +++++++++++++++++++++++ dlls/comctl32/trackbar.c | 16 ++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index adb1b12..918cf1a 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -687,6 +687,7 @@ static void test_position(void) static void test_range(void) { HWND hWndTrackbar; + RECT rect1, rect2; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -752,6 +753,28 @@ static void test_range(void) ok_sequence(sequences, TRACKBAR_SEQ_INDEX, range_test_seq, "range test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_range_test_seq, "parent range test sequence", TRUE); + /* TBM_SETRANGE updates thumb visual position (rectangle) if needed */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 10)); + ok(r == 0, "got %d\n", r); + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(!EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + + /* change range back, don't force repaint */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 12c3e9d..7ce1a51 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1249,21 +1249,21 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) infoPtr->lRangeMin = (SHORT)LOWORD(range); infoPtr->lRangeMax = (SHORT)HIWORD(range); - if (infoPtr->lPos < infoPtr->lRangeMin) { + /* clip position to new min/max limit */ + if (infoPtr->lPos < infoPtr->lRangeMin) infoPtr->lPos = infoPtr->lRangeMin; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } - if (infoPtr->lPos > infoPtr->lRangeMax) { + if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) - TRACKBAR_RecalculateTics (infoPtr); + if (changed) { + if (infoPtr->dwStyle & TBS_AUTOTICKS) + TRACKBAR_RecalculateTics (infoPtr); + infoPtr->flags |= TB_THUMBPOSCHANGED; + } if (redraw) TRACKBAR_InvalidateAll(infoPtr);

1 0

Kenneth Haley : v4 resend: Riched20: allow setting background text color.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 486752a5fe14d66c0bc36f7a551c251943a1b3fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=486752a5fe14d66c0bc36f7a5… Author: Kenneth Haley <haleykd(a)users.sf.net> Date: Mon Aug 15 13:03:07 2016 -0600 v4 resend: Riched20: allow setting background text color. Signed-off-by: Kenneth Haley <haleykd(a)users.sf.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fc1b2e0473d26ecb37575edae139e3a684e3d1c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 2 +- dlls/riched20/paint.c | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 49cfbb8..d6c606e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -489,7 +489,7 @@ void ME_RTFCharAttrHook(RTF_Info *info) { RTFColor *c = RTFGetColor(info, info->rtfParam); if (c && c->rtfCBlue >= 0) - fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + fmt.crBackColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); else fmt.dwEffects = CFE_AUTOBACKCOLOR; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f893061..be6e5d2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -201,6 +201,21 @@ static COLORREF get_text_color( ME_Context *c, ME_Style *style, BOOL highlight ) return color; } +static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) +{ + COLORREF color; + + if (highlight) + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ); + else if ( (style->fmt.dwMask & CFM_BACKCOLOR) + && !(style->fmt.dwEffects & CFE_AUTOBACKCOLOR) ) + color = style->fmt.crBackColor; + else + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_WINDOW ); + + return color; +} + static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) { *pen = NULL; @@ -313,14 +328,17 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in return; } - static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, RECT *sel_rect ) { COLORREF text_color = get_text_color( c, run->style, selected ); - COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; + COLORREF back_color = get_back_color( c, run->style, selected ); COLORREF old_text, old_back = 0; const WCHAR *text = get_text( run, 0 ); ME_String *masked = NULL; + const BOOL paint_bg = ( selected + || ( ( run->style->fmt.dwMask & CFM_BACKCOLOR ) + && !(CFE_AUTOBACKCOLOR & run->style->fmt.dwEffects) ) + ); if (c->editor->cPasswordMask) { @@ -329,16 +347,16 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, } old_text = SetTextColor( c->hDC, text_color ); - if (selected) old_back = SetBkColor( c->hDC, back_color ); + if (paint_bg) old_back = SetBkColor( c->hDC, back_color ); if (run->para->nFlags & MEPF_COMPLEX) - ScriptTextOut( c->hDC, &run->style->script_cache, x, y, selected ? ETO_OPAQUE : 0, sel_rect, + ScriptTextOut( c->hDC, &run->style->script_cache, x, y, paint_bg ? ETO_OPAQUE : 0, sel_rect, &run->script_analysis, NULL, 0, run->glyphs, run->num_glyphs, run->advances, NULL, run->offsets ); else - ExtTextOutW( c->hDC, x, y, selected ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); + ExtTextOutW( c->hDC, x, y, paint_bg ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); - if (selected) SetBkColor( c->hDC, old_back ); + if (paint_bg) SetBkColor( c->hDC, old_back ); SetTextColor( c->hDC, old_text ); draw_underline( c, run, x, y, text_color ); @@ -387,7 +405,18 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, hOldFont = ME_SelectStyleFont( c, run->style ); if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); - draw_text( c, run, x, y - yOffset, FALSE, NULL ); + + if (!(run->style->fmt.dwEffects & CFE_AUTOBACKCOLOR) + && (run->style->fmt.dwMask & CFM_BACKCOLOR) ) + { + RECT tmp_rect; + get_selection_rect( c, run, 0, run->len, cy, &tmp_rect ); + OffsetRect( &tmp_rect, x, ymin ); + draw_text( c, run, x, y - yOffset, FALSE, &tmp_rect ); + } + else + draw_text( c, run, x, y - yOffset, FALSE, NULL ); + if (sel_rgn) { ExtSelectClipRgn( hDC, clip, RGN_COPY );

1 0

Nikolay Sivov : user32: Handle invalid dialog handles in IsDialogMessage() .
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: ca8f2d9e0e46b9cf8bbb2d2da74ed5d843db32cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8f2d9e0e46b9cf8bbb2d2da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 16 10:38:32 2016 +0300 user32: Handle invalid dialog handles in IsDialogMessage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 17987c589fc4587b0adfb9de841adf1201efa111) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dialog.c | 3 +++ dlls/user32/tests/dialog.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 8df38c9..38e4053 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1176,6 +1176,9 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { INT dlgCode = 0; + if (!IsWindow( hwndDlg )) + return FALSE; + if (CallMsgFilterW( msg, MSGF_DIALOGBOX )) return TRUE; hwndDlg = WIN_GetFullHandle( hwndDlg ); diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 3488f31..bbe8e47 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -719,8 +719,23 @@ static void test_WM_NEXTDLGCTL(void) DestroyWindow(g_hwndTestDlg); } +static LRESULT CALLBACK hook_proc(INT code, WPARAM wParam, LPARAM lParam) +{ + ok(0, "unexpected hook called, code %d\n", code); + return CallNextHookEx(NULL, code, wParam, lParam); +} + +static BOOL g_MSGF_DIALOGBOX; +static LRESULT CALLBACK hook_proc2(INT code, WPARAM wParam, LPARAM lParam) +{ + ok(code == MSGF_DIALOGBOX, "unexpected hook called, code %d\n", code); + g_MSGF_DIALOGBOX = code == MSGF_DIALOGBOX; + return CallNextHookEx(NULL, code, wParam, lParam); +} + static void test_IsDialogMessage(void) { + HHOOK hook; MSG msg; g_hwndMain = CreateWindowA("IsDialogMessageWindowClass", "IsDialogMessageWindowClass", @@ -732,11 +747,34 @@ static void test_IsDialogMessage(void) assert (g_hwndButton1); assert (g_hwndButtonCancel); + if (0) + { + /* crashes on Windows */ + IsDialogMessageA(NULL, NULL); + IsDialogMessageA(g_hwndMain, NULL); + } + /* The focus should initially be nowhere. The first TAB should take it * to the first button. The second TAB should take it to the Cancel * button. */ + + /* valid window, invalid message window */ + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc2, NULL, GetCurrentThreadId()); + FormTabMsg (&msg, (HWND)0xbeefbeef); + ok (!IsDialogMessageA(g_hwndMain, &msg), "expected failure\n"); + ok(g_MSGF_DIALOGBOX, "hook wasn't called\n"); + g_MSGF_DIALOGBOX = FALSE; + UnhookWindowsHookEx(hook); + + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc, NULL, GetCurrentThreadId()); FormTabMsg (&msg, g_hwndMain); + + ok (!IsDialogMessageA(NULL, &msg), "expected failure\n"); + ok (!IsDialogMessageA((HWND)0xbeefbeef, &msg), "expected failure\n"); + + UnhookWindowsHookEx(hook); + ok (IsDialogMessageA(g_hwndMain, &msg), "Did not handle first TAB\n"); ok ((GetFocus() == g_hwndButton1), "Focus did not move to first button\n"); FormTabMsg (&msg, g_hwndButton1); @@ -746,6 +784,18 @@ static void test_IsDialogMessage(void) FormEnterMsg (&msg, g_hwndButtonCancel); ok (IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); ok (g_terminated, "ENTER did not terminate\n"); + + /* matching but invalid window handles, NULL */ + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc, NULL, GetCurrentThreadId()); + + FormTabMsg (&msg, NULL); + ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); + + /* matching but invalid window handles, not NULL */ + FormTabMsg (&msg, (HWND)0xbeefbeef); + ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); + + UnhookWindowsHookEx(hook); }

1 0

Joerg Schiermeier : loader/wine.inf: Correct wrong symlink.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: d2d979cb290d81487cea1a847e3964bdfaba423f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d979cb290d81487cea1a847… Author: Joerg Schiermeier <mywine(a)Schiermeier-IT.de> Date: Wed Aug 10 15:07:05 2016 +0200 loader/wine.inf: Correct wrong symlink. Signed-off-by: Joerg Schiermeier <mywine(a)Schiermeier-IT.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 989bb04495ba6069552727995b333abc15f0e62f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ce51168..2039798 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3311,7 +3311,7 @@ HKLM,Software\Wow6432Node\Microsoft\Notepad\DefaultFonts,"SymbolicLinkValue",0x6 HKLM,Software\Wow6432Node\Microsoft\OLE,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\OLE" HKLM,Software\Wow6432Node\Microsoft\RAS,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\RAS" HKLM,Software\Wow6432Node\Microsoft\RPC,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\RPC" -HKLM,Software\Wow6432Node\Microsoft\Software\Microsoft\Shared Tools\MSInfo,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Software\Microsoft\Shared Tools\MSInfo" +HKLM,Software\Wow6432Node\Microsoft\Software\Microsoft\Shared Tools\MSInfo,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Shared Tools\MSInfo" HKLM,Software\Wow6432Node\Microsoft\SystemCertificates,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\SystemCertificates" HKLM,Software\Wow6432Node\Microsoft\TermServLicensing,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\TermServLicensing" HKLM,Software\Wow6432Node\Microsoft\Transaction Server,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Transaction Server"

1 0

Matt Robinson : ntdll: Catch page fault in RtlWow64EnableFsRedirectionEx.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 36932d220f08c475819f6b189be4bdfe4bfda786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36932d220f08c475819f6b189… Author: Matt Robinson <git(a)nerdoftheherd.com> Date: Sat Aug 6 23:00:21 2016 +0100 ntdll: Catch page fault in RtlWow64EnableFsRedirectionEx. Signed-off-by: Matt Robinson <git(a)nerdoftheherd.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4a6bd3d2008f6ab4d91fcbeb6c410099932c97e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/directory.c | 13 +++++++++++-- dlls/ntdll/tests/directory.c | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0902759..49855dd 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -106,6 +106,7 @@ #include "wine/list.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(file); @@ -3242,9 +3243,17 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) { if (!is_wow64) return STATUS_NOT_IMPLEMENTED; - if (((ULONG_PTR)old_value >> 16) == 0) return STATUS_ACCESS_VIOLATION; - *old_value = !ntdll_get_thread_data()->wow64_redir; + __TRY + { + *old_value = !ntdll_get_thread_data()->wow64_redir; + } + __EXCEPT_PAGE_FAULT + { + return STATUS_ACCESS_VIOLATION; + } + __ENDTRY + ntdll_get_thread_data()->wow64_redir = !disable; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 7b1002a..ec170b2 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -444,6 +444,8 @@ static void test_redirection(void) ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)1 ); ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)0xDEADBEEF ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); status = pRtlWow64EnableFsRedirection( FALSE ); ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );

1 0

Nikolay Sivov : gdi32: Append "TrueType" suffix to registry key names.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: f1f6185e909a2c6fb76b359f2d7489df1474f07f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f6185e909a2c6fb76b359f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 14 23:52:16 2016 +0300 gdi32: Append "TrueType" suffix to registry key names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fcd0f6b0749b6827ee466a620e0198abe8a387f5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b9d6768..47d44fe 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3096,20 +3096,21 @@ static void update_reg_entries(void) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, Face, entry ) { char *buffer; + WCHAR *name; + if (!(face->flags & ADDFONT_EXTERNAL_FONT)) continue; - if(face->FullName) - { - len = strlenW(face->FullName) + sizeof(TrueType) / sizeof(WCHAR) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, face->FullName); - } - else - { - len = strlenW(family->FamilyName) + sizeof(TrueType) / sizeof(WCHAR) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, family->FamilyName); - } + name = face->FullName ? face->FullName : family->FamilyName; + + len = strlenW(name) + 1; + if (face->scalable) + len += sizeof(TrueType) / sizeof(WCHAR); + + valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + strcpyW(valueW, name); + + if (face->scalable) + strcatW(valueW, TrueType); buffer = strWtoA( CP_UNIXCP, face->file ); path = wine_get_dos_file_name( buffer );

1 0

André Hentschel : hal: Add WRITE_PORT_UCHAR stub.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 1e5bc9090a599a8c41633773eca725c0f6a817f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5bc9090a599a8c41633773e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 16 22:30:20 2016 +0200 hal: Add WRITE_PORT_UCHAR stub. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9087404a13d92dc6cd559a2cedaba853ed651a08) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.c | 5 +++++ dlls/hal/hal.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 0b2e422..9cae67e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -168,6 +168,11 @@ ULONG WINAPI READ_PORT_ULONG(ULONG *port) return 0; } +void WINAPI WRITE_PORT_UCHAR(UCHAR *port, UCHAR value) +{ + FIXME("(%p %d) stub!\n", port, value); +} + void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index c21806c..bd6bc35 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -87,6 +87,6 @@ @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT -@ stub WRITE_PORT_UCHAR +@ stdcall WRITE_PORT_UCHAR(ptr long) @ stdcall WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT

1 0