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

Nikolay Sivov : dbgeng: Add IDebugDataSpaces stub.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: a47bb5dc839811f52219ebf6a3acf4cea679f138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a47bb5dc839811f52219ebf6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:45 2019 +0300 dbgeng: Add IDebugDataSpaces stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 236 +++++++++++++++++++++++++++++++++++++++++++++++++-- include/dbgeng.h | 40 +++++++++ 2 files changed, 271 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a47bb5dc839811f52219…

1 0

Isira Seneviratne : start: Correct capitalization of "Windows Explorer".
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 5d14f02f6a70747a1c0b86a76360a24353fba56c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d14f02f6a70747a1c0b86a7… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Mar 27 08:21:36 2019 +0530 start: Correct capitalization of "Windows Explorer". Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/start/start.rc b/programs/start/start.rc index a818ddf..ad3aaee 100644 --- a/programs/start/start.rc +++ b/programs/start/start.rc @@ -49,8 +49,8 @@ Options:\n\ /affinity mask Start the program with the specified affinity mask.\n\ /wait Wait for the started program to finish, then exit with its\n\ exit code.\n\ -/unix Use a Unix filename and start the file like windows\n\ - explorer.\n\ +/unix Use a Unix filename and start the file like Windows\n\ + Explorer.\n\ /ProgIDOpen Open a document using the specified progID.\n\ /? Display this help and exit.\n"

1 0

Isira Seneviratne : cmd: Correct capitalization of "Windows Explorer".
by Alexandre Julliard April 3, 2019

April 3, 2019

1 0

Gabriel Ivăncescu : comctl32/button: Center align split buttons' text by default.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 725d3ff9f31a82ab69d0498167c3baca8ebc4b93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=725d3ff9f31a82ab69d04981… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 1 15:19:36 2019 +0300 comctl32/button: Center align split buttons' text by default. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f7497a1..0bd416d 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -215,6 +215,13 @@ static inline UINT get_button_type( LONG window_style ) return (window_style & BS_TYPEMASK); } +static inline BOOL button_centers_text( LONG window_style ) +{ + /* Push button's text is centered by default, same for split buttons */ + UINT type = get_button_type(window_style); + return type <= BS_DEFPUSHBUTTON || type == BS_SPLITBUTTON || type == BS_DEFSPLITBUTTON; +} + /* paint a button of any type */ static inline void paint_button( BUTTON_INFO *infoPtr, LONG style, UINT action ) { @@ -308,9 +315,7 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) case BS_RIGHT: dtStyle |= DT_RIGHT; break; case BS_CENTER: dtStyle |= DT_CENTER; break; default: - /* Pushbutton's text is centered by default */ - if (get_button_type(style) <= BS_DEFPUSHBUTTON) dtStyle |= DT_CENTER; - /* all other flavours have left aligned text */ + if (button_centers_text(style)) dtStyle |= DT_CENTER; } if (ex_style & WS_EX_RIGHT) dtStyle = DT_RIGHT | (dtStyle & ~(DT_LEFT | DT_CENTER)); @@ -984,8 +989,7 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe if (!(style & BS_CENTER)) { - /* Push button's text is centered by default, all other types have left aligned text */ - if (get_button_type(style) <= BS_DEFPUSHBUTTON) + if (button_centers_text(style)) style |= BS_CENTER; else style |= BS_LEFT;

1 0

Gabriel Ivăncescu : comctl32/button: Implement BCM_GETSPLITINFO.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 4e08a7e5d700a5796ccd4873a8c715748d09c5e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e08a7e5d700a5796ccd4873… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 1 15:19:39 2019 +0300 comctl32/button: Implement BCM_GETSPLITINFO. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 4b8a8f4..213ab29 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -466,6 +466,9 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L infoPtr->hwnd = hWnd; infoPtr->parent = cs->hwndParent; infoPtr->style = cs->style; + infoPtr->split_style = BCSS_STRETCH; + infoPtr->glyph = (HIMAGELIST)0x36; /* Marlett down arrow char code */ + infoPtr->glyph_size.cx = get_default_glyph_size(infoPtr); return DefWindowProcW(hWnd, uMsg, wParam, lParam); } @@ -880,6 +883,22 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L return TRUE; } + case BCM_GETSPLITINFO: + { + BUTTON_SPLITINFO *info = (BUTTON_SPLITINFO*)lParam; + + if (!info) return FALSE; + + if (info->mask & BCSIF_STYLE) + info->uSplitStyle = infoPtr->split_style; + if (info->mask & (BCSIF_GLYPH | BCSIF_IMAGE)) + info->himlGlyph = infoPtr->glyph; + if (info->mask & BCSIF_SIZE) + info->size = infoPtr->glyph_size; + + return TRUE; + } + case BM_GETCHECK: return infoPtr->state & 3;

1 0

Gabriel Ivăncescu : comctl32/button: Implement BCM_SETSPLITINFO.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 82d39e181778f165a973c90a8e80c261a3926a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82d39e181778f165a973c90a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 1 15:19:38 2019 +0300 comctl32/button: Implement BCM_SETSPLITINFO. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 38c7d4c..4b8a8f4 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -86,6 +86,9 @@ typedef struct _BUTTON_INFO INT note_length; DWORD image_type; /* IMAGE_BITMAP or IMAGE_ICON */ BUTTON_IMAGELIST imagelist; + UINT split_style; + HIMAGELIST glyph; /* this is a font character code when split_style doesn't have BCSS_IMAGE */ + SIZE glyph_size; RECT text_margin; union { @@ -243,6 +246,21 @@ static inline WCHAR *get_button_text( const BUTTON_INFO *infoPtr ) return buffer; } +/* get the default glyph size for split buttons */ +static LONG get_default_glyph_size(const BUTTON_INFO *infoPtr) +{ + if (infoPtr->split_style & BCSS_IMAGE) + { + /* Size it to fit, including the left and right edges */ + int w, h; + if (!ImageList_GetIconSize(infoPtr->glyph, &w, &h)) w = 0; + return w + GetSystemMetrics(SM_CXEDGE) * 2; + } + + /* The glyph size relies on the default menu font's cell height */ + return GetSystemMetrics(SM_CYMENUCHECK); +} + static void init_custom_draw(NMCUSTOMDRAW *nmcd, const BUTTON_INFO *infoPtr, HDC hdc, const RECT *rc) { nmcd->hdr.hwndFrom = infoPtr->hwnd; @@ -834,6 +852,34 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L return TRUE; } + case BCM_SETSPLITINFO: + { + BUTTON_SPLITINFO *info = (BUTTON_SPLITINFO*)lParam; + + if (!info) return TRUE; + + if (info->mask & (BCSIF_GLYPH | BCSIF_IMAGE)) + { + infoPtr->split_style &= ~BCSS_IMAGE; + if (!(info->mask & BCSIF_GLYPH)) + infoPtr->split_style |= BCSS_IMAGE; + infoPtr->glyph = info->himlGlyph; + infoPtr->glyph_size.cx = infoPtr->glyph_size.cy = 0; + } + + if (info->mask & BCSIF_STYLE) + infoPtr->split_style = info->uSplitStyle; + if (info->mask & BCSIF_SIZE) + infoPtr->glyph_size = info->size; + + /* Calculate fitting value for cx if invalid (cy is untouched) */ + if (infoPtr->glyph_size.cx <= 0) + infoPtr->glyph_size.cx = get_default_glyph_size(infoPtr); + + /* Windows doesn't invalidate or redraw it, so we don't, either */ + return TRUE; + } + case BM_GETCHECK: return infoPtr->state & 3;

1 0

