February 2018 - Wine-Commits

Nikolay Sivov : dwrite: Use ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: d31651b70566716d51c6495dbb6f8fce76561d7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d31651b70566716d51c6495d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 21 08:15:22 2018 +0300 dwrite: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +++++----- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/font.c | 26 +++++++++++++------------- dlls/dwrite/opentype.c | 6 +++--- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index bb08017..b20bafa 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -217,8 +217,8 @@ struct fallback_mapping { static const struct fallback_mapping fontfallback_neutral_data[] = { #define MAPPING_RANGE(ranges, families) \ - { (DWRITE_UNICODE_RANGE *)ranges, sizeof(ranges)/sizeof(ranges[0]), \ - (WCHAR **)families, sizeof(families)/sizeof(families[0]) } + { (DWRITE_UNICODE_RANGE *)ranges, ARRAY_SIZE(ranges), \ + (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), @@ -1056,7 +1056,7 @@ static UINT32 get_opentype_language(const WCHAR *locale) if (locale) { WCHAR tag[5]; - if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, sizeof(tag)/sizeof(WCHAR))) + if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, ARRAY_SIZE(tag))) language = DWRITE_MAKE_OPENTYPE_TAG(tag[0],tag[1],tag[2],tag[3]); } @@ -1108,7 +1108,7 @@ static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSub break; case DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL: case DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL: - if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, sizeof(isolang)/sizeof(isolang[0]))) { + if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, ARRAY_SIZE(isolang))) { static const WCHAR arW[] = {'a','r',0}; static const WCHAR arabicW[] = {0x640,0x641,0x642,0x643,0x644,0x645,0x646,0x647,0x648,0x649,0}; @@ -2199,7 +2199,7 @@ HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback fallback->IDWriteFontFallback_iface.lpVtbl = &fontfallbackvtbl; fallback->factory = factory; fallback->mappings = (struct fallback_mapping *)fontfallback_neutral_data; - fallback->mappings_count = sizeof(fontfallback_neutral_data) / sizeof(*fontfallback_neutral_data); + fallback->mappings_count = ARRAY_SIZE(fontfallback_neutral_data); IDWriteFactory5_GetSystemFontCollection(fallback->factory, FALSE, &fallback->systemcollection, FALSE); *ret = &fallback->IDWriteFontFallback_iface; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 31b977a..c16c401 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -24,6 +24,8 @@ #include "wine/list.h" #include "wine/unicode.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + static const DWRITE_MATRIX identity = { 1.0f, 0.0f, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c545f09..c7824b6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -419,7 +419,7 @@ static void release_font_data(struct dwrite_font_data *data) if (InterlockedDecrement(&data->ref) > 0) return; - for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < sizeof(data->info_strings)/sizeof(data->info_strings[0]); i++) { + for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < ARRAY_SIZE(data->info_strings); i++) { if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } @@ -522,7 +522,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace4 *iface) IDWriteFontFileStream_Release(This->stream); heap_free(This->files); - for (i = 0; i < sizeof(This->glyphs)/sizeof(This->glyphs[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->glyphs); i++) heap_free(This->glyphs[i]); freetype_notify_cacheremove(iface); @@ -3060,7 +3060,7 @@ static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { extrablackW, DWRITE_FONT_WEIGHT_EXTRA_BLACK } }; - ptr = bsearch(&weight, knownweights, sizeof(knownweights)/sizeof(knownweights[0]), sizeof(knownweights[0]), + ptr = bsearch(&weight, knownweights, ARRAY_SIZE(knownweights), sizeof(knownweights[0]), compare_knownweights); if (!ptr) { nameW[0] = 0; @@ -3373,8 +3373,8 @@ static HRESULT init_font_data(const struct fontface_desc *desc, IDWriteLocalized data->fontsig = props.fontsig; data->lf = props.lf; - fontstrings_get_en_string(*family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); - fontstrings_get_en_string(data->names, faceW, sizeof(faceW)/sizeof(WCHAR)); + fontstrings_get_en_string(*family_name, familyW, ARRAY_SIZE(familyW)); + fontstrings_get_en_string(data->names, faceW, ARRAY_SIZE(faceW)); if (font_apply_differentiation_rules(data, familyW, faceW)) { set_en_localizedstring(*family_name, familyW); set_en_localizedstring(data->names, faceW); @@ -3495,7 +3495,7 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa /* Simulated face name should only contain Bold as weight term, so remove existing regular and weight terms. */ - fontstrings_get_en_string(family->fonts[heaviest]->names, initialW, sizeof(initialW)/sizeof(WCHAR)); + fontstrings_get_en_string(family->fonts[heaviest]->names, initialW, ARRAY_SIZE(initialW)); facename_remove_regular_term(initialW, -1); /* remove current weight pattern */ @@ -3566,7 +3566,7 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data /* add oblique simulation based on this regular face */ /* remove regular term if any, append 'Oblique' */ - fontstrings_get_en_string(family->fonts[regular]->names, facenameW, sizeof(facenameW)/sizeof(WCHAR)); + fontstrings_get_en_string(family->fonts[regular]->names, facenameW, ARRAY_SIZE(facenameW)); facename_remove_regular_term(facenameW, -1); if (*facenameW) @@ -3610,7 +3610,7 @@ static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collect } fontcollection_add_family(collection, target); - fontstrings_get_en_string(replacement->familyname, nameW, sizeof(nameW)/sizeof(WCHAR)); + fontstrings_get_en_string(replacement->familyname, nameW, ARRAY_SIZE(nameW)); TRACE("replacement %s -> %s\n", debugstr_w(target_name), debugstr_w(nameW)); } IDWriteLocalizedStrings_Release(strings); @@ -3767,7 +3767,7 @@ HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerat continue; } - fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); + fontstrings_get_en_string(family_name, familyW, ARRAY_SIZE(familyW)); /* ignore dot named faces */ if (familyW[0] == '.') { @@ -3886,7 +3886,7 @@ static HRESULT create_local_file_reference(IDWriteFactory5 *factory, const WCHAR static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; WCHAR fullpathW[MAX_PATH]; - GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); + GetWindowsDirectoryW(fullpathW, ARRAY_SIZE(fullpathW)); strcatW(fullpathW, fontsW); strcatW(fullpathW, filename); @@ -3914,7 +3914,7 @@ static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerato { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); WCHAR name_buf[256], *name = name_buf; - DWORD name_count, max_name_count = sizeof(name_buf) / sizeof(*name_buf), type, data_size; + DWORD name_count, max_name_count = ARRAY_SIZE(name_buf), type, data_size; HRESULT hr = S_OK; LONG r; @@ -4162,8 +4162,8 @@ HRESULT get_eudc_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection1 WCHAR keynameW[64], pathW[MAX_PATH]; DWORD type, path_len, name_len; - path_len = sizeof(pathW)/sizeof(*pathW); - name_len = sizeof(keynameW)/sizeof(*keynameW); + path_len = ARRAY_SIZE(pathW); + name_len = ARRAY_SIZE(keynameW); retval = RegEnumValueW(eudckey, index++, keynameW, &name_len, NULL, &type, (BYTE*)pathW, &path_len); if (retval || type != REG_SZ) continue; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 18fb00b..b95083e 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1553,7 +1553,7 @@ static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_a UINT codepage; codepage = get_name_record_codepage(platform, encoding); - get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); + get_name_record_locale(platform, lang_id, locale, ARRAY_SIZE(locale)); if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); @@ -1730,7 +1730,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * BOOL exists; exists = FALSE; - if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, ARRAY_SIZE(localeW))) IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) @@ -1801,7 +1801,7 @@ HRESULT opentype_get_typographic_features(IDWriteFontFace *fontface, UINT32 scri UINT8 i; *count = 0; - for (i = 0; i < sizeof(tables)/sizeof(tables[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tables); i++) { const OT_ScriptList *scriptlist; const GPOS_GSUB_Header *header; const OT_Script *script;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in surface_download_data().
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: a09edd24461c75529565a9195835a25c4e24f657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a09edd24461c75529565a919… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:30 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3fabef..91979ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -555,6 +555,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct unsigned int src_row_pitch, src_slice_pitch; struct wined3d_bo_address data; BYTE *temporary_mem = NULL; + GLenum target; void *mem; /* Only support read back of converted P8 surfaces. */ @@ -565,8 +566,9 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } sub_resource = &texture->sub_resources[sub_resource_idx]; + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { if (format->download) { @@ -658,7 +660,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct TRACE("Downloading compressed surface %p, level %u, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, mem); - GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, mem)); + GL_EXTCALL(glGetCompressedTexImage(target, surface->texture_level, mem)); checkGLcall("glGetCompressedTexImage"); } else @@ -666,8 +668,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct TRACE("Downloading surface %p, level %u, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, mem); - gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, surface->texture_level, - format->glFormat, format->glType, mem); + gl_info->gl_ops.gl.p_glGetTexImage(target, surface->texture_level, format->glFormat, format->glType, mem); checkGLcall("glGetTexImage"); }

1 0

Michael Stefaniuc : ddraw/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: f450e8e32fcd65ee669c12ede918e1e707d5ccbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=f450e8e32fcd65ee669c12ed… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 20 23:57:14 2018 +0100 ddraw/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 02b10b5..550d73a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14265,7 +14265,7 @@ static void test_map_synchronisation(void) tri_count = ((tri_count + 2 + 3) & ~3) - 2; vb_desc.dwNumVertices = tri_count + 2; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0, NULL); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 43c52aa..3f433a6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13640,7 +13640,7 @@ static void test_map_synchronisation(void) tri_count = ((tri_count + 2 + 3) & ~3) - 2; vb_desc.dwNumVertices = tri_count + 2; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_texture_allocate_gl_mutable_storage().
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: 4e3cd97d496b7830fd3681e83940b13f89c2188b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e3cd97d496b7830fd3681e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:29 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_texture_allocate_gl_mutable_storage(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 94d6a98..1e34299 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -492,7 +492,7 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * GLenum gl_internal_format, const struct wined3d_format *format, const struct wined3d_gl_info *gl_info) { - unsigned int i, sub_call_count; + unsigned int i, level, sub_call_count; sub_call_count = texture->level_count; if (texture->target != GL_TEXTURE_2D_ARRAY) @@ -502,29 +502,31 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * { struct wined3d_surface *surface = texture->sub_resources[i].u.surface; GLsizei width, height; + GLenum target; - width = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); - height = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); + level = surface->texture_level; + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator; height /= format->height_scale.denominator; } + target = wined3d_texture_get_sub_resource_target(texture, i); TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", - surface, surface->texture_target, surface->texture_level, width, height); + surface, target, level, width, height); if (texture->target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glTexImage3D(surface->texture_target, surface->texture_level, - gl_internal_format, width, height, texture->layer_count, 0, - format->glFormat, format->glType, NULL)); + GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, + texture->layer_count, 0, format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } else { - gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, - gl_internal_format, width, height, 0, format->glFormat, format->glType, NULL); + gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, + width, height, 0, format->glFormat, format->glType, NULL); checkGLcall("glTexImage2D"); } }

