wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Hugh McMaster : regedit/tests: Test whether comments ending in a backslash affect the next line.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 750358fc44087926c606623f6a27f93a5328ada3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750358fc44087926c606623f6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:33 2016 +0000 regedit/tests: Test whether comments ending in a backslash affect the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e9bf082..23ea4f9 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -278,6 +278,14 @@ static void test_basic_import(void) verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment \\\n" + "\"Wine9\"=\"Line 2\"\n\n"); + verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Fix line concatenation test.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: b897c9b13de9503afafb4d2f8d9776f314d1e219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b897c9b13de9503afafb4d2f8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:10 2016 +0000 regedit/tests: Fix line concatenation test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 482940c..e9bf082 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -251,8 +251,8 @@ static void test_basic_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1\"=dword:00000782\n\n" "\"Wine2\"=\"Test Value\"\n" - "\"Wine3\"=hex(7):4c,69,6e,65,20,\ - 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" "#comment\n" "@=\"Test\"\n" ";comment\n\n"

1 0

Ken Thomases : winemac: Keep floating windows in a higher window level than non-floating full-screen windows.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 7161df136fd1f98fc005528e6e2f391e5a952f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7161df136fd1f98fc005528e6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 1 19:38:40 2016 -0600 winemac: Keep floating windows in a higher window level than non-floating full-screen windows. When windows aren't full-screen, non-floating windows go in NSNormalWindowLevel and floating ones go in NSFloatingWindowLevel, which is higher. However, a non-floating full-screen window will go into a level higher than either of those. The prior logic of the -adjustWindowLevels: method would keep the floating windows at a window level at least that high. They should actually be in a strictly higher level. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 0eaea57..09c95d0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -520,6 +520,7 @@ static NSString* WineLocalizedString(unsigned int stringID) NSUInteger nextFloatingIndex = 0; __block NSInteger maxLevel = NSIntegerMin; __block NSInteger maxNonfloatingLevel = NSNormalWindowLevel; + __block NSInteger minFloatingLevel = NSFloatingWindowLevel; __block WineWindow* prev = nil; WineWindow* window; @@ -556,6 +557,14 @@ static NSString* WineLocalizedString(unsigned int stringID) NSInteger origLevel = [window level]; NSInteger newLevel = [window minimumLevelForActive:active]; + if (window.floating) + { + if (minFloatingLevel <= maxNonfloatingLevel) + minFloatingLevel = maxNonfloatingLevel + 1; + if (newLevel < minFloatingLevel) + newLevel = minFloatingLevel; + } + if (newLevel < maxLevel) newLevel = maxLevel; else

1 0

Ken Thomases : winemac: Set the parent of Cocoa views for child windows when they are created.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: b5194d6f8300ee3114e848d1bc28207c7d4e4a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5194d6f8300ee3114e848d1b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 1 19:38:41 2016 -0600 winemac: Set the parent of Cocoa views for child windows when they are created. This fixes an oversight in commit d91e56863. Some of the views created for Win32 child windows were being left out of any view hierarchy. OpenGL contexts attached to such child windows and views were not able to render to screen, leaving blank areas. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 07d0f23..40aa439 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -786,6 +786,25 @@ static void destroy_cocoa_view(struct macdrv_win_data *data) /*********************************************************************** + * set_cocoa_view_parent + */ +static void set_cocoa_view_parent(struct macdrv_win_data *data, HWND parent) +{ + struct macdrv_win_data *parent_data = get_win_data(parent); + macdrv_window cocoa_window = parent_data ? parent_data->cocoa_window : NULL; + macdrv_view superview = parent_data ? parent_data->client_cocoa_view : NULL; + + TRACE("win %p/%p parent %p/%p\n", data->hwnd, data->cocoa_view, parent, cocoa_window ? (void*)cocoa_window : (void*)superview); + + if (!cocoa_window && !superview) + WARN("hwnd %p new parent %p has no Cocoa window or view in this process\n", data->hwnd, parent); + + macdrv_set_view_superview(data->cocoa_view, superview, cocoa_window, NULL, NULL); + release_win_data(parent_data); +} + + +/*********************************************************************** * macdrv_create_win_data * * Create a Mac data window structure for an existing window. @@ -825,6 +844,8 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win TRACE("win %p/%p window %s whole %s client %s\n", hwnd, data->cocoa_view, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); + + set_cocoa_view_parent(data, parent); } return data; @@ -1574,18 +1595,8 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) destroy_cocoa_window(data); create_cocoa_view(data); } - else - { - struct macdrv_win_data *parent_data = get_win_data(parent); - macdrv_window cocoa_window = parent_data ? parent_data->cocoa_window : NULL; - macdrv_view superview = parent_data ? parent_data->client_cocoa_view : NULL; - - if (!cocoa_window && !superview) - WARN("hwnd %p new parent %p has no Cocoa window or view in this process\n", hwnd, parent); - macdrv_set_view_superview(data->cocoa_view, superview, cocoa_window, NULL, NULL); - release_win_data(parent_data); - } + set_cocoa_view_parent(data, parent); } else /* new top level window */ {

1 0

Nikolay Sivov : dwrite: Skip entries prefixed with '@' in system font file enumerator.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 93ac04d6082f1f64eeaf61e17f5f664539ea1469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ac04d6082f1f64eeaf61e17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 2 01:31:56 2016 +0300 dwrite: Skip entries prefixed with '@' in system font file enumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2e1eab0..76a90bd 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3808,10 +3808,12 @@ static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerato /* iterate until we find next string value */ while (1) { DWORD type = 0, count, val_count; + val_count = max_val_count; + value[0] = 0; if (RegEnumValueW(enumerator->hkey, enumerator->index, value, &val_count, NULL, &type, NULL, &count)) break; - if (type == REG_SZ) { + if (type == REG_SZ && *value && *value != '@') { *current = TRUE; break; }

1 0

Vincent Povirk : gdiplus: Create the FontFamily before checking for duplicates.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 50185949d8d41c78fe52ba7c6fc1e5de39491f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50185949d8d41c78fe52ba7c6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 1 13:08:12 2016 -0600 gdiplus: Create the FontFamily before checking for duplicates. Sometimes GdipCreateFontFamilyFromName stores a different name in the GpFontFamily object, which breaks the duplicate check. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ed0499d..1068a47 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1599,6 +1599,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { GpFontCollection* fonts = (GpFontCollection*)lParam; + GpFontFamily* family; int i; if (type == RASTER_FONTTYPE) @@ -1608,10 +1609,8 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (lfw->lfFaceName[0] == '@') return 1; - /* skip duplicates */ - for (i=0; i<fonts->count; i++) - if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) - return 1; + if (fonts->count && strcmpiW(lfw->lfFaceName, fonts->FontFamilies[fonts->count-1]->FamilyName) == 0) + return 1; if (fonts->allocated == fonts->count) { @@ -1627,11 +1626,21 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &fonts->FontFamilies[fonts->count]) == Ok) - fonts->count++; - else + if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) return 0; + /* skip duplicates */ + for (i=0; i<fonts->count; i++) + { + if (strcmpiW(family->FamilyName, fonts->FontFamilies[i]->FamilyName) == 0) + { + GdipDeleteFontFamily(family); + return 1; + } + } + + fonts->FontFamilies[fonts->count++] = family; + return 1; }

