January 2019 - Wine-Commits

Nikolay Sivov : dwrite: Validate 'sbix' data before using it.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: f73ba331c18577942a371b98a724f2a44f6565ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f73ba331c18577942a371b98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 29 10:06:44 2019 +0300 dwrite: Validate 'sbix' data before using it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 125 +++++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 57 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 261d00c..35cf838 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -243,30 +243,34 @@ typedef struct { USHORT numberOfHMetrics; } TT_HHEA; -typedef struct { +struct sbix_header +{ WORD version; WORD flags; - DWORD numStrikes; - DWORD strikeOffset[1]; -} sbix_header; + DWORD num_strikes; + DWORD strike_offset[1]; +}; -typedef struct { +struct sbix_strike +{ WORD ppem; WORD ppi; - DWORD glyphDataOffsets[1]; -} sbix_strike; + DWORD glyphdata_offsets[1]; +}; -typedef struct { +struct sbix_glyph_data +{ WORD originOffsetX; WORD originOffsetY; - DWORD graphicType; + DWORD graphic_type; BYTE data[1]; -} sbix_glyph_data; +}; -typedef struct { +struct maxp +{ DWORD version; - WORD numGlyphs; -} maxp; + WORD num_glyphs; +}; struct cblc_header { @@ -2221,67 +2225,74 @@ static BOOL opentype_has_font_table(IDWriteFontFace4 *fontface, UINT32 tag) return exists; } -static DWORD opentype_get_sbix_formats(IDWriteFontFace4 *fontface) +static unsigned int opentype_get_sbix_formats(IDWriteFontFace4 *fontface) { - UINT32 size, s, num_strikes; - const sbix_header *header; - UINT16 g, num_glyphs; - BOOL exists = FALSE; - const maxp *maxp; - const void *data; - DWORD ret = 0; - void *context; - HRESULT hr; + unsigned int num_strikes, num_glyphs, i, j, ret = 0; + const struct sbix_header *sbix_header; + struct dwrite_fonttable table; - hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_MAXP_TAG, &data, &size, &context, &exists); - if (FAILED(hr) || !exists) + memset(&table, 0, sizeof(table)); + table.exists = TRUE; + + if (!get_fontface_table(fontface, MS_MAXP_TAG, &table)) return 0; - maxp = data; - num_glyphs = GET_BE_WORD(maxp->numGlyphs); + num_glyphs = table_read_be_word(&table, FIELD_OFFSET(struct maxp, num_glyphs)); - IDWriteFontFace4_ReleaseFontTable(fontface, context); + IDWriteFontFace4_ReleaseFontTable(fontface, table.context); - if (FAILED(IDWriteFontFace4_TryGetFontTable(fontface, MS_SBIX_TAG, &data, &size, &context, &exists))) { - WARN("Failed to get 'sbix' table, %#x\n", hr); - return 0; - } + memset(&table, 0, sizeof(table)); + table.exists = TRUE; - header = data; - num_strikes = GET_BE_DWORD(header->numStrikes); + if (!get_fontface_table(fontface, MS_SBIX_TAG, &table)) + return 0; - for (s = 0; s < num_strikes; s++) { - sbix_strike *strike = (sbix_strike *)((BYTE *)header + GET_BE_DWORD(header->strikeOffset[s])); + num_strikes = table_read_be_dword(&table, FIELD_OFFSET(struct sbix_header, num_strikes)); + sbix_header = table_read_ensure(&table, 0, FIELD_OFFSET(struct sbix_header, strike_offset[num_strikes])); - for (g = 0; g < num_glyphs; g++) { - DWORD offset = GET_BE_DWORD(strike->glyphDataOffsets[g]); - DWORD offset_next = GET_BE_DWORD(strike->glyphDataOffsets[g + 1]); - sbix_glyph_data *glyph_data; - DWORD format; + if (sbix_header) + { + for (i = 0; i < num_strikes; ++i) + { + unsigned int strike_offset = GET_BE_DWORD(sbix_header->strike_offset[i]); + const struct sbix_strike *strike = table_read_ensure(&table, strike_offset, + FIELD_OFFSET(struct sbix_strike, glyphdata_offsets[num_glyphs + 1])); - if (offset == offset_next) + if (!strike) continue; - glyph_data = (sbix_glyph_data *)((BYTE *)strike + offset); - switch (format = glyph_data->graphicType) + for (j = 0; j < num_glyphs; j++) { - case MS_PNG__TAG: - ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; - break; - case MS_JPG__TAG: - ret |= DWRITE_GLYPH_IMAGE_FORMATS_JPEG; - break; - case MS_TIFF_TAG: - ret |= DWRITE_GLYPH_IMAGE_FORMATS_TIFF; - break; - default: - format = GET_BE_DWORD(format); - FIXME("unexpected bitmap format %s\n", debugstr_an((char *)&format, 4)); + unsigned int offset = GET_BE_DWORD(strike->glyphdata_offsets[j]); + unsigned int next_offset = GET_BE_DWORD(strike->glyphdata_offsets[j + 1]); + const struct sbix_glyph_data *glyph_data; + + if (offset == next_offset) + continue; + + glyph_data = table_read_ensure(&table, strike_offset + offset, sizeof(*glyph_data)); + if (!glyph_data) + continue; + + switch (glyph_data->graphic_type) + { + case MS_PNG__TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; + break; + case MS_JPG__TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_JPEG; + break; + case MS_TIFF_TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_TIFF; + break; + default: + FIXME("unexpected bitmap format %s\n", debugstr_tag(GET_BE_DWORD(glyph_data->graphic_type))); + } } } } - IDWriteFontFace4_ReleaseFontTable(fontface, context); + IDWriteFontFace4_ReleaseFontTable(fontface, table.context); return ret; }

1 0

Nikolay Sivov : dwrite: Validate 'CBLC' data before using it.
by Alexandre Julliard Jan. 29, 2019

Jan. 29, 2019

Module: wine Branch: master Commit: e6967c513d0dab398bdd0c216bb5366ca465047c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6967c513d0dab398bdd0c21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 29 10:06:43 2019 +0300 dwrite: Validate 'CBLC' data before using it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +++ dlls/dwrite/font.c | 2 +- dlls/dwrite/opentype.c | 63 ++++++++++++++++++++++++-------------------- dlls/dwrite/tests/font.c | 2 +- 4 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3251e66..2d20b41 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -216,6 +216,9 @@ struct dwrite_fonttable BOOL exists; }; +extern const void* get_fontface_table(IDWriteFontFace4 *fontface, UINT32 tag, + struct dwrite_fonttable *table) DECLSPEC_HIDDEN; + extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,BOOL*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,UINT32*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_table(struct file_stream_desc*,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_fonttable *table, unsigned int max_count, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bb04df6..372578e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -338,7 +338,7 @@ static HRESULT set_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 return S_OK; } -static const void* get_fontface_table(IDWriteFontFace4 *fontface, UINT32 tag, struct dwrite_fonttable *table) +const void* get_fontface_table(IDWriteFontFace4 *fontface, UINT32 tag, struct dwrite_fonttable *table) { HRESULT hr; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 82491dc..261d00c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -268,17 +268,19 @@ typedef struct { WORD numGlyphs; } maxp; -typedef struct { - WORD majorVersion; - WORD minorVersion; - DWORD numSizes; -} CBLCHeader; +struct cblc_header +{ + WORD major_version; + WORD minor_version; + DWORD num_sizes; +}; typedef struct { BYTE res[12]; } sbitLineMetrics; -typedef struct { +struct cblc_bitmapsize_table +{ DWORD indexSubTableArrayOffset; DWORD indexTablesSize; DWORD numberofIndexSubTables; @@ -289,9 +291,9 @@ typedef struct { WORD endGlyphIndex; BYTE ppemX; BYTE ppemY; - BYTE bitDepth; + BYTE bit_depth; BYTE flags; -} CBLCBitmapSizeTable; +}; struct gasp_range { @@ -2284,36 +2286,39 @@ static DWORD opentype_get_sbix_formats(IDWriteFontFace4 *fontface) return ret; } -static UINT32 opentype_get_cblc_formats(IDWriteFontFace4 *fontface) +static unsigned int opentype_get_cblc_formats(IDWriteFontFace4 *fontface) { - CBLCBitmapSizeTable *sizes; - UINT32 num_sizes, size, s; - BOOL exists = FALSE; - CBLCHeader *header; - UINT32 ret = 0; - void *context; - HRESULT hr; + const unsigned int format_mask = DWRITE_GLYPH_IMAGE_FORMATS_PNG | + DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8; + const struct cblc_bitmapsize_table *sizes; + struct dwrite_fonttable cblc = { 0 }; + unsigned int num_sizes, i, ret = 0; + const struct cblc_header *header; - if (FAILED(hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_CBLC_TAG, (const void **)&header, &size, - &context, &exists))) + cblc.exists = TRUE; + if (!get_fontface_table(fontface, MS_CBLC_TAG, &cblc)) return 0; - if (!exists) - return 0; + num_sizes = table_read_be_dword(&cblc, FIELD_OFFSET(struct cblc_header, num_sizes)); + sizes = table_read_ensure(&cblc, sizeof(*header), num_sizes * sizeof(*sizes)); - num_sizes = GET_BE_DWORD(header->numSizes); - sizes = (CBLCBitmapSizeTable *)(header + 1); + if (sizes) + { + for (i = 0; i < num_sizes; ++i) + { + BYTE bpp = sizes[i].bit_depth; - for (s = 0; s < num_sizes; s++) { - BYTE bpp = sizes->bitDepth; + if ((ret & format_mask) == format_mask) + break; - if (bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8) - ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; - else if (bpp == 32) - ret |= DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8; + if (bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; + else if (bpp == 32) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8; + } } - IDWriteFontFace4_ReleaseFontTable(fontface, context); + IDWriteFontFace4_ReleaseFontTable(fontface, cblc.context); return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3e736c8..309c0a2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8755,7 +8755,7 @@ static DWORD get_cblc_formats(IDWriteFontFace4 *fontface) sizes = (CBLCBitmapSizeTable *)(header + 1); for (s = 0; s < num_sizes; s++) { - BYTE bpp = sizes->bitDepth; + BYTE bpp = sizes[s].bitDepth; if (bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8) ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG;

1 0

Daniel Lehman : msvcrt: _towlower_l only lowercase A-Z in C locale.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 6a71e7c9ee1f5378b4744323b8f4b99855e0f22b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a71e7c9ee1f5378b4744323… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Jan 28 12:08:11 2019 +0100 msvcrt: _towlower_l only lowercase A-Z in C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 2 -- dlls/msvcrt/wcs.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a159132..4f8b8b0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3633,7 +3633,6 @@ static void test_C_locale(void) ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); } else - todo_wine_if(ret != i) ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); ret = p_towupper(i); @@ -3664,7 +3663,6 @@ static void test_C_locale(void) ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); } else - todo_wine_if(ret != j) ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); ret = p__towupper_l(j, locale); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a6d7c1f..d96da44 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2494,6 +2494,19 @@ int CDECL MSVCRT_towupper(MSVCRT_wint_t c) */ int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { + if(c >= 'A' && c <= 'Z') + return c + 'a' - 'A'; + return c; + } + return tolowerW(c); }

