July 2018 - Wine-Commits - list.winehq.org

Zebediah Figura : dbghelp/tests: Add a simple test for StackWalk64().
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 8dc0d36717d4ac3c2c698b43d104119590541dc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc0d36717d4ac3c2c698b43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 16:59:41 2018 +0200 dbghelp/tests: Add a simple test for StackWalk64(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/dbghelp/tests/Makefile.in | 5 ++ dlls/dbghelp/tests/dbghelp.c | 144 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+) diff --git a/configure b/configure index 2ca572d..431d56d 100755 --- a/configure +++ b/configure @@ -18687,6 +18687,7 @@ wine_fn_config_makefile dlls/d3dxof/tests enable_tests wine_fn_config_makefile dlls/davclnt enable_davclnt wine_fn_config_makefile dlls/dbgeng enable_dbgeng wine_fn_config_makefile dlls/dbghelp enable_dbghelp +wine_fn_config_makefile dlls/dbghelp/tests enable_tests wine_fn_config_makefile dlls/dciman32 enable_dciman32 wine_fn_config_makefile dlls/ddeml.dll16 enable_win16 wine_fn_config_makefile dlls/ddraw enable_ddraw diff --git a/configure.ac b/configure.ac index d10acde..1db5a40 100644 --- a/configure.ac +++ b/configure.ac @@ -3186,6 +3186,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dxof/tests) WINE_CONFIG_MAKEFILE(dlls/davclnt) WINE_CONFIG_MAKEFILE(dlls/dbgeng) WINE_CONFIG_MAKEFILE(dlls/dbghelp) +WINE_CONFIG_MAKEFILE(dlls/dbghelp/tests) WINE_CONFIG_MAKEFILE(dlls/dciman32) WINE_CONFIG_MAKEFILE(dlls/ddeml.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/ddraw) diff --git a/dlls/dbghelp/tests/Makefile.in b/dlls/dbghelp/tests/Makefile.in new file mode 100644 index 0000000..31e5b01 --- /dev/null +++ b/dlls/dbghelp/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dbghelp.dll +IMPORTS = dbghelp + +C_SRCS = \ + dbghelp.c diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c new file mode 100644 index 0000000..1292b66 --- /dev/null +++ b/dlls/dbghelp/tests/dbghelp.c @@ -0,0 +1,144 @@ +/* + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +#include "windef.h" +#include "verrsrc.h" +#include "dbghelp.h" +#include "wine/test.h" + +#if defined(__i386__) || defined(__x86_64__) + +DWORD CALLBACK stack_walk_thread(void *arg) +{ + DWORD count = SuspendThread(GetCurrentThread()); + ok(!count, "got %d\n", count); + return 0; +} + +static void test_stack_walk(void) +{ + char si_buf[sizeof(SYMBOL_INFO) + 200]; + SYMBOL_INFO *si = (SYMBOL_INFO *)si_buf; + STACKFRAME64 frame = {{0}}, frame0; + BOOL found_our_frame = FALSE; + DWORD machine; + HANDLE thread; + DWORD64 disp; + CONTEXT ctx; + DWORD count; + BOOL ret; + + thread = CreateThread(NULL, 0, stack_walk_thread, NULL, 0, NULL); + + /* wait for the thread to suspend itself */ + do + { + Sleep(50); + count = SuspendThread(thread); + ResumeThread(thread); + } + while (!count); + + ctx.ContextFlags = CONTEXT_CONTROL; + ret = GetThreadContext(thread, &ctx); + ok(ret, "got error %u\n", ret); + + frame.AddrPC.Mode = AddrModeFlat; + frame.AddrFrame.Mode = AddrModeFlat; + frame.AddrStack.Mode = AddrModeFlat; + +#ifdef __i386__ + machine = IMAGE_FILE_MACHINE_I386; + + frame.AddrPC.Segment = ctx.SegCs; + frame.AddrPC.Offset = ctx.Eip; + frame.AddrFrame.Segment = ctx.SegSs; + frame.AddrFrame.Offset = ctx.Ebp; + frame.AddrStack.Segment = ctx.SegSs; + frame.AddrStack.Offset = ctx.Esp; +#elif defined(__x86_64__) + machine = IMAGE_FILE_MACHINE_AMD64; + + frame.AddrPC.Segment = ctx.SegCs; + frame.AddrPC.Offset = ctx.Rip; + frame.AddrFrame.Segment = ctx.SegSs; + frame.AddrFrame.Offset = ctx.Rbp; + frame.AddrStack.Segment = ctx.SegSs; + frame.AddrStack.Offset = ctx.Rsp; +#endif + frame0 = frame; + + /* first invocation just calculates the return address */ + ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL); + ok(ret, "StackWalk64() failed: %u\n", GetLastError()); + ok(frame.AddrPC.Offset == frame0.AddrPC.Offset, "expected %s, got %s\n", + wine_dbgstr_longlong(frame0.AddrPC.Offset), + wine_dbgstr_longlong(frame.AddrPC.Offset)); + ok(frame.AddrStack.Offset == frame0.AddrStack.Offset, "expected %s, got %s\n", + wine_dbgstr_longlong(frame0.AddrStack.Offset), + wine_dbgstr_longlong(frame.AddrStack.Offset)); + ok(frame.AddrReturn.Offset && frame.AddrReturn.Offset != frame.AddrPC.Offset, + "got bad return address %s\n", wine_dbgstr_longlong(frame.AddrReturn.Offset)); + + while (frame.AddrReturn.Offset) + { + char *addr; + + ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL); + ok(ret, "StackWalk64() failed: %u\n", GetLastError()); + + addr = (void *)(DWORD_PTR)frame.AddrPC.Offset; + + if (addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) + { + found_our_frame = TRUE; + + si->SizeOfStruct = sizeof(SYMBOL_INFO); + si->MaxNameLen = 200; + if (SymFromAddr(GetCurrentProcess(), frame.AddrPC.Offset, &disp, si)) + ok(!strcmp(si->Name, "stack_walk_thread"), "got wrong name %s\n", si->Name); + } + } + + ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL); + ok(!ret, "StackWalk64() should have failed\n"); + + ok(found_our_frame, "didn't find stack_walk_thread frame\n"); +} + +#else /* __i386__ || __x86_64__ */ + +static void test_stack_walk(void) +{ +} + +#endif /* __i386__ || __x86_64__ */ + +START_TEST(dbghelp) +{ + BOOL ret = SymInitialize(GetCurrentProcess(), NULL, TRUE); + ok(ret, "got error %u\n", GetLastError()); + + test_stack_walk(); + + ret = SymCleanup(GetCurrentProcess()); + ok(ret, "got error %u\n", GetLastError()); +}

