September 2017 - Wine-Commits

Nikolay Sivov : dwrite: Handle 8bpp gray bitmaps for bitmap target.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 55aedbffa6418c92ad6282ee10b00169149a0d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55aedbffa6418c92ad6282ee1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 5 13:35:27 2017 +0300 dwrite: Handle 8bpp gray bitmaps for bitmap target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 5425b5c..2e1811b 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -256,6 +256,25 @@ static inline DWORD *get_pixel_ptr_32(struct dib_data *dib, int x, int y) return (DWORD *)((BYTE*)dib->ptr + y * dib->stride + x * 4); } +static inline BYTE blend_color(BYTE dst, BYTE src, BYTE alpha) +{ + return (src * alpha + dst * (255 - alpha) + 127) / 255; +} + +static inline DWORD blend_subpixel(BYTE r, BYTE g, BYTE b, DWORD text, const BYTE *alpha) +{ + return blend_color(r, text >> 16, alpha[0]) << 16 | + blend_color(g, text >> 8, alpha[1]) << 8 | + blend_color(b, text, alpha[2]); +} + +static inline DWORD blend_pixel(BYTE r, BYTE g, BYTE b, DWORD text, BYTE alpha) +{ + return blend_color(r, text >> 16, alpha) << 16 | + blend_color(g, text >> 8, alpha) << 8 | + blend_color(b, text, alpha); +} + static void blit_8(struct dib_data *dib, const BYTE *src, const RECT *rect, DWORD text_pixel) { DWORD *dst_ptr = get_pixel_ptr_32(dib, rect->left, rect->top); @@ -263,8 +282,11 @@ static void blit_8(struct dib_data *dib, const BYTE *src, const RECT *rect, DWOR for (y = rect->top; y < rect->bottom; y++) { for (x = 0; x < src_width; x++) { - if (src[x] < DWRITE_ALPHA_MAX) continue; - dst_ptr[x] = text_pixel; + if (src[x]) continue; + if (src[x] == DWRITE_ALPHA_MAX) + dst_ptr[x] = text_pixel; + else + dst_ptr[x] = blend_pixel(dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, src[x]); } src += src_width; @@ -272,18 +294,6 @@ static void blit_8(struct dib_data *dib, const BYTE *src, const RECT *rect, DWOR } } -static inline BYTE blend_color(BYTE dst, BYTE src, BYTE alpha) -{ - return (src * alpha + dst * (255 - alpha) + 127) / 255; -} - -static inline DWORD blend_subpixel(BYTE r, BYTE g, BYTE b, DWORD text, const BYTE *alpha) -{ - return blend_color(r, text >> 16, alpha[0]) << 16 | - blend_color(g, text >> 8, alpha[1]) << 8 | - blend_color(b, text, alpha[2]); -} - static void blit_subpixel_888(struct dib_data *dib, int dib_width, const BYTE *src, const RECT *rect, DWORD text_pixel) {

1 0

Fabian Maurer : winecfg: Remove processorArchitecture from manifest.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 685bdb2614503f7df7658000c46a5acaff11eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=685bdb2614503f7df7658000c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 2 01:19:39 2017 +0200 winecfg: Remove processorArchitecture from manifest. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/winecfg.manifest b/programs/winecfg/winecfg.manifest index a7e4d88..9008877 100644 --- a/programs/winecfg/winecfg.manifest +++ b/programs/winecfg/winecfg.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0" processorArchitecture=""/> +<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0"/> <dependency> <dependentAssembly> <assemblyIdentity

1 0

Nikolay Sivov : dwrite: Use 8bpp bitmaps in grayscale mode.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: c4917bdbdfd93668d3c73268e81f5df74646ba1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4917bdbdfd93668d3c73268e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 5 13:35:29 2017 +0300 dwrite: Use 8bpp bitmaps in grayscale mode. Problem analyzed by Kimmo Myllyvirta. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 37 +++++++----- dlls/dwrite/freetype.c | 6 +- dlls/dwrite/tests/font.c | 134 ++++++++++++++++++++++++++++++++++++++----- 4 files changed, 148 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4917bdbdfd93668d3c73…

1 0

Nikolay Sivov : dwrite: Validate buffer size passed to CreateAlphaTexture( ) against analysis texture type.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 0a633908410f8ecd815ab8c897768a0dfad1028e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a633908410f8ecd815ab8c89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 5 13:35:28 2017 +0300 dwrite: Validate buffer size passed to CreateAlphaTexture() against analysis texture type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4dfb47f..9af46be 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5092,7 +5092,7 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi /* make sure buffer is large enough for requested texture type */ required = (bounds->right - bounds->left) * (bounds->bottom - bounds->top); - if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) + if (This->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) required *= 3; if (size < required)

1 0

Alexandre Julliard : ntdll: Remove the view parameter from the page protection helpers.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 2e12f7cdd6cb3d53624024d64232540e65a15261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e12f7cdd6cb3d53624024d64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 16:20:23 2017 +0200 ntdll: Remove the view parameter from the page protection helpers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 63 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e12f7cdd6cb3d5362402…

1 0

Alexandre Julliard : ntdll: Allocate the per-page protection byte separately from the view.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 3ecf069e45c12cf3cd79319a633acecba9a00553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ecf069e45c12cf3cd79319a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 16:17:39 2017 +0200 ntdll: Allocate the per-page protection byte separately from the view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ea4834f..379c8a1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -73,7 +73,6 @@ struct file_view HANDLE mapping; /* Handle to the file mapping */ unsigned int map_protect; /* Mapping protection */ unsigned int protect; /* Protection for all pages at allocation time */ - BYTE prot[1]; /* Protection byte for each page */ }; @@ -146,6 +145,15 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); #define VIRTUAL_HEAP_SIZE (sizeof(void*)*1024*1024) +#ifdef _WIN64 /* on 64-bit the page protection bytes use a 2-level table */ +static const size_t pages_vprot_shift = 20; +static const size_t pages_vprot_mask = (1 << 20) - 1; +static size_t pages_vprot_size; +static BYTE **pages_vprot; +#else /* on 32-bit we use a simple array with one byte per page */ +static BYTE *pages_vprot; +#endif + static HANDLE virtual_heap; static void *preload_reserve_start; static void *preload_reserve_end; @@ -160,7 +168,13 @@ static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mma */ static BYTE get_page_vprot( struct file_view *view, const void *addr ) { - return view->prot[((const char *)addr - (const char *)view->base) >> page_shift]; + size_t idx = (size_t)addr >> page_shift; + +#ifdef _WIN64 + return pages_vprot[idx >> pages_vprot_shift][idx & pages_vprot_mask]; +#else + return pages_vprot[idx]; +#endif } @@ -171,8 +185,20 @@ static BYTE get_page_vprot( struct file_view *view, const void *addr ) */ static void set_page_vprot( struct file_view *view, const void *addr, size_t size, BYTE vprot ) { - BYTE *ptr = view->prot + (((const char *)addr - (const char *)view->base) >> page_shift); - memset( ptr, vprot, ROUND_SIZE( addr, size ) >> page_shift ); + size_t idx = (size_t)addr >> page_shift; + size_t end = ((size_t)addr + size + page_mask) >> page_shift; + +#ifdef _WIN64 + while (idx >> pages_vprot_shift != end >> pages_vprot_shift) + { + size_t dir_size = pages_vprot_mask + 1 - (idx & pages_vprot_mask); + memset( pages_vprot[idx >> pages_vprot_shift] + (idx & pages_vprot_mask), vprot, dir_size ); + idx += dir_size; + } + memset( pages_vprot[idx >> pages_vprot_shift] + (idx & pages_vprot_mask), vprot, end - idx ); +#else + memset( pages_vprot + idx, vprot, end - idx ); +#endif } @@ -184,10 +210,44 @@ static void set_page_vprot( struct file_view *view, const void *addr, size_t siz static void set_page_vprot_bits( struct file_view *view, const void *addr, size_t size, BYTE set, BYTE clear ) { - BYTE *ptr = view->prot + (((const char *)addr - (const char *)view->base) >> page_shift); + size_t idx = (size_t)addr >> page_shift; + size_t end = ((size_t)addr + size + page_mask) >> page_shift; + +#ifdef _WIN64 + for ( ; idx < end; idx++) + { + BYTE *ptr = pages_vprot[idx >> pages_vprot_shift] + (idx & pages_vprot_mask); + *ptr = (*ptr & ~clear) | set; + } +#else + for ( ; idx < end; idx++) pages_vprot[idx] = (pages_vprot[idx] & ~clear) | set; +#endif +} + + +/*********************************************************************** + * alloc_pages_vprot + * + * Allocate the page protection bytes for a given range. + */ +static BOOL alloc_pages_vprot( const void *addr, size_t size ) +{ +#ifdef _WIN64 + size_t idx = (size_t)addr >> page_shift; + size_t end = ((size_t)addr + size + page_mask) >> page_shift; size_t i; + void *ptr; - for (i = 0; i < ROUND_SIZE( addr, size ) >> page_shift; i++) ptr[i] = (ptr[i] & ~clear) | set; + assert( end <= pages_vprot_size << pages_vprot_shift ); + for (i = idx >> pages_vprot_shift; i < (end + pages_vprot_mask) >> pages_vprot_shift; i++) + { + if (pages_vprot[i]) continue; + if ((ptr = wine_anon_mmap( NULL, pages_vprot_mask + 1, PROT_READ | PROT_WRITE, 0 )) == (void *)-1) + return FALSE; + pages_vprot[i] = ptr; + } +#endif + return TRUE; } @@ -555,9 +615,11 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz assert( !((UINT_PTR)base & page_mask) ); assert( !(size & page_mask) ); + if (!alloc_pages_vprot( base, size )) return STATUS_NO_MEMORY; + /* Create the view structure */ - if (!(view = RtlAllocateHeap( virtual_heap, 0, sizeof(*view) + (size >> page_shift) - 1 ))) + if (!(view = RtlAllocateHeap( virtual_heap, 0, sizeof(*view) ))) { FIXME( "out of memory in virtual heap for %p-%p\n", base, (char *)base + size ); return STATUS_NO_MEMORY; @@ -1440,8 +1502,13 @@ void virtual_init(void) assert( !(page_size & page_mask) ); page_shift = 0; while ((1 << page_shift) != page_size) page_shift++; - user_space_limit = working_set_limit = address_space_limit = (void *)~page_mask; -#endif /* page_mask */ +#ifdef _WIN64 + address_space_limit = (void *)(((1UL << 47) - 1) & ~page_mask); +#else + address_space_limit = (void *)~page_mask; +#endif + user_space_limit = working_set_limit = address_space_limit; +#endif if ((preload = getenv("WINEPRELOADRESERVE"))) { unsigned long start, end; @@ -1452,12 +1519,18 @@ void virtual_init(void) } } - /* try to find space in a reserved area for the virtual heap */ - alloc_heap.size = VIRTUAL_HEAP_SIZE; + /* try to find space in a reserved area for the virtual heap and pages protection table */ +#ifdef _WIN64 + pages_vprot_size = ((size_t)address_space_limit >> page_shift >> pages_vprot_shift) + 1; + alloc_heap.size = VIRTUAL_HEAP_SIZE + pages_vprot_size * sizeof(*pages_vprot); +#else + alloc_heap.size = VIRTUAL_HEAP_SIZE + (1U << (32 - page_shift)); +#endif if (!wine_mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_heap, 1 )) alloc_heap.base = wine_anon_mmap( NULL, alloc_heap.size, PROT_READ|PROT_WRITE, 0 ); assert( alloc_heap.base != (void *)-1 ); + pages_vprot = (void *)((char *)alloc_heap.base + VIRTUAL_HEAP_SIZE); virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, alloc_heap.base, VIRTUAL_HEAP_SIZE, VIRTUAL_HEAP_SIZE, NULL, NULL ); create_view( &heap_view, alloc_heap.base, alloc_heap.size, VPROT_COMMITTED|VPROT_READ|VPROT_WRITE );