1 0

Alexandre Julliard : makefiles: Make the directory specifications a bit more standard.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: 832a40109e645a18d6fc608008ae357000750b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832a40109e645a18d6fc6080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 21 12:25:26 2018 +0100 makefiles: Make the directory specifications a bit more standard. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 5 ++--- aclocal.m4 | 8 ++++---- configure | 11 ++++------- configure.ac | 1 - tools/makedep.c | 12 ++++++------ tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 8 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index ea19306..9ad9f23 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,10 +27,9 @@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ +includedir = @includedir@ fontdir = ${datadir}/wine/fonts -includedir = @includedir@/wine -dlldir = @dlldir@ -fakedlldir = ${dlldir}/fakedlls +dlldir = ${libdir}/wine top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ diff --git a/aclocal.m4 b/aclocal.m4 index 334d7a8..3fd8606 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -363,9 +363,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll" else wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir @@ -451,9 +451,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install:: $ac_dir \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program + \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program" if test -z "$with_wine64" && wine_fn_has_flag installbin then diff --git a/configure b/configure index 657a557..cd2b275 100755 --- a/configure +++ b/configure @@ -735,7 +735,6 @@ LDEXECFLAGS LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS -dlldir CPP OPENGL_LIBS ICOTOOL @@ -7450,8 +7449,6 @@ done -dlldir="\${libdir}/wine" - DLLFLAGS="-D_REENTRANT" LDRPATH_INSTALL="" @@ -7853,9 +7850,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll" else wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir @@ -7944,9 +7941,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install:: $ac_dir \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program + \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program" if test -z "$with_wine64" && wine_fn_has_flag installbin then diff --git a/configure.ac b/configure.ac index 2996010..2ec62b6 100644 --- a/configure.ac +++ b/configure.ac @@ -699,7 +699,6 @@ AC_CHECK_HEADERS([libprocstat.h],,, dnl **** Check for working dll **** -AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") diff --git a/tools/makedep.c b/tools/makedep.c index d6019b8..8d39623 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2412,7 +2412,7 @@ static void output_source_h( struct makefile *make, struct incl_file *source, co { strarray_add( &make->install_rules[INSTALL_DEV], source->name ); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "D$(includedir)/%s", get_include_install_path( source->name ) )); + strmake( "D$(includedir)/wine/%s", get_include_install_path( source->name ) )); } } @@ -2540,12 +2540,12 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, { strarray_add( &make->install_rules[INSTALL_DEV], xstrdup( source->name )); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "D$(includedir)/%s.idl", get_include_install_path( obj ) )); + strmake( "D$(includedir)/wine/%s.idl", get_include_install_path( obj ) )); if (source->file->flags & FLAG_IDL_HEADER) { strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj )); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) )); + strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); } } if (!targets.count) return; @@ -2589,10 +2589,10 @@ static void output_source_x( struct makefile *make, struct incl_file *source, co { strarray_add( &make->install_rules[INSTALL_DEV], source->name ); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "D$(includedir)/%s", get_include_install_path( source->name ) )); + strmake( "D$(includedir)/wine/%s", get_include_install_path( source->name ) )); strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj )); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) )); + strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); } } @@ -2975,7 +2975,7 @@ static void output_module( struct makefile *make ) add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), strmake( "p$(dlldir)/%s%s", make->module, dll_ext )); add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d$(fakedlldir)/%s", make->module )); + strmake( "d$(dlldir)/fakedlls/%s", make->module )); output( "%s%s %s.fake:", module_path, dll_ext, module_path ); } else diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index b47a170..e06d6cc 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\" +widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/wine/windows/\" EXTRALIBS = -lwpp diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index daeb91b..6de23b0 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -9,7 +9,7 @@ C_SRCS = \ winegcc.c winegcc_EXTRADEFS = \ - -DINCLUDEDIR="\"${includedir}\"" \ + -DINCLUDEDIR="\"${includedir}/wine\"" \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index d502e4b..500d5c1 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,7 +15,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" +wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}/wine\"" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_surface_upload_data().
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: 29e0230a94de20206457ec59c3f0e0e3659f001f URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e0230a94de20206457ec59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:31 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91979ee..6e80f85 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -775,6 +775,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; + GLenum target; TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, @@ -798,6 +799,8 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w checkGLcall("glBindBuffer"); } + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { unsigned int dst_row_pitch, dst_slice_pitch; @@ -819,22 +822,20 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", - surface->texture_target, surface->texture_level, surface->texture_layer, - dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); + target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, + update_w, update_h, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_pitch) { - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, - internal, dst_slice_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + surface->texture_layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, update_w, update_h, - internal, dst_slice_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + update_w, update_h, internal, dst_slice_pitch, addr)); } } else @@ -846,16 +847,15 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w * can't use the unpack row length like for glTexSubImage2D. */ for (row = 0, y = dst_point->y; row < row_count; ++row) { - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, y, surface->texture_layer, update_w, format->block_height, 1, - internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, y, + surface->texture_layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, y, update_w, format->block_height, internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, y, + update_w, format->block_height, internal, dst_row_pitch, addr)); } y += format->block_height; @@ -873,20 +873,19 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", - surface->texture_target, surface->texture_level, surface->texture_layer, + target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, - format->glFormat, format->glType, addr)); + GL_EXTCALL(glTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + surface->texture_layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); } else { - gl_info->gl_ops.gl.p_glTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); + gl_info->gl_ops.gl.p_glTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + update_w, update_h, format->glFormat, format->glType, addr); } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); checkGLcall("Upload surface data");