Gabriel Ivăncescu : comctl32/button: Implement BCM_SETDROPDOWNSTATE.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 202a1c1ef048cf4f8f224bf36a3b514d548016e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=202a1c1ef048cf4f8f224bf3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 1 15:19:37 2019 +0300 comctl32/button: Implement BCM_SETDROPDOWNSTATE. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0bd416d..38c7d4c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -875,6 +875,17 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L } break; + case BCM_SETDROPDOWNSTATE: + new_state = wParam ? BST_DROPDOWNPUSHED : 0; + + if ((infoPtr->state ^ new_state) & BST_DROPDOWNPUSHED) + { + infoPtr->state &= ~BST_DROPDOWNPUSHED; + infoPtr->state |= new_state; + InvalidateRect(hWnd, NULL, FALSE); + } + break; + case BCM_SETTEXTMARGIN: { RECT *text_margin = (RECT *)lParam;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Use an owner-drawn listbox for the dropdown.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 0cd95038aff9163a8e07316aa749e426f2342fa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd95038aff9163a8e07316a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 2 14:28:15 2019 +0300 shell32/autocomplete: Use an owner-drawn listbox for the dropdown. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 72 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6abc3a48..3fde1e4 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -61,6 +61,7 @@ typedef struct BOOL enabled; UINT enum_strs_num; WCHAR **enum_strs; + WCHAR **listbox_strs; HWND hwndEdit; HWND hwndListBox; HWND hwndListBoxOwner; @@ -296,7 +297,6 @@ static void show_listbox(IAutoCompleteImpl *ac) UINT cnt, width, height; GetWindowRect(ac->hwndEdit, &r); - SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); /* Windows XP displays 7 lines at most, then it uses a scroll bar */ cnt = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0); @@ -307,6 +307,60 @@ static void show_listbox(IAutoCompleteImpl *ac) SWP_SHOWWINDOW | SWP_NOACTIVATE); } +static void set_listbox_font(IAutoCompleteImpl *ac, HFONT font) +{ + /* We have to calculate the item height manually due to owner-drawn */ + HFONT old_font = NULL; + UINT height = 16; + HDC hdc; + + if ((hdc = GetDCEx(ac->hwndListBox, 0, DCX_CACHE))) + { + TEXTMETRICW metrics; + if (font) old_font = SelectObject(hdc, font); + if (GetTextMetricsW(hdc, &metrics)) + height = metrics.tmHeight; + if (old_font) SelectObject(hdc, old_font); + ReleaseDC(ac->hwndListBox, hdc); + } + SendMessageW(ac->hwndListBox, WM_SETFONT, (WPARAM)font, FALSE); + SendMessageW(ac->hwndListBox, LB_SETITEMHEIGHT, 0, height); +} + +static BOOL draw_listbox_item(IAutoCompleteImpl *ac, DRAWITEMSTRUCT *info, UINT id) +{ + COLORREF old_text, old_bk; + HDC hdc = info->hDC; + UINT state; + WCHAR *str; + + if (info->CtlType != ODT_LISTBOX || info->CtlID != id || + id != (UINT)GetWindowLongPtrW(ac->hwndListBox, GWLP_ID)) + return FALSE; + + if ((INT)info->itemID < 0 || info->itemAction == ODA_FOCUS) + return TRUE; + + state = info->itemState; + if (state & ODS_SELECTED) + { + old_bk = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); + old_text = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + } + + str = ac->listbox_strs[info->itemID]; + ExtTextOutW(hdc, info->rcItem.left + 1, info->rcItem.top, + ETO_OPAQUE | ETO_CLIPPED, &info->rcItem, str, + strlenW(str), NULL); + + if (state & ODS_SELECTED) + { + SetBkColor(hdc, old_bk); + SetTextColor(hdc, old_text); + } + return TRUE; +} + static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) { /* Replace the first %s directly without using snprintf, to avoid @@ -541,6 +595,8 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + + ac->listbox_strs = str + start; SendMessageW(ac->hwndListBox, LB_INITSTORAGE, end - start, 0); for (; start < end; start++) SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[start]); @@ -582,7 +638,11 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ size = len + 1; if (!(text = heap_alloc(size * sizeof(WCHAR)))) + { + /* Reset the listbox to prevent potential crash from ResetEnumerator */ + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); return; + } len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)text); if (len + 1 != size) text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); @@ -781,7 +841,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, break; case WM_SETFONT: if (This->hwndListBox) - SendMessageW(This->hwndListBox, WM_SETFONT, wParam, lParam); + set_listbox_font(This, (HFONT)wParam); break; case WM_DESTROY: { @@ -833,6 +893,10 @@ static LRESULT APIENTRY ACLBoxOwnerSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPa { case WM_MOUSEACTIVATE: return MA_NOACTIVATE; + case WM_DRAWITEM: + if (draw_listbox_item(This, (DRAWITEMSTRUCT*)lParam, wParam)) + return TRUE; + break; case WM_SIZE: SetWindowPos(This->hwndListBox, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_DEFERERASE); @@ -854,7 +918,7 @@ static void create_listbox(IAutoCompleteImpl *This) /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ This->hwndListBox = CreateWindowExW(WS_EX_NOACTIVATE, WC_LISTBOXW, NULL, - WS_CHILD | WS_VISIBLE | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT, + WS_CHILD | WS_VISIBLE | WS_VSCROLL | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT, 0, 0, 0, 0, This->hwndListBoxOwner, NULL, shell32_hInstance, NULL); if (This->hwndListBox) { @@ -869,7 +933,7 @@ static void create_listbox(IAutoCompleteImpl *This) /* Use the same font as the edit control, as it gets destroyed before it anyway */ edit_font = (HFONT)SendMessageW(This->hwndEdit, WM_GETFONT, 0, 0); if (edit_font) - SendMessageW(This->hwndListBox, WM_SETFONT, (WPARAM)edit_font, FALSE); + set_listbox_font(This, edit_font); return; }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Encapsulate the listbox into an owner window.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 6f3beaee37854f46bcb242387226156e453cd34d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3beaee37854f46bcb24238… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 2 14:28:14 2019 +0300 shell32/autocomplete: Encapsulate the listbox into an owner window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 69 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 9e8d93c..6abc3a48 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -63,8 +63,10 @@ typedef struct WCHAR **enum_strs; HWND hwndEdit; HWND hwndListBox; + HWND hwndListBoxOwner; WNDPROC wpOrigEditProc; WNDPROC wpOrigLBoxProc; + WNDPROC wpOrigLBoxOwnerProc; WCHAR *txtbackup; WCHAR *quickComplete; IEnumString *enumstr; @@ -283,7 +285,7 @@ static void free_enum_strs(IAutoCompleteImpl *ac) static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) { - ShowWindow(hwnd, SW_HIDE); + ShowWindow(ac->hwndListBoxOwner, SW_HIDE); SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); if (reset) free_enum_strs(ac); } @@ -301,7 +303,7 @@ static void show_listbox(IAutoCompleteImpl *ac) height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); width = r.right - r.left; - SetWindowPos(ac->hwndListBox, HWND_TOP, r.left, r.bottom + 1, width, height, + SetWindowPos(ac->hwndListBoxOwner, HWND_TOP, r.left, r.bottom + 1, width, height, SWP_SHOWWINDOW | SWP_NOACTIVATE); } @@ -338,7 +340,7 @@ static BOOL select_item_with_return_key(IAutoCompleteImpl *ac, HWND hwnd) if (!(ac->options & ACO_AUTOSUGGEST)) return FALSE; - if (IsWindowVisible(hwndListBox)) + if (IsWindowVisible(ac->hwndListBoxOwner)) { INT sel = SendMessageW(hwndListBox, LB_GETCURSEL, 0, 0); if (sel >= 0) @@ -612,8 +614,8 @@ static void destroy_autocomplete_object(IAutoCompleteImpl *ac) { ac->hwndEdit = NULL; free_enum_strs(ac); - if (ac->hwndListBox) - DestroyWindow(ac->hwndListBox); + if (ac->hwndListBoxOwner) + DestroyWindow(ac->hwndListBoxOwner); IAutoComplete2_Release(&ac->IAutoComplete2_iface); } @@ -627,7 +629,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT { case VK_ESCAPE: /* When pressing ESC, Windows hides the auto-suggest listbox, if visible */ - if ((ac->options & ACO_AUTOSUGGEST) && IsWindowVisible(ac->hwndListBox)) + if ((ac->options & ACO_AUTOSUGGEST) && IsWindowVisible(ac->hwndListBoxOwner)) { hide_listbox(ac, ac->hwndListBox, FALSE); ac->no_fwd_char = 0x1B; /* ESC char */ @@ -666,7 +668,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT break; case VK_TAB: if ((ac->options & (ACO_AUTOSUGGEST | ACO_USETAB)) == (ACO_AUTOSUGGEST | ACO_USETAB) - && IsWindowVisible(ac->hwndListBox) && !(GetKeyState(VK_CONTROL) & 0x8000)) + && IsWindowVisible(ac->hwndListBoxOwner) && !(GetKeyState(VK_CONTROL) & 0x8000)) { ac->no_fwd_char = '\t'; return change_selection(ac, hwnd, wParam); @@ -684,7 +686,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT if (!(ac->options & ACO_AUTOSUGGEST)) break; - if (!IsWindowVisible(ac->hwndListBox)) + if (!IsWindowVisible(ac->hwndListBoxOwner)) { if (ac->options & ACO_UPDOWNKEYDROPSLIST) { @@ -725,7 +727,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_KILLFOCUS: if (This->options & ACO_AUTOSUGGEST) { - if ((HWND)wParam == This->hwndListBox) break; + if (This->hwndListBoxOwner == (HWND)wParam || + This->hwndListBoxOwner == GetAncestor((HWND)wParam, GA_PARENT)) + break; hide_listbox(This, This->hwndListBox, FALSE); } @@ -737,7 +741,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, WINDOWPOS *pos = (WINDOWPOS*)lParam; if ((pos->flags & (SWP_NOMOVE | SWP_NOSIZE)) != (SWP_NOMOVE | SWP_NOSIZE) && - This->hwndListBox && IsWindowVisible(This->hwndListBox)) + This->hwndListBoxOwner && IsWindowVisible(This->hwndListBoxOwner)) show_listbox(This); break; } @@ -772,7 +776,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_MOUSEWHEEL: - if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) + if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBoxOwner)) return SendMessageW(This->hwndListBox, WM_MOUSEWHEEL, wParam, lParam); break; case WM_SETFONT: @@ -821,12 +825,37 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } +static LRESULT APIENTRY ACLBoxOwnerSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + IAutoCompleteImpl *This = (IAutoCompleteImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + + switch (uMsg) + { + case WM_MOUSEACTIVATE: + return MA_NOACTIVATE; + case WM_SIZE: + SetWindowPos(This->hwndListBox, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_DEFERERASE); + break; + } + return CallWindowProcW(This->wpOrigLBoxOwnerProc, hwnd, uMsg, wParam, lParam); +} + static void create_listbox(IAutoCompleteImpl *This) { + This->hwndListBoxOwner = CreateWindowExW(WS_EX_NOACTIVATE, WC_STATICW, NULL, + WS_BORDER | WS_POPUP | WS_CLIPCHILDREN, + 0, 0, 0, 0, NULL, NULL, shell32_hInstance, NULL); + if (!This->hwndListBoxOwner) + { + This->options &= ~ACO_AUTOSUGGEST; + return; + } + /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ This->hwndListBox = CreateWindowExW(WS_EX_NOACTIVATE, WC_LISTBOXW, NULL, - WS_BORDER | WS_POPUP | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT, - 0, 0, 0, 0, NULL, NULL, shell32_hInstance, NULL); + WS_CHILD | WS_VISIBLE | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT, + 0, 0, 0, 0, This->hwndListBoxOwner, NULL, shell32_hInstance, NULL); if (This->hwndListBox) { HFONT edit_font; @@ -834,13 +863,19 @@ static void create_listbox(IAutoCompleteImpl *This) This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); + This->wpOrigLBoxOwnerProc = (WNDPROC)SetWindowLongPtrW(This->hwndListBoxOwner, GWLP_WNDPROC, (LONG_PTR)ACLBoxOwnerSubclassProc); + SetWindowLongPtrW(This->hwndListBoxOwner, GWLP_USERDATA, (LONG_PTR)This); + /* Use the same font as the edit control, as it gets destroyed before it anyway */ edit_font = (HFONT)SendMessageW(This->hwndEdit, WM_GETFONT, 0, 0); if (edit_font) SendMessageW(This->hwndListBox, WM_SETFONT, (WPARAM)edit_font, FALSE); + return; } - else - This->options &= ~ACO_AUTOSUGGEST; + + DestroyWindow(This->hwndListBoxOwner); + This->hwndListBoxOwner = NULL; + This->options &= ~ACO_AUTOSUGGEST; } /************************************************************************** @@ -1148,7 +1183,7 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnGetDropDownStatus( TRACE("(%p) -> (%p, %p)\n", This, pdwFlags, ppwszString); - dropped = IsWindowVisible(This->hwndListBox); + dropped = IsWindowVisible(This->hwndListBoxOwner); if (pdwFlags) *pdwFlags = (dropped ? ACDD_VISIBLE : 0); @@ -1189,7 +1224,7 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnResetEnumerator( if (This->hwndEdit) { free_enum_strs(This); - if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) + if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBoxOwner)) autocomplete_text(This, This->hwndEdit, autoappend_flag_displayempty); } return S_OK;

1 0

Alexandre Julliard : winecrt0: Add a fallback implementation of __wine_dbg_strdup().
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: d6060b7cf76cd1f45327b68f65caef8ea9da96a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6060b7cf76cd1f45327b68f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:24:02 2019 +0200 winecrt0: Add a fallback implementation of __wine_dbg_strdup(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/debug.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6b7c3e8..79ba92f 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,6 +1,7 @@ MODULE = libwinecrt0.a C_SRCS = \ + debug.c \ delay_load.c \ dll_entry.c \ dll_main.c \ diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c new file mode 100644 index 0000000..1eb5a46 --- /dev/null +++ b/dlls/winecrt0/debug.c @@ -0,0 +1,62 @@ +/* + * Fallbacks for debugging functions when running on Windows + * + * Copyright 2019 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef _WIN32 + +#include "config.h" +#include "wine/port.h" + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +static const char * (__cdecl *p__wine_dbg_strdup)( const char *str ); + +static void load_func( void **func, const char *name, void *def ) +{ + if (!*func) + { + HMODULE module = GetModuleHandleA( "ntdll.dll" ); + void *proc = GetProcAddress( module, name ); + interlocked_xchg_ptr( func, proc ? proc : def ); + } +} +#define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name ) + +/* FIXME: this is not 100% thread-safe */ +static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) +{ + static char *list[32]; + static int pos; + char *ret = _strdup( str ); + int idx; + + idx = interlocked_xchg_add( &pos, 1 ) % ARRAY_SIZE(list); + free( interlocked_xchg_ptr( (void **)&list[idx], ret )); + return ret; +} + +const char * __cdecl __wine_dbg_strdup( const char *str ) +{ + LOAD_FUNC( __wine_dbg_strdup ); + return p__wine_dbg_strdup( str ); +} + +#endif /* _WIN32 */