1 0

Matteo Bruni : d3d9/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 4ee4b35cb274cfecbeff7d3452f85f7b38d33696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee4b35cb274cfecbeff7d34… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:03 2019 +0100 d3d9/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability. 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/d3d9/tests/device.c | 218 +++++++++++++++++------------------------------ 1 file changed, 76 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ee4b35cb274cfecbeff…

1 0

David Adam : d3dx9/tests: Add more tests for D3DXMatrixTransformation().
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 956d7356e0559a07aac68bcaf73a5005e0600fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=956d7356e0559a07aac68bca… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Jan 28 19:40:03 2019 +0100 d3dx9/tests: Add more tests for D3DXMatrixTransformation(). Most of those new tests were written by Rico Schüller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33456 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 705 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 705 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=956d7356e0559a07aac6…

1 0

Matteo Bruni : d3d9: Drop map read access from the internal buffers used for user-pointer draws.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: f891bb847b67505cb8e22d8e5d8b0ac6ffc0ff68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f891bb847b67505cb8e22d8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:06 2019 +0100 d3d9: Drop map read access from the internal buffers used for user-pointer draws. 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/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ed1fedf..83db304 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2856,7 +2856,7 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -2961,7 +2961,7 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Matteo Bruni : d3d8/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 8384452d199f234bf2fb61ca64e1c87571e28f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8384452d199f234bf2fb61ca… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:05 2019 +0100 d3d8/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability. 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/d3d8/tests/device.c | 213 ++++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8384452d199f234bf2fb…

