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

Zebediah Figura : strmbase: Update comment for copying pin info.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 567be5b60ee6c165828f6a43b252299b5f9f6dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=567be5b60ee6c165828f6a43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:43:24 2018 +0200 strmbase: Update comment for copying pin info. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index ef22a57..a100ae1 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -145,10 +145,7 @@ out: static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) { - /* Tempting to just do a memcpy, but the name field is - 128 characters long! We will probably never exceed 10 - most of the time, so we are better off copying - each field manually */ + /* avoid copying uninitialized data */ strcpyW(pDest->achName, pSrc->achName); pDest->dir = pSrc->dir; pDest->pFilter = pSrc->pFilter;

1 0

Zebediah Figura : quartz: Inline copying pin info and update comment.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 1105d0bafb4d86731795600116ff49d9f65ebaa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1105d0bafb4d867317956001… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:43:25 2018 +0200 quartz: Inline copying pin info and update comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5197d5c..a3674f2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -138,18 +138,6 @@ out: return hr; } - -static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) -{ - /* Tempting to just do a memcpy, but the name field is - 128 characters long! We will probably never exceed 10 - most of the time, so we are better off copying - each field manually */ - strcpyW(pDest->achName, pSrc->achName); - pDest->dir = pSrc->dir; - pDest->pFilter = pSrc->pFilter; -} - static HRESULT deliver_endofstream(IPin* pin, LPVOID unused) { return IPin_EndOfStream( pin ); @@ -179,15 +167,20 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) /*** PullPin implementation ***/ -static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, - QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, PullPin * pPinImpl) +static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO *info, + SAMPLEPROC_PULL pSampleProc, void *pUserData, QUERYACCEPTPROC pQueryAccept, + CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, + LPCRITICAL_SECTION pCritSec, PullPin *pPinImpl) { /* Common attributes */ pPinImpl->pin.IPin_iface.lpVtbl = PullPin_Vtbl; pPinImpl->pin.refCount = 1; pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pCritSec = pCritSec; - Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); + /* avoid copying uninitialized data */ + strcpyW(pPinImpl->pin.pinInfo.achName, info->achName); + pPinImpl->pin.pinInfo.dir = info->dir; + pPinImpl->pin.pinInfo.pFilter = info->pFilter; ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); /* Input pin attributes */

1 0

Michael Stefaniuc : quartz: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: e7bcc1193aeb88079e63d7e799daff43ff5c8522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7bcc1193aeb88079e63d7e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 00:21:22 2018 +0200 quartz: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index d78f643..d189d1d 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - typedef struct FilterMapper3Impl { IUnknown IUnknown_inner; @@ -264,7 +262,7 @@ static HRESULT WINAPI FilterMapper3_CreateCategory( { LPWSTR wClsidAMCat = NULL; LPWSTR wClsidCategory = NULL; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + ARRAYSIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + ARRAY_SIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; HKEY hKey = NULL; LONG lRet; HRESULT hr; @@ -1268,7 +1266,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c LPWSTR wszClsid = NULL; HKEY hKey; LONG lRet; - WCHAR wszKeyName[ARRAYSIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit); @@ -1337,7 +1335,7 @@ static HRESULT WINAPI FilterMapper_RegisterPin( HKEY hKey = NULL; HKEY hPinsKey = NULL; WCHAR * wszPinsKeyName; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %d, %d, %d, %d, %s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(szName), bRendered, bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin)); @@ -1498,7 +1496,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID LONG lRet; LPWSTR wszClsid = NULL; HKEY hKey; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter)); @@ -1563,7 +1561,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi LPWSTR wszClsid = NULL; HKEY hKey = NULL; WCHAR * wszPinNameKey; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name));

1 0

Dmitry Timoshkov : comctl32/listbox: Fix order of items passed in WM_COMPAREITEM data.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 7decba4e2bf985acbc38d9895e18d691ac914a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7decba4e2bf985acbc38d989… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 5 08:14:33 2018 +0300 comctl32/listbox: Fix order of items passed in WM_COMPAREITEM data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42602 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 12 ++++++------ dlls/comctl32/tests/listbox.c | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 94712fd..a1fdf83 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -798,7 +798,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { index = (min + max) / 2; if (HAS_STRINGS(descr)) - res = LISTBOX_lstrcmpiW( descr->locale, str, descr->items[index].str); + res = LISTBOX_lstrcmpiW( descr->locale, descr->items[index].str, str ); else { COMPAREITEMSTRUCT cis; @@ -809,15 +809,15 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) cis.hwndItem = descr->self; /* note that some application (MetaStock) expects the second item * to be in the listbox */ - cis.itemID1 = -1; - cis.itemData1 = (ULONG_PTR)str; - cis.itemID2 = index; - cis.itemData2 = descr->items[index].data; + cis.itemID1 = index; + cis.itemData1 = descr->items[index].data; + cis.itemID2 = -1; + cis.itemData2 = (ULONG_PTR)str; cis.dwLocaleId = descr->locale; res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res < 0) max = index; + if (res > 0) max = index; else min = index + 1; } return exact ? -1 : max; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 790c2c4..69d3381 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -326,9 +326,7 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA ok(wParam == cis->CtlID, "expected %#x, got %#lx\n", cis->CtlID, wParam); ok(cis->hwndItem == ctrl, "expected %p, got %p\n", ctrl, cis->hwndItem); -todo_wine ok((int)cis->itemID1 >= 0, "expected >= 0, got %d\n", cis->itemID1); -todo_wine ok((int)cis->itemID2 == -1, "expected -1, got %d\n", cis->itemID2); if (cis->CtlType == ODT_LISTBOX) @@ -2030,10 +2028,8 @@ static void test_WM_MEASUREITEM(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); ok(ret == 0, "expected 0, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); -todo_wine ok(ret == 1, "expected 1, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); -todo_wine ok(ret == 2, "expected 2, got %ld\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", TRUE);

1 0

Dmitry Timoshkov : comctl32/listbox: Fix the listbox sorting algorithm.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 02c36b52b0071482d369deacb3a617a7f01e8a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c36b52b0071482d369deac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 5 08:14:34 2018 +0300 comctl32/listbox: Fix the listbox sorting algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42602 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 11 ++++++----- dlls/comctl32/tests/listbox.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a1fdf83..e033975 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -791,10 +791,11 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { INT index, min, max, res; - if (!(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + if (!descr->nb_items || !(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + min = 0; - max = descr->nb_items; - while (min != max) + max = descr->nb_items - 1; + while (min <= max) { index = (min + max) / 2; if (HAS_STRINGS(descr)) @@ -817,10 +818,10 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res > 0) max = index; + if (res > 0) max = index - 1; else min = index + 1; } - return exact ? -1 : max; + return exact ? -1 : min; } diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 69d3381..9af675b 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2032,7 +2032,7 @@ static void test_WM_MEASUREITEM(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); ok(ret == 2, "expected 2, got %ld\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", FALSE); DestroyWindow(listbox); /* LBS_HASSTRINGS */

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

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

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

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 : 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