1 0

Henri Verbeet : wined3d: Store overlay info in textures instead of in surfaces.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: 90696dfe5efa2ac8e3d703aec03474d08107214e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90696dfe5efa2ac8e3d703ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:27 2018 +0330 wined3d: Store overlay info in textures instead of in surfaces. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 105 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 16 ++++--- 2 files changed, 73 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90696dfe5efa2ac8e3d7…

1 0

Alexandre Julliard : ntdll: Add support for running IL-only .NET executables.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: 39c8875ff8aa543eaa50e52db0c546717de691af URL: https://source.winehq.org/git/wine.git/?a=commit;h=39c8875ff8aa543eaa50e52d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 21 09:55:05 2018 +0100 ntdll: Add support for running IL-only .NET executables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 50 +++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- include/winternl.h | 3 ++- 8 files changed, 56 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3fcbbf7..51aa334 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -887,6 +887,44 @@ static void free_tls_slot( LDR_MODULE *mod ) /**************************************************************** + * fixup_imports_ilonly + * + * Fixup imports for an IL-only module. All we do is import mscoree. + * The loader_section must be locked while calling this function. + */ +static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void **entry ) +{ + static const WCHAR mscoreeW[] = {'m','s','c','o','r','e','e','.','d','l','l',0}; + IMAGE_EXPORT_DIRECTORY *exports; + DWORD exp_size; + NTSTATUS status; + void *proc = NULL; + WINE_MODREF *prev, *imp; + + if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ + wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + + wm->nDeps = 1; + wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(WINE_MODREF *) ); + + prev = current_modref; + current_modref = wm; + if (!(status = load_dll( load_path, mscoreeW, 0, &imp ))) wm->deps[0] = imp; + current_modref = prev; + if (status) return status; + + TRACE( "loaded mscoree for %s\n", debugstr_w(wm->ldr.FullDllName.Buffer) ); + + if ((exports = RtlImageDirectoryEntryToData( imp->ldr.BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) + proc = find_named_export( imp->ldr.BaseAddress, exports, exp_size, "_CorExeMain", -1, load_path ); + if (!proc) return STATUS_PROCEDURE_NOT_FOUND; + *entry = proc; + return STATUS_SUCCESS; +} + + +/**************************************************************** * fixup_imports * * Fixup all imports of a given module. @@ -1837,6 +1875,9 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, return STATUS_NO_MEMORY; } + if (image_info.loader_flags) wm->ldr.Flags |= LDR_COR_IMAGE; + if (image_info.image_flags & IMAGE_FLAGS_ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; + set_security_cookie( module, len ); /* fixup imports */ @@ -2991,7 +3032,7 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) * Attach to all the loaded dlls. * If this is the first time, perform the full process initialization. */ -NTSTATUS attach_dlls( CONTEXT *context ) +NTSTATUS attach_dlls( CONTEXT *context, void **entry ) { NTSTATUS status; WINE_MODREF *wm; @@ -3009,7 +3050,12 @@ NTSTATUS attach_dlls( CONTEXT *context ) if (!imports_fixup_done) { actctx_init(); - if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) + if (wm->ldr.Flags & LDR_COR_ILONLY) + status = fixup_imports_ilonly( wm, load_path, entry ); + else + status = fixup_imports( wm, load_path ); + + if (status) { ERR( "Importing dlls for %s failed, status %x\n", debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer), status ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3fbccba..85bdd9e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -106,7 +106,7 @@ extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS attach_dlls( CONTEXT *context ) DECLSPEC_HIDDEN; +extern NTSTATUS attach_dlls( CONTEXT *context, void **entry ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 79aeb2a..7fe698c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1277,7 +1277,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx ); + attach_dlls( ctx, (void **)&ctx->R0 ); return ctx; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 7be64fd..c461e88 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1009,7 +1009,7 @@ static void thread_startup( void *param ) context.Pc = (DWORD_PTR)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context ); + attach_dlls( &context, (void **)&context.u.s.X0 ); ((thread_start_func)context.Pc)( (LPTHREAD_START_ROUTINE)context.u.s.X0, (void *)context.u.s.X1 ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fcadcf9..71eff66 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2675,7 +2675,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx ); + attach_dlls( ctx, (void **)&ctx->Eax ); return ctx; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 39e8f42..cb5089b 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1171,7 +1171,7 @@ static void thread_startup( void *param ) context.Iar = (DWORD)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context ); + attach_dlls( &context, (void **)&context->Gpr3 ); ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f75ba57c..169793b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4169,7 +4169,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx ); + attach_dlls( ctx, (void **)&ctx->Rcx ); return ctx; } diff --git a/include/winternl.h b/include/winternl.h index ec6850a..c3cca80 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2158,7 +2158,8 @@ typedef struct _LDR_MODULE #define LDR_UNLOAD_IN_PROGRESS 0x00002000 #define LDR_NO_DLL_CALLS 0x00040000 #define LDR_PROCESS_ATTACHED 0x00080000 -#define LDR_MODULE_REBASED 0x00200000 +#define LDR_COR_IMAGE 0x00400000 +#define LDR_COR_ILONLY 0x01000000 /* these ones is Wine specific */ #define LDR_DONT_RESOLVE_REFS 0x40000000