1 0

Alexandre Julliard : ntdll: Export __wine_dbg_get_channel_flags().
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 9911cfdeae63539110d991a5915b339219d3f0e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9911cfdeae63539110d991a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:25:28 2019 +0200 ntdll: Export __wine_dbg_get_channel_flags(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/wine/debug.h | 4 +- libs/wine/debug.c | 2 + libs/wine/wine.def | 2 +- 5 files changed, 158 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 9c3add4..1e4a3a1 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -43,6 +43,12 @@ WINE_DECLARE_DEBUG_CHANNEL(timestamp); static BOOL init_done; static struct debug_info initial_info; /* debug info for initial thread */ +static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME); +static int nb_debug_options = -1; +static int options_size; +static struct __wine_debug_channel *debug_options; + +static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; /* get the debug info pointer for the current thread */ static inline struct debug_info *get_info(void) @@ -88,6 +94,153 @@ static int append_output( struct debug_info *info, const char *str, size_t len ) return len; } +/* add a new debug option at the end of the option list */ +static void add_option( const char *name, unsigned char set, unsigned char clear ) +{ + int min = 0, max = nb_debug_options - 1, pos, res; + + if (!name[0]) /* "all" option */ + { + default_flags = (default_flags & ~clear) | set; + return; + } + if (strlen(name) >= sizeof(debug_options[0].name)) return; + + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( name, debug_options[pos].name ); + if (!res) + { + debug_options[pos].flags = (debug_options[pos].flags & ~clear) | set; + return; + } + if (res < 0) max = pos - 1; + else min = pos + 1; + } + if (nb_debug_options >= options_size) + { + options_size = max( options_size * 2, 16 ); + debug_options = realloc( debug_options, options_size * sizeof(debug_options[0]) ); + } + + pos = min; + if (pos < nb_debug_options) memmove( &debug_options[pos + 1], &debug_options[pos], + (nb_debug_options - pos) * sizeof(debug_options[0]) ); + strcpy( debug_options[pos].name, name ); + debug_options[pos].flags = (default_flags & ~clear) | set; + nb_debug_options++; +} + +/* parse a set of debugging option specifications and add them to the option list */ +static void parse_options( const char *str ) +{ + char *opt, *next, *options; + unsigned int i; + + if (!(options = strdup(str))) return; + for (opt = options; opt; opt = next) + { + const char *p; + unsigned char set = 0, clear = 0; + + if ((next = strchr( opt, ',' ))) *next++ = 0; + + p = opt + strcspn( opt, "+-" ); + if (!p[0]) p = opt; /* assume it's a debug channel name */ + + if (p > opt) + { + for (i = 0; i < ARRAY_SIZE(debug_classes); i++) + { + int len = strlen(debug_classes[i]); + if (len != (p - opt)) continue; + if (!memcmp( opt, debug_classes[i], len )) /* found it */ + { + if (*p == '+') set |= 1 << i; + else clear |= 1 << i; + break; + } + } + if (i == ARRAY_SIZE(debug_classes)) /* bad class name, skip it */ + continue; + } + else + { + if (*p == '-') clear = ~0; + else set = ~0; + } + if (*p == '+' || *p == '-') p++; + if (!p[0]) continue; + + if (!strcmp( p, "all" )) + default_flags = (default_flags & ~clear) | set; + else + add_option( p, set, clear ); + } + free( options ); +} + +/* print the usage message */ +static void debug_usage(void) +{ + static const char usage[] = + "Syntax of the WINEDEBUG variable:\n" + " WINEDEBUG=[class]+xxx,[class]-yyy,...\n\n" + "Example: WINEDEBUG=+relay,warn-heap\n" + " turns on relay traces, disable heap warnings\n" + "Available message classes: err, warn, fixme, trace\n"; + write( 2, usage, sizeof(usage) - 1 ); + exit(1); +} + +/* initialize all options at startup */ +static void init_options(void) +{ + char *wine_debug = getenv("WINEDEBUG"); + struct stat st1, st2; + + nb_debug_options = 0; + + /* check for stderr pointing to /dev/null */ + if (!fstat( 2, &st1 ) && S_ISCHR(st1.st_mode) && + !stat( "/dev/null", &st2 ) && S_ISCHR(st2.st_mode) && + st1.st_rdev == st2.st_rdev) + { + default_flags = 0; + return; + } + if (!wine_debug) return; + if (!strcmp( wine_debug, "help" )) debug_usage(); + parse_options( wine_debug ); +} + +/*********************************************************************** + * __wine_dbg_get_channel_flags (NTDLL.@) + * + * Get the flags to use for a given channel, possibly setting them too in case of lazy init + */ +unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +{ + int min, max, pos, res; + + if (nb_debug_options == -1) init_options(); + + min = 0; + max = nb_debug_options - 1; + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( channel->name, debug_options[pos].name ); + if (!res) return debug_options[pos].flags; + if (res < 0) max = pos - 1; + else min = pos + 1; + } + /* no option for this channel */ + if (channel->flags & (1 << __WINE_DBCL_INIT)) channel->flags = default_flags; + return default_flags; +} + /*********************************************************************** * __wine_dbg_strdup (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 98991ad..b608ab9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1506,6 +1506,7 @@ @ cdecl __wine_make_process_system() # Debugging +@ cdecl -norelay __wine_dbg_get_channel_flags(ptr) @ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str) diff --git a/include/wine/debug.h b/include/wine/debug.h index 2412c2b..416b6c8 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -156,9 +156,7 @@ struct __wine_debug_functions const char *function, const char *format, va_list args ); }; -extern unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); -extern int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, - unsigned char set, unsigned char clear ); +extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, struct __wine_debug_functions *old_funcs, size_t size ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 2d56b01..b9c7e0b 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -30,6 +30,7 @@ # include <sys/stat.h> #endif +#define __wine_dbg_get_channel_flags __wine_dbg_get_channel_flags_inline #define wine_dbg_sprintf wine_dbg_sprintf_inline #define wine_dbg_printf wine_dbg_printf_inline #define wine_dbgstr_an wine_dbgstr_an_inline @@ -61,6 +62,7 @@ static int cmp_name( const void *p1, const void *p2 ) } /* get the flags to use for a given channel, possibly setting them too in case of lazy init */ +#undef __wine_dbg_get_channel_flags unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) { if (nb_debug_options == -1) debug_init(); diff --git a/libs/wine/wine.def b/libs/wine/wine.def index ed315bd..3c88f8a 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -1,7 +1,7 @@ LIBRARY libwine.dll EXPORTS - __wine_dbg_get_channel_flags + __wine_dbg_get_channel_flags PRIVATE __wine_dbg_set_channel_flags __wine_dbg_set_functions __wine_dll_register