1 0

Matteo Bruni : wined3d: Declare the correct number and type of fragment shader color outputs.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 4032cc80f9b623dd554f710c6c08f97f40f9c33e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4032cc80f9b623dd554f710c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 5 17:18:49 2018 +0430 wined3d: Declare the correct number and type of fragment shader color outputs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 149 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 124 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4032cc80f9b623dd554f…

1 0

Zebediah Figura : winegstreamer: Add a missing debugstr_a.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: f482b9463c45710adc4841f73899dc4e95cad067 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f482b9463c45710adc4841f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 14:18:03 2018 +0200 winegstreamer: Add a missing debugstr_a. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7fd1116..833464b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1087,7 +1087,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) { gchar *strcaps = gst_caps_to_string(caps); - ERR("Could not find a filter for caps: %s\n", strcaps); + ERR("Could not find a filter for caps: %s\n", debugstr_a(strcaps)); g_free(strcaps); }

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for command links.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: cb468b682d2b7d088d0607259affe1680b558e24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb468b682d2b7d088d060725… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 26 11:37:02 2018 +0800 comctl32/taskdialog: Add support for command links. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 62 +++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/taskdialog.c | 61 ++++++++++++++++++++++----------------- 2 files changed, 93 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb468b682d2b7d088d06…

1 0

