wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Gabriel Ivăncescu : shell32/autocomplete: Make the dropdown listbox a proper pop-up window.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 3a3424280f6a5093f9299629848b53a9b15031a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3424280f6a5093f9299629… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 2 14:28:13 2019 +0300 shell32/autocomplete: Make the dropdown listbox a proper pop-up 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 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index ed8b270..9e8d93c 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -301,7 +301,8 @@ 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, SWP_SHOWWINDOW); + SetWindowPos(ac->hwndListBox, HWND_TOP, r.left, r.bottom + 1, width, height, + SWP_SHOWWINDOW | SWP_NOACTIVATE); } static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) @@ -798,6 +799,8 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, int sel, len; switch (uMsg) { + case WM_MOUSEACTIVATE: + return MA_NOACTIVATE; case WM_MOUSEMOVE: sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); SendMessageW(hwnd, LB_SETCURSEL, sel, 0); @@ -821,16 +824,15 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, static void create_listbox(IAutoCompleteImpl *This) { /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ - This->hwndListBox = CreateWindowExW(0, WC_LISTBOXW, NULL, - WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, - 0, 0, 0, 0, GetParent(This->hwndEdit), NULL, shell32_hInstance, NULL); + 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); if (This->hwndListBox) { HFONT edit_font; This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); - SetParent(This->hwndListBox, HWND_DESKTOP); /* 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);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Forward to the original listbox proc outside the switch.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: df1c7c8aa7fcb3f8533fd0625ac560611ee07b47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df1c7c8aa7fcb3f8533fd062… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 2 14:28:12 2019 +0300 shell32/autocomplete: Forward to the original listbox proc outside the switch. 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 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index bd9b872..ed8b270 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -801,23 +801,21 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_MOUSEMOVE: sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); SendMessageW(hwnd, LB_SETCURSEL, sel, 0); - break; + return 0; case WM_LBUTTONDOWN: sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); if (sel < 0) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXTLEN, sel, 0); if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); set_text_and_selection(This, This->hwndEdit, msg, 0, len); hide_listbox(This, hwnd, TRUE); heap_free(msg); - break; - default: - return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + return 0; } - return 0; + return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } static void create_listbox(IAutoCompleteImpl *This)

1 0

Isira Seneviratne : start: Correct capitalization of "Windows Explorer".
by Alexandre Julliard 03 Apr '19

03 Apr '19

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 03 Apr '19

03 Apr '19

1 0

Alexandre Julliard : winecrt0: Add a fallback implementation of __wine_dbg_header().
by Alexandre Julliard 03 Apr '19

03 Apr '19

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_get_channel_flags().
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: b0ecbe0baed6910fae291f0ae506dd90506e5315 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ecbe0baed6910fae291f0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:25:39 2019 +0200 winecrt0: Add a fallback implementation of __wine_dbg_get_channel_flags(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 4ae086c..8003e03 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -27,9 +27,18 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "wine/heap.h" 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 const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; + +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 void load_func( void **func, const char *name, void *def ) { @@ -42,6 +51,103 @@ static void load_func( void **func, const char *name, void *def ) } #define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name ) + +/* 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 = heap_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 ); +} + +/* initialize all options at startup */ +static void init_options(void) +{ + char *wine_debug = getenv("WINEDEBUG"); + + nb_debug_options = 0; + if (wine_debug) parse_options( wine_debug ); +} + /* FIXME: this is not 100% thread-safe */ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) { @@ -60,6 +166,27 @@ static int __cdecl fallback__wine_dbg_output( const char *str ) return fwrite( str, 1, strlen(str), stderr ); } +static unsigned char __cdecl fallback__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; +} + const char * __cdecl __wine_dbg_strdup( const char *str ) { LOAD_FUNC( __wine_dbg_strdup ); @@ -72,4 +199,10 @@ int __cdecl __wine_dbg_output( const char *str ) return p__wine_dbg_output( str ); } +unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +{ + LOAD_FUNC( __wine_dbg_get_channel_flags ); + return p__wine_dbg_get_channel_flags( channel ); +} + #endif /* _WIN32 */

1 0

Alexandre Julliard : winecrt0: Add a fallback implementation of __wine_dbg_output().
by Alexandre Julliard 03 Apr '19

03 Apr '19

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 : winecrt0: Add a fallback implementation of __wine_dbg_strdup().
by Alexandre Julliard 03 Apr '19

03 Apr '19

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: Store offsets instead of pointers in the debug_info structure.
by Alexandre Julliard 03 Apr '19

03 Apr '19

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 03 Apr '19

03 Apr '19

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

← Newer
1
...
66
67
68
69
70
71
72
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019