1 0

Jacek Caban : services: Store a list of service handles in service_entry.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: ac3f571e56bc31b7b23686fc19cc804133769a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3f571e56bc31b7b23686fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 15:52:24 2019 +0100 services: Store a list of service handles in service_entry. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 6 ++++++ programs/services/services.c | 3 +++ programs/services/services.h | 1 + 3 files changed, 10 insertions(+) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index efbcd76..623e1fa 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -78,6 +78,7 @@ struct sc_manager_handle /* service control manager handle */ struct sc_service_handle /* service handle */ { struct sc_handle hdr; + struct list entry; struct service_entry *service_entry; }; @@ -311,6 +312,7 @@ static void SC_RPC_HANDLE_destroy(SC_RPC_HANDLE handle) { struct sc_service_handle *service = (struct sc_service_handle *)hdr; service_lock(service->service_entry); + list_remove(&service->entry); if (service->service_entry->notify && service->service_entry->notify->service == service) { @@ -431,7 +433,11 @@ static DWORD create_handle_for_service(struct service_entry *entry, DWORD dwDesi service->hdr.type = SC_HTYPE_SERVICE; service->hdr.access = dwDesiredAccess; RtlMapGenericMask(&service->hdr.access, &g_svc_generic); + + service_lock(entry); service->service_entry = entry; + list_add_tail(&entry->handles, &service->entry); + service_unlock(entry); *phService = &service->hdr; return ERROR_SUCCESS; diff --git a/programs/services/services.c b/programs/services/services.c index 3de46bd..fe605ac 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -21,6 +21,7 @@ #define WIN32_LEAN_AND_MEAN #include <stdarg.h> +#include <assert.h> #include <windows.h> #include <winsvc.h> #include <rpc.h> @@ -114,6 +115,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) if (!*entry) return ERROR_NOT_ENOUGH_SERVER_MEMORY; (*entry)->name = strdupW(name); + list_init(&(*entry)->handles); if (!(*entry)->name) { HeapFree(GetProcessHeap(), 0, *entry); @@ -136,6 +138,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) void free_service_entry(struct service_entry *entry) { + assert(list_empty(&entry->handles)); CloseHandle(entry->status_changed_event); HeapFree(GetProcessHeap(), 0, entry->name); HeapFree(GetProcessHeap(), 0, entry->config.lpBinaryPathName); diff --git a/programs/services/services.h b/programs/services/services.h index 5a79c35..c78f71c 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -67,6 +67,7 @@ struct service_entry BOOL is_wow64; BOOL status_notified; struct sc_notify_handle *notify; + struct list handles; }; extern struct scmdatabase *active_database;

1 0

Jacek Caban : advapi32/tests: Add test using NotifyServiceStatusChange on different handles of the same service.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 9084b9761d7e4088f5aaa9e9aca0e13b033e0c1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9084b9761d7e4088f5aaa9e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 15:52:06 2019 +0100 advapi32/tests: Add test using NotifyServiceStatusChange on different handles of the same service. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index cc48347..1552791 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2350,7 +2350,7 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); ok(data.was_called == TRUE, "APC wasn't called\n"); - /* cannot register two notifications */ + /* cannot register two notifications on the same handle */ data.phase = PHASE_STOPPED; data.was_called = FALSE; @@ -2373,13 +2373,29 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) (dr == ERROR_ALREADY_REGISTERED && dr2 == 0), "Got wrong SleepEx result: %u\n", dr); ok(data.was_called == FALSE, "APC should not have been called\n"); + memset(&data2.notify, 0, sizeof(data2.notify)); + data2.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; + data2.notify.pfnNotifyCallback = &notify_cb; + data2.notify.pContext = &data; + data2.svc = svc2; + data2.phase = PHASE_STOPPED; + data2.was_called = FALSE; + + /* it's possible to have multiple notifications using different service handles */ + dr = pNotifyServiceStatusChangeW(svc2, SERVICE_NOTIFY_STOPPED, &data2.notify); + todo_wine + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW gave wrong result: %u\n", dr); + /* stop service and receive notifiction */ br = ControlService(svc, SERVICE_CONTROL_STOP, &status); ok(br, "ControlService failed: %u\n", GetLastError()); dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); + dr2 = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION || dr2 == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); ok(data.was_called == TRUE, "APC wasn't called\n"); + todo_wine + ok(data2.was_called == TRUE, "APC wasn't called\n"); /* test cancelation: create notify on svc that will block until service * start; close svc; start service on svc2; verify that notification does

1 0

Matteo Bruni : d3d8: Drop map read access from the internal buffers used for user-pointer draws.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 955744e0c9749210f8dc379a979dad6c2acaf868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=955744e0c9749210f8dc379a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:07 2019 +0100 d3d8: Drop map read access from the internal buffers used for user-pointer draws. 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/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 33ab34d..a113e57 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2385,7 +2385,7 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -2480,7 +2480,7 @@ static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0