1 0

Michael Stefaniuc : ddraw: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: 27ef844bd1c2b5ebddf4c8663a597b38c3636e71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ef844bd1c2b5ebddf4c866… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 20 23:57:15 2018 +0100 ddraw: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 10 +++++----- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/main.c | 4 ++-- dlls/ddraw/utils.c | 25 ++++++++++++------------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 56a02bc..97a11ef 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1738,7 +1738,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes outsize = NumCodes && Codes ? *NumCodes : 0; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) @@ -2395,7 +2395,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, wined3d_mutex_lock(); pixelformat.dwSize = sizeof(pixelformat); - for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) + for(fmt = 0; fmt < ARRAY_SIZE(checkFormatList); fmt++) { modenum = 0; while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], @@ -3111,7 +3111,7 @@ static BOOL ddraw_match_surface_desc(const DDSURFACEDESC2 *requested, const DDSU if ((requested->dwFlags & provided->dwFlags) != requested->dwFlags) return FALSE; - for (i=0; i < sizeof(compare)/sizeof(compare[0]); i++) + for (i=0; i < ARRAY_SIZE(compare); i++) { if (requested->dwFlags & compare[i].flag && memcmp((const char *)provided + compare[i].offset, @@ -3643,7 +3643,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA return hr; } - for (i = 0; i < sizeof(device_list7)/sizeof(device_list7[0]); i++) + for (i = 0; i < ARRAY_SIZE(device_list7); i++) { HRESULT ret; @@ -4357,7 +4357,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device return hr; } - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, WINED3DUSAGE_DEPTHSTENCIL, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c2d87dd..75e000a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1086,7 +1086,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, return hr; } - for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) + for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) @@ -1108,7 +1108,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, } } - for (i = 0; i < sizeof(BumpFormatList) / sizeof(*BumpFormatList); ++i) + for (i = 0; i < ARRAY_SIZE(BumpFormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_LEGACYBUMPMAP, @@ -1214,7 +1214,7 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, return hr; } - for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) + for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index b6e5b11..0faa9823 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -740,13 +740,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) && !IsEqualGUID(&IID_IUnknown, riid)) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i=0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 0170fcd..65f24dc 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -768,8 +768,8 @@ void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) FE(DDSCAPS2_STEREOSURFACELEFT) }; - DDRAW_dump_flags_nolf(in->dwCaps, flags, sizeof(flags)/sizeof(flags[0])); - DDRAW_dump_flags(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); + DDRAW_dump_flags_nolf(in->dwCaps, flags, ARRAY_SIZE(flags)); + DDRAW_dump_flags(in->dwCaps2, flags2, ARRAY_SIZE(flags2)); } static void @@ -806,7 +806,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagmask) FE(DDPF_ZPIXELS) }; - DDRAW_dump_flags_nolf(flagmask, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags_nolf(flagmask, flags, ARRAY_SIZE(flags)); } static void DDRAW_dump_members(DWORD flags, const void *data, const struct member_info *mems, size_t num_mems) @@ -906,8 +906,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) { DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members_caps, 1); } - DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members, - sizeof(members)/sizeof(members[0])); + DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members, ARRAY_SIZE(members)); } } @@ -984,7 +983,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) if (TRACE_ON(ddraw)) { TRACE(" - "); - DDRAW_dump_flags(cooplevel, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags(cooplevel, flags, ARRAY_SIZE(flags)); } } @@ -1143,13 +1142,13 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) }; TRACE(" - dwSize : %d\n", lpcaps->dwSize); - TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, sizeof(flags1)/sizeof(flags1[0])); - TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); - TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, sizeof(flags3)/sizeof(flags3[0])); - TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, sizeof(flags4)/sizeof(flags4[0])); - TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, sizeof(flags5)/sizeof(flags5[0])); - TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, sizeof(flags6)/sizeof(flags6[0])); - TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, sizeof(flags7)/sizeof(flags7[0])); + TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, ARRAY_SIZE(flags1)); + TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, ARRAY_SIZE(flags2)); + TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, ARRAY_SIZE(flags3)); + TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, ARRAY_SIZE(flags4)); + TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, ARRAY_SIZE(flags5)); + TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, ARRAY_SIZE(flags6)); + TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, ARRAY_SIZE(flags7)); TRACE("...\n"); TRACE(" - dwNumFourCCCodes : %d\n", lpcaps->dwNumFourCCCodes); TRACE(" - dwCurrVisibleOverlays : %d\n", lpcaps->dwCurrVisibleOverlays);

1 0

Alexandre Julliard : makefiles: Generate the uninstall rule using the subdirs file lists.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: wine Branch: master Commit: 1a52ba0bc8a7640a53f86bc06f51fa3848020834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a52ba0bc8a7640a53f86bc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 21 12:29:06 2018 +0100 makefiles: Generate the uninstall rule using the subdirs file lists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 9 +--- aclocal.m4 | 60 +++++++---------------- configure | 60 +++++++---------------- tools/makedep.c | 146 +++++++++++++++++++++++++++++++++++++------------------- 4 files changed, 132 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a52ba0bc8a7640a53f8…

1 0