1 0

Alexandre Julliard : include: Make wine_dbgstr_an()/wine_dbgstr_wn() into inline functions.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 9f75f7189935aeec55df79a5abbc3d2691ec5f7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f75f7189935aeec55df79a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:23:43 2019 +0200 include: Make wine_dbgstr_an()/wine_dbgstr_wn() into inline functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 54 ++++++---------------------- dlls/ntdll/ntdll.spec | 3 ++ include/wine/debug.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++-- libs/wine/debug.c | 4 +++ 4 files changed, 111 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 4e2fd78..42db30a 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -41,8 +41,6 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); -static struct __wine_debug_functions default_funcs; - static BOOL init_done; static struct debug_info initial_info; /* debug info for initial thread */ @@ -77,49 +75,17 @@ static void release_temp_buffer( char *ptr, size_t size ) } /*********************************************************************** - * NTDLL_dbgstr_an + * __wine_dbg_strdup (NTDLL.@) */ -static const char *NTDLL_dbgstr_an( const char *src, int n ) +const char * __cdecl __wine_dbg_strdup( const char *str ) { - const char *res; struct debug_info *info = get_info(); - /* save current position to restore it on exception */ - char *old_pos = info->str_pos; - - __TRY - { - res = default_funcs.dbgstr_an( src, n ); - } - __EXCEPT_PAGE_FAULT - { - release_temp_buffer( old_pos, 0 ); - return "(invalid)"; - } - __ENDTRY - return res; -} - -/*********************************************************************** - * NTDLL_dbgstr_wn - */ -static const char *NTDLL_dbgstr_wn( const WCHAR *src, int n ) -{ - const char *res; - struct debug_info *info = get_info(); - /* save current position to restore it on exception */ - char *old_pos = info->str_pos; + char *res = info->str_pos; + size_t n = strlen( str ) + 1; - __TRY - { - res = default_funcs.dbgstr_wn( src, n ); - } - __EXCEPT_PAGE_FAULT - { - release_temp_buffer( old_pos, 0 ); - return "(invalid)"; - } - __ENDTRY - return res; + if (res + n > &info->strings[sizeof(info->strings)]) res = info->strings; + info->str_pos = res + n; + return strcpy( res, str ); } /*********************************************************************** @@ -195,8 +161,8 @@ static const struct __wine_debug_functions funcs = { get_temp_buffer, release_temp_buffer, - NTDLL_dbgstr_an, - NTDLL_dbgstr_wn, + wine_dbgstr_an, + wine_dbgstr_wn, NTDLL_dbg_vprintf, NTDLL_dbg_vlog }; @@ -210,5 +176,5 @@ void debug_init(void) if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; - __wine_dbg_set_functions( &funcs, &default_funcs, sizeof(funcs) ); + __wine_dbg_set_functions( &funcs, NULL, sizeof(funcs) ); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 233c4ef..7622289 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1505,6 +1505,9 @@ @ cdecl wine_server_send_fd(long) @ cdecl __wine_make_process_system() +# Debugging +@ cdecl -norelay __wine_dbg_strdup(str) + # Virtual memory @ cdecl __wine_locked_recvmsg(long ptr long) diff --git a/include/wine/debug.h b/include/wine/debug.h index 07ac88d..65322d0 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -23,6 +23,9 @@ #include <stdarg.h> #include <windef.h> +#ifndef _NTSYSTEM_ +#include <winbase.h> +#endif #ifndef GUID_DEFINED #include <guiddef.h> #endif @@ -157,6 +160,7 @@ extern int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, unsigned char set, unsigned char clear ); extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, struct __wine_debug_functions *old_funcs, size_t size ); +extern const char * __cdecl __wine_dbg_strdup( const char *str ); /* * Exported definitions and macros @@ -165,14 +169,102 @@ extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_f /* These functions return a printable version of a string, including quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern const char *wine_dbgstr_an( const char * s, int n ); -extern const char *wine_dbgstr_wn( const WCHAR *s, int n ); extern const char *wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *func, const char *format, ... ) __WINE_PRINTF_ATTR(4,5); +static inline const char *wine_dbgstr_an( const char *str, int n ) +{ + static const char hex[16] = "0123456789abcdef"; + char buffer[300], *dst = buffer; + + if (!str) return "(null)"; + if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); +#ifndef _NTSYSTEM_ + if (IsBadStringPtrA( str, n )) return "(invalid)"; +#endif + if (n == -1) for (n = 0; str[n]; n++) ; + *dst++ = '"'; + while (n-- > 0 && dst <= buffer + sizeof(buffer) - 9) + { + unsigned char c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c < ' ' || c >= 127) + { + *dst++ = '\\'; + *dst++ = 'x'; + *dst++ = hex[(c >> 4) & 0x0f]; + *dst++ = hex[c & 0x0f]; + } + else *dst++ = c; + } + } + *dst++ = '"'; + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst = 0; + return __wine_dbg_strdup( buffer ); +} + +static inline const char *wine_dbgstr_wn( const WCHAR *str, int n ) +{ + static const char hex[16] = "0123456789abcdef"; + char buffer[300], *dst = buffer; + + if (!str) return "(null)"; + if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); +#ifndef _NTSYSTEM_ + if (IsBadStringPtrW( str, n )) return "(invalid)"; +#endif + if (n == -1) for (n = 0; str[n]; n++) ; + *dst++ = 'L'; + *dst++ = '"'; + while (n-- > 0 && dst <= buffer + sizeof(buffer) - 10) + { + WCHAR c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c < ' ' || c >= 127) + { + *dst++ = '\\'; + *dst++ = hex[(c >> 12) & 0x0f]; + *dst++ = hex[(c >> 8) & 0x0f]; + *dst++ = hex[(c >> 4) & 0x0f]; + *dst++ = hex[c & 0x0f]; + } + else *dst++ = c; + } + } + *dst++ = '"'; + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst = 0; + return __wine_dbg_strdup( buffer ); +} + static inline const char *wine_dbgstr_a( const char *s ) { return wine_dbgstr_an( s, -1 ); diff --git a/libs/wine/debug.c b/libs/wine/debug.c index ae12356..0c3b4ef 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -30,6 +30,8 @@ # include <sys/stat.h> #endif +#define wine_dbgstr_an wine_dbgstr_an_inline +#define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" #include "wine/library.h" @@ -420,11 +422,13 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch /* wrappers to use the function pointers */ +#undef wine_dbgstr_an const char *wine_dbgstr_an( const char * s, int n ) { return funcs.dbgstr_an(s, n); } +#undef wine_dbgstr_wn const char *wine_dbgstr_wn( const WCHAR *s, int n ) { return funcs.dbgstr_wn(s, n);