1 0

Marcin Mikołajczak : po: Update Polish translation.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 3dcc1ad4f6398a1cb39db9175c43574ac32801a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dcc1ad4f6398a1cb39db9175… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Sat Sep 2 13:34:56 2017 +0200 po: Update Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 49 ++++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/po/pl.po b/po/pl.po index 198866a..46acf8d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-01 14:36+0200\n" +"PO-Revision-Date: 2017-09-02 13:29+0200\n" "Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Poedit 2.0.3\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -6903,7 +6903,7 @@ msgstr "funkcja z:" #: msi.rc:65 msgid "choose which folder contains %s" -msgstr "wybierz folder zawierający '%s'" +msgstr "wybierz folder zawierający %s" #: msi.rc:90 msgid "Allocating registry space" @@ -7275,21 +7275,19 @@ msgstr "Klucz: [1], Nazwa: [2], Wartość: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Krytyczny błąd: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Błąd [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Ostrzeżenie [1]." #: msi.rc:74 -#, fuzzy -#| msgid "Info [1]. " msgid "Info [1]." -msgstr "Informacje [1]. " +msgstr "Informacje [1]." #: msi.rc:75 msgid "" @@ -7299,26 +7297,20 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Dysk pełen.\n" +msgstr "{{Pełny dysk: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "Działanie %s: [1]. [2]" +msgstr "Działanie [Czas]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "Rodzaj wiadomości: [1], Argument: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Rozpoczęcie zbierania logów: %s %s ===" +msgstr "=== Rozpoczęcie zbierania logów: [Data] [Czas] ===" #: msi.rc:79 #, fuzzy @@ -7334,7 +7326,7 @@ msgstr "Zakończono działanie %s: [1]. Zwrócona wartość [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Włóż dysk: [2]" #: msi.rc:84 msgid "" @@ -12631,12 +12623,11 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Nie udało się otworzyć klucza rejestru '%1'.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: Nieobsługiwany rodzaj wartości rejestru [%1] wystąpił w '%2'.\n" +"regedit: Nieobsługiwany rodzaj wartości rejestru [0x%1!x!] napotkany w " +"'%2'.\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -12645,10 +12636,8 @@ msgstr "" "binarna.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Niewłaściwa nazwa klucza\n" +msgstr "regedit: Nieprawidłowy klucz systemowy [%1]\n" #: regedit.rc:428 msgid "" @@ -12658,10 +12647,8 @@ msgstr "" "został odnaleziony.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: Nie udało się usunąć klasy rejestru '%1'.\n" +msgstr "regedit: Nie udało się usunąć klucza rejestru '%1'.\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12809,14 +12796,10 @@ msgid "Confirm Key Delete" msgstr "Potwierdź usunięcie klucza" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" msgstr "" -"Czy na pewno chcesz usunąć klucz rejestru '%1' i wszystkie jego pochodne?" +"Czy na pewno chcesz usunąć ten klucz rejestru i wszystkie jego pochodne?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0