1 0

Vincent Povirk : gdiplus: Don' t include rotated fonts in the installed font collection.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 0d6a4b06f96da1027e564e99e37f773b0975803b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6a4b06f96da1027e564e99e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 1 13:08:11 2016 -0600 gdiplus: Don't include rotated fonts in the installed font collection. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 63eaed2..ed0499d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1604,6 +1604,10 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (type == RASTER_FONTTYPE) return 1; + /* skip rotated fonts */ + if (lfw->lfFaceName[0] == '@') + return 1; + /* skip duplicates */ for (i=0; i<fonts->count; i++) if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0)

1 0

André Hentschel : Add WWN 403
by Jeremy Newman 02 Dec '16

02 Dec '16

Module: website Branch: master Commit: d5cee8eff5a2ee3211877af31250e68e05a2461e URL: http://source.winehq.org/git/website.git/?a=commit;h=d5cee8eff5a2ee3211877a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 2 21:39:17 2016 +0100 Add WWN 403 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016120201.xml | 11 + news/en/2016120201.xml | 11 + wwn/en/wn20161202_403.xml | 10038 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 10060 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d5cee8eff5a2ee3211…

1 0

Aric Stewart : hidclass: All reports read or written to user space lead with a reportId.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: d0039106dea1f4f6e6d762f564c8f12364a2db01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0039106dea1f4f6e6d762f56… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 29 07:58:27 2016 -0600 hidclass: All reports read or written to user space lead with a reportId. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 31 ++++---------- dlls/hidclass.sys/device.c | 94 ++++++++++++++++++++++++++++-------------- dlls/winebus.sys/bus_udev.c | 38 ++++++++++++++++- 3 files changed, 107 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0039106dea1f4f6e6d76…

1 0

Bruno Jesus : iphlpapi: Ensure GetIpAddrTable returns loopback addresses in the end.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 95298b4442504d9e977fbdb72ce1417273340265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95298b4442504d9e977fbdb72… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 1 10:23:36 2016 -0200 iphlpapi: Ensure GetIpAddrTable returns loopback addresses in the end. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 27 +++++++++++++++++++++------ dlls/iphlpapi/tests/iphlpapi.c | 3 +++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 90dcda3..54f7a37 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -134,17 +134,27 @@ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable, } -static int IpAddrTableSorter(const void *a, const void *b) +static int IpAddrTableNumericSorter(const void *a, const void *b) { - int ret; + int ret = 0; if (a && b) ret = ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; - else - ret = 0; return ret; } +static int IpAddrTableLoopbackSorter(const void *a, const void *b) +{ + const MIB_IPADDRROW *left = a, *right = b; + int ret = 0; + + if (isIfIndexLoopback(left->dwIndex)) + ret = 1; + else if (isIfIndexLoopback(right->dwIndex)) + ret = -1; + + return ret; +} /****************************************************************** * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) @@ -173,7 +183,7 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, ret = getIPAddrTable(ppIpAddrTable, heap, flags); if (!ret && bOrder) qsort((*ppIpAddrTable)->table, (*ppIpAddrTable)->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableSorter); + sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); TRACE("returning %d\n", ret); return ret; } @@ -1988,9 +1998,14 @@ DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL else { *pdwSize = size; memcpy(pIpAddrTable, table, size); + /* sort by numeric IP value */ if (bOrder) qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableSorter); + sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); + /* sort ensuring loopback interfaces are in the end */ + else + qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, + sizeof(MIB_IPADDRROW), IpAddrTableLoopbackSorter); ret = NO_ERROR; } HeapFree(GetProcessHeap(), 0, table); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 73e4302..9f59910 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -261,6 +261,9 @@ static void testGetIpAddrTable(void) ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); + /* loopback must never be the first when more than one interface is found */ + if (buf->table[i].dwAddr == htonl(INADDR_LOOPBACK)) + ok(buf->dwNumEntries == 1 || i, "Loopback interface in wrong first position\n"); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

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 December 2016