1 0

Zebediah Figura : quartz/tests: Add tests for VMR7 pin interfaces.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: a2f60aaa838ab449e4245df6e1406321edd4aec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2f60aaa838ab449e4245df6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 20:59:38 2019 -0500 quartz/tests: Add tests for VMR7 pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 918d579..e9efe55 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -187,8 +187,10 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; IBaseFilter *filter = create_vmr7(0); ULONG ref; + IPin *pin; check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); @@ -227,6 +229,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr7(VMRMode_Windowless); @@ -243,6 +259,20 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); todo_wine check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr7(VMRMode_Renderless); @@ -258,6 +288,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Zebediah Figura : quartz/tests: Add tests for querying VMR7 pin information.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 3fb152ab3905827bfdcf45ad346b22f5315f1ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb152ab3905827bfdcf45ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 20:59:37 2019 -0500 quartz/tests: Add tests for querying VMR7 pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d5253f4..918d579 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -459,6 +459,70 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr7(0); + PIN_DIRECTION dir; + ULONG count, ref; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IPin_QueryPinInfo(pin, &info); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + sink_id[9] = '1'; + + IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IPin_QueryPinInfo(pin, &info); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + } + else + skip("Mixing mode is not supported.\n"); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); @@ -467,6 +531,7 @@ START_TEST(vmr7) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for VMR7 filter interfaces.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: cc7200017054da3bd298015cbc3932b4d28a0c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7200017054da3bd298015c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 20:59:34 2019 -0500 quartz/tests: Add tests for VMR7 filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 105e6b2..90fcd77 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -24,6 +24,24 @@ #include "vmr9.h" #include "wine/test.h" +static IBaseFilter *create_vmr7(DWORD mode) +{ + IBaseFilter *filter = NULL; + IVMRFilterConfig *config; + HRESULT hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (mode) + { + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVMRFilterConfig_SetRenderingMode(config, mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVMRFilterConfig_Release(config); + } + return filter; +} + static void test_filter_config(void) { IVMRFilterConfig *config; @@ -130,11 +148,104 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_vmr7(0); + ULONG ref; + + check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IQualityControl, TRUE); + todo_wine check_interface(filter, &IID_IQualProp, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + todo_wine check_interface(filter, &IID_IVMRAspectRatioControl, TRUE); + todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl, TRUE); + check_interface(filter, &IID_IVMRFilterConfig, TRUE); + todo_wine check_interface(filter, &IID_IVMRMixerBitmap, TRUE); + check_interface(filter, &IID_IVMRMonitorConfig, TRUE); + + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IDirectDrawVideo, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVMRAspectRatioControl9, FALSE); + check_interface(filter, &IID_IVMRDeinterlaceControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRFilterConfig9, FALSE); + check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr7(VMRMode_Windowless); + + check_interface(filter, &IID_IVMRMonitorConfig, TRUE); + check_interface(filter, &IID_IVMRWindowlessControl, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + todo_wine check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr7(VMRMode_Renderless); + + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); test_filter_config(); + test_interfaces(); CoUninitialize(); }