Alexandre Julliard : server: Add a couple of rectangle helper functions.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: d3876ca84e1d52f11864a9c126ee063eaad32200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3876ca84e1d52f11864a9c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 5 12:46:18 2018 +0200 server: Add a couple of rectangle helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/region.c | 21 +++++---------------- server/user.h | 21 ++++++++++++++++++++- server/window.c | 38 ++++++++------------------------------ 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/server/region.c b/server/region.c index 33e2a54..0e52f2f 100644 --- a/server/region.c +++ b/server/region.c @@ -129,7 +129,7 @@ static inline int validate_rectangles( const rectangle_t *rects, unsigned int nb for (ptr = rects, end = rects + nb_rects; ptr < end; ptr++) { - if (ptr->left >= ptr->right || ptr->top >= ptr->bottom) return 0; /* empty rectangle */ + if (is_rect_empty( ptr )) return 0; /* empty rectangle */ if (ptr == end - 1) break; if (ptr[0].top == ptr[1].top) /* same band */ { @@ -623,7 +623,7 @@ void free_region( struct region *region ) /* set region to a simple rectangle */ void set_region_rect( struct region *region, const rectangle_t *rect ) { - if (rect->left < rect->right && rect->top < rect->bottom) + if (!is_rect_empty( rect )) { region->num_rects = 1; region->rects[0] = region->extents = *rect; @@ -631,10 +631,7 @@ void set_region_rect( struct region *region, const rectangle_t *rect ) else { region->num_rects = 0; - region->extents.left = 0; - region->extents.top = 0; - region->extents.right = 0; - region->extents.bottom = 0; + region->extents = empty_rect; } } @@ -700,16 +697,8 @@ void offset_region( struct region *region, int x, int y ) if (!region->num_rects) return; for (rect = region->rects, end = rect + region->num_rects; rect < end; rect++) - { - rect->left += x; - rect->right += x; - rect->top += y; - rect->bottom += y; - } - region->extents.left += x; - region->extents.right += x; - region->extents.top += y; - region->extents.bottom += y; + offset_rect( rect, x, y ); + offset_rect( &region->extents, x, y ); } /* mirror a region relative to a window client rect */ diff --git a/server/user.h b/server/user.h index e7eecd4..1236b0e 100644 --- a/server/user.h +++ b/server/user.h @@ -188,6 +188,25 @@ extern void set_process_default_desktop( struct process *process, struct desktop extern void close_process_desktop( struct process *process ); extern void close_thread_desktop( struct thread *thread ); +static inline int is_rect_empty( const rectangle_t *rect ) +{ + return (rect->left >= rect->right || rect->top >= rect->bottom); +} + +static inline int point_in_rect( const rectangle_t *rect, int x, int y ) +{ + return (x >= rect->left && x < rect->right && y >= rect->top && y < rect->bottom); +} + +/* offset the coordinates of a rectangle */ +static inline void offset_rect( rectangle_t *rect, int offset_x, int offset_y ) +{ + rect->left += offset_x; + rect->top += offset_y; + rect->right += offset_x; + rect->bottom += offset_y; +} + /* mirror a rectangle respective to the window client area */ static inline void mirror_rect( const rectangle_t *client_rect, rectangle_t *rect ) { @@ -204,7 +223,7 @@ static inline int intersect_rect( rectangle_t *dst, const rectangle_t *src1, con dst->top = max( src1->top, src2->top ); dst->right = min( src1->right, src2->right ); dst->bottom = min( src1->bottom, src2->bottom ); - return (dst->left < dst->right && dst->top < dst->bottom); + return !is_rect_empty( dst ); } /* validate a window handle and return the full handle */ diff --git a/server/window.c b/server/window.c index 7081209..0a32d46 100644 --- a/server/window.c +++ b/server/window.c @@ -114,6 +114,8 @@ struct user_handle_array int total; }; +static const rectangle_t empty_rect; + /* global window pointers */ static struct window *shell_window; static struct window *shell_listview; @@ -431,8 +433,7 @@ struct process *get_top_window_owner( struct desktop *desktop ) void get_top_window_rectangle( struct desktop *desktop, rectangle_t *rect ) { struct window *win = desktop->top_window; - if (!win) rect->left = rect->top = rect->right = rect->bottom = 0; - else *rect = win->window_rect; + *rect = win ? win->window_rect : empty_rect; } /* post a message to the desktop window */ @@ -447,7 +448,6 @@ void post_desktop_message( struct desktop *desktop, unsigned int message, static struct window *create_window( struct window *parent, struct window *owner, atom_t atom, mod_handle_t instance ) { - static const rectangle_t empty_rect; int extra_bytes; struct window *win = NULL; struct desktop *desktop; @@ -665,8 +665,7 @@ static inline int is_point_in_window( struct window *win, int x, int y ) return 0; /* disabled child */ if ((win->ex_style & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == (WS_EX_LAYERED|WS_EX_TRANSPARENT)) return 0; /* transparent */ - if (x < win->visible_rect.left || x >= win->visible_rect.right || - y < win->visible_rect.top || y >= win->visible_rect.bottom) + if (!point_in_rect( &win->visible_rect, x, y )) return 0; /* not in window */ if (win->win_region && !point_in_region( win->win_region, x - win->window_rect.left, y - win->window_rect.top )) @@ -710,9 +709,7 @@ static struct window *child_window_from_point( struct window *parent, int x, int if (ptr->style & (WS_MINIMIZE|WS_DISABLED)) return ptr; /* if point is not in client area, return at once */ - if (x < ptr->client_rect.left || x >= ptr->client_rect.right || - y < ptr->client_rect.top || y >= ptr->client_rect.bottom) - return ptr; + if (!point_in_rect( &ptr->client_rect, x, y )) return ptr; return child_window_from_point( ptr, x - ptr->client_rect.left, y - ptr->client_rect.top ); } @@ -730,9 +727,7 @@ static int get_window_children_from_point( struct window *parent, int x, int y, if (!is_point_in_window( ptr, x, y )) continue; /* skip it */ /* if point is in client area, and window is not minimized or disabled, check children */ - if (!(ptr->style & (WS_MINIMIZE|WS_DISABLED)) && - x >= ptr->client_rect.left && x < ptr->client_rect.right && - y >= ptr->client_rect.top && y < ptr->client_rect.bottom) + if (!(ptr->style & (WS_MINIMIZE|WS_DISABLED)) && point_in_rect( &ptr->client_rect, x, y )) { if (!get_window_children_from_point( ptr, x - ptr->client_rect.left, y - ptr->client_rect.top, array )) @@ -794,9 +789,7 @@ static int all_windows_from_point( struct window *top, int x, int y, struct user if (!is_point_in_window( top, x, y )) return 1; /* if point is in client area, and window is not minimized or disabled, check children */ - if (!(top->style & (WS_MINIMIZE|WS_DISABLED)) && - x >= top->client_rect.left && x < top->client_rect.right && - y >= top->client_rect.top && y < top->client_rect.bottom) + if (!(top->style & (WS_MINIMIZE|WS_DISABLED)) && point_in_rect( &top->client_rect, x, y )) { if (!is_desktop_window(top)) { @@ -907,12 +900,7 @@ static inline void client_to_screen( struct window *win, int *x, int *y ) static inline void client_to_screen_rect( struct window *win, rectangle_t *rect ) { for ( ; win && !is_desktop_window(win); win = win->parent) - { - rect->left += win->client_rect.left; - rect->right += win->client_rect.left; - rect->top += win->client_rect.top; - rect->bottom += win->client_rect.top; - } + offset_rect( rect, win->client_rect.left, win->client_rect.top ); } /* map the region from window to screen coordinates */ @@ -956,16 +944,6 @@ static struct region *clip_children( struct window *parent, struct window *last, } -/* offset the coordinates of a rectangle */ -static inline void offset_rect( rectangle_t *rect, int offset_x, int offset_y ) -{ - rect->left += offset_x; - rect->top += offset_y; - rect->right += offset_x; - rect->bottom += offset_y; -} - - /* set the region to the client rect clipped by the window rect, in parent-relative coordinates */ static void set_region_client_rect( struct region *region, struct window *win ) {

1 0

Zebediah Figura : psapi/tests: Avoid linking statically to kernel32 functions.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: dbfc4ab5edfc1db0bb3a76a311761e8dd74a50c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbfc4ab5edfc1db0bb3a76a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 11:47:44 2018 +0200 psapi/tests: Avoid linking statically to kernel32 functions. Since they are not available everywhere. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 13205b3..0c25668 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -199,16 +199,16 @@ static void test_EnumProcessModules(void) ok(!!hMod, "expected non-NULL module\n"); ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); - ret = GetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); + ret = pGetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); ok(ret, "got error %u\n", GetLastError()); ok(!strcmp(name, "notepad.exe"), "got %s\n", name); - ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); + ret = pGetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); ok(ret, "got error %u\n", GetLastError()); todo_wine ok(!strcmp(name, buffer), "got %s\n", name); - ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); + ret = pGetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); ok(ret, "got error %u\n", GetLastError()); ok(info.lpBaseOfDll == hMod, "expected %p, got %p\n", hMod, info.lpBaseOfDll); ok(info.SizeOfImage, "image size was 0\n");

1 0

Jason Edmeades : cmd: Fix issue in WCMD_assoc highlighted by valgrind.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: ab46a89c3b8649844a70ee30abffbbd275128bc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab46a89c3b8649844a70ee30… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:40 2018 +0100 cmd: Fix issue in WCMD_assoc highlighted by valgrind. In an error condition, the wrong variable was being used for an insert, resulting in a read from uninitialized data. This could be triggered for example by 'ftype jason=', and the error message should have included jason but instead was just ''. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38849 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3a0981d..57a41c4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4923,7 +4923,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); } - WCMD_output_stderr(msgbuffer, keyValue); + WCMD_output_stderr(msgbuffer, args); errorlevel = 2; }

1 0

Jason Edmeades : cmd: Call and goto finds the next matching label.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 254dc78c2cc5aec26b8af6956c3525c1880bf570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=254dc78c2cc5aec26b8af695… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:39 2018 +0100 cmd: Call and goto finds the next matching label. A call or a goto will find the next matching label not the first one in the file. This means it could be later in the file or it could be earlier in the file, so make goto (which 'call' also uses) first scan from current file position to the end of the file, and subsequently from the start of the file to the wrap point. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42823 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 67 +++++++++++++++++++++++--------- programs/cmd/tests/test_builtins.cmd | 51 ++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 +++++++ 3 files changed, 113 insertions(+), 18 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 35b68bd..3a0981d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2582,30 +2582,61 @@ void WCMD_goto (CMD_LIST **cmdList) { if (labelend) *labelend = 0x00; WINE_TRACE("goto label: '%s'\n", wine_dbgstr_w(paramStart)); - SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (*paramStart && - WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { - str = string; + /* Loop through potentially twice - once from current file position + through to the end, and second time from start to current file + position */ + if (*paramStart) { + int loop; + LARGE_INTEGER startli; + for (loop=0; loop<2; loop++) { + if (loop==0) { + /* On first loop, save the file size */ + startli.QuadPart = 0; + startli.u.LowPart = SetFilePointer(context -> h, startli.u.LowPart, + &startli.u.HighPart, FILE_CURRENT); + } else { + /* On second loop, start at the beginning of the file */ + WINE_TRACE("Label not found, trying from beginning of file\n"); + if (loop==1) SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); + } - /* Ignore leading whitespace or no-echo character */ - while (*str=='@' || isspaceW (*str)) str++; + while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + str = string; - /* If the first real character is a : then this is a label */ - if (*str == ':') { - str++; + /* Ignore leading whitespace or no-echo character */ + while (*str=='@' || isspaceW (*str)) str++; - /* Skip spaces between : and label */ - while (isspaceW (*str)) str++; - WINE_TRACE("str before brk %s\n", wine_dbgstr_w(str)); + /* If the first real character is a : then this is a label */ + if (*str == ':') { + str++; - /* Label ends at whitespace or redirection characters */ - labelend = strpbrkW(str, labelEndsW); - if (labelend) *labelend = 0x00; - WINE_TRACE("comparing found label %s\n", wine_dbgstr_w(str)); + /* Skip spaces between : and label */ + while (isspaceW (*str)) str++; + WINE_TRACE("str before brk %s\n", wine_dbgstr_w(str)); - if (lstrcmpiW (str, paramStart) == 0) return; - } + /* Label ends at whitespace or redirection characters */ + labelend = strpbrkW(str, labelEndsW); + if (labelend) *labelend = 0x00; + WINE_TRACE("comparing found label %s\n", wine_dbgstr_w(str)); + + if (lstrcmpiW (str, paramStart) == 0) return; + } + + /* See if we have gone beyond the end point if second time through */ + if (loop==1) { + LARGE_INTEGER curli; + curli.QuadPart = 0; + curli.u.LowPart = SetFilePointer(context -> h, curli.u.LowPart, + &curli.u.HighPart, FILE_CURRENT); + if (curli.QuadPart > startli.QuadPart) { + WINE_TRACE("Reached wrap point, label not found\n"); + break; + } + } + } + } } + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); context -> skip_rest = TRUE; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 49c2d9e..0a8122c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3027,6 +3027,57 @@ echo FAILURE at dest 10 :dest10:this is also ignored echo Correctly ignored trailing information +rem Testing which label is reached when there are many options +echo Begin: +set nextlabel= +call :sub +set nextlabel=middle +goto :sub + +:sub +echo ..First sub +if not "%nextlabel%"=="" goto :%nextlabel% +goto :EOF + +:sub +echo ..Second sub +if not "%nextlabel%"=="" goto :%nextlabel% +goto :EOF + +:middle +echo Middle: +set nextlabel= +call :sub +set nextlabel=nearend +goto :sub + +:sub +echo ..Third sub +if not "%nextlabel%"=="" goto :%nextlabel% +goto :EOF + +:nearend +echo Near end: +set nextlabel= +call :sub +set nextlabel=end +goto :sub + +:sub +echo ..Fourth sub +if not "%nextlabel%"=="" goto :%nextlabel% +goto :EOF + +:end +echo At end: +set nextlabel= +call :sub +set nextlabel=done +goto :sub + +:done +echo Finished + echo ------------ Testing PATH ------------ set WINE_backup_path=%path% set path=original diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index cfde83b..7f4f724 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1582,6 +1582,19 @@ goto with redirections worked Ignoring double colons worked label with mixed whitespace and no echo worked Correctly ignored trailing information +Begin: +..First sub +..First sub +Middle: +..Third sub +..Third sub +Near end: +..Fourth sub +..Fourth sub +At end: +..First sub +..First sub +Finished ------------ Testing PATH ------------ PATH=original PATH=try2

1 0

Jason Edmeades : cmd: Support "c:<space>" etc when changing drive letters.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: daee8b753c52011d1dd745e399cbe25ac9e9ac47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daee8b753c52011d1dd745e3… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:38 2018 +0100 cmd: Support "c:<space>" etc when changing drive letters. This allows whitespace and any other text on the line when changing drive letters. Mostly I expect it crops up when commands are concatenated and the readability whitespace is added to the end of the command. For example C: & dir results in "C: " and "dir" as the two commands. We cannot unconditionally remove whitespace as some commands rely on it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40694 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 35 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ programs/cmd/wcmdmain.c | 9 ++++++-- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 6f2ef4a..49c2d9e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3042,6 +3042,41 @@ echo ------------ Testing start /W ------------ echo start /W failed to wait>foobar.txt start /W "" cmd /C "ping -n1 & echo start /W seems to really wait>foobar.txt"& type foobar.txt& del foobar.txt +echo ------------ Testing changing the drive letter ---------- +pushd C:\ + +echo Normal: +call :setError 0 +C: +if errorlevel 1 echo Normal drive change failed + +echo Normal+space +call :setError 0 +C:@space@ +if errorlevel 1 echo Normal+space drive change failed + +echo Normal+space+garbage +call :setError 0 +C: garbage +if errorlevel 1 echo Normal+space+garbage drive change failed + +call :setError 0 +echo Quoted should fail +"C:" +if not errorlevel 1 echo quoted drive change unexpectedly worked + +echo Normal+tab +call :setError 0 +C:@tab@ +if errorlevel 1 echo Normal+tab drive change failed + +echo Normal+tab+garbage +call :setError 0 +C:@tab(a)garbagetab +if errorlevel 1 echo Normal+tab+garbage drive change failed + +popd + echo ------------ Testing combined CALLs/GOTOs ------------ echo @echo off>foo.cmd echo goto :eof>>foot.cmd diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0eb5b96..cfde83b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1588,6 +1588,13 @@ PATH=try2 PATH=try3 ------------ Testing start /W ------------ start /W seems to really wait +------------ Testing changing the drive letter ---------- +Normal: +Normal+space +Normal+space+garbage +Quoted should fail +Normal+tab +Normal+tab+garbage ------------ Testing combined CALLs/GOTOs ------------ world cheball diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 827ddd2..0d02f1f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1327,13 +1327,18 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, cmd = new_cmd; /* - * Changing default drive has to be handled as a special case. + * Changing default drive has to be handled as a special case, anything + * else if it exists after whitespace is ignored */ - if ((strlenW(cmd) == 2) && (cmd[1] == ':') && IsCharAlphaW(cmd[0])) { + if ((cmd[1] == ':') && IsCharAlphaW(cmd[0]) && + (!cmd[2] || cmd[2] == ' ' || cmd[2] == '\t')) { WCHAR envvar[5]; WCHAR dir[MAX_PATH]; + /* Ignore potential garbage on the same line */ + cmd[2]=0x00; + /* According to MSDN CreateProcess docs, special env vars record the current directory on each drive, in the form =C: so see if one specified, and if so go back to it */

1 0

Alexandre Julliard : Revert "add perm news blurb about wineconf".
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: website Branch: master Commit: a766c9724eedfba2fee2ab28ae98749af2dc29f1 URL: https://source.winehq.org/git/website.git/?a=commit;h=a766c9724eedfba2fee2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 5 17:37:34 2018 +0200 Revert "add perm news blurb about wineconf". This reverts commit 941ab4df439b4e0f76ec1b1a3e69a484feac7b08. WineConf 2018 is over. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/en/home.template | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index 8eec1bf..0411569 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -161,20 +161,6 @@ <h1 class="title"><a href="{$root}/news">News and Updates</a></h1> - <p class="newstitle"><a href="/news/2018030801">WineConf 2018 - 25th anniversary</a></p> - <div class="newsblock"> - <p>The Wine Project is pleased to announce that WineConf 2018 will - take place on June 29 - July 1 2018 in The Hague, The - Netherlands. This will coincide with the 25th anniversary of Wine.</p> - <p>WineConf is the Wine Project's annual conference, where members of - the Wine community, the broader Free Software community and interested - users meet up over food and beverages. We traditionally also have a - number of talks by attendees, as well as some formal and informal - discussions about anything vaguely Wine related.</p> - <p>Please see the <a href="https://wiki.winehq.org/WineConf2018">WineConf2018 page</a> - for further details.</p> - </div> -  <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> more news...</a></p>

1 0