wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Zhiyi Zhang : comctl32/taskdialog: Add support for radio buttons.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 4836727d5e8ccf848971b67992c3d67eac54db36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4836727d5e8ccf848971b679… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 26 11:36:37 2018 +0800 comctl32/taskdialog: Add support for radio buttons. 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 | 139 ++++++++++++++++++++++++++++++- dlls/comctl32/tests/taskdialog.c | 172 ++++++++++++++++++++++++++++++++++----- 2 files changed, 290 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4836727d5e8ccf848971…

1 0

Zhiyi Zhang : comctl32/taskdialog: Use dynamic buffer for taskdialog_get_label_size().
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 07d8d624598ad74933970063e29040c10b4675c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d8d624598ad74933970063… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 26 11:35:24 2018 +0800 comctl32/taskdialog: Use dynamic buffer for taskdialog_get_label_size(). 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 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 33fb578..5625f2b 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -235,7 +235,7 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND HFONT hfont, old_hfont; HDC hdc; RECT rect = {0}; - WCHAR text[1024]; + WCHAR *text; INT text_length; if (syslink) @@ -250,7 +250,15 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND style |= DT_LEFT; hfont = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); - text_length = GetWindowTextW(hwnd, text, ARRAY_SIZE(text)); + text_length = GetWindowTextLengthW(hwnd); + text = Alloc((text_length + 1) * sizeof(WCHAR)); + if (!text) + { + size->cx = 0; + size->cy = 0; + return; + } + GetWindowTextW(hwnd, text, text_length + 1); hdc = GetDC(hwnd); old_hfont = SelectObject(hdc, hfont); rect.right = max_width; @@ -258,6 +266,7 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND size->cx = min(max_width, rect.right - rect.left); if (old_hfont) SelectObject(hdc, old_hfont); ReleaseDC(hwnd, hdc); + Free(text); } static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon)

1 0

Zebediah Figura : dbghelp/tests: Add a simple test for StackWalk64().
by Alexandre Julliard 05 Jul '18

05 Jul '18

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 05 Jul '18

05 Jul '18

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 05 Jul '18

05 Jul '18

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

Alexandre Julliard : comdlg32/filedlg: Resize the Places toolbar along with the dialog.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 75ff2c12342101acd533cfb8c91c34fe9326ee92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75ff2c12342101acd533cfb8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 5 13:39:23 2018 +0200 comdlg32/filedlg: Resize the Places toolbar along with the dialog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 2 +- dlls/comdlg32/filedlg.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 0dc2b48..22a5a93 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -487,7 +487,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 7bed515..deae866 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1241,6 +1241,10 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam) rc.bottom - rc.top + chgy, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); break; + case IDC_TOOLBARPLACES: + DeferWindowPos( hdwp, ctrl, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top + chgy, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + break; } } }

1 0

Alexandre Julliard : server: Don' t clip update regions to the desktop window.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 8cfac3b218669edcef8b92ea8370b0579eb23ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfac3b218669edcef8b92ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 5 12:48:13 2018 +0200 server: Don't clip update regions to the desktop window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- server/window.c | 23 ++++++++--------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0cfafe4..cb918fa 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4760,7 +4760,7 @@ static void test_showwindow(void) flush_sequence(); ShowWindow(hwnd, SW_SHOWMAXIMIZED); ok_sequence(WmShowMaxPopupResizedSeq_todo, - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", TRUE); + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); DestroyWindow(hwnd); flush_sequence(); @@ -5339,7 +5339,7 @@ static void test_messages(void) hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP | WS_VISIBLE, -10, -10, 10000, 10000, NULL, 0, 0, NULL ); ok (hwnd != 0, "Failed to create popup window\n"); - ok_sequence(WmShowPopupExtremeLocationSeq, "RedrawWindow:show_popup_extreme_location", TRUE); + ok_sequence(WmShowPopupExtremeLocationSeq, "RedrawWindow:show_popup_extreme_location", FALSE); DestroyWindow(hwnd); diff --git a/server/window.c b/server/window.c index 0a32d46..322001d 100644 --- a/server/window.c +++ b/server/window.c @@ -1141,27 +1141,20 @@ struct window_class* get_window_class( user_handle_t window ) /* the returned rectangle is in window coordinates; return 0 if rectangle is empty */ static int get_window_visible_rect( struct window *win, rectangle_t *rect, int frame ) { - int offset_x = 0, offset_y = 0; - - if (!(win->style & WS_VISIBLE)) return 0; + int offset_x = win->window_rect.left, offset_y = win->window_rect.top; *rect = frame ? win->window_rect : win->client_rect; - if (!is_desktop_window(win)) - { - offset_x = win->window_rect.left; - offset_y = win->window_rect.top; - } - while (win->parent) + if (!(win->style & WS_VISIBLE)) return 0; + if (is_desktop_window( win )) return 1; + + while (!is_desktop_window( win->parent )) { win = win->parent; if (!(win->style & WS_VISIBLE) || win->style & WS_MINIMIZE) return 0; - if (!is_desktop_window(win)) - { - offset_x += win->client_rect.left; - offset_y += win->client_rect.top; - offset_rect( rect, win->client_rect.left, win->client_rect.top ); - } + offset_x += win->client_rect.left; + offset_y += win->client_rect.top; + offset_rect( rect, win->client_rect.left, win->client_rect.top ); if (!intersect_rect( rect, rect, &win->client_rect )) return 0; if (!intersect_rect( rect, rect, &win->window_rect )) return 0; }

1 0

Alexandre Julliard : server: Add a couple of rectangle helper functions.
by Alexandre Julliard 05 Jul '18

05 Jul '18

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 05 Jul '18

05 Jul '18

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

Julian Rüger : po: Update German translation.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 6d13c66dd50a6e1cbb2814ded6f39fa72e41a13d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d13c66dd50a6e1cbb2814de… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 11:58:12 2018 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/po/de.po b/po/de.po index a05fee9..2b4f422 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-05-18 15:21+0200\n" +"PO-Revision-Date: 2018-07-05 11:58+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3437,32 +3437,24 @@ msgid "Publishers..." msgstr "Herausgeber..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "LAN-Verbindung" +msgstr "Verbindungen" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokaler Server" +msgstr "Proxyserver" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Proxy verwenden" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Keine Ports" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -12919,10 +12911,8 @@ msgid "Confirm Value Delete" msgstr "Löschen des Wertes bestätigen" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Sind Sie sicher, dass Sie den Wert '%1' löschen möchten?" +msgstr "Sind Sie sicher, dass Sie den ausgewählten Wert löschen möchten?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14911,6 +14901,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Ein Programm auf Ihrem System ist abgestürzt, aber WineDbg konnte nicht an " +"den Prozess anknüpfen, um eine Backtrace zu erstellen." #: winedbg.rc:41 msgid "(unidentified)"

1 0

← Newer
1
...
33
34
35
36
37
38
39
40
41
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 July 2018