1 0

Austin English : propvarutil.h: Add extern "C" if __cplusplus is defined.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: da998cb20677d781f643d4984880f17556c423d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da998cb20677d781f643d498… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 3 01:43:54 2019 -0500 propvarutil.h: Add extern "C" if __cplusplus is defined. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46939 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propvarutil.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/propvarutil.h b/include/propvarutil.h index a4eedef..e0a21fa 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -22,6 +22,10 @@ #include <shtypes.h> #include <shlwapi.h> +#ifdef __cplusplus +extern "C" { +#endif + enum tagPROPVAR_CHANGE_FLAGS { PVCHF_DEFAULT = 0x00000000, @@ -120,7 +124,12 @@ inline HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar) return S_OK; } -#endif +#endif /* NO_PROPVAR_INLINES */ +#endif /* __cplusplus */ + + +#ifdef __cplusplus +} #endif #endif /* __WINE_PROPVARUTIL_H */

1 0

Sebastian Lackner : dinput: Do not wait for hook thread startup in IDirectInput8::Initialize.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 890d1b812a9477b434486ab503c15dd3fce3e964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=890d1b812a9477b434486ab5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 3 11:39:36 2019 +0800 dinput: Do not wait for hook thread startup in IDirectInput8::Initialize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21403 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 54777da..66dc6e3 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1719,7 +1719,7 @@ static DWORD WINAPI hook_thread_proc(void *param) /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); - SetEvent(*(LPHANDLE)param); + SetEvent(param); while (GetMessageW( &msg, 0, 0, 0 )) { @@ -1785,6 +1785,7 @@ static DWORD WINAPI hook_thread_proc(void *param) } static DWORD hook_thread_id; +static HANDLE hook_thread_event; static CRITICAL_SECTION_DEBUG dinput_critsect_debug = { @@ -1803,24 +1804,21 @@ static BOOL check_hook_thread(void) TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { - HANDLE event; - - event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &hook_thread_id); - if (event && hook_thread) - { - HANDLE handles[2]; - handles[0] = event; - handles[1] = hook_thread; - WaitForMultipleObjects(2, handles, FALSE, INFINITE); - } + hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); + hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); LeaveCriticalSection(&dinput_hook_crit); - CloseHandle(event); } else if (list_empty(&direct_input_list) && hook_thread) { DWORD tid = hook_thread_id; + if (hook_thread_event) /* if thread is not started yet */ + { + WaitForSingleObject(hook_thread_event, INFINITE); + CloseHandle(hook_thread_event); + hook_thread_event = NULL; + } + hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); LeaveCriticalSection(&dinput_hook_crit); @@ -1861,6 +1859,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) callwndproc_hook = NULL; } + if (hook_thread_event) /* if thread is not started yet */ + { + WaitForSingleObject(hook_thread_event, INFINITE); + CloseHandle(hook_thread_event); + hook_thread_event = NULL; + } + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); LeaveCriticalSection(&dinput_hook_crit);

1 0

Alexandre Julliard : include: Make wine_dbg_sprintf() into an inline function.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: f2e6f05fe33a2933e45c0741847bf0dbbf43b940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e6f05fe33a2933e45c0741… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 10:02:14 2019 +0200 include: Make wine_dbg_sprintf() into an inline function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 26 +++++++++++++++++++++++++- libs/wine/debug.c | 2 ++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 65322d0..fd8e56e 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -22,6 +22,7 @@ #define __WINE_WINE_DEBUG_H #include <stdarg.h> +#include <stdio.h> #include <windef.h> #ifndef _NTSYSTEM_ #include <winbase.h> @@ -169,12 +170,35 @@ extern const char * __cdecl __wine_dbg_strdup( const char *str ); /* These functions return a printable version of a string, including quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern const char *wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *func, const char *format, ... ) __WINE_PRINTF_ATTR(4,5); +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +# define __wine_dbg_cdecl __cdecl +# define __wine_dbg_va_list __builtin_ms_va_list +# define __wine_dbg_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __wine_dbg_va_end(list) __builtin_ms_va_end(list) +#else +# define __wine_dbg_cdecl +# define __wine_dbg_va_list va_list +# define __wine_dbg_va_start(list,arg) va_start(list,arg) +# define __wine_dbg_va_end(list) va_end(list) +#endif + +static const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); +static inline const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) +{ + char buffer[200]; + __wine_dbg_va_list args; + + __wine_dbg_va_start( args, format ); + vsnprintf( buffer, sizeof(buffer), format, args ); + __wine_dbg_va_end( args ); + return __wine_dbg_strdup( buffer ); +} + static inline const char *wine_dbgstr_an( const char *str, int n ) { static const char hex[16] = "0123456789abcdef"; diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 0c3b4ef..1bf59dd 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -30,6 +30,7 @@ # include <sys/stat.h> #endif +#define wine_dbg_sprintf wine_dbg_sprintf_inline #define wine_dbgstr_an wine_dbgstr_an_inline #define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" @@ -228,6 +229,7 @@ int wine_dbg_printf( const char *format, ... ) } /* printf with temp buffer allocation */ +#undef wine_dbg_sprintf const char *wine_dbg_sprintf( const char *format, ... ) { static const int max_size = 200;

1 0