Fabian Maurer : shell32: Draw text on message boxes without background.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 755f49d7c4765c792da2c0b776300b4616f7bef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755f49d7c4765c792da2c0b77… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 4 19:42:53 2017 +0200 shell32: Draw text on message boxes without background. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 3c18066..8d4160d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -122,6 +122,7 @@ static INT_PTR ConfirmMsgBox_Paint(HWND hDlg) BeginPaint(hDlg, &ps); hdc = ps.hdc; + SetBkMode(hdc, TRANSPARENT); GetClientRect(GetDlgItem(hDlg, IDD_MESSAGE), &r); /* this will remap the rect to dialog coords */

1 0

Alexandre Julliard : ntdll: Add a helper function for applying page protection bytes with mprotect.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 4069c4a4d1d8cc7dd9015b0c4caccc7513d597b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4069c4a4d1d8cc7dd9015b0c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 14:28:27 2017 +0200 ntdll: Add a helper function for applying page protection bytes with mprotect. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 96 ++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 63 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d34fbed..80d83d8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -707,6 +707,32 @@ static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigne return mprotect( base, size, unix_prot ); } + +/*********************************************************************** + * mprotect_range + * + * Call mprotect on a page range, applying the protections from the per-page byte. + */ +static void mprotect_range( struct file_view *view, void *base, size_t size, BYTE set, BYTE clear ) +{ + size_t i, count; + char *addr = base; + int prot, next; + + prot = VIRTUAL_GetUnixProt( (get_page_vprot( view, addr ) & ~clear ) | set ); + for (count = i = 1; i < size >> page_shift; i++, count++) + { + next = VIRTUAL_GetUnixProt( (get_page_vprot( view, addr + (count << page_shift) ) & ~clear) | set ); + if (next == prot) continue; + mprotect_exec( addr, count << page_shift, prot, view->protect ); + addr += count << page_shift; + prot = next; + count = 0; + } + if (count) mprotect_exec( addr, count << page_shift, prot, view->protect ); +} + + /*********************************************************************** * VIRTUAL_SetProt * @@ -729,22 +755,8 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ if (view->protect & VPROT_WRITEWATCH) { /* each page may need different protections depending on write watch flag */ - UINT i, count; - char *addr = base; - int prot; - set_page_vprot_bits( view, base, size, vprot & ~VPROT_WRITEWATCH, ~vprot & ~VPROT_WRITEWATCH ); - unix_prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr )); - for (count = i = 1; i < size >> page_shift; i++, count++) - { - prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr + (count << page_shift) )); - if (prot == unix_prot) continue; - mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); - addr += count << page_shift; - unix_prot = prot; - count = 0; - } - if (count) mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); + mprotect_range( view, base, size, 0, 0 ); VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE; } @@ -777,22 +789,8 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ */ static void reset_write_watches( struct file_view *view, void *base, SIZE_T size ) { - SIZE_T i, count; - int prot, unix_prot; - char *addr = base; - set_page_vprot_bits( view, base, size, VPROT_WRITEWATCH, 0 ); - unix_prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr )); - for (count = i = 1; i < size >> page_shift; i++, count++) - { - prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr + (count << page_shift) )); - if (prot == unix_prot) continue; - mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); - addr += count << page_shift; - unix_prot = prot; - count = 0; - } - if (count) mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); + mprotect_range( view, base, size, 0, 0 ); } @@ -1625,14 +1623,15 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) if (vprot & VPROT_WRITEWATCH) { set_page_vprot_bits( view, page, page_size, 0, VPROT_WRITEWATCH ); - VIRTUAL_SetProt( view, page, page_size, get_page_vprot( view, page )); + mprotect_range( view, page, page_size, 0, 0 ); } /* ignore fault if page is writable now */ if (VIRTUAL_GetUnixProt( get_page_vprot( view, page )) & PROT_WRITE) ret = STATUS_SUCCESS; } if (!on_signal_stack && (vprot & VPROT_GUARD)) { - VIRTUAL_SetProt( view, page, page_size, vprot & ~VPROT_GUARD ); + set_page_vprot_bits( view, page, page_size, 0, VPROT_GUARD ); + mprotect_range( view, page, page_size, 0, 0 ); ret = STATUS_GUARD_PAGE_VIOLATION; } } @@ -1835,7 +1834,7 @@ SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_ if (vprot & VPROT_WRITEWATCH) { set_page_vprot_bits( view, page, page_size, 0, VPROT_WRITEWATCH ); - VIRTUAL_SetProt( view, page, page_size, get_page_vprot( view, page )); + mprotect_range( view, page, page_size, 0, 0 ); } /* ignore fault if page is writable now */ if (!(VIRTUAL_GetUnixProt( get_page_vprot( view, page )) & PROT_WRITE)) @@ -1873,39 +1872,10 @@ void VIRTUAL_SetForceExec( BOOL enable ) LIST_FOR_EACH_ENTRY( view, &views_list, struct file_view, entry ) { - UINT i, count; - char *addr = view->base; BYTE commit = view->mapping ? VPROT_COMMITTED : 0; /* file mappings are always accessible */ - int unix_prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr ) | commit ); if (view->protect & VPROT_NOEXEC) continue; - for (count = i = 1; i < view->size >> page_shift; i++, count++) - { - int prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr + (count << page_shift) ) | commit ); - if (prot == unix_prot) continue; - if ((unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) - { - TRACE( "%s exec prot for %p-%p\n", - force_exec_prot ? "enabling" : "disabling", - addr, addr + (count << page_shift) - 1 ); - mprotect( addr, count << page_shift, - unix_prot | (force_exec_prot ? PROT_EXEC : 0) ); - } - addr += (count << page_shift); - unix_prot = prot; - count = 0; - } - if (count) - { - if ((unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) - { - TRACE( "%s exec prot for %p-%p\n", - force_exec_prot ? "enabling" : "disabling", - addr, addr + (count << page_shift) - 1 ); - mprotect( addr, count << page_shift, - unix_prot | (force_exec_prot ? PROT_EXEC : 0) ); - } - } + mprotect_range( view, view->base, view->size, commit, 0 ); } } server_leave_uninterrupted_section( &csVirtual, &sigset );