Alexandre Julliard : winecrt0: Add a fallback implementation of __wine_dbg_header().
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 93a9d85488a66e0d40e311d7027ec076c8b2bd20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a9d85488a66e0d40e311d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:27:24 2019 +0200 winecrt0: Add a fallback implementation of __wine_dbg_header(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 8003e03..d7c170c 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -29,9 +29,15 @@ #include "wine/debug.h" #include "wine/heap.h" +WINE_DECLARE_DEBUG_CHANNEL(pid); +WINE_DECLARE_DEBUG_CHANNEL(timestamp); + static const char * (__cdecl *p__wine_dbg_strdup)( const char *str ); static int (__cdecl *p__wine_dbg_output)( const char *str ); static unsigned char (__cdecl *p__wine_dbg_get_channel_flags)( struct __wine_debug_channel *channel ); +static int (__cdecl *p__wine_dbg_header)( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, + const char *function ); static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; @@ -39,6 +45,7 @@ static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_ static int nb_debug_options = -1; static int options_size; static struct __wine_debug_channel *debug_options; +static DWORD partial_line_tid; /* id of the last thread to output a partial line */ static void load_func( void **func, const char *name, void *def ) { @@ -163,7 +170,36 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) static int __cdecl fallback__wine_dbg_output( const char *str ) { - return fwrite( str, 1, strlen(str), stderr ); + size_t len = strlen( str ); + + if (!len) return 0; + interlocked_xchg( (LONG *)&partial_line_tid, str[len - 1] != '\n' ? GetCurrentThreadId() : 0 ); + return fwrite( str, 1, len, stderr ); +} + +static int __cdecl fallback__wine_dbg_header( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, + const char *function ) +{ + char buffer[200], *pos = buffer; + + if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + + /* skip header if partial line and no other thread came in between */ + if (partial_line_tid == GetCurrentThreadId()) return 0; + + if (TRACE_ON(timestamp)) + { + ULONG ticks = GetTickCount(); + pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 ); + } + if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() ); + pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); + if (function && cls < ARRAY_SIZE( debug_classes )) + snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", + debug_classes[cls], channel->name, function ); + + return fwrite( buffer, 1, strlen(buffer), stderr ); } static unsigned char __cdecl fallback__wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) @@ -205,4 +241,11 @@ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel return p__wine_dbg_get_channel_flags( channel ); } +int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ) +{ + LOAD_FUNC( __wine_dbg_header ); + return p__wine_dbg_header( cls, channel, function ); +} + #endif /* _WIN32 */

1 0

Alexandre Julliard : winecrt0: Add a fallback implementation of __wine_dbg_output().
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 0ad86465ae87d2dc81da2ecd69a7775b6cf56767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ad86465ae87d2dc81da2ecd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:24:52 2019 +0200 winecrt0: Add a fallback implementation of __wine_dbg_output(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 1eb5a46..4ae086c 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -23,11 +23,13 @@ #include "config.h" #include "wine/port.h" +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h" static const char * (__cdecl *p__wine_dbg_strdup)( const char *str ); +static int (__cdecl *p__wine_dbg_output)( const char *str ); static void load_func( void **func, const char *name, void *def ) { @@ -53,10 +55,21 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) return ret; } +static int __cdecl fallback__wine_dbg_output( const char *str ) +{ + return fwrite( str, 1, strlen(str), stderr ); +} + const char * __cdecl __wine_dbg_strdup( const char *str ) { LOAD_FUNC( __wine_dbg_strdup ); return p__wine_dbg_strdup( str ); } +int __cdecl __wine_dbg_output( const char *str ) +{ + LOAD_FUNC( __wine_dbg_output ); + return p__wine_dbg_output( str ); +} + #endif /* _WIN32 */

1 0

Alexandre Julliard : ntdll: Use static debug info before initialization is done.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: b3c8d5d36850e484b5cc84ab818a75db567a06a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3c8d5d36850e484b5cc84ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 09:50:31 2019 +0200 ntdll: Use static debug info before initialization is done. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 13 ++++++++++++- dlls/ntdll/thread.c | 5 ----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 254673b..4e2fd78 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -43,11 +43,18 @@ WINE_DECLARE_DEBUG_CHANNEL(timestamp); static struct __wine_debug_functions default_funcs; -/* ---------------------------------------------------------------------- */ +static BOOL init_done; +static struct debug_info initial_info; /* debug info for initial thread */ /* get the debug info pointer for the current thread */ static inline struct debug_info *get_info(void) { + if (!init_done) + { + if (!initial_info.str_pos) initial_info.str_pos = initial_info.strings; + if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; + return &initial_info; + } return ntdll_get_thread_data()->debug_info; } @@ -199,5 +206,9 @@ static const struct __wine_debug_functions funcs = */ void debug_init(void) { + if (!initial_info.str_pos) initial_info.str_pos = initial_info.strings; + if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; + ntdll_get_thread_data()->debug_info = &initial_info; + init_done = TRUE; __wine_dbg_set_functions( &funcs, &default_funcs, sizeof(funcs) ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9f4a08f..6445ec6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -163,7 +163,6 @@ void thread_init(void) LARGE_INTEGER now; NTSTATUS status; struct ntdll_thread_data *thread_data; - static struct debug_info debug_info; /* debug info for initial thread */ virtual_init(); @@ -231,13 +230,9 @@ void thread_init(void) thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; - thread_data->debug_info = &debug_info; signal_init_thread( teb ); virtual_init_threading(); - - debug_info.str_pos = debug_info.strings; - debug_info.out_pos = debug_info.output; debug_init(); /* setup the server connection */

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR7 filter.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 42f70a79d6489452861f60926dde04efa9e93ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=42f70a79d6489452861f6092… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 20:59:36 2019 -0500 quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR7 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 9dbe009..d5253f4 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -393,6 +393,72 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + static const WCHAR inW[] = {'I','n',0}; + + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr7(0); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + IBaseFilter_EnumPins(filter, &enum_pins); + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, inW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + IEnumPins_Reset(enum_pins); + + sink_id[9] = '0'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '2'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + } + else + skip("Mixing mode is not supported.\n"); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); @@ -400,6 +466,7 @@ START_TEST(vmr7) test_filter_config(); test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR7.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 08d91f6d71c2b9794eb8d08503fac287e8d2c6aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d91f6d71c2b9794eb8d085… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 20:59:35 2019 -0500 quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 90fcd77..9dbe009 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -42,6 +42,28 @@ static IBaseFilter *create_vmr7(DWORD mode) return filter; } +static HRESULT set_mixing_mode(IBaseFilter *filter) +{ + IVMRFilterConfig *config; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetNumberOfStreams(config, 2); + todo_wine ok(hr == VFW_E_DDRAW_CAPS_NOT_SUITABLE || hr == S_OK, "Got hr %#x.\n", hr); + + IVMRFilterConfig_Release(config); + return hr; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_filter_config(void) { IVMRFilterConfig *config; @@ -240,12 +262,144 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_vmr7(0); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[3]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + hr = IEnumPins_Next(enum1, 1, pins, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + } + else + skip("Mixing mode is not supported.\n"); + + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); test_filter_config(); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Alexandre Julliard : ntdll: Store offsets instead of pointers in the debug_info structure.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: c9bf52502ce986ae73a712146f81a0430afdc24f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9bf52502ce986ae73a71214… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 14:16:29 2019 +0200 ntdll: Store offsets instead of pointers in the debug_info structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 30 ++++++++++++------------------ dlls/ntdll/ntdll_misc.h | 8 ++++---- dlls/ntdll/thread.c | 3 +-- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 790af11..64355ab 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -47,25 +47,20 @@ static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; /* get the debug info pointer for the current thread */ static inline struct debug_info *get_info(void) { - if (!init_done) - { - if (!initial_info.str_pos) initial_info.str_pos = initial_info.strings; - if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; - return &initial_info; - } + if (!init_done) return &initial_info; return ntdll_get_thread_data()->debug_info; } /* add a string to the output buffer */ static int append_output( struct debug_info *info, const char *str, size_t len ) { - if (len >= sizeof(info->output) - (info->out_pos - info->output)) + if (len >= sizeof(info->output) - info->out_pos) { fprintf( stderr, "wine_dbg_output: debugstr buffer overflow (contents: '%s')\n", info->output ); - info->out_pos = info->output; + info->out_pos = 0; abort(); } - memcpy( info->out_pos, str, len ); + memcpy( info->output + info->out_pos, str, len ); info->out_pos += len; return len; } @@ -223,12 +218,13 @@ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel const char * __cdecl __wine_dbg_strdup( const char *str ) { struct debug_info *info = get_info(); - char *res = info->str_pos; + unsigned int pos = info->str_pos; size_t n = strlen( str ) + 1; - if (res + n > &info->strings[sizeof(info->strings)]) res = info->strings; - info->str_pos = res + n; - return strcpy( res, str ); + assert( n <= sizeof(info->strings) ); + if (pos + n > sizeof(info->strings)) pos = 0; + info->str_pos = pos + n; + return memcpy( info->strings + pos, str, n ); } /*********************************************************************** @@ -243,8 +239,8 @@ int __cdecl __wine_dbg_output( const char *str ) if (end) { ret += append_output( info, str, end + 1 - str ); - write( 2, info->output, info->out_pos - info->output ); - info->out_pos = info->output; + write( 2, info->output, info->out_pos ); + info->out_pos = 0; str = end + 1; } if (*str) ret += append_output( info, str, strlen( str )); @@ -264,7 +260,7 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; /* only print header if we are at the beginning of the line */ - if (info->out_pos > info->output) return 0; + if (info->out_pos) return 0; if (init_done) { @@ -288,8 +284,6 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ */ void debug_init(void) { - if (!initial_info.str_pos) initial_info.str_pos = initial_info.strings; - if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index ca04583..6a60912 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -221,10 +221,10 @@ extern enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRIN struct debug_info { - char *str_pos; /* current position in strings buffer */ - char *out_pos; /* current position in output buffer */ - char strings[1024]; /* buffer for temporary strings */ - char output[1024]; /* current output line */ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1024]; /* buffer for temporary strings */ + char output[1024]; /* current output line */ }; /* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6445ec6..be46218 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -367,8 +367,7 @@ static void start_thread( struct startup_info *info ) struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; struct debug_info debug_info; - debug_info.str_pos = debug_info.strings; - debug_info.out_pos = debug_info.output; + debug_info.str_pos = debug_info.out_pos = 0; thread_data->debug_info = &debug_info; thread_data->pthread_id = pthread_self();

1 0

Alexandre Julliard : ntdll: Remove no longer used debug functions.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: f438ff566d9cf1928a272afdec0c4f29a17b7e2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f438ff566d9cf1928a272afd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 14:11:42 2019 +0200 ntdll: Remove no longer used debug functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 104 ------------------------------------------------ include/wine/debug.h | 13 ------ libs/wine/debug.c | 18 +++++---- 3 files changed, 10 insertions(+), 125 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 94d2de7..790af11 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -28,14 +28,8 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <ctype.h> #include "wine/debug.h" -#include "wine/exception.h" -#include "wine/library.h" -#include "wine/unicode.h" -#include "winnt.h" -#include "winternl.h" #include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(pid); @@ -62,24 +56,6 @@ static inline struct debug_info *get_info(void) return ntdll_get_thread_data()->debug_info; } -/* allocate some tmp space for a string */ -static char *get_temp_buffer( size_t n ) -{ - struct debug_info *info = get_info(); - char *res = info->str_pos; - - if (res + n >= &info->strings[sizeof(info->strings)]) res = info->strings; - info->str_pos = res + n; - return res; -} - -/* release extra space that we requested in get_temp_buffer() */ -static void release_temp_buffer( char *ptr, size_t size ) -{ - struct debug_info *info = get_info(); - info->str_pos = ptr + size; -} - /* add a string to the output buffer */ static int append_output( struct debug_info *info, const char *str, size_t len ) { @@ -308,85 +284,6 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ } /*********************************************************************** - * NTDLL_dbg_vprintf - */ -static int NTDLL_dbg_vprintf( const char *format, va_list args ) -{ - struct debug_info *info = get_info(); - int end; - - int ret = vsnprintf( info->out_pos, sizeof(info->output) - (info->out_pos - info->output), - format, args ); - - /* make sure we didn't exceed the buffer length - * the two checks are due to glibc changes in vsnprintfs return value - * the buffer size can be exceeded in case of a missing \n in - * debug output */ - if ((ret == -1) || (ret >= sizeof(info->output) - (info->out_pos - info->output))) - { - fprintf( stderr, "wine_dbg_vprintf: debugstr buffer overflow (contents: '%s')\n", - info->output); - info->out_pos = info->output; - abort(); - } - - for (end = ret; end > 0; end--) if (info->out_pos[end - 1] == '\n') break; - - if (!end) info->out_pos += ret; - else - { - char *pos = info->output; - write( 2, pos, info->out_pos + end - pos ); - /* move beginning of next line to start of buffer */ - memmove( pos, info->out_pos + end, ret - end ); - info->out_pos = pos + ret - end; - } - return ret; -} - -/*********************************************************************** - * NTDLL_dbg_vlog - */ -static int NTDLL_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function, const char *format, va_list args ) -{ - static const char * const classes[] = { "fixme", "err", "warn", "trace" }; - struct debug_info *info = get_info(); - int ret = 0; - - /* only print header if we are at the beginning of the line */ - if (info->out_pos == info->output || info->out_pos[-1] == '\n') - { - if (TRACE_ON(timestamp)) - { - ULONG ticks = NtGetTickCount(); - ret = wine_dbg_printf( "%3u.%03u:", ticks / 1000, ticks % 1000 ); - } - if (TRACE_ON(pid)) - ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); - ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); - if (*format == '\1') /* special magic to avoid standard prefix */ - format++; - else if (cls < ARRAY_SIZE( classes )) - ret += wine_dbg_printf( "%s:%s:%s ", classes[cls], channel->name, function ); - } - if (format) - ret += NTDLL_dbg_vprintf( format, args ); - return ret; -} - - -static const struct __wine_debug_functions funcs = -{ - get_temp_buffer, - release_temp_buffer, - wine_dbgstr_an, - wine_dbgstr_wn, - NTDLL_dbg_vprintf, - NTDLL_dbg_vlog -}; - -/*********************************************************************** * debug_init */ void debug_init(void) @@ -395,5 +292,4 @@ void debug_init(void) if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; - __wine_dbg_set_functions( &funcs, NULL, sizeof(funcs) ); } diff --git a/include/wine/debug.h b/include/wine/debug.h index e95fcfb..c7eb185 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -145,20 +145,7 @@ struct __wine_debug_channel #endif /* !__GNUC__ && !__SUNPRO_C */ -struct __wine_debug_functions -{ - char * (*get_temp_buffer)( size_t n ); - void (*release_temp_buffer)( char *buffer, size_t n ); - const char * (*dbgstr_an)( const char * s, int n ); - const char * (*dbgstr_wn)( const WCHAR *s, int n ); - int (*dbg_vprintf)( const char *format, va_list args ); - int (*dbg_vlog)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function, const char *format, va_list args ); -}; - extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); -extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, - struct __wine_debug_functions *old_funcs, size_t size ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str ); extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, diff --git a/libs/wine/debug.c b/libs/wine/debug.c index b19fefe..0e71022 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -39,9 +39,16 @@ #include "wine/debug.h" #include "wine/library.h" -#if defined(__MINGW32__) || defined(_MSC_VER) -WINE_DECLARE_DEBUG_CHANNEL(pid); -#endif +struct __wine_debug_functions +{ + char * (*get_temp_buffer)( size_t n ); + void (*release_temp_buffer)( char *buffer, size_t n ); + const char * (*dbgstr_an)( const char * s, int n ); + const char * (*dbgstr_wn)( const WCHAR *s, int n ); + int (*dbg_vprintf)( const char *format, va_list args ); + int (*dbg_vlog)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function, const char *format, va_list args ); +}; static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; @@ -416,11 +423,6 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch { int ret = 0; -#if defined(__MINGW32__) || defined(_MSC_VER) - if (TRACE_ON(pid)) - ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); - ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); -#endif if (cls < ARRAY_SIZE(debug_classes)) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format)

1 0