1 0

Alexandre Julliard : ntdll: Add a helper function for setting bits in page protection bytes.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: e4b5e5da8ad0adc0cbb60b8937bc4406a21ae38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b5e5da8ad0adc0cbb60b893… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 14:18:06 2017 +0200 ntdll: Add a helper function for setting bits in page protection bytes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 63 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d681b4c..d34fbed 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -177,6 +177,21 @@ static void set_page_vprot( struct file_view *view, const void *addr, size_t siz /*********************************************************************** + * set_page_vprot_bits + * + * Set or clear bits in a range of page protection bytes. + */ +static void set_page_vprot_bits( struct file_view *view, const void *addr, size_t size, + BYTE set, BYTE clear ) +{ + BYTE *ptr = view->prot + (((const char *)addr - (const char *)view->base) >> page_shift); + size_t i; + + for (i = 0; i < ROUND_SIZE( addr, size ) >> page_shift; i++) ptr[i] = (ptr[i] & ~clear) | set; +} + + +/*********************************************************************** * VIRTUAL_GetProtStr */ static const char *VIRTUAL_GetProtStr( BYTE prot ) @@ -717,14 +732,12 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ UINT i, count; char *addr = base; int prot; - BYTE *p = view->prot + ((addr - (char *)view->base) >> page_shift); - p[0] = vprot | (p[0] & VPROT_WRITEWATCH); - unix_prot = VIRTUAL_GetUnixProt( p[0] ); + set_page_vprot_bits( view, base, size, vprot & ~VPROT_WRITEWATCH, ~vprot & ~VPROT_WRITEWATCH ); + unix_prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr )); for (count = i = 1; i < size >> page_shift; i++, count++) { - p[i] = vprot | (p[i] & VPROT_WRITEWATCH); - prot = VIRTUAL_GetUnixProt( p[i] ); + prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr + (count << page_shift) )); if (prot == unix_prot) continue; mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); addr += count << page_shift; @@ -767,14 +780,12 @@ static void reset_write_watches( struct file_view *view, void *base, SIZE_T size SIZE_T i, count; int prot, unix_prot; char *addr = base; - BYTE *p = view->prot + ((addr - (char *)view->base) >> page_shift); - p[0] |= VPROT_WRITEWATCH; - unix_prot = VIRTUAL_GetUnixProt( p[0] ); + set_page_vprot_bits( view, base, size, VPROT_WRITEWATCH, 0 ); + unix_prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr )); for (count = i = 1; i < size >> page_shift; i++, count++) { - p[i] |= VPROT_WRITEWATCH; - prot = VIRTUAL_GetUnixProt( p[i] ); + prot = VIRTUAL_GetUnixProt( get_page_vprot( view, addr + (count << page_shift) )); if (prot == unix_prot) continue; mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); addr += count << page_shift; @@ -1051,7 +1062,7 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro if (reply->committed) { *vprot |= VPROT_COMMITTED; - for (i = 0; i < ret >> page_shift; i++) view->prot[start+i] |= VPROT_COMMITTED; + set_page_vprot_bits( view, base, ret, VPROT_COMMITTED, 0 ); } } } @@ -1074,9 +1085,7 @@ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t siz { if (wine_anon_mmap( (char *)view->base + start, size, PROT_NONE, MAP_FIXED ) != (void *)-1) { - BYTE *p = view->prot + (start >> page_shift); - size >>= page_shift; - while (size--) *p++ &= ~VPROT_COMMITTED; + set_page_vprot_bits( view, (char *)view->base + start, size, 0, VPROT_COMMITTED ); return STATUS_SUCCESS; } return FILE_GetNtStatus(); @@ -1610,20 +1619,20 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) if ((view = VIRTUAL_FindView( addr, 0 ))) { void *page = ROUND_ADDR( addr, page_mask ); - BYTE *vprot = &view->prot[((const char *)page - (const char *)view->base) >> page_shift]; + BYTE vprot = get_page_vprot( view, page ); if ((err & EXCEPTION_WRITE_FAULT) && (view->protect & VPROT_WRITEWATCH)) { - if (*vprot & VPROT_WRITEWATCH) + if (vprot & VPROT_WRITEWATCH) { - *vprot &= ~VPROT_WRITEWATCH; - VIRTUAL_SetProt( view, page, page_size, *vprot ); + set_page_vprot_bits( view, page, page_size, 0, VPROT_WRITEWATCH ); + VIRTUAL_SetProt( view, page, page_size, get_page_vprot( view, page )); } /* ignore fault if page is writable now */ - if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS; + if (VIRTUAL_GetUnixProt( get_page_vprot( view, page )) & PROT_WRITE) ret = STATUS_SUCCESS; } - if (!on_signal_stack && (*vprot & VPROT_GUARD)) + if (!on_signal_stack && (vprot & VPROT_GUARD)) { - VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); + VIRTUAL_SetProt( view, page, page_size, vprot & ~VPROT_GUARD ); ret = STATUS_GUARD_PAGE_VIOLATION; } } @@ -1812,24 +1821,24 @@ SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_ while (bytes_written < size) { void *page = ROUND_ADDR( addr, page_mask ); - BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift); + BYTE vprot = get_page_vprot( view, page ); SIZE_T block_size; /* If the page is not writable then check for write watches * before giving up. This can be done without raising a real * exception. Similar to virtual_handle_fault. */ - if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE)) + if (!(VIRTUAL_GetUnixProt( vprot ) & PROT_WRITE)) { if (!(view->protect & VPROT_WRITEWATCH)) break; - if (*p & VPROT_WRITEWATCH) + if (vprot & VPROT_WRITEWATCH) { - *p &= ~VPROT_WRITEWATCH; - VIRTUAL_SetProt( view, page, page_size, *p ); + set_page_vprot_bits( view, page, page_size, 0, VPROT_WRITEWATCH ); + VIRTUAL_SetProt( view, page, page_size, get_page_vprot( view, page )); } /* ignore fault if page is writable now */ - if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE)) + if (!(VIRTUAL_GetUnixProt( get_page_vprot( view, page )) & PROT_WRITE)) break; }

1 0